viem 2.57.13 → 2.57.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +60 -0
- package/_cjs/account-abstraction/utils/formatters/userOperationReceipt.js +2 -0
- package/_cjs/account-abstraction/utils/formatters/userOperationReceipt.js.map +1 -1
- package/_cjs/actions/public/estimateGas.js +5 -2
- package/_cjs/actions/public/estimateGas.js.map +1 -1
- package/_cjs/actions/public/fillTransaction.js +2 -0
- package/_cjs/actions/public/fillTransaction.js.map +1 -1
- package/_cjs/actions/public/getFilterChanges.js +1 -0
- package/_cjs/actions/public/getFilterChanges.js.map +1 -1
- package/_cjs/actions/public/getFilterLogs.js +1 -0
- package/_cjs/actions/public/getFilterLogs.js.map +1 -1
- package/_cjs/actions/public/watchBlockNumber.js +3 -1
- package/_cjs/actions/public/watchBlockNumber.js.map +1 -1
- package/_cjs/actions/public/watchBlocks.js +20 -8
- package/_cjs/actions/public/watchBlocks.js.map +1 -1
- package/_cjs/actions/public/watchContractEvent.js +10 -3
- package/_cjs/actions/public/watchContractEvent.js.map +1 -1
- package/_cjs/actions/public/watchEvent.js +5 -0
- package/_cjs/actions/public/watchEvent.js.map +1 -1
- package/_cjs/actions/wallet/prepareTransactionRequest.js +3 -2
- package/_cjs/actions/wallet/prepareTransactionRequest.js.map +1 -1
- package/_cjs/actions/wallet/sendTransaction.js +4 -2
- package/_cjs/actions/wallet/sendTransaction.js.map +1 -1
- package/_cjs/actions/wallet/sendTransactionSync.js +48 -7
- package/_cjs/actions/wallet/sendTransactionSync.js.map +1 -1
- package/_cjs/chains/definitions/hashKeyChain.js +4 -4
- package/_cjs/chains/definitions/hashKeyChain.js.map +1 -1
- package/_cjs/chains/definitions/hashkeyChainTestnet.js +4 -4
- package/_cjs/chains/definitions/hashkeyChainTestnet.js.map +1 -1
- package/_cjs/chains/definitions/turkchain.js +26 -0
- package/_cjs/chains/definitions/turkchain.js.map +1 -0
- package/_cjs/chains/definitions/zksync.js +1 -1
- package/_cjs/chains/definitions/zksync.js.map +1 -1
- package/_cjs/chains/index.js +4 -2
- package/_cjs/chains/index.js.map +1 -1
- package/_cjs/clients/createClient.js.map +1 -1
- package/_cjs/clients/transports/fallback.js +5 -0
- package/_cjs/clients/transports/fallback.js.map +1 -1
- package/_cjs/errors/node.js +10 -4
- package/_cjs/errors/node.js.map +1 -1
- package/_cjs/errors/typedData.js +4 -2
- package/_cjs/errors/typedData.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/index.js +5 -4
- package/_cjs/index.js.map +1 -1
- package/_cjs/tempo/Account.js +85 -12
- package/_cjs/tempo/Account.js.map +1 -1
- package/_cjs/tempo/Formatters.js +4 -1
- package/_cjs/tempo/Formatters.js.map +1 -1
- package/_cjs/tempo/Relay.js +5 -0
- package/_cjs/tempo/Relay.js.map +1 -1
- package/_cjs/tempo/Transaction.js +2 -1
- package/_cjs/tempo/Transaction.js.map +1 -1
- package/_cjs/tempo/chainConfig.js +10 -13
- package/_cjs/tempo/chainConfig.js.map +1 -1
- package/_cjs/tempo/internal/relay/autoSwap.js +200 -0
- package/_cjs/tempo/internal/relay/autoSwap.js.map +1 -0
- package/_cjs/tempo/internal/relay/error.js +5 -1
- package/_cjs/tempo/internal/relay/error.js.map +1 -1
- package/_cjs/tempo/internal/relay/feePayer.js +18 -5
- package/_cjs/tempo/internal/relay/feePayer.js.map +1 -1
- package/_cjs/tempo/internal/relay/feeToken.js +14 -1
- package/_cjs/tempo/internal/relay/feeToken.js.map +1 -1
- package/_cjs/tempo/internal/relay/simulate.js +57 -15
- package/_cjs/tempo/internal/relay/simulate.js.map +1 -1
- package/_cjs/utils/abi/decodeEventLog.js +57 -7
- package/_cjs/utils/abi/decodeEventLog.js.map +1 -1
- package/_cjs/utils/abi/getAbiItem.js +27 -6
- package/_cjs/utils/abi/getAbiItem.js.map +1 -1
- package/_cjs/utils/abi/parseEventLogs.js +27 -4
- package/_cjs/utils/abi/parseEventLogs.js.map +1 -1
- package/_cjs/utils/authorization/recoverAuthorizationAddress.js +9 -2
- package/_cjs/utils/authorization/recoverAuthorizationAddress.js.map +1 -1
- package/_cjs/utils/authorization/verifyAuthorization.js +14 -4
- package/_cjs/utils/authorization/verifyAuthorization.js.map +1 -1
- package/_cjs/utils/ccip.js +134 -28
- package/_cjs/utils/ccip.js.map +1 -1
- package/_cjs/utils/ccipTunnel.js +5 -1
- package/_cjs/utils/ccipTunnel.js.map +1 -1
- package/_cjs/utils/ens/localBatchGatewayRequest.js +55 -5
- package/_cjs/utils/ens/localBatchGatewayRequest.js.map +1 -1
- package/_cjs/utils/internal/http.js +79 -0
- package/_cjs/utils/internal/http.js.map +1 -0
- package/_cjs/utils/nonceManager.js.map +1 -1
- package/_cjs/utils/rpc/http.js +3 -73
- package/_cjs/utils/rpc/http.js.map +1 -1
- package/_cjs/utils/transaction/assertRequest.js +2 -2
- package/_cjs/utils/transaction/assertRequest.js.map +1 -1
- package/_cjs/utils/transaction/assertTransaction.js +2 -2
- package/_cjs/utils/transaction/assertTransaction.js.map +1 -1
- package/_cjs/utils/transaction/parseTransaction.js +21 -7
- package/_cjs/utils/transaction/parseTransaction.js.map +1 -1
- package/_cjs/utils/typedData.js +19 -6
- package/_cjs/utils/typedData.js.map +1 -1
- package/_esm/account-abstraction/utils/formatters/userOperationReceipt.js +2 -0
- package/_esm/account-abstraction/utils/formatters/userOperationReceipt.js.map +1 -1
- package/_esm/actions/public/estimateGas.js +10 -5
- package/_esm/actions/public/estimateGas.js.map +1 -1
- package/_esm/actions/public/fillTransaction.js +2 -0
- package/_esm/actions/public/fillTransaction.js.map +1 -1
- package/_esm/actions/public/getFilterChanges.js +1 -0
- package/_esm/actions/public/getFilterChanges.js.map +1 -1
- package/_esm/actions/public/getFilterLogs.js +1 -0
- package/_esm/actions/public/getFilterLogs.js.map +1 -1
- package/_esm/actions/public/watchBlockNumber.js +5 -1
- package/_esm/actions/public/watchBlockNumber.js.map +1 -1
- package/_esm/actions/public/watchBlocks.js +28 -8
- package/_esm/actions/public/watchBlocks.js.map +1 -1
- package/_esm/actions/public/watchContractEvent.js +15 -5
- package/_esm/actions/public/watchContractEvent.js.map +1 -1
- package/_esm/actions/public/watchEvent.js +11 -2
- package/_esm/actions/public/watchEvent.js.map +1 -1
- package/_esm/actions/wallet/prepareTransactionRequest.js +3 -2
- package/_esm/actions/wallet/prepareTransactionRequest.js.map +1 -1
- package/_esm/actions/wallet/sendTransaction.js +6 -2
- package/_esm/actions/wallet/sendTransaction.js.map +1 -1
- package/_esm/actions/wallet/sendTransactionSync.js +59 -8
- package/_esm/actions/wallet/sendTransactionSync.js.map +1 -1
- package/_esm/chains/definitions/hashKeyChain.js +4 -4
- package/_esm/chains/definitions/hashKeyChain.js.map +1 -1
- package/_esm/chains/definitions/hashkeyChainTestnet.js +4 -4
- package/_esm/chains/definitions/hashkeyChainTestnet.js.map +1 -1
- package/_esm/chains/definitions/turkchain.js +23 -0
- package/_esm/chains/definitions/turkchain.js.map +1 -0
- package/_esm/chains/definitions/zksync.js +1 -1
- package/_esm/chains/definitions/zksync.js.map +1 -1
- package/_esm/chains/index.js +1 -0
- package/_esm/chains/index.js.map +1 -1
- package/_esm/clients/createClient.js.map +1 -1
- package/_esm/clients/transports/fallback.js +8 -0
- package/_esm/clients/transports/fallback.js.map +1 -1
- package/_esm/errors/node.js +10 -4
- package/_esm/errors/node.js.map +1 -1
- package/_esm/errors/typedData.js +5 -2
- package/_esm/errors/typedData.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/index.js +1 -1
- package/_esm/index.js.map +1 -1
- package/_esm/tempo/Account.js +122 -11
- package/_esm/tempo/Account.js.map +1 -1
- package/_esm/tempo/Formatters.js +5 -2
- package/_esm/tempo/Formatters.js.map +1 -1
- package/_esm/tempo/Relay.js +20 -0
- package/_esm/tempo/Relay.js.map +1 -1
- package/_esm/tempo/Transaction.js +2 -0
- package/_esm/tempo/Transaction.js.map +1 -1
- package/_esm/tempo/chainConfig.js +20 -14
- package/_esm/tempo/chainConfig.js.map +1 -1
- package/_esm/tempo/internal/relay/autoSwap.js +218 -0
- package/_esm/tempo/internal/relay/autoSwap.js.map +1 -0
- package/_esm/tempo/internal/relay/error.js +6 -2
- package/_esm/tempo/internal/relay/error.js.map +1 -1
- package/_esm/tempo/internal/relay/feePayer.js +24 -7
- package/_esm/tempo/internal/relay/feePayer.js.map +1 -1
- package/_esm/tempo/internal/relay/feeToken.js +17 -3
- package/_esm/tempo/internal/relay/feeToken.js.map +1 -1
- package/_esm/tempo/internal/relay/simulate.js +68 -17
- package/_esm/tempo/internal/relay/simulate.js.map +1 -1
- package/_esm/utils/abi/decodeEventLog.js +69 -7
- package/_esm/utils/abi/decodeEventLog.js.map +1 -1
- package/_esm/utils/abi/getAbiItem.js +34 -6
- package/_esm/utils/abi/getAbiItem.js.map +1 -1
- package/_esm/utils/abi/parseEventLogs.js +43 -10
- package/_esm/utils/abi/parseEventLogs.js.map +1 -1
- package/_esm/utils/authorization/recoverAuthorizationAddress.js +11 -2
- package/_esm/utils/authorization/recoverAuthorizationAddress.js.map +1 -1
- package/_esm/utils/authorization/verifyAuthorization.js +15 -4
- package/_esm/utils/authorization/verifyAuthorization.js.map +1 -1
- package/_esm/utils/ccip.js +163 -31
- package/_esm/utils/ccip.js.map +1 -1
- package/_esm/utils/ccipTunnel.js +5 -1
- package/_esm/utils/ccipTunnel.js.map +1 -1
- package/_esm/utils/ens/localBatchGatewayRequest.js +69 -4
- package/_esm/utils/ens/localBatchGatewayRequest.js.map +1 -1
- package/_esm/utils/internal/http.js +83 -0
- package/_esm/utils/internal/http.js.map +1 -0
- package/_esm/utils/nonceManager.js.map +1 -1
- package/_esm/utils/rpc/http.js +1 -75
- package/_esm/utils/rpc/http.js.map +1 -1
- package/_esm/utils/transaction/assertRequest.js +2 -2
- package/_esm/utils/transaction/assertRequest.js.map +1 -1
- package/_esm/utils/transaction/assertTransaction.js +2 -2
- package/_esm/utils/transaction/assertTransaction.js.map +1 -1
- package/_esm/utils/transaction/parseTransaction.js +24 -7
- package/_esm/utils/transaction/parseTransaction.js.map +1 -1
- package/_esm/utils/typedData.js +25 -8
- package/_esm/utils/typedData.js.map +1 -1
- package/_types/account-abstraction/utils/formatters/userOperationReceipt.d.ts.map +1 -1
- package/_types/actions/public/estimateGas.d.ts.map +1 -1
- package/_types/actions/public/fillTransaction.d.ts.map +1 -1
- package/_types/actions/public/getFilterChanges.d.ts.map +1 -1
- package/_types/actions/public/getFilterLogs.d.ts.map +1 -1
- package/_types/actions/public/watchBlockNumber.d.ts +6 -2
- package/_types/actions/public/watchBlockNumber.d.ts.map +1 -1
- package/_types/actions/public/watchBlocks.d.ts +7 -2
- package/_types/actions/public/watchBlocks.d.ts.map +1 -1
- package/_types/actions/public/watchContractEvent.d.ts.map +1 -1
- package/_types/actions/public/watchEvent.d.ts.map +1 -1
- package/_types/actions/wallet/prepareTransactionRequest.d.ts.map +1 -1
- package/_types/actions/wallet/sendTransaction.d.ts.map +1 -1
- package/_types/actions/wallet/sendTransactionSync.d.ts.map +1 -1
- package/_types/chains/definitions/hashKeyChain.d.ts +4 -4
- package/_types/chains/definitions/hashkeyChainTestnet.d.ts +4 -4
- package/_types/chains/definitions/turkchain.d.ts +53 -0
- package/_types/chains/definitions/turkchain.d.ts.map +1 -0
- package/_types/chains/definitions/zksync.d.ts +1 -1
- package/_types/chains/index.d.ts +1 -0
- package/_types/chains/index.d.ts.map +1 -1
- package/_types/clients/createClient.d.ts +6 -0
- package/_types/clients/createClient.d.ts.map +1 -1
- package/_types/clients/transports/fallback.d.ts.map +1 -1
- package/_types/errors/node.d.ts.map +1 -1
- package/_types/errors/typedData.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/index.d.ts +1 -1
- package/_types/index.d.ts.map +1 -1
- package/_types/tempo/Account.d.ts +78 -5
- package/_types/tempo/Account.d.ts.map +1 -1
- package/_types/tempo/Capabilities.d.ts +32 -2
- package/_types/tempo/Capabilities.d.ts.map +1 -1
- package/_types/tempo/Relay.d.ts +27 -1
- package/_types/tempo/Relay.d.ts.map +1 -1
- package/_types/tempo/Transaction.d.ts +2 -0
- package/_types/tempo/Transaction.d.ts.map +1 -1
- package/_types/tempo/actions/accessKey.d.ts +2 -2
- package/_types/tempo/chainConfig.d.ts.map +1 -1
- package/_types/tempo/internal/relay/autoSwap.d.ts +3 -0
- package/_types/tempo/internal/relay/autoSwap.d.ts.map +1 -0
- package/_types/tempo/internal/relay/error.d.ts.map +1 -1
- package/_types/tempo/internal/relay/feePayer.d.ts.map +1 -1
- package/_types/tempo/internal/relay/feeToken.d.ts.map +1 -1
- package/_types/tempo/internal/relay/simulate.d.ts +4 -0
- package/_types/tempo/internal/relay/simulate.d.ts.map +1 -1
- package/_types/tempo/internal/relay/utils.d.ts +8 -8
- package/_types/utils/abi/decodeEventLog.d.ts +13 -1
- package/_types/utils/abi/decodeEventLog.d.ts.map +1 -1
- package/_types/utils/abi/getAbiItem.d.ts.map +1 -1
- package/_types/utils/abi/parseEventLogs.d.ts.map +1 -1
- package/_types/utils/authorization/recoverAuthorizationAddress.d.ts +2 -1
- package/_types/utils/authorization/recoverAuthorizationAddress.d.ts.map +1 -1
- package/_types/utils/authorization/verifyAuthorization.d.ts.map +1 -1
- package/_types/utils/ccip.d.ts +24 -4
- package/_types/utils/ccip.d.ts.map +1 -1
- package/_types/utils/ccipTunnel.d.ts.map +1 -1
- package/_types/utils/ens/localBatchGatewayRequest.d.ts +26 -0
- package/_types/utils/ens/localBatchGatewayRequest.d.ts.map +1 -1
- package/_types/utils/internal/http.d.ts +16 -0
- package/_types/utils/internal/http.d.ts.map +1 -0
- package/_types/utils/nonceManager.d.ts +15 -1
- package/_types/utils/nonceManager.d.ts.map +1 -1
- package/_types/utils/rpc/http.d.ts.map +1 -1
- package/_types/utils/transaction/parseTransaction.d.ts.map +1 -1
- package/_types/utils/typedData.d.ts.map +1 -1
- package/account-abstraction/utils/formatters/userOperationReceipt.ts +1 -0
- package/actions/public/estimateGas.ts +12 -5
- package/actions/public/fillTransaction.ts +2 -0
- package/actions/public/getFilterChanges.ts +1 -0
- package/actions/public/getFilterLogs.ts +1 -0
- package/actions/public/watchBlockNumber.ts +11 -2
- package/actions/public/watchBlocks.ts +46 -14
- package/actions/public/watchContractEvent.ts +22 -4
- package/actions/public/watchEvent.ts +17 -1
- package/actions/wallet/prepareTransactionRequest.ts +6 -2
- package/actions/wallet/sendTransaction.ts +9 -3
- package/actions/wallet/sendTransactionSync.ts +74 -12
- package/chains/definitions/hashKeyChain.ts +4 -4
- package/chains/definitions/hashkeyChainTestnet.ts +4 -4
- package/chains/definitions/turkchain.ts +23 -0
- package/chains/definitions/zksync.ts +1 -1
- package/chains/index.ts +1 -0
- package/clients/createClient.ts +6 -0
- package/clients/transports/fallback.ts +11 -0
- package/errors/node.ts +11 -5
- package/errors/typedData.ts +5 -2
- package/errors/version.ts +1 -1
- package/index.ts +2 -0
- package/package.json +1 -1
- package/tempo/Account.ts +203 -17
- package/tempo/Capabilities.ts +34 -2
- package/tempo/Formatters.ts +5 -5
- package/tempo/Relay.ts +32 -1
- package/tempo/Transaction.ts +3 -0
- package/tempo/actions/accessKey.ts +2 -2
- package/tempo/chainConfig.ts +22 -14
- package/tempo/internal/relay/autoSwap.ts +263 -0
- package/tempo/internal/relay/error.ts +7 -2
- package/tempo/internal/relay/feePayer.ts +30 -7
- package/tempo/internal/relay/feeToken.ts +21 -3
- package/tempo/internal/relay/simulate.ts +106 -19
- package/utils/abi/decodeEventLog.ts +97 -10
- package/utils/abi/getAbiItem.ts +35 -5
- package/utils/abi/parseEventLogs.ts +48 -11
- package/utils/authorization/recoverAuthorizationAddress.ts +18 -2
- package/utils/authorization/verifyAuthorization.ts +12 -7
- package/utils/ccip.ts +199 -33
- package/utils/ccipTunnel.ts +5 -1
- package/utils/ens/localBatchGatewayRequest.ts +82 -4
- package/utils/internal/http.ts +92 -0
- package/utils/nonceManager.ts +16 -1
- package/utils/rpc/http.ts +1 -83
- package/utils/transaction/assertRequest.ts +2 -2
- package/utils/transaction/assertTransaction.ts +2 -2
- package/utils/transaction/parseTransaction.ts +32 -7
- package/utils/typedData.ts +31 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decodeEventLog.js","sourceRoot":"","sources":["../../../utils/abi/decodeEventLog.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gCAAgC,EAEhC,iCAAiC,EAEjC,8BAA8B,EAE9B,qBAAqB,EAErB,uBAAuB,GAExB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AAajE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAEL,eAAe,GAChB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAEL,mBAAmB,GACpB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAA+B,aAAa,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"decodeEventLog.js","sourceRoot":"","sources":["../../../utils/abi/decodeEventLog.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gCAAgC,EAEhC,iCAAiC,EAEjC,8BAA8B,EAE9B,qBAAqB,EAErB,uBAAuB,GAExB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AAajE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAEL,eAAe,GAChB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAEL,mBAAmB,GACpB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAA+B,aAAa,EAAE,MAAM,oBAAoB,CAAA;AA4D/E,MAAM,QAAQ,GAAG,+BAA+B,CAAA;AAEhD,MAAM,UAAU,cAAc,CAO5B,UAA0E;IAE1E,MAAM,EACJ,GAAG,EACH,IAAI,EACJ,SAAS,EACT,MAAM,EAAE,OAAO,EACf,MAAM,GACP,GAAG,UAAsC,CAAA;IAE1C,MAAM,MAAM,GAAG,OAAO,IAAI,IAAI,CAAA;IAC9B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CACvB,CAAC,IAAI,EAAoB,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,MAAM,IAAI,IAAI,CACpE,CAAA;IACD,0EAA0E;IAC1E,+DAA+D;IAC/D,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IAC3B,MAAM,UAAU,GAAG,SAAS;QAC1B,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,IAAI,CAAC,SAAS;YACf,SAAS,KAAK,eAAe,CAAC,aAAa,CAAC,IAAI,CAAoB,CAAC,CACxE;QACH,CAAC,CAAC,SAAS,CAAA;IACb,MAAM,UAAU,GAAG,UAAU;QAC3B,CAAC,CAAC,CAAC,UAAU,CAAC;QACd,CAAC,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAEzD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;QACvB,MAAM,IAAI,sBAAsB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IACvE,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;IAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,iCAAiC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;QACzE,MAAM,IAAI,8BAA8B,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;IACnE,CAAC;IAED,OAAO,qBAAqB,CAAC;QAC3B,OAAO;QACP,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,IAAI;QACJ,MAAM;KACP,CAAmE,CAAA;AACtE,CAAC;AAED,SAAS,mBAAmB,CAC1B,MAA2B,EAC3B,UAAkB,EAClB,SAA6B;IAE7B,2EAA2E;IAC3E,4EAA4E;IAC5E,6EAA6E;IAC7E,+DAA+D;IAC/D,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;QACtB,IAAI,SAAS;YAAE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;QACtE,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;YAAE,OAAO,MAAM,CAAA;QACzD,OAAO,EAAE,CAAA;IACX,CAAC,CAAC,EAAE,CAAA;IACJ,0EAA0E;IAC1E,2BAA2B;IAC3B,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,UAAU,CAC9D,CAAA;AACH,CAAC;AAED,SAAS,YAAY,CAAC,IAAc;IAClC,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAA;AAClE,CAAC;AAED,SAAS,qBAAqB,CAAC,EAC7B,OAAO,EACP,SAAS,EACT,IAAI,EACJ,MAAM,GAMP;IACC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAChC,MAAM,SAAS,GAAG,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IAE/D,MAAM,IAAI,GAAQ,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAErC,gCAAgC;IAChC,MAAM,aAAa,GAAG,MAAM;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAU,CAAC;SAC9B,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IAE/C,MAAM,oBAAoB,GAA6B,EAAE,CAAA;IAEzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;QAC1C,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QAC1B,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,MAAM;gBACR,MAAM,IAAI,uBAAuB,CAAC;oBAChC,OAAO;oBACP,KAAK,EAAE,KAA4C;iBACpD,CAAC,CAAA;YACJ,wEAAwE;YACxE,oBAAoB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;YAC5C,SAAQ;QACV,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,GAAG,WAAW,CAAC;YAChE,KAAK;YACL,KAAK,EAAE,KAAK;SACb,CAAC,CAAA;IACJ,CAAC;IAED,8EAA8E;IAC9E,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IAE7E,2EAA2E;IAC3E,MAAM,cAAc,GAAG,MAAM;QAC3B,CAAC,CAAC,gBAAgB;QAClB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,gBAAgB,CAAC,CAAA;IAE1E,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,IAAI,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,mBAAmB,CACrC,cAAc,EACd,IAAI,CACQ,CAAA;gBACd,IAAI,WAAW,EAAE,CAAC;oBAChB,IAAI,SAAS,GAAG,CAAC,CAAA;oBACjB,kEAAkE;oBAClE,IAAI,CAAC,MAAM,EAAE,CAAC;wBACZ,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,oBAAoB,EAAE,CAAC;4BACrD,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC;gCACjD,WAAW,CAAC,SAAS,EAAE,CAAC,CAAA;wBAC5B,CAAC;oBACH,CAAC;oBACD,sCAAsC;oBACtC,IAAI,SAAS,EAAE,CAAC;wBACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE;4BACpC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,SAAS,GAAG,WAAW,CAAC,MAAM;gCACzD,IAAI,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,SAAS,EAAE,CAAC,CAAA;oBACxC,CAAC;;wBACC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE;4BAC9C,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAK,CAAC,GAAG,WAAW,CAAC,SAAS,EAAE,CAAC,CAAA;gBAChE,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,MAAM,EAAE,CAAC;oBACX,IACE,GAAG,YAAY,gCAAgC;wBAC/C,GAAG,YAAY,wBAAwB;wBAEvC,MAAM,IAAI,qBAAqB,CAAC;4BAC9B,OAAO;4BACP,IAAI,EAAE,IAAI;4BACV,MAAM,EAAE,cAAc;4BACtB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;yBACjB,CAAC,CAAA;oBACJ,MAAM,GAAG,CAAA;gBACX,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,MAAM,EAAE,CAAC;YAClB,MAAM,IAAI,qBAAqB,CAAC;gBAC9B,OAAO;gBACP,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,cAAc;gBACtB,IAAI,EAAE,CAAC;aACR,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,SAAS,EAAE,IAAI;QACf,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;KAC5B,CAAA;AAC/B,CAAC;AAED,SAAS,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAuC;IACxE,IACE,KAAK,CAAC,IAAI,KAAK,QAAQ;QACvB,KAAK,CAAC,IAAI,KAAK,OAAO;QACtB,KAAK,CAAC,IAAI,KAAK,OAAO;QACtB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;QAEpC,OAAO,KAAK,CAAA;IACd,MAAM,UAAU,GAAG,mBAAmB,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,CAAA;IAC5D,OAAO,UAAU,CAAC,CAAC,CAAC,CAAA;AACtB,CAAC;AAMD;;;GAGG;AACH,MAAM,OAAO,sBAAuB,SAAQ,SAAS;IACnD,YAAY,UAA6B;QACvC,0EAA0E;QAC1E,qCAAqC;QACrC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,CAAA;QAC/D,KAAK,CAAC,gCAAgC,EAAE;YACtC,QAAQ;YACR,YAAY,EAAE;gBACZ,WAAW,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;gBAChE,sDAAsD;gBACtD,QAAQ;oBACN,CAAC,CAAC,iCAAiC;oBACnC,CAAC,CAAC,oDAAoD;aACzD;YACD,IAAI,EAAE,wBAAwB;SAC/B,CAAC,CAAA;IACJ,CAAC;CACF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AbiItemAmbiguityError, } from '../../errors/abi.js';
|
|
2
2
|
import { isHex } from '../../utils/data/isHex.js';
|
|
3
3
|
import { isAddress } from '../address/isAddress.js';
|
|
4
|
+
import { size } from '../data/size.js';
|
|
4
5
|
import { toEventSelector } from '../hash/toEventSelector.js';
|
|
5
6
|
import { toFunctionSelector, } from '../hash/toFunctionSelector.js';
|
|
6
7
|
import { getArrayComponents } from './encodeAbiParameters.js';
|
|
@@ -85,12 +86,29 @@ export function isArgOfType(arg, abiParameter) {
|
|
|
85
86
|
});
|
|
86
87
|
// `(u)int<M>`: (un)signed integer type of `M` bits, `0 < M <= 256`, `M % 8 == 0`
|
|
87
88
|
// https://regexr.com/6v8hp
|
|
88
|
-
if (/^u?int(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)?$/.test(abiParameterType))
|
|
89
|
-
|
|
89
|
+
if (/^u?int(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)?$/.test(abiParameterType)) {
|
|
90
|
+
if (typeof arg !== 'bigint' && typeof arg !== 'number')
|
|
91
|
+
return false;
|
|
92
|
+
if (typeof arg === 'number' && !Number.isInteger(arg))
|
|
93
|
+
return false;
|
|
94
|
+
const signed = abiParameterType.startsWith('int');
|
|
95
|
+
const bits = Number.parseInt(abiParameterType.replace(/^u?int/, '') || '256', 10);
|
|
96
|
+
const max = 2n ** (BigInt(bits) - (signed ? 1n : 0n)) - 1n;
|
|
97
|
+
const min = signed ? -max - 1n : 0n;
|
|
98
|
+
return arg >= min && arg <= max;
|
|
99
|
+
}
|
|
90
100
|
// `bytes<M>`: binary type of `M` bytes, `0 < M <= 32`
|
|
91
101
|
// https://regexr.com/6va55
|
|
92
|
-
if (/^bytes([1-9]|1[0-9]|2[0-9]|3[0-2])?$/.test(abiParameterType))
|
|
93
|
-
|
|
102
|
+
if (/^bytes([1-9]|1[0-9]|2[0-9]|3[0-2])?$/.test(abiParameterType)) {
|
|
103
|
+
if (typeof arg !== 'string' && !(arg instanceof Uint8Array))
|
|
104
|
+
return false;
|
|
105
|
+
const bytes = abiParameterType.slice(5);
|
|
106
|
+
if (!bytes)
|
|
107
|
+
return true;
|
|
108
|
+
if (typeof arg === 'string' && !isHex(arg))
|
|
109
|
+
return false;
|
|
110
|
+
return size(arg) === Number.parseInt(bytes, 10);
|
|
111
|
+
}
|
|
94
112
|
// fixed-length (`<type>[M]`) and dynamic (`<type>[]`) arrays
|
|
95
113
|
const arrayComponents = getArrayComponents(abiParameterType);
|
|
96
114
|
if (arrayComponents) {
|
|
@@ -127,17 +145,27 @@ export function getAmbiguousTypes(sourceParameters, targetParameters, args) {
|
|
|
127
145
|
const types = getAmbiguousTypes([{ ...sourceParameter, type: sourceArray[1] }], [{ ...targetParameter, type: targetArray[1] }], [args[parameterIndex]?.[0]]);
|
|
128
146
|
if (types)
|
|
129
147
|
return types;
|
|
148
|
+
// Same element type, different array shape: `uint256[]` and `uint256[2]`
|
|
149
|
+
// both accept `[1n, 1n]`, but one is dynamic and the other is static.
|
|
150
|
+
// Skip this when the element types differ. `string[]` vs `address[]`
|
|
151
|
+
// stays unambiguous for a non-address string.
|
|
152
|
+
if (sourceArray[1] === targetArray[1] &&
|
|
153
|
+
sourceParameter.type !== targetParameter.type)
|
|
154
|
+
return [sourceParameter.type, targetParameter.type];
|
|
130
155
|
continue;
|
|
131
156
|
}
|
|
132
157
|
const types = [sourceParameter.type, targetParameter.type];
|
|
133
158
|
const value = args[parameterIndex];
|
|
134
159
|
const ambiguous = (() => {
|
|
135
|
-
if (types.includes('address') && types.includes('bytes20'))
|
|
136
|
-
return true;
|
|
137
160
|
// An `undefined` value comes from an empty array, which matches both types.
|
|
161
|
+
// This stays above the catch-all: a non-address string is not ambiguous.
|
|
138
162
|
if (types.includes('address') &&
|
|
139
163
|
(types.includes('string') || types.includes('bytes')))
|
|
140
164
|
return (value === undefined || isAddress(value, { strict: false }));
|
|
165
|
+
// Distinct types that both matched cannot be distinguished at runtime
|
|
166
|
+
// (e.g. `bytes` vs `bytes32`, `uint256` vs `int256`, `address` vs `bytes20`).
|
|
167
|
+
if (sourceParameter.type !== targetParameter.type)
|
|
168
|
+
return true;
|
|
141
169
|
return false;
|
|
142
170
|
})();
|
|
143
171
|
if (ambiguous)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAbiItem.js","sourceRoot":"","sources":["../../../utils/abi/getAbiItem.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getAbiItem.js","sourceRoot":"","sources":["../../../utils/abi/getAbiItem.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,16 +45,43 @@ export function parseEventLogs(parameters) {
|
|
|
45
45
|
abi: abiItem,
|
|
46
46
|
selector: toEventSelector(abiItem),
|
|
47
47
|
}));
|
|
48
|
+
// Nothing in a log identifies an anonymous event, so any log with the same
|
|
49
|
+
// topic count fits it. Anonymous events are only considered when requested:
|
|
50
|
+
// `eventName` names one, or every event in the ABI is anonymous. Otherwise a
|
|
51
|
+
// log from another contract in the same receipt is decoded as the anonymous
|
|
52
|
+
// event.
|
|
53
|
+
const anonymousTopics = (() => {
|
|
54
|
+
if (eventName)
|
|
55
|
+
return abiTopics.filter((item) => item.abi.anonymous && eventName.includes(item.abi.name));
|
|
56
|
+
if (abiTopics.every((item) => item.abi.anonymous))
|
|
57
|
+
return abiTopics;
|
|
58
|
+
return [];
|
|
59
|
+
})();
|
|
48
60
|
return logs
|
|
49
61
|
.map((log) => {
|
|
50
62
|
// Normalize RpcLog (hex-encoded quantities) to Log (bigint/number).
|
|
51
63
|
// When logs come directly from an RPC response (e.g. eth_getLogs),
|
|
52
64
|
// fields like blockNumber are hex strings instead of bigints.
|
|
53
65
|
const formattedLog = typeof log.blockNumber === 'string' ? formatLog(log) : log;
|
|
54
|
-
//
|
|
55
|
-
//
|
|
56
|
-
//
|
|
57
|
-
|
|
66
|
+
// Non-anonymous events share a signature topic. Several events can share
|
|
67
|
+
// that selector and differ in indexed parameters (ERC-20 vs ERC-721
|
|
68
|
+
// `Transfer`). Check that against the whole ABI before `eventName`, so
|
|
69
|
+
// an anonymous event never claims a log whose signature is known.
|
|
70
|
+
const bySelector = abiTopics.filter((item) => !item.abi.anonymous && formattedLog.topics[0] === item.selector);
|
|
71
|
+
const abiItems = (() => {
|
|
72
|
+
if (bySelector.length > 0) {
|
|
73
|
+
if (!eventName)
|
|
74
|
+
return bySelector;
|
|
75
|
+
return bySelector.filter((item) => eventName.includes(item.abi.name));
|
|
76
|
+
}
|
|
77
|
+
// A dynamic ABI value can decode as a static type without throwing, so
|
|
78
|
+
// several anonymous events of the same arity are not guessed.
|
|
79
|
+
const anonymous = anonymousTopics.filter((item) => (item.abi.inputs?.filter((input) => input.indexed).length ?? 0) ===
|
|
80
|
+
formattedLog.topics.length);
|
|
81
|
+
if (anonymous.length === 1)
|
|
82
|
+
return anonymous;
|
|
83
|
+
return [];
|
|
84
|
+
})();
|
|
58
85
|
if (abiItems.length === 0)
|
|
59
86
|
return null;
|
|
60
87
|
// Try each matching ABI item until one successfully decodes.
|
|
@@ -75,9 +102,13 @@ export function parseEventLogs(parameters) {
|
|
|
75
102
|
}
|
|
76
103
|
}
|
|
77
104
|
// If strict decoding failed for all, and we're in non-strict mode,
|
|
78
|
-
// fall back to the first
|
|
105
|
+
// fall back to the first signature match. An anonymous candidate that
|
|
106
|
+
// failed to decode is not identified, so it is left out.
|
|
79
107
|
if (!event && !strict) {
|
|
80
|
-
|
|
108
|
+
const fallback = abiItems[0];
|
|
109
|
+
if (!fallback || fallback.abi.anonymous)
|
|
110
|
+
return null;
|
|
111
|
+
abiItem = fallback;
|
|
81
112
|
try {
|
|
82
113
|
event = decodeEventLog({
|
|
83
114
|
data: formattedLog.data,
|
|
@@ -100,6 +131,7 @@ export function parseEventLogs(parameters) {
|
|
|
100
131
|
return null;
|
|
101
132
|
// Check that the decoded event args match the provided args.
|
|
102
133
|
if (!includesArgs({
|
|
134
|
+
anonymous: abiItem.abi.anonymous,
|
|
103
135
|
args: event.args,
|
|
104
136
|
inputs: abiItem.abi.inputs,
|
|
105
137
|
matchArgs: args,
|
|
@@ -111,16 +143,17 @@ export function parseEventLogs(parameters) {
|
|
|
111
143
|
.filter(Boolean);
|
|
112
144
|
}
|
|
113
145
|
function includesArgs(parameters) {
|
|
114
|
-
const { args, inputs, matchArgs, topics } = parameters;
|
|
146
|
+
const { anonymous, args, inputs, matchArgs, topics } = parameters;
|
|
115
147
|
if (!matchArgs)
|
|
116
148
|
return true;
|
|
117
149
|
if (!args)
|
|
118
150
|
return false;
|
|
119
|
-
// Topics hold the signature, then indexed inputs in order.
|
|
120
|
-
// decoding reads indexed inputs without
|
|
151
|
+
// Topics hold the signature, then indexed inputs in order. Anonymous events
|
|
152
|
+
// have no signature topic. Non-strict decoding reads indexed inputs without
|
|
153
|
+
// a topic from data.
|
|
121
154
|
const topicInputs = inputs
|
|
122
155
|
.filter((input) => input.indexed)
|
|
123
|
-
.slice(0, topics.length - 1);
|
|
156
|
+
.slice(0, anonymous ? topics.length : topics.length - 1);
|
|
124
157
|
function isEqual(input, value, arg) {
|
|
125
158
|
try {
|
|
126
159
|
if (input.type === 'address')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseEventLogs.js","sourceRoot":"","sources":["../../../utils/abi/parseEventLogs.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAO9B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAEL,cAAc,GACf,MAAM,qBAAqB,CAAA;AAsD5B;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,cAAc,CAQ5B,UAA4D;IAE5D,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,UAAU,CAAA;IAErD,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;QACtB,IAAI,CAAC,UAAU,CAAC,SAAS;YAAE,OAAO,SAAS,CAAA;QAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,UAAU,CAAC,SAAS,CAAA;QACpE,OAAO,CAAC,UAAU,CAAC,SAAmB,CAAC,CAAA;IACzC,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,SAAS,GAAI,GAAW;SAC3B,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC;SAC7C,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACjB,GAAG,EAAE,OAAO;QACZ,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC;KACnC,CAAC,CAAC,CAAA;IAEL,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,oEAAoE;QACpE,mEAAmE;QACnE,8DAA8D;QAC9D,MAAM,YAAY,GAChB,OAAO,GAAG,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,GAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;QAEtE,
|
|
1
|
+
{"version":3,"file":"parseEventLogs.js","sourceRoot":"","sources":["../../../utils/abi/parseEventLogs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,19 @@
|
|
|
1
|
+
import { InvalidYParityError, } from '../../errors/transaction.js';
|
|
1
2
|
import { recoverAddress, } from '../signature/recoverAddress.js';
|
|
2
3
|
import { hashAuthorization, } from './hashAuthorization.js';
|
|
3
4
|
export async function recoverAuthorizationAddress(parameters) {
|
|
4
|
-
const { authorization
|
|
5
|
+
const { authorization } = parameters;
|
|
6
|
+
const signature = (parameters.signature ?? authorization);
|
|
7
|
+
// EIP-7702 recovers the authority with `y_parity` as the raw recovery id, so a
|
|
8
|
+
// tuple with any other `yParity` (such as 27 or 28) has no authority.
|
|
9
|
+
if (typeof signature === 'object' &&
|
|
10
|
+
typeof signature.yParity === 'number' &&
|
|
11
|
+
signature.yParity !== 0 &&
|
|
12
|
+
signature.yParity !== 1)
|
|
13
|
+
throw new InvalidYParityError({ yParity: BigInt(signature.yParity) });
|
|
5
14
|
return recoverAddress({
|
|
6
15
|
hash: hashAuthorization(authorization),
|
|
7
|
-
signature
|
|
16
|
+
signature,
|
|
8
17
|
});
|
|
9
18
|
}
|
|
10
19
|
//# sourceMappingURL=recoverAuthorizationAddress.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recoverAuthorizationAddress.js","sourceRoot":"","sources":["../../../utils/authorization/recoverAuthorizationAddress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"recoverAuthorizationAddress.js","sourceRoot":"","sources":["../../../utils/authorization/recoverAuthorizationAddress.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,GAEpB,MAAM,6BAA6B,CAAA;AASpC,OAAO,EAEL,cAAc,GACf,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAEL,iBAAiB,GAClB,MAAM,wBAAwB,CAAA;AAoC/B,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAK/C,UAAgE;IAEhE,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAA;IACpC,MAAM,SAAS,GAAG,CAAC,UAAU,CAAC,SAAS,IAAI,aAAa,CAAc,CAAA;IAEtE,+EAA+E;IAC/E,sEAAsE;IACtE,IACE,OAAO,SAAS,KAAK,QAAQ;QAC7B,OAAO,SAAS,CAAC,OAAO,KAAK,QAAQ;QACrC,SAAS,CAAC,OAAO,KAAK,CAAC;QACvB,SAAS,CAAC,OAAO,KAAK,CAAC;QAEvB,MAAM,IAAI,mBAAmB,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAEvE,OAAO,cAAc,CAAC;QACpB,IAAI,EAAE,iBAAiB,CAAC,aAAqC,CAAC;QAC9D,SAAS;KACV,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { InvalidYParityError } from '../../errors/transaction.js';
|
|
1
2
|
import { getAddress } from '../address/getAddress.js';
|
|
2
3
|
import { isAddressEqual, } from '../address/isAddressEqual.js';
|
|
3
4
|
import { recoverAuthorizationAddress, } from './recoverAuthorizationAddress.js';
|
|
@@ -10,9 +11,19 @@ import { recoverAuthorizationAddress, } from './recoverAuthorizationAddress.js';
|
|
|
10
11
|
* @returns Whether or not the signature is valid. {@link VerifyAuthorizationReturnType}
|
|
11
12
|
*/
|
|
12
13
|
export async function verifyAuthorization({ address, authorization, signature, }) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
const recovered = await (async () => {
|
|
15
|
+
try {
|
|
16
|
+
return await recoverAuthorizationAddress({ authorization, signature });
|
|
17
|
+
}
|
|
18
|
+
catch (error) {
|
|
19
|
+
// A `yParity` other than 0 or 1 has no authority under EIP-7702.
|
|
20
|
+
if (error instanceof InvalidYParityError)
|
|
21
|
+
return undefined;
|
|
22
|
+
throw error;
|
|
23
|
+
}
|
|
24
|
+
})();
|
|
25
|
+
if (!recovered)
|
|
26
|
+
return false;
|
|
27
|
+
return isAddressEqual(getAddress(address), recovered);
|
|
17
28
|
}
|
|
18
29
|
//# sourceMappingURL=verifyAuthorization.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyAuthorization.js","sourceRoot":"","sources":["../../../utils/authorization/verifyAuthorization.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"verifyAuthorization.js","sourceRoot":"","sources":["../../../utils/authorization/verifyAuthorization.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAEjE,OAAO,EAA4B,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC/E,OAAO,EAEL,cAAc,GACf,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAGL,2BAA2B,GAC5B,MAAM,kCAAkC,CAAA;AAgBzC;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EACxC,OAAO,EACP,aAAa,EACb,SAAS,GACqB;IAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE;QAClC,IAAI,CAAC;YACH,OAAO,MAAM,2BAA2B,CAAC,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAA;QACxE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iEAAiE;YACjE,IAAI,KAAK,YAAY,mBAAmB;gBAAE,OAAO,SAAS,CAAA;YAC1D,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;IACJ,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAA;IAC5B,OAAO,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;AACvD,CAAC"}
|
package/_esm/utils/ccip.js
CHANGED
|
@@ -1,14 +1,19 @@
|
|
|
1
|
-
import { call } from '../actions/public/call.js';
|
|
1
|
+
import { call, getRevertErrorData, } from '../actions/public/call.js';
|
|
2
2
|
import { OffchainLookupError, OffchainLookupResponseMalformedError, OffchainLookupSenderMismatchError, } from '../errors/ccip.js';
|
|
3
|
-
import { HttpRequestError, } from '../errors/request.js';
|
|
3
|
+
import { HttpRequestError, ResponseBodyTooLargeError, TimeoutError, } from '../errors/request.js';
|
|
4
4
|
import { getAbortError, isAbortError } from '../errors/utils.js';
|
|
5
5
|
import { decodeErrorResult } from './abi/decodeErrorResult.js';
|
|
6
6
|
import { encodeAbiParameters } from './abi/encodeAbiParameters.js';
|
|
7
7
|
import { isAddressEqual } from './address/isAddressEqual.js';
|
|
8
8
|
import { concat } from './data/concat.js';
|
|
9
9
|
import { isHex } from './data/isHex.js';
|
|
10
|
-
import { localBatchGatewayRequest, localBatchGatewayUrl, } from './ens/localBatchGatewayRequest.js';
|
|
10
|
+
import { ccipReadLimit, createCcipReadBudget, localBatchGatewayRequest, localBatchGatewayUrl, } from './ens/localBatchGatewayRequest.js';
|
|
11
|
+
import { anySignal, readResponseBody } from './internal/http.js';
|
|
12
|
+
import { withTimeout } from './promise/withTimeout.js';
|
|
11
13
|
import { stringify } from './stringify.js';
|
|
14
|
+
const ccipTimeout = 10_000;
|
|
15
|
+
// Same ceiling as the HTTP transport.
|
|
16
|
+
const maxCcipResponseBytes = 10_485_760;
|
|
12
17
|
export const offchainLookupSignature = '0x556f1830';
|
|
13
18
|
export const offchainLookupAbiItem = {
|
|
14
19
|
name: 'OffchainLookup',
|
|
@@ -36,7 +41,14 @@ export const offchainLookupAbiItem = {
|
|
|
36
41
|
},
|
|
37
42
|
],
|
|
38
43
|
};
|
|
39
|
-
|
|
44
|
+
/**
|
|
45
|
+
* Performs an EIP-3668 CCIP-Read lookup for a reverted `OffchainLookup` call.
|
|
46
|
+
*
|
|
47
|
+
* Follows at most 4 nested callbacks. Every gateway request of the lookup,
|
|
48
|
+
* including nested local batches, draws from one query and concurrency budget.
|
|
49
|
+
* Each gateway request uses the client transport timeout.
|
|
50
|
+
*/
|
|
51
|
+
export async function offchainLookup(client, { blockNumber, blockTag, budget = createCcipReadBudget(), data, depth = 0, requestOptions, to, }) {
|
|
40
52
|
const { args } = decodeErrorResult({
|
|
41
53
|
data,
|
|
42
54
|
abi: [offchainLookupAbiItem],
|
|
@@ -46,26 +58,72 @@ export async function offchainLookup(client, { blockNumber, blockTag, data, requ
|
|
|
46
58
|
const ccipRequest_ = ccipRead && typeof ccipRead?.request === 'function'
|
|
47
59
|
? ccipRead.request
|
|
48
60
|
: ccipRequest;
|
|
61
|
+
const timeout = getTransportTimeout(client.transport);
|
|
49
62
|
try {
|
|
63
|
+
if (depth >= ccipReadLimit.depth)
|
|
64
|
+
throw new HttpRequestError({
|
|
65
|
+
details: `CCIP Read exceeded the maximum callback depth (${ccipReadLimit.depth}).`,
|
|
66
|
+
url: urls[0] ?? '',
|
|
67
|
+
});
|
|
50
68
|
if (!isAddressEqual(to, sender))
|
|
51
69
|
throw new OffchainLookupSenderMismatchError({ sender, to });
|
|
52
|
-
const result =
|
|
53
|
-
|
|
70
|
+
const result = await (async () => {
|
|
71
|
+
if (urls.includes(localBatchGatewayUrl))
|
|
72
|
+
return localBatchGatewayRequest({
|
|
73
|
+
budget,
|
|
74
|
+
ccipRequest: (parameters) => ccipRequest_({
|
|
75
|
+
...parameters,
|
|
76
|
+
requestOptions,
|
|
77
|
+
timeout: parameters.timeout ?? timeout,
|
|
78
|
+
}),
|
|
79
|
+
data: callData,
|
|
80
|
+
});
|
|
81
|
+
if (budget.queries <= 0)
|
|
82
|
+
throw new HttpRequestError({
|
|
83
|
+
details: `CCIP Read exceeded the maximum number of queries (${ccipReadLimit.queries}).`,
|
|
84
|
+
url: urls[0] ?? '',
|
|
85
|
+
});
|
|
86
|
+
// Each URL is a gateway request, so each one draws from the budget.
|
|
87
|
+
const urls_ = urls.slice(0, budget.queries);
|
|
88
|
+
budget.queries -= Math.max(1, urls_.length);
|
|
89
|
+
return budget.run(() => ccipRequest_({
|
|
54
90
|
data: callData,
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
91
|
+
requestOptions,
|
|
92
|
+
sender,
|
|
93
|
+
timeout,
|
|
94
|
+
urls: urls_,
|
|
95
|
+
}));
|
|
96
|
+
})();
|
|
97
|
+
const callbackData = concat([
|
|
98
|
+
callbackSelector,
|
|
99
|
+
encodeAbiParameters([{ type: 'bytes' }, { type: 'bytes' }], [result, extraData]),
|
|
100
|
+
]);
|
|
101
|
+
// The callback runs without CCIP-Read so a nested `OffchainLookup` comes
|
|
102
|
+
// back here with the lookup's depth and budget.
|
|
103
|
+
try {
|
|
104
|
+
const { data: data_ } = await call({ ...client, ccipRead: false }, {
|
|
105
|
+
blockNumber,
|
|
106
|
+
blockTag,
|
|
107
|
+
data: callbackData,
|
|
108
|
+
requestOptions,
|
|
109
|
+
to,
|
|
110
|
+
});
|
|
111
|
+
return data_;
|
|
112
|
+
}
|
|
113
|
+
catch (err) {
|
|
114
|
+
const revertData = getRevertErrorData(err);
|
|
115
|
+
if (revertData?.slice(0, 10) !== offchainLookupSignature)
|
|
116
|
+
throw err;
|
|
117
|
+
return await offchainLookup(client, {
|
|
118
|
+
blockNumber,
|
|
119
|
+
blockTag,
|
|
120
|
+
budget,
|
|
121
|
+
data: revertData,
|
|
122
|
+
depth: depth + 1,
|
|
123
|
+
requestOptions,
|
|
124
|
+
to,
|
|
125
|
+
});
|
|
126
|
+
}
|
|
69
127
|
}
|
|
70
128
|
catch (err) {
|
|
71
129
|
if (requestOptions?.signal?.aborted)
|
|
@@ -82,28 +140,63 @@ export async function offchainLookup(client, { blockNumber, blockTag, data, requ
|
|
|
82
140
|
});
|
|
83
141
|
}
|
|
84
142
|
}
|
|
85
|
-
|
|
143
|
+
/**
|
|
144
|
+
* Requests a CCIP-Read gateway result.
|
|
145
|
+
*
|
|
146
|
+
* Tries each HTTP(S) URL in order. Each request, including the response body,
|
|
147
|
+
* times out after `timeout` (default 10 seconds) and reads at most 10 MiB.
|
|
148
|
+
*/
|
|
149
|
+
export async function ccipRequest({ data, requestOptions, sender, timeout = ccipTimeout, urls, }) {
|
|
86
150
|
let error = new Error('An unknown error occurred.');
|
|
87
|
-
for (
|
|
151
|
+
for (const url of urls) {
|
|
88
152
|
if (requestOptions?.signal?.aborted)
|
|
89
153
|
throw getAbortError(requestOptions.signal);
|
|
90
|
-
const
|
|
154
|
+
const requestUrl = url
|
|
155
|
+
.replace('{sender}', sender.toLowerCase())
|
|
156
|
+
.replace('{data}', data);
|
|
91
157
|
const method = url.includes('{data}') ? 'GET' : 'POST';
|
|
92
158
|
const body = method === 'POST' ? { data, sender } : undefined;
|
|
93
159
|
const headers = method === 'POST' ? { 'Content-Type': 'application/json' } : {};
|
|
94
160
|
try {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
161
|
+
assertCcipUrl(requestUrl);
|
|
162
|
+
const { response, responseBody } = await withTimeout(async ({ signal: timeoutSignal }) => {
|
|
163
|
+
// Abort on whichever fires first so that a `signal` does not
|
|
164
|
+
// disable the timeout.
|
|
165
|
+
const { signal, cleanup } = anySignal([
|
|
166
|
+
requestOptions?.signal,
|
|
167
|
+
timeout > 0 ? timeoutSignal : null,
|
|
168
|
+
]);
|
|
169
|
+
try {
|
|
170
|
+
const response = await fetch(requestUrl, {
|
|
171
|
+
body: JSON.stringify(body),
|
|
172
|
+
headers,
|
|
173
|
+
method,
|
|
174
|
+
...(signal ? { signal } : {}),
|
|
175
|
+
});
|
|
176
|
+
// Read the body within the timeout too, so a response that stalls
|
|
177
|
+
// after its headers cannot hang the request.
|
|
178
|
+
const responseBody = await readResponseBody(response, {
|
|
179
|
+
maxResponseBodySize: maxCcipResponseBytes,
|
|
180
|
+
});
|
|
181
|
+
return { response, responseBody };
|
|
182
|
+
}
|
|
183
|
+
finally {
|
|
184
|
+
cleanup();
|
|
185
|
+
}
|
|
186
|
+
}, {
|
|
187
|
+
errorInstance: new TimeoutError({
|
|
188
|
+
body: body ?? { data, sender },
|
|
189
|
+
url,
|
|
190
|
+
}),
|
|
191
|
+
signal: true,
|
|
192
|
+
timeout,
|
|
100
193
|
});
|
|
101
194
|
let result;
|
|
102
195
|
if (response.headers.get('Content-Type')?.startsWith('application/json')) {
|
|
103
|
-
result =
|
|
196
|
+
result = JSON.parse(responseBody).data;
|
|
104
197
|
}
|
|
105
198
|
else {
|
|
106
|
-
result =
|
|
199
|
+
result = responseBody;
|
|
107
200
|
}
|
|
108
201
|
if (!response.ok) {
|
|
109
202
|
error = new HttpRequestError({
|
|
@@ -131,13 +224,52 @@ export async function ccipRequest({ data, requestOptions, sender, urls, }) {
|
|
|
131
224
|
throw getAbortError(requestOptions.signal);
|
|
132
225
|
if (isAbortError(err))
|
|
133
226
|
throw err;
|
|
227
|
+
if (err instanceof HttpRequestError ||
|
|
228
|
+
err instanceof TimeoutError ||
|
|
229
|
+
err instanceof ResponseBodyTooLargeError) {
|
|
230
|
+
error = err;
|
|
231
|
+
continue;
|
|
232
|
+
}
|
|
134
233
|
error = new HttpRequestError({
|
|
135
234
|
body,
|
|
136
|
-
|
|
235
|
+
cause: err,
|
|
137
236
|
url,
|
|
138
237
|
});
|
|
139
238
|
}
|
|
140
239
|
}
|
|
141
240
|
throw error;
|
|
142
241
|
}
|
|
242
|
+
function assertCcipUrl(url) {
|
|
243
|
+
const parsed = (() => {
|
|
244
|
+
try {
|
|
245
|
+
return new URL(url);
|
|
246
|
+
}
|
|
247
|
+
catch {
|
|
248
|
+
throw new HttpRequestError({
|
|
249
|
+
details: 'CCIP Read URL is invalid.',
|
|
250
|
+
url,
|
|
251
|
+
});
|
|
252
|
+
}
|
|
253
|
+
})();
|
|
254
|
+
if (parsed.protocol === 'http:' || parsed.protocol === 'https:')
|
|
255
|
+
return;
|
|
256
|
+
throw new HttpRequestError({
|
|
257
|
+
details: `CCIP Read URL scheme "${parsed.protocol.slice(0, -1)}" is not allowed.`,
|
|
258
|
+
url,
|
|
259
|
+
});
|
|
260
|
+
}
|
|
261
|
+
/**
|
|
262
|
+
* Returns the transport timeout. A wrapper that sets none (such as
|
|
263
|
+
* `fallback`) uses the longest timeout of its transports, since any of them
|
|
264
|
+
* may have served the call.
|
|
265
|
+
*/
|
|
266
|
+
function getTransportTimeout(transport) {
|
|
267
|
+
const timeout = transport.timeout ?? transport.config?.timeout;
|
|
268
|
+
if (timeout !== undefined)
|
|
269
|
+
return timeout;
|
|
270
|
+
const timeouts = (transport.transports ?? transport.value?.transports ?? [])
|
|
271
|
+
.map(getTransportTimeout)
|
|
272
|
+
.filter((timeout) => timeout !== undefined);
|
|
273
|
+
return timeouts.length ? Math.max(...timeouts) : undefined;
|
|
274
|
+
}
|
|
143
275
|
//# sourceMappingURL=ccip.js.map
|
package/_esm/utils/ccip.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../utils/ccip.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../utils/ccip.ts"],"names":[],"mappings":"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"}
|