From 8e29326ff560f4b4424255a0acb910e5472caf81 Mon Sep 17 00:00:00 2001 From: Willian Mitsuda Date: Thu, 11 Nov 2021 15:37:40 -0300 Subject: [PATCH 1/9] Remove unused attribute --- src/TokenTransferItem.tsx | 9 +-------- src/transaction/Details.tsx | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/TokenTransferItem.tsx b/src/TokenTransferItem.tsx index d28a538..eb3e0b2 100644 --- a/src/TokenTransferItem.tsx +++ b/src/TokenTransferItem.tsx @@ -4,17 +4,11 @@ import { faCaretRight } from "@fortawesome/free-solid-svg-icons/faCaretRight"; import TransactionAddress from "./components/TransactionAddress"; import ValueHighlighter from "./components/ValueHighlighter"; import FormattedBalance from "./components/FormattedBalance"; -import { - AddressContext, - TokenMeta, - TokenTransfer, - TransactionData, -} from "./types"; +import { AddressContext, TokenMeta, TokenTransfer } from "./types"; import { ResolvedAddresses } from "./api/address-resolver"; type TokenTransferItemProps = { t: TokenTransfer; - txData: TransactionData; tokenMeta?: TokenMeta | undefined; resolvedAddresses: ResolvedAddresses | undefined; }; @@ -22,7 +16,6 @@ type TokenTransferItemProps = { // TODO: handle partial const TokenTransferItem: React.FC = ({ t, - txData, tokenMeta, resolvedAddresses, }) => ( diff --git a/src/transaction/Details.tsx b/src/transaction/Details.tsx index 37226f7..2c87e79 100644 --- a/src/transaction/Details.tsx +++ b/src/transaction/Details.tsx @@ -225,7 +225,6 @@ const Details: React.FC = ({ From 36b5437643091e7d2dbd0c76779490da799762b1 Mon Sep 17 00:00:00 2001 From: Willian Mitsuda Date: Thu, 11 Nov 2021 15:51:03 -0300 Subject: [PATCH 2/9] Fix missing Sourcify decoration on token transfers --- src/TokenTransferItem.tsx | 13 ++++++++++++- src/transaction/Details.tsx | 6 ++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/TokenTransferItem.tsx b/src/TokenTransferItem.tsx index eb3e0b2..5b9fc72 100644 --- a/src/TokenTransferItem.tsx +++ b/src/TokenTransferItem.tsx @@ -4,13 +4,20 @@ import { faCaretRight } from "@fortawesome/free-solid-svg-icons/faCaretRight"; import TransactionAddress from "./components/TransactionAddress"; import ValueHighlighter from "./components/ValueHighlighter"; import FormattedBalance from "./components/FormattedBalance"; -import { AddressContext, TokenMeta, TokenTransfer } from "./types"; +import { + AddressContext, + ChecksummedAddress, + TokenMeta, + TokenTransfer, +} from "./types"; import { ResolvedAddresses } from "./api/address-resolver"; +import { Metadata } from "./useSourcify"; type TokenTransferItemProps = { t: TokenTransfer; tokenMeta?: TokenMeta | undefined; resolvedAddresses: ResolvedAddresses | undefined; + metadatas: Record; }; // TODO: handle partial @@ -18,6 +25,7 @@ const TokenTransferItem: React.FC = ({ t, tokenMeta, resolvedAddresses, + metadatas, }) => (
@@ -30,6 +38,7 @@ const TokenTransferItem: React.FC = ({ address={t.from} addressCtx={AddressContext.FROM} resolvedAddresses={resolvedAddresses} + metadata={metadatas[t.from]} />
@@ -38,6 +47,7 @@ const TokenTransferItem: React.FC = ({ address={t.to} addressCtx={AddressContext.TO} resolvedAddresses={resolvedAddresses} + metadata={metadatas[t.to]} />
@@ -53,6 +63,7 @@ const TokenTransferItem: React.FC = ({
diff --git a/src/transaction/Details.tsx b/src/transaction/Details.tsx index 2c87e79..afa2628 100644 --- a/src/transaction/Details.tsx +++ b/src/transaction/Details.tsx @@ -95,6 +95,11 @@ const Details: React.FC = ({ if (txData.confirmedData?.createdContractAddress) { _addresses.push(txData.confirmedData.createdContractAddress); } + for (const t of txData.tokenTransfers) { + _addresses.push(t.from); + _addresses.push(t.to); + _addresses.push(t.token); + } return _addresses; }, [txData]); const { sourcifySource } = useAppConfigContext(); @@ -227,6 +232,7 @@ const Details: React.FC = ({ t={t} tokenMeta={txData.tokenMetas[t.token]} resolvedAddresses={resolvedAddresses} + metadatas={metadatas} /> ))} From 5b203bc8d40d11876f1b82f9cc8eb1509990fce9 Mon Sep 17 00:00:00 2001 From: Willian Mitsuda Date: Thu, 11 Nov 2021 16:14:04 -0300 Subject: [PATCH 3/9] Remove unnecessary nested spans --- src/transaction/Details.tsx | 66 +++++++++++++++---------------------- 1 file changed, 27 insertions(+), 39 deletions(-) diff --git a/src/transaction/Details.tsx b/src/transaction/Details.tsx index afa2628..1fc10bd 100644 --- a/src/transaction/Details.tsx +++ b/src/transaction/Details.tsx @@ -225,17 +225,15 @@ const Details: React.FC = ({ )} {txData.tokenTransfers.length > 0 && ( -
- {txData.tokenTransfers.map((t, i) => ( - - ))} -
+ {txData.tokenTransfers.map((t, i) => ( + + ))} )} @@ -262,24 +260,16 @@ const Details: React.FC = ({ {txData.type === 2 && ( <> - - Ether ( - {" "} - Gwei) - + Ether ( + {" "} + Gwei) - - Ether ( - {" "} - Gwei) - + Ether ( + Gwei) )} @@ -321,18 +311,16 @@ const Details: React.FC = ({ )} {txData.confirmedData && hasEIP1559 && ( - - {" "} - Gwei ( - {" "} - wei) - + {" "} + Gwei ( + {" "} + wei) )} {txData.confirmedData && ( From c9f7f46ebc3dd43a001486e6670fee3df5cbf1bd Mon Sep 17 00:00:00 2001 From: Willian Mitsuda Date: Thu, 18 Nov 2021 15:46:09 -0300 Subject: [PATCH 4/9] Add generic resolvers support to internal ops --- src/components/InternalCreate.tsx | 12 +++++- src/components/InternalSelfDestruct.tsx | 40 ++++++++++++------- .../InternalTransactionOperation.tsx | 12 +++++- src/components/InternalTransfer.tsx | 4 +- src/transaction/Details.tsx | 2 +- 5 files changed, 50 insertions(+), 20 deletions(-) diff --git a/src/components/InternalCreate.tsx b/src/components/InternalCreate.tsx index 7a723ce..dcf050f 100644 --- a/src/components/InternalCreate.tsx +++ b/src/components/InternalCreate.tsx @@ -4,26 +4,33 @@ import { faAngleRight } from "@fortawesome/free-solid-svg-icons/faAngleRight"; import AddressHighlighter from "./AddressHighlighter"; import DecoratedAddressLink from "./DecoratedAddressLink"; import { TransactionData, InternalOperation } from "../types"; +import { ResolvedAddresses } from "../api/address-resolver"; type InternalCreateProps = { txData: TransactionData; internalOp: InternalOperation; + resolvedAddresses: ResolvedAddresses | undefined; }; const InternalCreate: React.FC = ({ txData, internalOp, + resolvedAddresses, }) => { return ( <> -
+
CREATE Contract
- +
@@ -33,6 +40,7 @@ const InternalCreate: React.FC = ({ address={internalOp.from} txFrom={internalOp.from === txData.from} txTo={internalOp.from === txData.to} + resolvedAddresses={resolvedAddresses} /> ) diff --git a/src/components/InternalSelfDestruct.tsx b/src/components/InternalSelfDestruct.tsx index 007fb32..be71afd 100644 --- a/src/components/InternalSelfDestruct.tsx +++ b/src/components/InternalSelfDestruct.tsx @@ -1,11 +1,12 @@ -import React, { useContext } from "react"; +import React from "react"; import { formatEther } from "@ethersproject/units"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faAngleRight } from "@fortawesome/free-solid-svg-icons/faAngleRight"; import AddressHighlighter from "./AddressHighlighter"; import DecoratedAddressLink from "./DecoratedAddressLink"; -import { RuntimeContext } from "../useRuntime"; import { TransactionData, InternalOperation } from "../types"; +import { ResolvedAddresses } from "../api/address-resolver"; +import TransactionAddress from "./TransactionAddress"; const CHI_ADDRESS = "0x0000000000004946c0e9F43F4Dee607b0eF1fA1c"; const GST2_ADDRESS = "0x0000000000b3F879cb30FE243b4Dfee438691c04"; @@ -13,40 +14,47 @@ const GST2_ADDRESS = "0x0000000000b3F879cb30FE243b4Dfee438691c04"; type InternalSelfDestructProps = { txData: TransactionData; internalOp: InternalOperation; + resolvedAddresses: ResolvedAddresses | undefined; }; const InternalSelfDestruct: React.FC = ({ txData, internalOp, + resolvedAddresses, }) => { - const { provider } = useContext(RuntimeContext); - const network = provider?.network; - const toMiner = txData.confirmedData?.miner !== undefined && internalOp.to === txData.confirmedData.miner; return ( <> -
+
SELF DESTRUCT Contract
- +
- {network?.chainId === 1 && internalOp.to === CHI_ADDRESS && ( - (Chi Gastoken) - )} - {network?.chainId === 1 && internalOp.to === GST2_ADDRESS && ( - (GST2 Gastoken) + {internalOp.value.isZero() && ( +
+ (To:{" "} + + ) +
)}
{!internalOp.value.isZero() && ( -
+
TRANSFER @@ -59,7 +67,11 @@ const InternalSelfDestruct: React.FC = ({ toMiner ? "rounded px-2 py-1 bg-yellow-100" : "" }`} > - +
diff --git a/src/components/InternalTransactionOperation.tsx b/src/components/InternalTransactionOperation.tsx index 7de3bb2..f35319d 100644 --- a/src/components/InternalTransactionOperation.tsx +++ b/src/components/InternalTransactionOperation.tsx @@ -22,11 +22,19 @@ const InternalTransactionOperation: React.FC /> )} {internalOp.type === OperationType.SELF_DESTRUCT && ( - + )} {(internalOp.type === OperationType.CREATE || internalOp.type === OperationType.CREATE2) && ( - + )} ); diff --git a/src/components/InternalTransfer.tsx b/src/components/InternalTransfer.tsx index 2958452..1dce1db 100644 --- a/src/components/InternalTransfer.tsx +++ b/src/components/InternalTransfer.tsx @@ -26,7 +26,7 @@ const InternalTransfer: React.FC = ({ internalOp.to === txData.confirmedData.miner; return ( -
+
TRANSFER @@ -44,6 +44,7 @@ const InternalTransfer: React.FC = ({ miner={fromMiner} txFrom={internalOp.from === txData.from} txTo={internalOp.from === txData.to} + resolvedAddresses={resolvedAddresses} />
@@ -61,6 +62,7 @@ const InternalTransfer: React.FC = ({ miner={toMiner} txFrom={internalOp.to === txData.from} txTo={internalOp.to === txData.to} + resolvedAddresses={resolvedAddresses} />
diff --git a/src/transaction/Details.tsx b/src/transaction/Details.tsx index 1fc10bd..0b474af 100644 --- a/src/transaction/Details.tsx +++ b/src/transaction/Details.tsx @@ -206,7 +206,7 @@ const Details: React.FC = ({
)} {internalOps && internalOps.length > 0 && ( -
+
{internalOps.map((op, i) => ( Date: Thu, 18 Nov 2021 15:51:08 -0300 Subject: [PATCH 5/9] Remove unnecessary code --- src/components/InternalCreate.tsx | 64 ++++++++++++------------- src/components/InternalSelfDestruct.tsx | 5 +- src/components/InternalTransfer.tsx | 2 +- 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/src/components/InternalCreate.tsx b/src/components/InternalCreate.tsx index dcf050f..5a6a543 100644 --- a/src/components/InternalCreate.tsx +++ b/src/components/InternalCreate.tsx @@ -16,38 +16,34 @@ const InternalCreate: React.FC = ({ txData, internalOp, resolvedAddresses, -}) => { - return ( - <> -
- - CREATE - - Contract -
- - - -
- - (Creator:{" "} - - - - ) - -
- - ); -}; +}) => ( +
+ + CREATE + + Contract +
+ + + +
+ + (Creator:{" "} + + + + ) + +
+); -export default React.memo(InternalCreate); +export default InternalCreate; diff --git a/src/components/InternalSelfDestruct.tsx b/src/components/InternalSelfDestruct.tsx index be71afd..794b987 100644 --- a/src/components/InternalSelfDestruct.tsx +++ b/src/components/InternalSelfDestruct.tsx @@ -8,9 +8,6 @@ import { TransactionData, InternalOperation } from "../types"; import { ResolvedAddresses } from "../api/address-resolver"; import TransactionAddress from "./TransactionAddress"; -const CHI_ADDRESS = "0x0000000000004946c0e9F43F4Dee607b0eF1fA1c"; -const GST2_ADDRESS = "0x0000000000b3F879cb30FE243b4Dfee438691c04"; - type InternalSelfDestructProps = { txData: TransactionData; internalOp: InternalOperation; @@ -81,4 +78,4 @@ const InternalSelfDestruct: React.FC = ({ ); }; -export default React.memo(InternalSelfDestruct); +export default InternalSelfDestruct; diff --git a/src/components/InternalTransfer.tsx b/src/components/InternalTransfer.tsx index 1dce1db..bf46778 100644 --- a/src/components/InternalTransfer.tsx +++ b/src/components/InternalTransfer.tsx @@ -71,4 +71,4 @@ const InternalTransfer: React.FC = ({ ); }; -export default React.memo(InternalTransfer); +export default InternalTransfer; From 2e586789a45d93be5e8615e9a491e012a744ae09 Mon Sep 17 00:00:00 2001 From: Willian Mitsuda Date: Thu, 18 Nov 2021 16:01:11 -0300 Subject: [PATCH 6/9] Replace by TransactionAddress component --- src/components/InternalCreate.tsx | 17 ++++++----------- src/components/InternalTransactionOperation.tsx | 1 - 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/components/InternalCreate.tsx b/src/components/InternalCreate.tsx index 5a6a543..e086e9d 100644 --- a/src/components/InternalCreate.tsx +++ b/src/components/InternalCreate.tsx @@ -1,19 +1,18 @@ import React from "react"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faAngleRight } from "@fortawesome/free-solid-svg-icons/faAngleRight"; +import TransactionAddress from "./TransactionAddress"; import AddressHighlighter from "./AddressHighlighter"; import DecoratedAddressLink from "./DecoratedAddressLink"; -import { TransactionData, InternalOperation } from "../types"; +import { InternalOperation } from "../types"; import { ResolvedAddresses } from "../api/address-resolver"; type InternalCreateProps = { - txData: TransactionData; internalOp: InternalOperation; resolvedAddresses: ResolvedAddresses | undefined; }; const InternalCreate: React.FC = ({ - txData, internalOp, resolvedAddresses, }) => ( @@ -33,14 +32,10 @@ const InternalCreate: React.FC = ({
(Creator:{" "} - - - + )
diff --git a/src/components/InternalTransactionOperation.tsx b/src/components/InternalTransactionOperation.tsx index f35319d..f167eb5 100644 --- a/src/components/InternalTransactionOperation.tsx +++ b/src/components/InternalTransactionOperation.tsx @@ -31,7 +31,6 @@ const InternalTransactionOperation: React.FC {(internalOp.type === OperationType.CREATE || internalOp.type === OperationType.CREATE2) && ( From 9d598a0193a3b7c36fde35942217c3afdba027a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 19:04:29 +0000 Subject: [PATCH 7/9] Bump highlightjs-solidity from 2.0.1 to 2.0.2 (#120) --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72a569e..c952ccd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "@types/react-syntax-highlighter": "^13.5.2", "chart.js": "^3.5.1", "ethers": "^5.5.1", - "highlightjs-solidity": "^2.0.1", + "highlightjs-solidity": "^2.0.2", "query-string": "^7.0.1", "react": "^17.0.2", "react-blockies": "^1.4.1", @@ -9283,9 +9283,9 @@ } }, "node_modules/highlightjs-solidity": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.1.tgz", - "integrity": "sha512-9YY+HQpXMTrF8HgRByjeQhd21GXAz2ktMPTcs6oWSj5HJR52fgsNoelMOmgigwcpt9j4tu4IVSaWaJB2n2TbvQ==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.2.tgz", + "integrity": "sha512-q0aYUKiZ9MPQg41qx/KpXKaCpqql50qTvmwGYyLFfcjt9AE/+C9CwjVIdJZc7EYj6NGgJuFJ4im1gfgrzUU1fQ==" }, "node_modules/history": { "version": "4.10.1", @@ -25780,9 +25780,9 @@ "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==" }, "highlightjs-solidity": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.1.tgz", - "integrity": "sha512-9YY+HQpXMTrF8HgRByjeQhd21GXAz2ktMPTcs6oWSj5HJR52fgsNoelMOmgigwcpt9j4tu4IVSaWaJB2n2TbvQ==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.2.tgz", + "integrity": "sha512-q0aYUKiZ9MPQg41qx/KpXKaCpqql50qTvmwGYyLFfcjt9AE/+C9CwjVIdJZc7EYj6NGgJuFJ4im1gfgrzUU1fQ==" }, "history": { "version": "4.10.1", diff --git a/package.json b/package.json index 53f80f4..2fdfa4e 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@types/react-syntax-highlighter": "^13.5.2", "chart.js": "^3.5.1", "ethers": "^5.5.1", - "highlightjs-solidity": "^2.0.1", + "highlightjs-solidity": "^2.0.2", "query-string": "^7.0.1", "react": "^17.0.2", "react-blockies": "^1.4.1", From 78a0544c54f4acb1820c4636fa8c42f74b96ca4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 19:07:05 +0000 Subject: [PATCH 8/9] Bump react-syntax-highlighter from 15.4.4 to 15.4.5 (#121) --- package-lock.json | 30 +++++++++++++++++++++--------- package.json | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index c952ccd..8b582fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,7 @@ "react-image": "^4.0.3", "react-router-dom": "^5.3.0", "react-scripts": "4.0.3", - "react-syntax-highlighter": "^15.4.4", + "react-syntax-highlighter": "^15.4.5", "serve": "^13.0.2", "typescript": "^4.4.4", "use-keyboard-shortcut": "^1.0.6", @@ -14920,20 +14920,25 @@ } }, "node_modules/react-syntax-highlighter": { - "version": "15.4.4", - "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.4.tgz", - "integrity": "sha512-PsOFHNTzkb3OroXdoR897eKN5EZ6grht1iM+f1lJSq7/L0YVnkJaNVwC3wEUYPOAmeyl5xyer1DjL6MrumO6Zw==", + "version": "15.4.5", + "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.5.tgz", + "integrity": "sha512-RC90KQTxZ/b7+9iE6s9nmiFLFjWswUcfULi4GwVzdFVKVMQySkJWBuOmJFfjwjMVCo0IUUuJrWebNKyviKpwLQ==", "dependencies": { "@babel/runtime": "^7.3.1", "highlight.js": "^10.4.1", "lowlight": "^1.17.0", - "prismjs": "^1.22.0", + "prismjs": "^1.25.0", "refractor": "^3.2.0" }, "peerDependencies": { "react": ">= 0.14.0" } }, + "node_modules/react-syntax-highlighter/node_modules/prismjs": { + "version": "1.25.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz", + "integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==" + }, "node_modules/read-pkg": { "version": "5.2.0", "license": "MIT", @@ -29547,15 +29552,22 @@ } }, "react-syntax-highlighter": { - "version": "15.4.4", - "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.4.tgz", - "integrity": "sha512-PsOFHNTzkb3OroXdoR897eKN5EZ6grht1iM+f1lJSq7/L0YVnkJaNVwC3wEUYPOAmeyl5xyer1DjL6MrumO6Zw==", + "version": "15.4.5", + "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.5.tgz", + "integrity": "sha512-RC90KQTxZ/b7+9iE6s9nmiFLFjWswUcfULi4GwVzdFVKVMQySkJWBuOmJFfjwjMVCo0IUUuJrWebNKyviKpwLQ==", "requires": { "@babel/runtime": "^7.3.1", "highlight.js": "^10.4.1", "lowlight": "^1.17.0", - "prismjs": "^1.22.0", + "prismjs": "^1.25.0", "refractor": "^3.2.0" + }, + "dependencies": { + "prismjs": { + "version": "1.25.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz", + "integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==" + } } }, "read-pkg": { diff --git a/package.json b/package.json index 2fdfa4e..f49441c 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "react-image": "^4.0.3", "react-router-dom": "^5.3.0", "react-scripts": "4.0.3", - "react-syntax-highlighter": "^15.4.4", + "react-syntax-highlighter": "^15.4.5", "serve": "^13.0.2", "typescript": "^4.4.4", "use-keyboard-shortcut": "^1.0.6", From 7f381878ee142c5ed14df2b19f189fd7eefc1b05 Mon Sep 17 00:00:00 2001 From: Willian Mitsuda Date: Thu, 18 Nov 2021 16:10:13 -0300 Subject: [PATCH 9/9] Update trustwallet assets --- trustwallet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trustwallet b/trustwallet index e439c36..30e4ffa 160000 --- a/trustwallet +++ b/trustwallet @@ -1 +1 @@ -Subproject commit e439c36937deb321ad01c23ac23941e8a491efe9 +Subproject commit 30e4ffa0153594b11421cf383b1192e4414d2f66