viem 2.57.14 → 2.57.16
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 +58 -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/Gateway.js +195 -0
- package/_cjs/tempo/Gateway.js.map +1 -0
- package/_cjs/tempo/GatewayDecorator.js +168 -0
- package/_cjs/tempo/GatewayDecorator.js.map +1 -0
- package/_cjs/tempo/Transaction.js +2 -1
- package/_cjs/tempo/Transaction.js.map +1 -1
- package/_cjs/tempo/actions/ai.js +69 -0
- package/_cjs/tempo/actions/ai.js.map +1 -0
- package/_cjs/tempo/actions/bucket.js +85 -0
- package/_cjs/tempo/actions/bucket.js.map +1 -0
- package/_cjs/tempo/actions/compute.js +165 -0
- package/_cjs/tempo/actions/compute.js.map +1 -0
- package/_cjs/tempo/actions/gateway.js +8 -0
- package/_cjs/tempo/actions/gateway.js.map +1 -0
- package/_cjs/tempo/actions/index.js +6 -1
- package/_cjs/tempo/actions/index.js.map +1 -1
- package/_cjs/tempo/actions/kv.js +44 -0
- package/_cjs/tempo/actions/kv.js.map +1 -0
- package/_cjs/tempo/chainConfig.js +4 -12
- package/_cjs/tempo/chainConfig.js.map +1 -1
- package/_cjs/tempo/index.js +4 -1
- package/_cjs/tempo/index.js.map +1 -1
- package/_cjs/tempo/internal/ndjson.js +43 -0
- package/_cjs/tempo/internal/ndjson.js.map +1 -0
- package/_cjs/tempo/internal/relay/feePayer.js +18 -5
- package/_cjs/tempo/internal/relay/feePayer.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/buildRequest.js +4 -0
- package/_cjs/utils/buildRequest.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/hash/toSignatureHash.js +10 -1
- package/_cjs/utils/hash/toSignatureHash.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 +9 -76
- package/_cjs/utils/rpc/http.js.map +1 -1
- package/_cjs/utils/rpc/socket.js +20 -9
- package/_cjs/utils/rpc/socket.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/_cjs/zksync/actions/finalizeWithdrawal.js +4 -2
- package/_cjs/zksync/actions/finalizeWithdrawal.js.map +1 -1
- package/_cjs/zksync/actions/isWithdrawalFinalized.js +4 -5
- package/_cjs/zksync/actions/isWithdrawalFinalized.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/Gateway.js +294 -0
- package/_esm/tempo/Gateway.js.map +1 -0
- package/_esm/tempo/GatewayDecorator.js +207 -0
- package/_esm/tempo/GatewayDecorator.js.map +1 -0
- package/_esm/tempo/Transaction.js +2 -0
- package/_esm/tempo/Transaction.js.map +1 -1
- package/_esm/tempo/actions/ai.js +132 -0
- package/_esm/tempo/actions/ai.js.map +1 -0
- package/_esm/tempo/actions/bucket.js +181 -0
- package/_esm/tempo/actions/bucket.js.map +1 -0
- package/_esm/tempo/actions/compute.js +424 -0
- package/_esm/tempo/actions/compute.js.map +1 -0
- package/_esm/tempo/actions/gateway.js +22 -0
- package/_esm/tempo/actions/gateway.js.map +1 -0
- package/_esm/tempo/actions/index.js +10 -0
- package/_esm/tempo/actions/index.js.map +1 -1
- package/_esm/tempo/actions/kv.js +124 -0
- package/_esm/tempo/actions/kv.js.map +1 -0
- package/_esm/tempo/chainConfig.js +13 -15
- package/_esm/tempo/chainConfig.js.map +1 -1
- package/_esm/tempo/index.js +9 -0
- package/_esm/tempo/index.js.map +1 -1
- package/_esm/tempo/internal/ndjson.js +45 -0
- package/_esm/tempo/internal/ndjson.js.map +1 -0
- package/_esm/tempo/internal/relay/feePayer.js +24 -7
- package/_esm/tempo/internal/relay/feePayer.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/buildRequest.js +6 -0
- package/_esm/utils/buildRequest.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/hash/toSignatureHash.js +11 -1
- package/_esm/utils/hash/toSignatureHash.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 +12 -78
- package/_esm/utils/rpc/http.js.map +1 -1
- package/_esm/utils/rpc/socket.js +24 -9
- package/_esm/utils/rpc/socket.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/_esm/zksync/actions/finalizeWithdrawal.js +5 -2
- package/_esm/zksync/actions/finalizeWithdrawal.js.map +1 -1
- package/_esm/zksync/actions/isWithdrawalFinalized.js +5 -5
- package/_esm/zksync/actions/isWithdrawalFinalized.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 +77 -4
- package/_types/tempo/Account.d.ts.map +1 -1
- package/_types/tempo/Gateway.d.ts +337 -0
- package/_types/tempo/Gateway.d.ts.map +1 -0
- package/_types/tempo/GatewayDecorator.d.ts +635 -0
- package/_types/tempo/GatewayDecorator.d.ts.map +1 -0
- package/_types/tempo/Relay.d.ts +1 -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/ai.d.ts +145 -0
- package/_types/tempo/actions/ai.d.ts.map +1 -0
- package/_types/tempo/actions/bucket.d.ts +210 -0
- package/_types/tempo/actions/bucket.d.ts.map +1 -0
- package/_types/tempo/actions/compute.d.ts +628 -0
- package/_types/tempo/actions/compute.d.ts.map +1 -0
- package/_types/tempo/actions/gateway.d.ts +25 -0
- package/_types/tempo/actions/gateway.d.ts.map +1 -0
- package/_types/tempo/actions/index.d.ts +10 -0
- package/_types/tempo/actions/index.d.ts.map +1 -1
- package/_types/tempo/actions/kv.d.ts +167 -0
- package/_types/tempo/actions/kv.d.ts.map +1 -0
- package/_types/tempo/chainConfig.d.ts.map +1 -1
- package/_types/tempo/index.d.ts +11 -0
- package/_types/tempo/index.d.ts.map +1 -1
- package/_types/tempo/internal/ndjson.d.ts +9 -0
- package/_types/tempo/internal/ndjson.d.ts.map +1 -0
- package/_types/tempo/internal/relay/feePayer.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/buildRequest.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/hash/toSignatureHash.d.ts +1 -1
- package/_types/utils/hash/toSignatureHash.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/rpc/socket.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 +5 -1
- package/tempo/Account.ts +202 -16
- package/tempo/Gateway.ts +477 -0
- package/tempo/GatewayDecorator.ts +909 -0
- package/tempo/Relay.ts +1 -1
- package/tempo/Transaction.ts +3 -0
- package/tempo/actions/ai.ts +250 -0
- package/tempo/actions/bucket.ts +324 -0
- package/tempo/actions/compute.ts +894 -0
- package/tempo/actions/gateway.ts +33 -0
- package/tempo/actions/index.ts +10 -0
- package/tempo/actions/kv.ts +229 -0
- package/tempo/chainConfig.ts +13 -15
- package/tempo/index.ts +12 -0
- package/tempo/internal/ndjson.ts +51 -0
- package/tempo/internal/relay/feePayer.ts +30 -7
- 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/buildRequest.ts +4 -0
- package/utils/ccip.ts +199 -33
- package/utils/ccipTunnel.ts +5 -1
- package/utils/ens/localBatchGatewayRequest.ts +82 -4
- package/utils/hash/toSignatureHash.ts +12 -2
- package/utils/internal/http.ts +92 -0
- package/utils/nonceManager.ts +16 -1
- package/utils/rpc/http.ts +12 -86
- package/utils/rpc/socket.ts +28 -15
- 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
- package/zksync/actions/finalizeWithdrawal.ts +5 -2
- package/zksync/actions/isWithdrawalFinalized.ts +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"finalizeWithdrawal.js","sourceRoot":"","sources":["../../../zksync/actions/finalizeWithdrawal.ts"],"names":[],"mappings":";;AAqHA,gDA+DC;AApLD,qCAAgD;AAEhD,0EAAmE;AACnE,gFAMgD;AAGhD,wDAA8D;AAC9D,oDAG8B;AAG9B,mDAK6B;AAC7B,mDAG4B;AAG5B,yFAAkF;AAClF,6EAAsE;AACtE,iFAA0E;AAC1E,qDAA8C;AAmFvC,KAAK,UAAU,kBAAkB,CAQtC,MAAyC,EACzC,UAOC;IAED,MAAM,EACJ,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAClC,MAAM,EAAE,QAAQ,EAChB,IAAI,EACJ,KAAK,GAAG,CAAC,EACT,GAAG,IAAI,EACR,GAAG,UAAU,CAAA;IACd,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,uBAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAA;IAClE,IAAI,CAAC,OAAO;QACV,MAAM,IAAI,iCAAoB,CAAC;YAC7B,QAAQ,EAAE,sCAAsC;SACjD,CAAC,CAAA;IACJ,IAAI,CAAC,QAAQ,CAAC,KAAK;QAAE,MAAM,IAAI,6BAAkB,EAAE,CAAA;IAEnD,MAAM,wBAAwB,GAAG,MAAM,2BAA2B,CAAC,QAAQ,EAAE;QAC3E,IAAI;QACJ,KAAK;KACN,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,CAAC,MAAM,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAA;IAE5E,MAAM,IAAI,GAAG,IAAA,6BAAkB,EAAC;QAC9B,GAAG,EAAE,IAAA,kBAAQ,EAAC;YACZ,wMAAwM;SACzM,CAAC;QACF,YAAY,EAAE,iBAAiB;QAC/B,IAAI,EAAE;YACJ;gBACE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,aAAa,EAAE,wBAAwB,CAAC,aAAc;gBACtD,cAAc,EAAE,MAAM,CAAC,wBAAwB,CAAC,cAAc,CAAC;gBAC/D,QAAQ,EAAE,wBAAwB,CAAC,MAAM;gBACzC,iBAAiB,EAAE,MAAM,CAAC,wBAAwB,CAAC,iBAAiB,CAAC;gBACrE,OAAO,EAAE,wBAAwB,CAAC,OAAO;gBACzC,WAAW,EAAE,wBAAwB,CAAC,KAAK;aAC5C;SACF;KACF,CAAC,CAAA;IAEF,OAAO,MAAM,IAAA,oCAAe,EAAC,MAAM,EAAE;QACnC,OAAO;QACP,EAAE,EAAE,WAAW;QACf,IAAI;QACJ,GAAG,IAAI;KACqB,CAAC,CAAA;AACjC,CAAC;AAED,KAAK,UAAU,2BAA2B,CAIxC,MAAyC,EACzC,UAAwC;IAExC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"finalizeWithdrawal.js","sourceRoot":"","sources":["../../../zksync/actions/finalizeWithdrawal.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,11 +13,10 @@ async function isWithdrawalFinalized(client, parameters) {
|
|
|
13
13
|
const { client: l2Client, hash, index = 0 } = parameters;
|
|
14
14
|
if (!l2Client.chain)
|
|
15
15
|
throw new chain_js_1.ChainNotFoundError();
|
|
16
|
-
const { log } = await
|
|
17
|
-
|
|
18
|
-
hash,
|
|
19
|
-
|
|
20
|
-
});
|
|
16
|
+
const [{ log }, { l2ToL1LogIndex }] = await Promise.all([
|
|
17
|
+
(0, getWithdrawalLog_js_1.getWithdrawalLog)(l2Client, { hash, index }),
|
|
18
|
+
(0, getWithdrawalL2ToL1Log_js_1.getWithdrawalL2ToL1Log)(l2Client, { hash, index }),
|
|
19
|
+
]);
|
|
21
20
|
const proof = await (0, getLogProof_js_1.getLogProof)(l2Client, {
|
|
22
21
|
txHash: hash,
|
|
23
22
|
index: l2ToL1LogIndex,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isWithdrawalFinalized.js","sourceRoot":"","sources":["../../../zksync/actions/isWithdrawalFinalized.ts"],"names":[],"mappings":";;AAmEA,sDAoCC;AAtGD,0EAAmE;AAGnE,oDAG8B;AAG9B,kDAAwD;AACxD,mDAG4B;AAE5B,yFAAkF;AAClF,6EAAsE;AACtE,iFAA0E;AAC1E,qDAA8C;AAgDvC,KAAK,UAAU,qBAAqB,CAMzC,MAAyC,EACzC,UAA+D;IAE/D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,UAAU,CAAA;IAExD,IAAI,CAAC,QAAQ,CAAC,KAAK;QAAE,MAAM,IAAI,6BAAkB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"isWithdrawalFinalized.js","sourceRoot":"","sources":["../../../zksync/actions/isWithdrawalFinalized.ts"],"names":[],"mappings":";;AAmEA,sDAoCC;AAtGD,0EAAmE;AAGnE,oDAG8B;AAG9B,kDAAwD;AACxD,mDAG4B;AAE5B,yFAAkF;AAClF,6EAAsE;AACtE,iFAA0E;AAC1E,qDAA8C;AAgDvC,KAAK,UAAU,qBAAqB,CAMzC,MAAyC,EACzC,UAA+D;IAE/D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,UAAU,CAAA;IAExD,IAAI,CAAC,QAAQ,CAAC,KAAK;QAAE,MAAM,IAAI,6BAAkB,EAAE,CAAA;IAGnD,MAAM,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACtD,IAAA,sCAAgB,EAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAC3C,IAAA,kDAAsB,EAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;KAClD,CAAC,CAAA;IAKF,MAAM,KAAK,GAAG,MAAM,IAAA,4BAAW,EAAC,QAAQ,EAAE;QACxC,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,cAAe;KACvB,CAAC,CAAA;IACF,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,sCAA0B,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;IAE1D,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAA,wDAAyB,EAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;IAErE,OAAO,MAAM,IAAA,8BAAY,EAAC,MAAM,EAAE;QAChC,OAAO,EAAE,QAAQ;QACjB,GAAG,EAAE,2BAAiB;QACtB,YAAY,EAAE,uBAAuB;QACrC,IAAI,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,aAAc,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KACxE,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -8,6 +8,8 @@ export function formatUserOperationReceipt(parameters) {
|
|
|
8
8
|
receipt.actualGasUsed = BigInt(parameters.actualGasUsed);
|
|
9
9
|
if (parameters.logs)
|
|
10
10
|
receipt.logs = parameters.logs.map((log) => formatLog(log));
|
|
11
|
+
if (parameters.nonce)
|
|
12
|
+
receipt.nonce = BigInt(parameters.nonce);
|
|
11
13
|
if (parameters.receipt)
|
|
12
14
|
receipt.receipt = formatTransactionReceipt(receipt.receipt);
|
|
13
15
|
return receipt;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userOperationReceipt.js","sourceRoot":"","sources":["../../../../account-abstraction/utils/formatters/userOperationReceipt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAA;AAM1F,MAAM,UAAU,0BAA0B,CACxC,UAAmC;IAEnC,MAAM,OAAO,GAAG,EAAE,GAAG,UAAU,EAAqC,CAAA;IAEpE,IAAI,UAAU,CAAC,aAAa;QAC1B,OAAO,CAAC,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,IAAI,UAAU,CAAC,aAAa;QAC1B,OAAO,CAAC,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,IAAI,UAAU,CAAC,IAAI;QACjB,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAQ,CAAA;IACpE,IAAI,UAAU,CAAC,OAAO;QACpB,OAAO,CAAC,OAAO,GAAG,wBAAwB,CAAC,OAAO,CAAC,OAAc,CAAC,CAAA;IAEpE,OAAO,OAAO,CAAA;AAChB,CAAC"}
|
|
1
|
+
{"version":3,"file":"userOperationReceipt.js","sourceRoot":"","sources":["../../../../account-abstraction/utils/formatters/userOperationReceipt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAA;AAM1F,MAAM,UAAU,0BAA0B,CACxC,UAAmC;IAEnC,MAAM,OAAO,GAAG,EAAE,GAAG,UAAU,EAAqC,CAAA;IAEpE,IAAI,UAAU,CAAC,aAAa;QAC1B,OAAO,CAAC,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,IAAI,UAAU,CAAC,aAAa;QAC1B,OAAO,CAAC,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,IAAI,UAAU,CAAC,IAAI;QACjB,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAQ,CAAA;IACpE,IAAI,UAAU,CAAC,KAAK;QAAE,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAC9D,IAAI,UAAU,CAAC,OAAO;QACpB,OAAO,CAAC,OAAO,GAAG,wBAAwB,CAAC,OAAO,CAAC,OAAc,CAAC,CAAA;IAEpE,OAAO,OAAO,CAAA;AAChB,CAAC"}
|
|
@@ -36,12 +36,16 @@ import { prepareTransactionRequest, } from '../wallet/prepareTransactionRequest.
|
|
|
36
36
|
export async function estimateGas(client, args) {
|
|
37
37
|
const { account: account_ = client.account, prepare = true } = args;
|
|
38
38
|
const account = account_ ? parseAccount(account_) : undefined;
|
|
39
|
+
// `eth_fillTransaction` cannot apply block context or state overrides, so a
|
|
40
|
+
// gas limit filled during preparation is only usable without them.
|
|
41
|
+
const hasContext = args.stateOverride !== undefined ||
|
|
42
|
+
typeof args.blockNumber === 'bigint' ||
|
|
43
|
+
args.blockTag !== undefined;
|
|
39
44
|
const parameters = (() => {
|
|
40
45
|
if (Array.isArray(prepare))
|
|
41
46
|
return prepare;
|
|
42
|
-
// Some RPC
|
|
43
|
-
|
|
44
|
-
if (account?.type !== 'local')
|
|
47
|
+
// Some RPC providers do not compute versioned hashes from blobs.
|
|
48
|
+
if (account?.type !== 'local' || hasContext)
|
|
45
49
|
return ['blobVersionedHashes'];
|
|
46
50
|
return undefined;
|
|
47
51
|
})();
|
|
@@ -71,8 +75,9 @@ export async function estimateGas(client, args) {
|
|
|
71
75
|
// If we get `gas` back from the prepared transaction request, which is
|
|
72
76
|
// different from the `gas` we provided, it was likely filled by other means
|
|
73
77
|
// during request preparation (e.g. `eth_fillTransaction` or `chain.transactionRequest.prepare`).
|
|
74
|
-
//
|
|
75
|
-
|
|
78
|
+
// Fee payer sponsorship and explicit `prepare` parameters can still fill
|
|
79
|
+
// gas, which ignores block context and state overrides.
|
|
80
|
+
if (gas && args.gas !== gas && !hasContext)
|
|
76
81
|
return gas;
|
|
77
82
|
const blockNumberHex = typeof blockNumber === 'bigint' ? numberToHex(blockNumber) : undefined;
|
|
78
83
|
const block = blockNumberHex || blockTag;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateGas.js","sourceRoot":"","sources":["../../../actions/public/estimateGas.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,GACb,MAAM,sCAAsC,CAAA;AAG7C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAMhD,OAAO,EAEL,2BAA2B,GAC5B,MAAM,0DAA0D,CAAA;AAEjE,OAAO,EAEL,WAAW,GACZ,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAEL,mBAAmB,GACpB,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAA;AAC3D,OAAO,EAEL,wBAAwB,GACzB,MAAM,8CAA8C,CAAA;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAGL,aAAa,GACd,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAGL,yBAAyB,GAC1B,MAAM,wCAAwC,CAAA;AAuC/C;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAI/B,MAAyC,EACzC,IAAkC;IAElC,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,IAAI,CAAA;IACnE,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAE7D,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE;QACvB,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YAAE,OAAO,OAAO,CAAA;QAC1C,
|
|
1
|
+
{"version":3,"file":"estimateGas.js","sourceRoot":"","sources":["../../../actions/public/estimateGas.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,6 +89,8 @@ export async function fillTransaction(client, parameters) {
|
|
|
89
89
|
delete transaction.transactionIndex;
|
|
90
90
|
delete transaction.v;
|
|
91
91
|
delete transaction.yParity;
|
|
92
|
+
if (typeof transaction.maxFeePerGas !== 'undefined')
|
|
93
|
+
delete transaction.gasPrice;
|
|
92
94
|
// Rewrite fields.
|
|
93
95
|
transaction.data = transaction.input;
|
|
94
96
|
const hasFeePayerSignature = typeof transaction.feePayerSignature !== 'undefined' &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fillTransaction.js","sourceRoot":"","sources":["../../../actions/public/fillTransaction.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fillTransaction.js","sourceRoot":"","sources":["../../../actions/public/fillTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFilterChanges.js","sourceRoot":"","sources":["../../../actions/public/getFilterChanges.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAElE,OAAO,EAEL,SAAS,GACV,MAAM,+BAA+B,CAAA;AAsCtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiFG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAUpC,OAAiC,EACjC,EACE,MAAM,GAQP;IAWD,MAAM,MAAM,GAAG,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAA;IAElD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IAEF,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ;QAC7B,OAAO,IAON,CAAA;IAEH,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAa,CAAC,CAAC,CAAA;IACjE,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG;QACnC,OAAO,aAON,CAAA;IACH,OAAO,cAAc,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,IAAI,EAAE,aAAa;QACnB,MAAM;KACP,CAOA,CAAA;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"getFilterChanges.js","sourceRoot":"","sources":["../../../actions/public/getFilterChanges.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAElE,OAAO,EAEL,SAAS,GACV,MAAM,+BAA+B,CAAA;AAsCtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiFG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAUpC,OAAiC,EACjC,EACE,MAAM,GAQP;IAWD,MAAM,MAAM,GAAG,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAA;IAElD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IAEF,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ;QAC7B,OAAO,IAON,CAAA;IAEH,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAa,CAAC,CAAC,CAAA;IACjE,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG;QACnC,OAAO,aAON,CAAA;IACH,OAAO,cAAc,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,IAAI,EAAE,aAAa;QACnB,MAAM;KACP,CAOA,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFilterLogs.js","sourceRoot":"","sources":["../../../actions/public/getFilterLogs.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAElE,OAAO,EAEL,SAAS,GACV,MAAM,+BAA+B,CAAA;AAiCtC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAQjC,OAAiC,EACjC,EACE,MAAM,GAC8D;IAItE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAA;IAErC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IACvD,IAAI,CAAC,MAAM,CAAC,GAAG;QACb,OAAO,aAMN,CAAA;IACH,OAAO,cAAc,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,IAAI,EAAE,aAAa;QACnB,MAAM;KACP,CAMA,CAAA;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"getFilterLogs.js","sourceRoot":"","sources":["../../../actions/public/getFilterLogs.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAElE,OAAO,EAEL,SAAS,GACV,MAAM,+BAA+B,CAAA;AAiCtC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAQjC,OAAiC,EACjC,EACE,MAAM,GAC8D;IAItE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAA;IAErC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IACvD,IAAI,CAAC,MAAM,CAAC,GAAG;QACb,OAAO,aAMN,CAAA;IACH,OAAO,cAAc,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,IAAI,EAAE,aAAa;QACnB,MAAM;KACP,CAMA,CAAA;AACH,CAAC"}
|
|
@@ -29,7 +29,7 @@ import { getBlockNumber, } from './getBlockNumber.js';
|
|
|
29
29
|
* onBlockNumber: (blockNumber) => console.log(blockNumber),
|
|
30
30
|
* })
|
|
31
31
|
*/
|
|
32
|
-
export function watchBlockNumber(client, { emitOnBegin = false, emitMissed
|
|
32
|
+
export function watchBlockNumber(client, { emitOnBegin = false, emitMissed: emitMissed_, onBlockNumber, onError, poll: poll_, pollingInterval = client.pollingInterval, }) {
|
|
33
33
|
const enablePolling = (() => {
|
|
34
34
|
if (typeof poll_ !== 'undefined')
|
|
35
35
|
return poll_;
|
|
@@ -42,6 +42,10 @@ export function watchBlockNumber(client, { emitOnBegin = false, emitMissed = fal
|
|
|
42
42
|
return false;
|
|
43
43
|
return true;
|
|
44
44
|
})();
|
|
45
|
+
// Polling less than twice per block skips blocks, so emit the missed
|
|
46
|
+
// ones unless told otherwise.
|
|
47
|
+
const blockTime = client.chain?.blockTime;
|
|
48
|
+
const emitMissed = emitMissed_ ?? (blockTime !== undefined && pollingInterval > blockTime / 2);
|
|
45
49
|
let prevBlockNumber;
|
|
46
50
|
const pollBlockNumber = () => {
|
|
47
51
|
const observerId = stringify([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchBlockNumber.js","sourceRoot":"","sources":["../../../actions/public/watchBlockNumber.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAsB,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEpD,OAAO,EAEL,cAAc,GACf,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"watchBlockNumber.js","sourceRoot":"","sources":["../../../actions/public/watchBlockNumber.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ import { getBlock } from './getBlock.js';
|
|
|
28
28
|
* onBlock: (block) => console.log(block),
|
|
29
29
|
* })
|
|
30
30
|
*/
|
|
31
|
-
export function watchBlocks(client, { blockTag = client.experimental_blockTag ?? 'latest', emitMissed
|
|
31
|
+
export function watchBlocks(client, { blockTag = client.experimental_blockTag ?? 'latest', emitMissed: emitMissed_, emitOnBegin = false, onBlock, onError, includeTransactions: includeTransactions_, poll: poll_, pollingInterval = client.pollingInterval, }) {
|
|
32
32
|
const enablePolling = (() => {
|
|
33
33
|
if (typeof poll_ !== 'undefined')
|
|
34
34
|
return poll_;
|
|
@@ -42,6 +42,18 @@ export function watchBlocks(client, { blockTag = client.experimental_blockTag ??
|
|
|
42
42
|
return true;
|
|
43
43
|
})();
|
|
44
44
|
const includeTransactions = includeTransactions_ ?? false;
|
|
45
|
+
// Polling less than twice per block skips blocks, so emit the missed
|
|
46
|
+
// ones unless told otherwise. `safe` and `finalized` can move by
|
|
47
|
+
// thousands of blocks at once (such as on Arbitrum) at any polling
|
|
48
|
+
// interval, so they emit missed blocks only when asked.
|
|
49
|
+
const blockTime = client.chain?.blockTime;
|
|
50
|
+
const emitMissed = emitMissed_ ??
|
|
51
|
+
((blockTag === 'latest' || blockTag === 'pending') &&
|
|
52
|
+
blockTime !== undefined &&
|
|
53
|
+
pollingInterval > blockTime / 2);
|
|
54
|
+
// The default catches up at most 100 blocks, so a long gap, such as a
|
|
55
|
+
// device waking from sleep, skips to the latest block.
|
|
56
|
+
const maxMissed = emitMissed_ === undefined ? 100 : Number.POSITIVE_INFINITY;
|
|
45
57
|
let prevBlock;
|
|
46
58
|
const pollBlocks = () => {
|
|
47
59
|
const observerId = stringify([
|
|
@@ -51,6 +63,7 @@ export function watchBlocks(client, { blockTag = client.experimental_blockTag ??
|
|
|
51
63
|
emitMissed,
|
|
52
64
|
emitOnBegin,
|
|
53
65
|
includeTransactions,
|
|
66
|
+
maxMissed,
|
|
54
67
|
pollingInterval,
|
|
55
68
|
]);
|
|
56
69
|
return observe(observerId, { onBlock, onError }, (emit) => poll(async () => {
|
|
@@ -66,14 +79,21 @@ export function watchBlocks(client, { blockTag = client.experimental_blockTag ??
|
|
|
66
79
|
return;
|
|
67
80
|
// If we have missed out on some previous blocks, and the
|
|
68
81
|
// `emitMissed` flag is truthy, let's emit those blocks.
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
82
|
+
// Fetch them in parallel batches so catching up takes a few
|
|
83
|
+
// round trips rather than one per block.
|
|
84
|
+
const missed = Number(block.number - prevBlock.number) - 1;
|
|
85
|
+
if (missed > 0 && missed <= maxMissed && emitMissed) {
|
|
86
|
+
const batchSize = 10;
|
|
87
|
+
const start = prevBlock.number + 1n;
|
|
88
|
+
for (let i = 0; i < missed; i += batchSize) {
|
|
89
|
+
const blocks = await Promise.all(Array.from({ length: Math.min(batchSize, missed - i) }, (_, j) => getAction(client, getBlock, 'getBlock')({
|
|
90
|
+
blockNumber: start + BigInt(i + j),
|
|
73
91
|
includeTransactions,
|
|
74
|
-
}));
|
|
75
|
-
|
|
76
|
-
|
|
92
|
+
})));
|
|
93
|
+
for (const block of blocks) {
|
|
94
|
+
emit.onBlock(block, prevBlock);
|
|
95
|
+
prevBlock = block;
|
|
96
|
+
}
|
|
77
97
|
}
|
|
78
98
|
}
|
|
79
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchBlocks.js","sourceRoot":"","sources":["../../../actions/public/watchBlocks.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAsB,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAA2B,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,EAA2B,QAAQ,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"watchBlocks.js","sourceRoot":"","sources":["../../../actions/public/watchBlocks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { DecodeLogDataMismatch, DecodeLogTopicsMismatch, } from '../../errors/abi.js';
|
|
1
|
+
import { AbiEventSignatureEmptyTopicsError, AbiEventSignatureNotFoundError, DecodeLogDataMismatch, DecodeLogTopicsMismatch, } from '../../errors/abi.js';
|
|
2
2
|
import { BaseError } from '../../errors/base.js';
|
|
3
3
|
import { HttpRequestError, RpcRequestError } from '../../errors/request.js';
|
|
4
4
|
import { InvalidInputRpcError } from '../../errors/rpc.js';
|
|
5
|
-
import { decodeEventLog } from '../../utils/abi/decodeEventLog.js';
|
|
5
|
+
import { AbiEventAmbiguityError, decodeEventLog, } from '../../utils/abi/decodeEventLog.js';
|
|
6
6
|
import { encodeEventTopics, } from '../../utils/abi/encodeEventTopics.js';
|
|
7
7
|
import { formatLog } from '../../utils/formatters/log.js';
|
|
8
8
|
import { getAction } from '../../utils/getAction.js';
|
|
@@ -197,6 +197,10 @@ export function watchContractEvent(client, parameters) {
|
|
|
197
197
|
}
|
|
198
198
|
return client.transport;
|
|
199
199
|
})();
|
|
200
|
+
// A topic filter cannot select an anonymous event, so the
|
|
201
|
+
// subscription can deliver logs that match no requested event. Skip
|
|
202
|
+
// them when the watch names an event, as the polling path does.
|
|
203
|
+
const skipUnmatched = Boolean(eventName || strict_);
|
|
200
204
|
const topics = eventName
|
|
201
205
|
? encodeEventTopics({
|
|
202
206
|
abi: abi,
|
|
@@ -211,19 +215,25 @@ export function watchContractEvent(client, parameters) {
|
|
|
211
215
|
return;
|
|
212
216
|
const log = data.result;
|
|
213
217
|
try {
|
|
214
|
-
const
|
|
218
|
+
const decoded = decodeEventLog({
|
|
215
219
|
abi: abi,
|
|
216
220
|
data: log.data,
|
|
221
|
+
eventName,
|
|
217
222
|
topics: log.topics,
|
|
218
223
|
strict: strict_,
|
|
219
224
|
});
|
|
220
225
|
const formatted = formatLog(log, {
|
|
221
|
-
args,
|
|
222
|
-
eventName: eventName,
|
|
226
|
+
args: decoded.args,
|
|
227
|
+
eventName: decoded.eventName,
|
|
223
228
|
});
|
|
224
229
|
emit.onLogs([formatted]);
|
|
225
230
|
}
|
|
226
231
|
catch (err) {
|
|
232
|
+
if (skipUnmatched &&
|
|
233
|
+
(err instanceof AbiEventAmbiguityError ||
|
|
234
|
+
err instanceof AbiEventSignatureEmptyTopicsError ||
|
|
235
|
+
err instanceof AbiEventSignatureNotFoundError))
|
|
236
|
+
return;
|
|
227
237
|
let eventName;
|
|
228
238
|
let isUnnamed;
|
|
229
239
|
if (err instanceof DecodeLogDataMismatch ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAY1D,OAAO,
|
|
1
|
+
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { DecodeLogDataMismatch, DecodeLogTopicsMismatch, } from '../../errors/abi.js';
|
|
1
|
+
import { AbiEventSignatureEmptyTopicsError, AbiEventSignatureNotFoundError, DecodeLogDataMismatch, DecodeLogTopicsMismatch, } from '../../errors/abi.js';
|
|
2
2
|
import { BaseError } from '../../errors/base.js';
|
|
3
3
|
import { HttpRequestError, RpcRequestError } from '../../errors/request.js';
|
|
4
4
|
import { InvalidInputRpcError } from '../../errors/rpc.js';
|
|
5
|
-
import { decodeEventLog } from '../../utils/abi/decodeEventLog.js';
|
|
5
|
+
import { AbiEventAmbiguityError, decodeEventLog, } from '../../utils/abi/decodeEventLog.js';
|
|
6
6
|
import { encodeEventTopics, } from '../../utils/abi/encodeEventTopics.js';
|
|
7
7
|
import { formatLog } from '../../utils/formatters/log.js';
|
|
8
8
|
import { getAction } from '../../utils/getAction.js';
|
|
@@ -216,6 +216,15 @@ export function watchEvent(client, { address, args, batch = true, event, events,
|
|
|
216
216
|
onLogs([formatted]);
|
|
217
217
|
}
|
|
218
218
|
catch (err) {
|
|
219
|
+
// A topic filter cannot select an anonymous event, so the
|
|
220
|
+
// subscription can deliver logs that match no requested event.
|
|
221
|
+
// Skip them when the watch names events, as the polling path
|
|
222
|
+
// does.
|
|
223
|
+
if ((events_ || strict_) &&
|
|
224
|
+
(err instanceof AbiEventAmbiguityError ||
|
|
225
|
+
err instanceof AbiEventSignatureEmptyTopicsError ||
|
|
226
|
+
err instanceof AbiEventSignatureNotFoundError))
|
|
227
|
+
return;
|
|
219
228
|
let eventName;
|
|
220
229
|
let isUnnamed;
|
|
221
230
|
if (err instanceof DecodeLogDataMismatch ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchEvent.js","sourceRoot":"","sources":["../../../actions/public/watchEvent.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAY1D,OAAO,
|
|
1
|
+
{"version":3,"file":"watchEvent.js","sourceRoot":"","sources":["../../../actions/public/watchEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -184,8 +184,9 @@ export async function prepareTransactionRequest(client, args) {
|
|
|
184
184
|
feeToken !== null &&
|
|
185
185
|
(!('feeToken' in request) || hasFilledFeePayerSignature);
|
|
186
186
|
supportsFillTransaction.set(client.uid, true);
|
|
187
|
+
const { feeToken: _feeToken, ...unsponsored } = request;
|
|
187
188
|
return {
|
|
188
|
-
...request,
|
|
189
|
+
...(hasFilledFeePayerSignature ? unsponsored : request),
|
|
189
190
|
...(from ? { from } : {}),
|
|
190
191
|
...(type && !request.type ? { type } : {}),
|
|
191
192
|
...(typeof chainId !== 'undefined' ? { chainId } : {}),
|
|
@@ -344,7 +345,7 @@ export async function prepareTransactionRequest(client, args) {
|
|
|
344
345
|
request: request,
|
|
345
346
|
});
|
|
346
347
|
if (typeof request.maxPriorityFeePerGas === 'undefined' &&
|
|
347
|
-
request.maxFeePerGas &&
|
|
348
|
+
typeof request.maxFeePerGas === 'bigint' &&
|
|
348
349
|
request.maxFeePerGas < maxPriorityFeePerGas)
|
|
349
350
|
throw new MaxFeePerGasTooLowError({
|
|
350
351
|
maxPriorityFeePerGas,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransactionRequest.js","sourceRoot":"","sources":["../../../actions/wallet/prepareTransactionRequest.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prepareTransactionRequest.js","sourceRoot":"","sources":["../../../actions/wallet/prepareTransactionRequest.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,GACb,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAEL,2BAA2B,GAC5B,MAAM,4CAA4C,CAAA;AACnD,OAAO,EAGL,WAAW,GACZ,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAEL,QAAQ,IAAI,SAAS,GACtB,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAEL,mBAAmB,GACpB,MAAM,6CAA6C,CAAA;AAKpD,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAA;AAqBxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AACjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAA;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAA;AAKnE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAE3C,OAAO,EAGL,aAAa,GACd,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAEL,kBAAkB,GACnB,MAAM,+CAA+C,CAAA;AACtD,OAAO,EAGL,eAAe,GAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEnE,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,qBAAqB;IACrB,SAAS;IACT,MAAM;IACN,KAAK;IACL,OAAO;IACP,MAAM;CACE,CAAA;AAEV,gBAAgB;AAChB,MAAM,CAAC,MAAM,mBAAmB,GAAG,aAAa,CAAC,IAAI,GAAG,EAAmB,CAAA;AAE3E,gBAAgB;AAChB,MAAM,CAAC,MAAM,uBAAuB,GAAG,aAAa,CAAC,IAAI,MAAM,CAAU,GAAG,CAAC,CAAA;AAoJ7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAO7C,MAAyC,EACzC,IAMC;IAUD,IAAI,OAAO,GAAG,IAA2C,CAAA;IAEzD,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO,CAAA;IAClC,OAAO,CAAC,UAAU,KAAK,iBAAiB,CAAA;IAExC,MAAM,EACJ,OAAO,EAAE,QAAQ,EACjB,KAAK,GAAG,MAAM,CAAC,KAAK,EACpB,YAAY,EACZ,UAAU,GACX,GAAG,OAAO,CAAA;IAEX,MAAM,yBAAyB,GAAG,CAAC,GAAG,EAAE;QACtC,IAAI,OAAO,KAAK,EAAE,yBAAyB,KAAK,UAAU;YACxD,OAAO;gBACL,EAAE,EAAE,KAAK,CAAC,yBAAyB;gBACnC,KAAK,EAAE,CAAC,uBAAuB,CAAC;aACjC,CAAA;QACH,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,yBAAyB,CAAC;YACjD,OAAO;gBACL,EAAE,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC;gBACtC,KAAK,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,KAAK;aAChD,CAAA;QACH,OAAO,SAAS,CAAA;IAClB,CAAC,CAAC,EAAE,CAAA;IAEJ,IAAI,OAA2B,CAAA;IAC/B,KAAK,UAAU,UAAU;QACvB,IAAI,OAAO;YAAE,OAAO,OAAO,CAAA;QAC3B,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,WAAW;YAAE,OAAO,OAAO,CAAC,OAAO,CAAA;QAClE,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC,EAAE,CAAA;QAC1B,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAA;QACvE,OAAO,GAAG,QAAQ,CAAA;QAClB,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,IAAI,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA;IAE1D,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;IACzB,IACE,yBAAyB,EAAE,EAAE;QAC7B,yBAAyB,CAAC,KAAK,EAAE,QAAQ,CAAC,uBAAuB,CAAC,EAClE,CAAC;QACD,OAAO,GAAG,MAAM,yBAAyB,CAAC,EAAE,CAC1C,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,EACrB;YACE,MAAM;YACN,KAAK,EAAE,uBAAuB;SAC/B,CACF,CAAA;QACD,KAAK,KAAK,OAAO,CAAC,KAAK,CAAA;QACvB,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,IAAK,OAA8B,CAAC,IAAI,CAAA;QACtE,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACrD,CAAC;IAED,IACE,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC;QAC5B,OAAO,KAAK,KAAK,WAAW;QAC5B,OAAO;QACP,YAAY,EACZ,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAA;QAClC,KAAK,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC;YACjC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,OAAO;YACP,MAAM;SACP,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE;QACxB,wCAAwC;QACxC,IACE,CAAC,UAAU,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YACzC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAClC,OAAO,CAAC,GAAG;YACX,OAAO,CAAC,KAAK;YAEb,OAAO,KAAK,CAAA;QAEd,uEAAuE;QACvE,wEAAwE;QACxE,uEAAuE;QACvE,wEAAwE;QACxE,0EAA0E;QAC1E,kEAAkE;QAClE,sEAAsE;QACtE,wEAAwE;QACxE,kEAAkE;QAClE,yEAAyE;QACzE,qDAAqD;QACrD,EAAE;QACF,0EAA0E;QAC1E,yEAAyE;QACzE,wEAAwE;QACxE,wEAAwE;QACxE,8DAA8D;QAC9D,IACE,UAAU,CAAC,MAAM,GAAG,CAAC;YACrB,UAAU,IAAI,OAAO;YACpB,OAAe,CAAC,QAAQ;YACzB,CAAC,CAAC,mBAAmB,IAAI,OAAO,IAAK,OAAe,CAAC,iBAAiB,CAAC;YAEvE,OAAO,IAAI,CAAA;QAEb,0EAA0E;QAC1E,4DAA4D;QAC5D,IAAI,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,KAAK;YAAE,OAAO,KAAK,CAAA;QAEnE,wFAAwF;QACxF,sDAAsD;QACtD,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CACvD,UAAU,CAAC,QAAQ,CAAC,SAAmD,CAAC,CACzE,CAAA;QACD,IAAI,CAAC,aAAa;YAAE,OAAO,KAAK,CAAA;QAEhC,qDAAqD;QACrD,IAAI,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ;YACvE,OAAO,IAAI,CAAA;QACb,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAA;QAC1E,IACE,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC3B,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ;YACpC,CAAC,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ;gBACvC,OAAQ,OAAe,CAAC,oBAAoB,KAAK,QAAQ,CAAC;YAE5D,OAAO,IAAI,CAAA;QACb,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ;YAC/D,OAAO,IAAI,CAAA;QACb,OAAO,KAAK,CAAA;IACd,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,UAAU,GAAG,WAAW;QAC5B,CAAC,CAAC,MAAM,SAAS,CACb,MAAM,EACN,eAAe,EACf,iBAAiB,CAClB,CAAC,EAAE,GAAG,OAAO,EAAE,KAAK,EAA+B,CAAC;aAClD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,MAAM,EACJ,OAAO,EACP,IAAI,EACJ,GAAG,EACH,QAAQ,EACR,KAAK,EACL,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACpB,IAAI,EACJ,GAAG,IAAI,EACR,GAAG,MAAM,CAAC,WAAW,CAAA;YACtB,MAAM,QAAQ,GAAG,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;YAC/D,MAAM,0BAA0B,GAC9B,mBAAmB,IAAI,IAAI;gBAC3B,IAAI,CAAC,iBAAiB,KAAK,IAAI;gBAC/B,OAAO,IAAI,CAAC,iBAAiB,KAAK,WAAW,CAAA;YAC/C,MAAM,uBAAuB,GAC3B,OAAO,QAAQ,KAAK,WAAW;gBAC/B,QAAQ,KAAK,IAAI;gBACjB,CAAC,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,0BAA0B,CAAC,CAAA;YAC1D,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;YAG7C,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,WAAW,EAAE,GAC3C,OAAuB,CAAA;YACzB,OAAO;gBACL,GAAG,CAAC,0BAA0B,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;gBACvD,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzB,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1C,GAAG,CAAC,OAAO,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtD,GAAG,CAAC,OAAO,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9C,GAAG,CAAC,OAAO,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,GAAG,CAAC,OAAO,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClD,GAAG,CAAC,OAAO,gBAAgB,KAAK,WAAW;oBAC3C,OAAO,CAAC,IAAI,KAAK,QAAQ;oBACzB,OAAO,CAAC,IAAI,KAAK,SAAS;oBACxB,CAAC,CAAC,EAAE,gBAAgB,EAAE;oBACtB,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,OAAO,YAAY,KAAK,WAAW;oBACvC,OAAO,CAAC,IAAI,KAAK,QAAQ;oBACzB,OAAO,CAAC,IAAI,KAAK,SAAS;oBACxB,CAAC,CAAC,EAAE,YAAY,EAAE;oBAClB,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,OAAO,oBAAoB,KAAK,WAAW;oBAC/C,OAAO,CAAC,IAAI,KAAK,QAAQ;oBACzB,OAAO,CAAC,IAAI,KAAK,SAAS;oBACxB,CAAC,CAAC,EAAE,oBAAoB,EAAE;oBAC1B,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,UAAU,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,WAAW;oBAC5D,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE;oBAC7B,CAAC,CAAC,EAAE,CAAC;gBACP,6DAA6D;gBAC7D,GAAG,CAAC,aAAa,IAAI,IAAI;oBACzB,IAAI,CAAC,WAAW,KAAK,IAAI;oBACzB,OAAO,IAAI,CAAC,WAAW,KAAK,WAAW;oBACrC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE;oBACnC,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,YAAY,IAAI,IAAI;oBACxB,IAAI,CAAC,UAAU,KAAK,IAAI;oBACxB,OAAO,IAAI,CAAC,UAAU,KAAK,WAAW;oBACpC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE;oBACjC,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,kBAAkB,IAAI,IAAI;oBAC9B,OAAO,IAAI,CAAC,gBAAgB,KAAK,WAAW;oBAC5C,IAAI,CAAC,gBAAgB,KAAK,IAAI;oBAC9B,CAAC,CAAC,kBAAkB,IAAI,OAAO,CAAC;oBAC9B,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE;oBAC7C,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,mBAAmB,IAAI,IAAI;oBAC/B,OAAO,IAAI,CAAC,iBAAiB,KAAK,WAAW;oBAC7C,IAAI,CAAC,iBAAiB,KAAK,IAAI;oBAC7B,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE;oBAC/C,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChD,GAAG,CAAC,MAAM,CAAC,YAAY;oBACrB,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE;oBACxC,CAAC,CAAC,EAAE,CAAC;aACR,CAAA;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,CAA6B,CAAA;YAE3C,IAAI,KAAK,CAAC,IAAI,KAAK,2BAA2B;gBAAE,OAAO,OAAO,CAAA;YAE9D,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,EAAE,CAChC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,0BAA0B,CACvD,CAAA;YACD,IAAI,aAAa;gBAAE,MAAM,CAAC,CAAA;YAE1B,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC3C,MAAM,KAAK,GAAG,CAAc,CAAA;gBAC5B,OAAO,KAAK,CAAC,IAAI,KAAK,wBAAwB,CAAA;YAChD,CAAC,CAAC,CAAA;YACF,IAAI,iBAAiB;gBAAE,MAAM,CAAC,CAAA;YAE9B,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrC,MAAM,KAAK,GAAG,CAAc,CAAA;gBAC5B,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,wBAAwB;oBACvC,KAAK,CAAC,IAAI,KAAK,4BAA4B;oBAC3C,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,sCAAsC,CAAC,CAChE,CAAA;YACH,CAAC,CAAC,CAAA;YACF,IAAI,WAAW;gBAAE,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YAE/D,OAAO,OAAO,CAAA;QAChB,CAAC,CAAC;QACN,CAAC,CAAC,OAAO,CAAA;IAEX,KAAK,KAAK,UAAU,CAAC,KAAK,CAAA;IAE1B,OAAO,GAAG;QACR,GAAI,UAAkB;QACtB,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,GAAG,CAAC,OAAO,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnD,CAAA;IACD,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;IAEzC,IACE,yBAAyB,EAAE,EAAE;QAC7B,yBAAyB,CAAC,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EACjE,CAAC;QACD,OAAO,GAAG,MAAM,yBAAyB,CAAC,EAAE,CAC1C,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,EACrB;YACE,MAAM;YACN,KAAK,EAAE,sBAAsB;SAC9B,CACF,CAAA;IACH,CAAC;IAED,IAAI,KAAwB,CAAA;IAC5B,KAAK,UAAU,QAAQ;QACrB,IAAI,KAAK;YAAE,OAAO,KAAK,CAAA;QACvB,KAAK,GAAG,MAAM,SAAS,CACrB,MAAM,EACN,SAAS,EACT,UAAU,CACX,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;QACzB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IACE,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC;QAC5B,OAAO,KAAK,KAAK,WAAW;QAC5B,OAAO;QACP,CAAC,YAAY;QAEb,OAAO,CAAC,KAAK,GAAG,MAAM,SAAS,CAC7B,MAAM,EACN,mBAAmB,EACnB,qBAAqB,CACtB,CAAC;YACA,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,SAAS;SACpB,CAAC,CAAA;IAEJ,IACE,CAAC,UAAU,CAAC,QAAQ,CAAC,qBAAqB,CAAC;QACzC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAClC,KAAK;QACL,GAAG,EACH,CAAC;QACD,MAAM,WAAW,GAAG,kBAAkB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;QAEtD,IAAI,UAAU,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;YAC/C,MAAM,eAAe,GAAG,4BAA4B,CAAC;gBACnD,WAAW;gBACX,EAAE,EAAE,KAAK;aACV,CAAC,CAAA;YACF,OAAO,CAAC,mBAAmB,GAAG,eAAe,CAAA;QAC/C,CAAC;QACD,IAAI,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,aAAa,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAA;YACzD,MAAM,QAAQ,GAAG,cAAc,CAAC;gBAC9B,KAAK;gBACL,WAAW;gBACX,MAAM;gBACN,EAAE,EAAE,KAAK;aACV,CAAC,CAAA;YACF,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAC7B,CAAC;IACH,CAAC;IAED,IAAI,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,CAAC,OAAO,GAAG,MAAM,UAAU,EAAE,CAAA;IAExE,IACE,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC5D,OAAO,IAAI,KAAK,WAAW,EAC3B,CAAC;QACD,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,GAAG,kBAAkB,CAC/B,OAAkC,CAC5B,CAAA;QACV,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,gBAAgB,GAAG,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAC1D,IAAI,OAAO,gBAAgB,KAAK,WAAW,EAAE,CAAC;gBAC5C,MAAM,KAAK,GAAG,MAAM,QAAQ,EAAE,CAAA;gBAC9B,gBAAgB,GAAG,OAAO,KAAK,EAAE,aAAa,KAAK,QAAQ,CAAA;gBAC3D,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAA;YACvD,CAAC;YACD,OAAO,CAAC,IAAI,GAAG,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAA;QACxD,CAAC;IACH,CAAC;IAED,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,wGAAwG;QAExG,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC5D,gBAAgB;YAChB,IACE,OAAO,OAAO,CAAC,YAAY,KAAK,WAAW;gBAC3C,OAAO,OAAO,CAAC,oBAAoB,KAAK,WAAW,EACnD,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,QAAQ,EAAE,CAAA;gBAC9B,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAC1C,MAAM,2BAA2B,CAAC,MAAM,EAAE;oBACxC,KAAK,EAAE,KAAc;oBACrB,KAAK;oBACL,OAAO,EAAE,OAA8C;iBACxD,CAAC,CAAA;gBAEJ,IACE,OAAO,OAAO,CAAC,oBAAoB,KAAK,WAAW;oBACnD,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ;oBACxC,OAAO,CAAC,YAAY,GAAG,oBAAoB;oBAE3C,MAAM,IAAI,uBAAuB,CAAC;wBAChC,oBAAoB;qBACrB,CAAC,CAAA;gBAEJ,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;gBACnD,OAAO,CAAC,YAAY,GAAG,YAAY,CAAA;YACrC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,cAAc;YACd,IACE,OAAO,OAAO,CAAC,YAAY,KAAK,WAAW;gBAC3C,OAAO,OAAO,CAAC,oBAAoB,KAAK,WAAW;gBAEnD,MAAM,IAAI,4BAA4B,EAAE,CAAA;YAE1C,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;gBAC5C,MAAM,KAAK,GAAG,MAAM,QAAQ,EAAE,CAAA;gBAC9B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,2BAA2B,CAC/D,MAAM,EACN;oBACE,KAAK,EAAE,KAAc;oBACrB,KAAK;oBACL,OAAO,EAAE,OAA8C;oBACvD,IAAI,EAAE,QAAQ;iBACf,CACF,CAAA;gBACD,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAA;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,GAAG,KAAK,WAAW;QAC1D,OAAO,CAAC,GAAG,GAAG,MAAM,SAAS,CAC3B,MAAM,EACN,WAAW,EACX,aAAa,CACd,CAAC;YACA,GAAG,OAAO;YACV,OAAO;YACP,OAAO,EAAE,OAAO,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC;SACzC,CAAC,CAAA;IAE7B,IACE,yBAAyB,EAAE,EAAE;QAC7B,yBAAyB,CAAC,KAAK,EAAE,QAAQ,CAAC,qBAAqB,CAAC;QAEhE,OAAO,GAAG,MAAM,yBAAyB,CAAC,EAAE,CAC1C,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,EACrB;YACE,MAAM;YACN,KAAK,EAAE,qBAAqB;SAC7B,CACF,CAAA;IAEH,aAAa,CAAC,OAAkC,CAAC,CAAA;IAEjD,OAAO,OAAO,CAAC,UAAU,CAAA;IAEzB,OAAO,OAAc,CAAA;AACvB,CAAC"}
|
|
@@ -168,12 +168,16 @@ export async function sendTransaction(client, parameters) {
|
|
|
168
168
|
return account.nonceManager;
|
|
169
169
|
const nonceManager = account.nonceManager;
|
|
170
170
|
return {
|
|
171
|
-
consume(parameters) {
|
|
171
|
+
async consume(parameters) {
|
|
172
172
|
nonceManagerParameters = {
|
|
173
173
|
address: parameters.address,
|
|
174
174
|
chainId: parameters.chainId,
|
|
175
175
|
};
|
|
176
|
-
|
|
176
|
+
const nonce = await nonceManager.consume(parameters);
|
|
177
|
+
// Pass the consumed nonce to `reset` so the manager can tell
|
|
178
|
+
// which `consume` a failed send follows.
|
|
179
|
+
nonceManagerParameters = { ...nonceManagerParameters, nonce };
|
|
180
|
+
return nonce;
|
|
177
181
|
},
|
|
178
182
|
get(parameters) {
|
|
179
183
|
return nonceManager.get(parameters);
|