viem 2.57.17 → 2.57.18
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 +80 -0
- package/_cjs/account-abstraction/actions/paymaster/getPaymasterData.js +4 -2
- package/_cjs/account-abstraction/actions/paymaster/getPaymasterData.js.map +1 -1
- package/_cjs/account-abstraction/actions/paymaster/getPaymasterStubData.js +6 -2
- package/_cjs/account-abstraction/actions/paymaster/getPaymasterStubData.js.map +1 -1
- package/_cjs/actions/ens/getEnsAddress.js +11 -1
- package/_cjs/actions/ens/getEnsAddress.js.map +1 -1
- package/_cjs/actions/index.js +5 -3
- package/_cjs/actions/index.js.map +1 -1
- package/_cjs/actions/public/call.js +13 -2
- package/_cjs/actions/public/call.js.map +1 -1
- package/_cjs/actions/public/getLogs.js +18 -1
- package/_cjs/actions/public/getLogs.js.map +1 -1
- package/_cjs/actions/public/internal/isRangeError.js +18 -0
- package/_cjs/actions/public/internal/isRangeError.js.map +1 -0
- package/_cjs/actions/public/internal/watchTransport.js +24 -0
- package/_cjs/actions/public/internal/watchTransport.js.map +1 -0
- package/_cjs/actions/public/iterateLogs.js +48 -0
- package/_cjs/actions/public/iterateLogs.js.map +1 -0
- package/_cjs/actions/public/simulateContract.js +4 -4
- package/_cjs/actions/public/simulateContract.js.map +1 -1
- package/_cjs/actions/public/verifyHash.js +72 -39
- package/_cjs/actions/public/verifyHash.js.map +1 -1
- package/_cjs/actions/public/waitForTransactionReceipt.js +18 -1
- package/_cjs/actions/public/waitForTransactionReceipt.js.map +1 -1
- package/_cjs/actions/public/watchBlockHeaders.js +2 -10
- package/_cjs/actions/public/watchBlockHeaders.js.map +1 -1
- package/_cjs/actions/public/watchBlockNumber.js +3 -18
- package/_cjs/actions/public/watchBlockNumber.js.map +1 -1
- package/_cjs/actions/public/watchBlocks.js +3 -18
- package/_cjs/actions/public/watchBlocks.js.map +1 -1
- package/_cjs/actions/public/watchContractEvent.js +5 -33
- package/_cjs/actions/public/watchContractEvent.js.map +1 -1
- package/_cjs/actions/public/watchEvent.js +5 -33
- package/_cjs/actions/public/watchEvent.js.map +1 -1
- package/_cjs/actions/wallet/prepareTransactionRequest.js +16 -3
- package/_cjs/actions/wallet/prepareTransactionRequest.js.map +1 -1
- package/_cjs/celo/serializers.js +1 -1
- package/_cjs/celo/serializers.js.map +1 -1
- package/_cjs/clients/decorators/public.js +2 -0
- package/_cjs/clients/decorators/public.js.map +1 -1
- package/_cjs/constants/contracts.js +1 -1
- package/_cjs/constants/contracts.js.map +1 -1
- package/_cjs/errors/chain.js +2 -2
- package/_cjs/errors/chain.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/op-stack/actions/buildProveWithdrawal.js +5 -5
- package/_cjs/op-stack/actions/buildProveWithdrawal.js.map +1 -1
- package/_cjs/op-stack/actions/getL2Output.js +13 -9
- package/_cjs/op-stack/actions/getL2Output.js.map +1 -1
- package/_cjs/op-stack/actions/waitToProve.js +1 -0
- package/_cjs/op-stack/actions/waitToProve.js.map +1 -1
- package/_cjs/tempo/Account.js +30 -0
- package/_cjs/tempo/Account.js.map +1 -1
- package/_cjs/tempo/actions/accessKey.js +1 -1
- package/_cjs/tempo/actions/accessKey.js.map +1 -1
- package/_cjs/tempo/actions/accounts.js +5 -5
- package/_cjs/tempo/actions/accounts.js.map +1 -1
- package/_cjs/tempo/actions/earn/deployment.js +1 -1
- package/_cjs/tempo/actions/earn/deployment.js.map +1 -1
- package/_cjs/tempo/actions/earn.js +3 -3
- package/_cjs/tempo/actions/earn.js.map +1 -1
- package/_cjs/tempo/actions/propAmm.js +1 -1
- package/_cjs/tempo/actions/propAmm.js.map +1 -1
- package/_cjs/tempo/actions/token.js +10 -2
- package/_cjs/tempo/actions/token.js.map +1 -1
- package/_cjs/tempo/chainConfig.js +14 -0
- package/_cjs/tempo/chainConfig.js.map +1 -1
- package/_cjs/tempo/internal/preAuthorized.js +214 -0
- package/_cjs/tempo/internal/preAuthorized.js.map +1 -0
- package/_cjs/tempo/internal/relay/feePayer.js +25 -7
- package/_cjs/tempo/internal/relay/feePayer.js.map +1 -1
- package/_cjs/utils/abi/decodeAbiParameters.js +33 -9
- package/_cjs/utils/abi/decodeAbiParameters.js.map +1 -1
- package/_cjs/utils/abi/encodeAbiParameters.js +5 -4
- package/_cjs/utils/abi/encodeAbiParameters.js.map +1 -1
- package/_cjs/utils/abi/encodePacked.js +4 -2
- package/_cjs/utils/abi/encodePacked.js.map +1 -1
- package/_cjs/utils/ccip.js +5 -1
- package/_cjs/utils/ccip.js.map +1 -1
- package/_cjs/utils/chain/getChainContractAddress.js +2 -2
- package/_cjs/utils/chain/getChainContractAddress.js.map +1 -1
- package/_cjs/utils/encoding/toBytes.js +5 -6
- package/_cjs/utils/encoding/toBytes.js.map +1 -1
- package/_cjs/utils/ens/avatar/utils.js +25 -5
- package/_cjs/utils/ens/avatar/utils.js.map +1 -1
- package/_cjs/utils/ens/localBatchGatewayRequest.js +13 -1
- package/_cjs/utils/ens/localBatchGatewayRequest.js.map +1 -1
- package/_cjs/utils/promise/createBatchScheduler.js +1 -1
- package/_cjs/utils/promise/createBatchScheduler.js.map +1 -1
- package/_cjs/utils/siwe/validateSiweMessage.js +5 -0
- package/_cjs/utils/siwe/validateSiweMessage.js.map +1 -1
- package/_cjs/zksync/actions/estimateFee.js +1 -1
- package/_cjs/zksync/actions/estimateFee.js.map +1 -1
- package/_cjs/zksync/actions/estimateGasL1ToL2.js +1 -1
- package/_cjs/zksync/actions/estimateGasL1ToL2.js.map +1 -1
- package/_cjs/zksync/actions/finalizeWithdrawal.js +3 -3
- package/_cjs/zksync/actions/finalizeWithdrawal.js.map +1 -1
- package/_cjs/zksync/actions/sendEip712Transaction.js +10 -2
- package/_cjs/zksync/actions/sendEip712Transaction.js.map +1 -1
- package/_cjs/zksync/actions/signEip712Transaction.js +2 -2
- package/_cjs/zksync/actions/signEip712Transaction.js.map +1 -1
- package/_esm/account-abstraction/actions/paymaster/getPaymasterData.js +4 -2
- package/_esm/account-abstraction/actions/paymaster/getPaymasterData.js.map +1 -1
- package/_esm/account-abstraction/actions/paymaster/getPaymasterStubData.js +6 -2
- package/_esm/account-abstraction/actions/paymaster/getPaymasterStubData.js.map +1 -1
- package/_esm/actions/ens/getEnsAddress.js +12 -1
- package/_esm/actions/ens/getEnsAddress.js.map +1 -1
- package/_esm/actions/index.js +1 -0
- package/_esm/actions/index.js.map +1 -1
- package/_esm/actions/public/call.js +13 -2
- package/_esm/actions/public/call.js.map +1 -1
- package/_esm/actions/public/getLogs.js +18 -1
- package/_esm/actions/public/getLogs.js.map +1 -1
- package/_esm/actions/public/internal/isRangeError.js +19 -0
- package/_esm/actions/public/internal/isRangeError.js.map +1 -0
- package/_esm/actions/public/internal/watchTransport.js +22 -0
- package/_esm/actions/public/internal/watchTransport.js.map +1 -0
- package/_esm/actions/public/iterateLogs.js +84 -0
- package/_esm/actions/public/iterateLogs.js.map +1 -0
- package/_esm/actions/public/simulateContract.js +5 -4
- package/_esm/actions/public/simulateContract.js.map +1 -1
- package/_esm/actions/public/verifyHash.js +77 -40
- package/_esm/actions/public/verifyHash.js.map +1 -1
- package/_esm/actions/public/waitForTransactionReceipt.js +20 -1
- package/_esm/actions/public/waitForTransactionReceipt.js.map +1 -1
- package/_esm/actions/public/watchBlockHeaders.js +2 -10
- package/_esm/actions/public/watchBlockHeaders.js.map +1 -1
- package/_esm/actions/public/watchBlockNumber.js +3 -18
- package/_esm/actions/public/watchBlockNumber.js.map +1 -1
- package/_esm/actions/public/watchBlocks.js +3 -18
- package/_esm/actions/public/watchBlocks.js.map +1 -1
- package/_esm/actions/public/watchContractEvent.js +4 -36
- package/_esm/actions/public/watchContractEvent.js.map +1 -1
- package/_esm/actions/public/watchEvent.js +4 -36
- package/_esm/actions/public/watchEvent.js.map +1 -1
- package/_esm/actions/wallet/prepareTransactionRequest.js +17 -3
- package/_esm/actions/wallet/prepareTransactionRequest.js.map +1 -1
- package/_esm/celo/serializers.js +1 -1
- package/_esm/celo/serializers.js.map +1 -1
- package/_esm/clients/decorators/public.js +2 -0
- package/_esm/clients/decorators/public.js.map +1 -1
- package/_esm/constants/contracts.js +1 -1
- package/_esm/constants/contracts.js.map +1 -1
- package/_esm/errors/chain.js +2 -2
- package/_esm/errors/chain.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/op-stack/actions/buildProveWithdrawal.js +5 -5
- package/_esm/op-stack/actions/buildProveWithdrawal.js.map +1 -1
- package/_esm/op-stack/actions/getL2Output.js +14 -9
- package/_esm/op-stack/actions/getL2Output.js.map +1 -1
- package/_esm/op-stack/actions/waitToProve.js +1 -0
- package/_esm/op-stack/actions/waitToProve.js.map +1 -1
- package/_esm/tempo/Account.js +33 -1
- package/_esm/tempo/Account.js.map +1 -1
- package/_esm/tempo/actions/accessKey.js +1 -1
- package/_esm/tempo/actions/accessKey.js.map +1 -1
- package/_esm/tempo/actions/accounts.js +5 -5
- package/_esm/tempo/actions/accounts.js.map +1 -1
- package/_esm/tempo/actions/earn/deployment.js +1 -1
- package/_esm/tempo/actions/earn/deployment.js.map +1 -1
- package/_esm/tempo/actions/earn.js +3 -3
- package/_esm/tempo/actions/earn.js.map +1 -1
- package/_esm/tempo/actions/propAmm.js +1 -1
- package/_esm/tempo/actions/propAmm.js.map +1 -1
- package/_esm/tempo/actions/token.js +10 -2
- package/_esm/tempo/actions/token.js.map +1 -1
- package/_esm/tempo/chainConfig.js +16 -0
- package/_esm/tempo/chainConfig.js.map +1 -1
- package/_esm/tempo/internal/preAuthorized.js +244 -0
- package/_esm/tempo/internal/preAuthorized.js.map +1 -0
- package/_esm/tempo/internal/relay/feePayer.js +26 -7
- package/_esm/tempo/internal/relay/feePayer.js.map +1 -1
- package/_esm/utils/abi/decodeAbiParameters.js +37 -9
- package/_esm/utils/abi/decodeAbiParameters.js.map +1 -1
- package/_esm/utils/abi/encodeAbiParameters.js +6 -4
- package/_esm/utils/abi/encodeAbiParameters.js.map +1 -1
- package/_esm/utils/abi/encodePacked.js +5 -2
- package/_esm/utils/abi/encodePacked.js.map +1 -1
- package/_esm/utils/ccip.js +8 -3
- package/_esm/utils/ccip.js.map +1 -1
- package/_esm/utils/chain/getChainContractAddress.js +2 -2
- package/_esm/utils/chain/getChainContractAddress.js.map +1 -1
- package/_esm/utils/encoding/toBytes.js +5 -6
- package/_esm/utils/encoding/toBytes.js.map +1 -1
- package/_esm/utils/ens/avatar/utils.js +26 -5
- package/_esm/utils/ens/avatar/utils.js.map +1 -1
- package/_esm/utils/ens/localBatchGatewayRequest.js +17 -1
- package/_esm/utils/ens/localBatchGatewayRequest.js.map +1 -1
- package/_esm/utils/promise/createBatchScheduler.js +2 -1
- package/_esm/utils/promise/createBatchScheduler.js.map +1 -1
- package/_esm/utils/siwe/validateSiweMessage.js +6 -0
- package/_esm/utils/siwe/validateSiweMessage.js.map +1 -1
- package/_esm/zksync/actions/estimateFee.js +1 -1
- package/_esm/zksync/actions/estimateFee.js.map +1 -1
- package/_esm/zksync/actions/estimateGasL1ToL2.js +1 -1
- package/_esm/zksync/actions/estimateGasL1ToL2.js.map +1 -1
- package/_esm/zksync/actions/finalizeWithdrawal.js +3 -3
- package/_esm/zksync/actions/finalizeWithdrawal.js.map +1 -1
- package/_esm/zksync/actions/sendEip712Transaction.js +12 -2
- package/_esm/zksync/actions/sendEip712Transaction.js.map +1 -1
- package/_esm/zksync/actions/signEip712Transaction.js +2 -2
- package/_esm/zksync/actions/signEip712Transaction.js.map +1 -1
- package/_types/account-abstraction/actions/paymaster/getPaymasterData.d.ts.map +1 -1
- package/_types/account-abstraction/actions/paymaster/getPaymasterStubData.d.ts.map +1 -1
- package/_types/actions/ens/getEnsAddress.d.ts +2 -1
- package/_types/actions/ens/getEnsAddress.d.ts.map +1 -1
- package/_types/actions/index.d.ts +1 -0
- package/_types/actions/index.d.ts.map +1 -1
- package/_types/actions/public/call.d.ts.map +1 -1
- package/_types/actions/public/getLogs.d.ts +20 -2
- package/_types/actions/public/getLogs.d.ts.map +1 -1
- package/_types/actions/public/internal/isRangeError.d.ts +3 -0
- package/_types/actions/public/internal/isRangeError.d.ts.map +1 -0
- package/_types/actions/public/internal/watchTransport.d.ts +6 -0
- package/_types/actions/public/internal/watchTransport.d.ts.map +1 -0
- package/_types/actions/public/iterateLogs.d.ts +94 -0
- package/_types/actions/public/iterateLogs.d.ts.map +1 -0
- package/_types/actions/public/simulateContract.d.ts.map +1 -1
- package/_types/actions/public/verifyHash.d.ts +2 -1
- package/_types/actions/public/verifyHash.d.ts.map +1 -1
- package/_types/actions/public/waitForTransactionReceipt.d.ts +7 -2
- package/_types/actions/public/waitForTransactionReceipt.d.ts.map +1 -1
- package/_types/actions/public/watchBlockHeaders.d.ts.map +1 -1
- package/_types/actions/public/watchBlockNumber.d.ts.map +1 -1
- 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 +2 -1
- package/_types/actions/wallet/prepareTransactionRequest.d.ts.map +1 -1
- package/_types/celo/serializers.d.ts.map +1 -1
- package/_types/clients/decorators/public.d.ts +33 -0
- package/_types/clients/decorators/public.d.ts.map +1 -1
- package/_types/constants/contracts.d.ts +1 -1
- package/_types/constants/contracts.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/index.d.ts +2 -1
- package/_types/index.d.ts.map +1 -1
- package/_types/op-stack/actions/getL2Output.d.ts +6 -0
- package/_types/op-stack/actions/getL2Output.d.ts.map +1 -1
- package/_types/op-stack/actions/waitToProve.d.ts.map +1 -1
- package/_types/tempo/Account.d.ts +5 -1
- package/_types/tempo/Account.d.ts.map +1 -1
- package/_types/tempo/actions/earn/deployment.d.ts.map +1 -1
- package/_types/tempo/actions/propAmm.d.ts.map +1 -1
- package/_types/tempo/actions/token.d.ts.map +1 -1
- package/_types/tempo/chainConfig.d.ts.map +1 -1
- package/_types/tempo/internal/preAuthorized.d.ts +41 -0
- package/_types/tempo/internal/preAuthorized.d.ts.map +1 -0
- package/_types/tempo/internal/relay/feePayer.d.ts.map +1 -1
- package/_types/utils/abi/decodeAbiParameters.d.ts +15 -1
- package/_types/utils/abi/decodeAbiParameters.d.ts.map +1 -1
- package/_types/utils/abi/encodeAbiParameters.d.ts.map +1 -1
- package/_types/utils/ccip.d.ts +4 -3
- package/_types/utils/ccip.d.ts.map +1 -1
- package/_types/utils/encoding/toBytes.d.ts +1 -1
- package/_types/utils/encoding/toBytes.d.ts.map +1 -1
- package/_types/utils/ens/avatar/utils.d.ts +6 -2
- package/_types/utils/ens/avatar/utils.d.ts.map +1 -1
- package/_types/utils/ens/localBatchGatewayRequest.d.ts +6 -1
- package/_types/utils/ens/localBatchGatewayRequest.d.ts.map +1 -1
- package/_types/utils/promise/createBatchScheduler.d.ts.map +1 -1
- package/_types/utils/siwe/validateSiweMessage.d.ts.map +1 -1
- package/_types/zksync/actions/estimateFee.d.ts.map +1 -1
- package/_types/zksync/actions/estimateGasL1ToL2.d.ts.map +1 -1
- package/_types/zksync/actions/finalizeWithdrawal.d.ts.map +1 -1
- package/_types/zksync/actions/sendEip712Transaction.d.ts +1 -1
- package/_types/zksync/actions/sendEip712Transaction.d.ts.map +1 -1
- package/account-abstraction/actions/paymaster/getPaymasterData.ts +23 -16
- package/account-abstraction/actions/paymaster/getPaymasterStubData.ts +27 -16
- package/actions/ens/getEnsAddress.ts +15 -1
- package/actions/index.ts +6 -0
- package/actions/public/call.ts +15 -2
- package/actions/public/getLogs.ts +44 -0
- package/actions/public/internal/isRangeError.ts +18 -0
- package/actions/public/internal/watchTransport.ts +29 -0
- package/actions/public/iterateLogs.ts +209 -0
- package/actions/public/simulateContract.ts +6 -4
- package/actions/public/verifyHash.ts +87 -60
- package/actions/public/waitForTransactionReceipt.ts +31 -1
- package/actions/public/watchBlockHeaders.ts +2 -12
- package/actions/public/watchBlockNumber.ts +6 -24
- package/actions/public/watchBlocks.ts +6 -24
- package/actions/public/watchContractEvent.ts +7 -42
- package/actions/public/watchEvent.ts +7 -42
- package/actions/wallet/prepareTransactionRequest.ts +23 -3
- package/celo/serializers.ts +5 -2
- package/clients/decorators/public.ts +47 -0
- package/constants/contracts.ts +1 -1
- package/errors/chain.ts +2 -2
- package/errors/version.ts +1 -1
- package/index.ts +7 -0
- package/op-stack/actions/buildProveWithdrawal.ts +5 -5
- package/op-stack/actions/getL2Output.ts +24 -11
- package/op-stack/actions/waitToProve.ts +1 -0
- package/package.json +2 -2
- package/tempo/Account.ts +38 -1
- package/tempo/actions/accessKey.ts +1 -1
- package/tempo/actions/accounts.ts +5 -5
- package/tempo/actions/earn/deployment.ts +2 -1
- package/tempo/actions/earn.ts +2 -2
- package/tempo/actions/propAmm.ts +2 -1
- package/tempo/actions/token.ts +10 -2
- package/tempo/chainConfig.ts +20 -0
- package/tempo/internal/preAuthorized.ts +309 -0
- package/tempo/internal/relay/feePayer.ts +33 -11
- package/utils/abi/decodeAbiParameters.ts +60 -9
- package/utils/abi/encodeAbiParameters.ts +6 -4
- package/utils/abi/encodePacked.ts +5 -1
- package/utils/ccip.ts +17 -3
- package/utils/chain/getChainContractAddress.ts +2 -2
- package/utils/encoding/toBytes.ts +4 -6
- package/utils/ens/avatar/utils.ts +38 -4
- package/utils/ens/localBatchGatewayRequest.ts +21 -2
- package/utils/promise/createBatchScheduler.ts +2 -1
- package/utils/siwe/validateSiweMessage.ts +7 -0
- package/zksync/actions/estimateFee.ts +2 -1
- package/zksync/actions/estimateGasL1ToL2.ts +2 -1
- package/zksync/actions/finalizeWithdrawal.ts +4 -3
- package/zksync/actions/sendEip712Transaction.ts +21 -8
- package/zksync/actions/signEip712Transaction.ts +3 -3
|
@@ -39,9 +39,9 @@ export async function simulateContract(client, parameters) {
|
|
|
39
39
|
const { abi, address, args, functionName, dataSuffix = typeof client.dataSuffix === 'string'
|
|
40
40
|
? client.dataSuffix
|
|
41
41
|
: client.dataSuffix?.value, ...callRequest } = parameters;
|
|
42
|
-
const account = callRequest.account
|
|
43
|
-
?
|
|
44
|
-
:
|
|
42
|
+
const account = callRequest.account === undefined
|
|
43
|
+
? client.account
|
|
44
|
+
: callRequest.account && parseAccount(callRequest.account);
|
|
45
45
|
const calldata = encodeFunctionData({ abi, args, functionName });
|
|
46
46
|
try {
|
|
47
47
|
const { data } = await getAction(client, call, 'call')({
|
|
@@ -49,7 +49,8 @@ export async function simulateContract(client, parameters) {
|
|
|
49
49
|
data: `${calldata}${dataSuffix ? dataSuffix.replace('0x', '') : ''}`,
|
|
50
50
|
to: address,
|
|
51
51
|
...callRequest,
|
|
52
|
-
|
|
52
|
+
// `call` omits the sender for `null` at runtime, but its parameter type excludes `null`.
|
|
53
|
+
account: account,
|
|
53
54
|
});
|
|
54
55
|
const result = decodeFunctionResult({
|
|
55
56
|
abi,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulateContract.js","sourceRoot":"","sources":["../../../actions/public/simulateContract.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,GACb,MAAM,sCAAsC,CAAA;AAuB7C,OAAO,EAEL,oBAAoB,GACrB,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAEL,kBAAkB,GACnB,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAEL,gBAAgB,GACjB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEpD,OAAO,EAA2C,IAAI,EAAE,MAAM,WAAW,CAAA;AAsJzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAapC,MAAyC,EACzC,UAOC;IAYD,MAAM,EACJ,GAAG,EACH,OAAO,EACP,IAAI,EACJ,YAAY,EACZ,UAAU,GAAG,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ;QAChD,CAAC,CAAC,MAAM,CAAC,UAAU;QACnB,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,EAC5B,GAAG,WAAW,EACf,GAAG,UAAwC,CAAA;IAE5C,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"simulateContract.js","sourceRoot":"","sources":["../../../actions/public/simulateContract.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,GACb,MAAM,sCAAsC,CAAA;AAuB7C,OAAO,EAEL,oBAAoB,GACrB,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAEL,kBAAkB,GACnB,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAEL,gBAAgB,GACjB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEpD,OAAO,EAA2C,IAAI,EAAE,MAAM,WAAW,CAAA;AAsJzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAapC,MAAyC,EACzC,UAOC;IAYD,MAAM,EACJ,GAAG,EACH,OAAO,EACP,IAAI,EACJ,YAAY,EACZ,UAAU,GAAG,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ;QAChD,CAAC,CAAC,MAAM,CAAC,UAAU;QACnB,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,EAC5B,GAAG,WAAW,EACf,GAAG,UAAwC,CAAA;IAE5C,MAAM,OAAO,GACX,WAAW,CAAC,OAAO,KAAK,SAAS;QAC/B,CAAC,CAAC,MAAM,CAAC,OAAO;QAChB,CAAC,CAAC,WAAW,CAAC,OAAO,IAAI,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IAC9D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;IAEhE,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAC9B,MAAM,EACN,IAAI,EACJ,MAAM,CACP,CAAC;YACA,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,GAAG,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;YACpE,EAAE,EAAE,OAAO;YACX,GAAG,WAAW;YACd,yFAAyF;YACzF,OAAO,EAAE,OAA8B;SACxC,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,oBAAoB,CAAC;YAClC,GAAG;YACH,IAAI;YACJ,YAAY;YACZ,IAAI,EAAE,IAAI,IAAI,IAAI;SACnB,CAAC,CAAA;QACF,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAC7B,CAAC,OAAO,EAAE,EAAE,CACV,MAAM,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,YAAY,CAChE,CAAA;QACD,OAAO;YACL,MAAM;YACN,OAAO,EAAE;gBACP,GAAG,EAAE,YAAY;gBACjB,OAAO;gBACP,IAAI;gBACJ,UAAU;gBACV,YAAY;gBACZ,GAAG,WAAW;gBACd,OAAO;aACR;SASF,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,gBAAgB,CAAC,KAAkB,EAAE;YACzC,GAAG;YACH,OAAO;YACP,IAAI;YACJ,QAAQ,EAAE,iCAAiC;YAC3C,YAAY;YACZ,MAAM,EAAE,OAAO,EAAE,OAAO;SACzB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { SignatureErc6492 } from 'ox/erc6492';
|
|
2
2
|
import { SignatureErc8010 } from 'ox/erc8010';
|
|
3
3
|
import { erc1271Abi, erc6492SignatureValidatorAbi, multicall3Abi, } from '../../constants/abis.js';
|
|
4
|
+
import { zeroAddress } from '../../constants/address.js';
|
|
4
5
|
import { erc6492SignatureValidatorByteCode, multicall3Bytecode, } from '../../constants/contracts.js';
|
|
5
|
-
import { CallExecutionError
|
|
6
|
+
import { CallExecutionError } from '../../errors/contract.js';
|
|
7
|
+
import { decodeFunctionResult } from '../../utils/abi/decodeFunctionResult.js';
|
|
6
8
|
import { encodeDeployData, } from '../../utils/abi/encodeDeployData.js';
|
|
7
9
|
import { encodeFunctionData, } from '../../utils/abi/encodeFunctionData.js';
|
|
8
10
|
import { getAddress, } from '../../utils/address/getAddress.js';
|
|
@@ -12,12 +14,10 @@ import { concatHex } from '../../utils/data/concat.js';
|
|
|
12
14
|
import { isHex } from '../../utils/data/isHex.js';
|
|
13
15
|
import { hexToBool } from '../../utils/encoding/fromHex.js';
|
|
14
16
|
import { bytesToHex, numberToHex, } from '../../utils/encoding/toHex.js';
|
|
15
|
-
import { getAction } from '../../utils/getAction.js';
|
|
16
17
|
import { recoverAddress, } from '../../utils/signature/recoverAddress.js';
|
|
17
18
|
import { serializeSignature, } from '../../utils/signature/serializeSignature.js';
|
|
18
19
|
import { call } from './call.js';
|
|
19
20
|
import { getCode } from './getCode.js';
|
|
20
|
-
import { readContract } from './readContract.js';
|
|
21
21
|
/**
|
|
22
22
|
* Verifies a message hash onchain using ERC-6492.
|
|
23
23
|
*
|
|
@@ -27,8 +27,20 @@ import { readContract } from './readContract.js';
|
|
|
27
27
|
*/
|
|
28
28
|
export async function verifyHash(client, parameters) {
|
|
29
29
|
const { address, chain = client.chain, hash, erc6492VerifierAddress: verifierAddress = parameters.universalSignatureVerifierAddress ??
|
|
30
|
-
|
|
30
|
+
(() => {
|
|
31
|
+
const { blockNumber } = parameters;
|
|
32
|
+
const verifier = chain?.contracts?.erc6492Verifier;
|
|
33
|
+
// Use the deployless validator for blocks before the verifier was created.
|
|
34
|
+
if (blockNumber !== undefined &&
|
|
35
|
+
verifier?.blockCreated &&
|
|
36
|
+
verifier.blockCreated > blockNumber)
|
|
37
|
+
return undefined;
|
|
38
|
+
return verifier?.address;
|
|
39
|
+
})(), multicallAddress = parameters.multicallAddress ??
|
|
31
40
|
chain?.contracts?.multicall3?.address, mode = 'auto', } = parameters;
|
|
41
|
+
// No signature is valid for the zero address.
|
|
42
|
+
if (address === zeroAddress)
|
|
43
|
+
return false;
|
|
32
44
|
if (chain?.verifyHash)
|
|
33
45
|
return await chain.verifyHash(client, parameters);
|
|
34
46
|
const signature = (() => {
|
|
@@ -112,42 +124,49 @@ export async function verifyErc8010(client, parameters) {
|
|
|
112
124
|
if (!valid)
|
|
113
125
|
throw new VerificationError();
|
|
114
126
|
// Deployless verification.
|
|
115
|
-
const
|
|
127
|
+
const { data: aggregate3Data } = await call({ ...client, ccipRead: false }, {
|
|
116
128
|
...(multicallAddress
|
|
117
|
-
? {
|
|
129
|
+
? { to: multicallAddress }
|
|
118
130
|
: { code: multicall3Bytecode }),
|
|
119
131
|
authorizationList: [authorization],
|
|
120
|
-
abi: multicall3Abi,
|
|
121
132
|
blockHash,
|
|
122
133
|
blockNumber,
|
|
123
|
-
blockTag: 'pending',
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
[
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
134
|
+
blockTag: blockTag ?? 'pending',
|
|
135
|
+
data: encodeFunctionData({
|
|
136
|
+
abi: multicall3Abi,
|
|
137
|
+
functionName: 'aggregate3',
|
|
138
|
+
args: [
|
|
139
|
+
[
|
|
140
|
+
...(initData
|
|
141
|
+
? [
|
|
142
|
+
{
|
|
143
|
+
allowFailure: true,
|
|
144
|
+
target: to ?? address,
|
|
145
|
+
callData: initData,
|
|
146
|
+
},
|
|
147
|
+
]
|
|
148
|
+
: []),
|
|
149
|
+
{
|
|
150
|
+
allowFailure: true,
|
|
151
|
+
target: address,
|
|
152
|
+
callData: encodeFunctionData({
|
|
153
|
+
abi: erc1271Abi,
|
|
154
|
+
functionName: 'isValidSignature',
|
|
155
|
+
args: [hash, signature],
|
|
156
|
+
}),
|
|
157
|
+
},
|
|
158
|
+
],
|
|
146
159
|
],
|
|
147
|
-
|
|
160
|
+
}),
|
|
161
|
+
requireCanonical,
|
|
162
|
+
});
|
|
163
|
+
const results = decodeFunctionResult({
|
|
164
|
+
abi: multicall3Abi,
|
|
165
|
+
functionName: 'aggregate3',
|
|
166
|
+
data: aggregate3Data ?? '0x',
|
|
148
167
|
});
|
|
149
|
-
const
|
|
150
|
-
if (
|
|
168
|
+
const result = results[results.length - 1];
|
|
169
|
+
if (result?.success && result.returnData.startsWith('0x1626ba7e'))
|
|
151
170
|
return true;
|
|
152
171
|
throw new VerificationError();
|
|
153
172
|
}
|
|
@@ -173,6 +192,7 @@ async function verifyErc6492(client, parameters) {
|
|
|
173
192
|
})();
|
|
174
193
|
const args = verifierAddress
|
|
175
194
|
? {
|
|
195
|
+
batch: false,
|
|
176
196
|
to: verifierAddress,
|
|
177
197
|
data: encodeFunctionData({
|
|
178
198
|
abi: erc6492SignatureValidatorAbi,
|
|
@@ -189,7 +209,9 @@ async function verifyErc6492(client, parameters) {
|
|
|
189
209
|
}),
|
|
190
210
|
...rest,
|
|
191
211
|
};
|
|
192
|
-
|
|
212
|
+
// Verification calls run without CCIP-Read. They use `call` directly
|
|
213
|
+
// because a client's own `call` action keeps its CCIP-Read setting.
|
|
214
|
+
const { data } = await call({ ...client, ccipRead: false }, args).catch((error) => {
|
|
193
215
|
if (error instanceof CallExecutionError)
|
|
194
216
|
throw new VerificationError();
|
|
195
217
|
throw error;
|
|
@@ -201,20 +223,35 @@ async function verifyErc6492(client, parameters) {
|
|
|
201
223
|
/** @internal */
|
|
202
224
|
export async function verifyErc1271(client, parameters) {
|
|
203
225
|
const { address, blockHash, blockNumber, blockTag, hash, requireCanonical, signature, } = parameters;
|
|
204
|
-
const
|
|
205
|
-
|
|
206
|
-
abi: erc1271Abi,
|
|
207
|
-
args: [hash, signature],
|
|
226
|
+
const { data } = await call({ ...client, ccipRead: false }, {
|
|
227
|
+
batch: false,
|
|
208
228
|
blockHash,
|
|
209
229
|
blockNumber,
|
|
210
230
|
blockTag,
|
|
211
|
-
|
|
231
|
+
data: encodeFunctionData({
|
|
232
|
+
abi: erc1271Abi,
|
|
233
|
+
functionName: 'isValidSignature',
|
|
234
|
+
args: [hash, signature],
|
|
235
|
+
}),
|
|
212
236
|
requireCanonical,
|
|
237
|
+
to: address,
|
|
213
238
|
}).catch((error) => {
|
|
214
|
-
if (error instanceof
|
|
239
|
+
if (error instanceof CallExecutionError)
|
|
215
240
|
throw new VerificationError();
|
|
216
241
|
throw error;
|
|
217
242
|
});
|
|
243
|
+
const result = (() => {
|
|
244
|
+
try {
|
|
245
|
+
return decodeFunctionResult({
|
|
246
|
+
abi: erc1271Abi,
|
|
247
|
+
functionName: 'isValidSignature',
|
|
248
|
+
data: data ?? '0x',
|
|
249
|
+
});
|
|
250
|
+
}
|
|
251
|
+
catch {
|
|
252
|
+
throw new VerificationError();
|
|
253
|
+
}
|
|
254
|
+
})();
|
|
218
255
|
if (result.startsWith('0x1626ba7e'))
|
|
219
256
|
return true;
|
|
220
257
|
throw new VerificationError();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyHash.js","sourceRoot":"","sources":["../../../actions/public/verifyHash.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAI7C,OAAO,EACL,UAAU,EACV,4BAA4B,EAC5B,aAAa,GACd,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACL,iCAAiC,EACjC,kBAAkB,GACnB,MAAM,8BAA8B,CAAA;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"verifyHash.js","sourceRoot":"","sources":["../../../actions/public/verifyHash.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAI7C,OAAO,EACL,UAAU,EACV,4BAA4B,EAC5B,aAAa,GACd,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EACL,iCAAiC,EACjC,kBAAkB,GACnB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAO7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAA;AAC9E,OAAO,EAEL,gBAAgB,GACjB,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAEL,kBAAkB,GACnB,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAEL,UAAU,GACX,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAEL,cAAc,GACf,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAA;AACtF,OAAO,EAA2B,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAC/E,OAAO,EAAuB,KAAK,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAC3D,OAAO,EAEL,UAAU,EAEV,WAAW,GACZ,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAEL,cAAc,GACf,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAEL,kBAAkB,GACnB,MAAM,6CAA6C,CAAA;AACpD,OAAO,EAA2C,IAAI,EAAE,MAAM,WAAW,CAAA;AACzE,OAAO,EAAyB,OAAO,EAAE,MAAM,cAAc,CAAA;AA8D7D;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAgC,EAChC,UAAgC;IAEhC,MAAM,EACJ,OAAO,EACP,KAAK,GAAG,MAAM,CAAC,KAAK,EACpB,IAAI,EACJ,sBAAsB,EACpB,eAAe,GAAG,UAAU,CAAC,iCAAiC;QAC9D,CAAC,GAAG,EAAE;YACJ,MAAM,EAAE,WAAW,EAAE,GAAG,UAAU,CAAA;YAClC,MAAM,QAAQ,GAAG,KAAK,EAAE,SAAS,EAAE,eAAe,CAAA;YAClD,2EAA2E;YAC3E,IACE,WAAW,KAAK,SAAS;gBACzB,QAAQ,EAAE,YAAY;gBACtB,QAAQ,CAAC,YAAY,GAAG,WAAW;gBAEnC,OAAO,SAAS,CAAA;YAClB,OAAO,QAAQ,EAAE,OAAO,CAAA;QAC1B,CAAC,CAAC,EAAE,EACN,gBAAgB,GAAG,UAAU,CAAC,gBAAgB;QAC5C,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EACvC,IAAI,GAAG,MAAM,GACd,GAAG,UAAU,CAAA;IAEd,8CAA8C;IAC9C,IAAI,OAAO,KAAK,WAAW;QAAE,OAAO,KAAK,CAAA;IAEzC,IAAI,KAAK,EAAE,UAAU;QAAE,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAExE,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;QACtB,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAA;QACtC,IAAI,KAAK,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAA;QACtC,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,IAAI,SAAS;YACvE,OAAO,kBAAkB,CAAC,SAAS,CAAC,CAAA;QACtC,OAAO,UAAU,CAAC,SAAS,CAAC,CAAA;IAC9B,CAAC,CAAC,EAAE,CAAA;IACJ,IAAI,CAAC;QACH,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,cAAc,CAC7B,UAAU,CAAC,OAAO,CAAC,EACnB,MAAM,cAAc,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAC1C,CAAA;gBACD,IAAI,QAAQ;oBAAE,OAAO,IAAI,CAAA;YAC3B,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;QAED,IAAI,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC;YACtC,OAAO,MAAM,aAAa,CAAC,MAAM,EAAE;gBACjC,GAAG,UAAU;gBACb,gBAAgB;gBAChB,SAAS;aACV,CAAC,CAAA;QACJ,OAAO,MAAM,aAAa,CAAC,MAAM,EAAE;YACjC,GAAG,UAAU;YACb,eAAe;YACf,SAAS;SACV,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,+DAA+D;YAC/D,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,cAAc,CAC7B,UAAU,CAAC,OAAO,CAAC,EACnB,MAAM,cAAc,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAC1C,CAAA;gBACD,IAAI,QAAQ;oBAAE,OAAO,IAAI,CAAA;YAC3B,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;QAED,IAAI,KAAK,YAAY,iBAAiB,EAAE,CAAC;YACvC,8GAA8G;YAC9G,kGAAkG;YAClG,0CAA0C;YAC1C,OAAO,KAAK,CAAA;QACd,CAAC;QAED,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC;AAED,gBAAgB;AAChB,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,UAAoC;IAEpC,MAAM,EACJ,OAAO,EACP,SAAS,EACT,WAAW,EACX,QAAQ,EACR,IAAI,EACJ,gBAAgB,EAChB,gBAAgB,GACjB,GAAG,UAAU,CAAA;IAEd,MAAM,EACJ,aAAa,EAAE,gBAAgB,EAC/B,IAAI,EAAE,QAAQ,EACd,SAAS,EACT,EAAE,GACH,GAAG,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IAEjD,6BAA6B;IAC7B,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE;QACjC,OAAO;QACP,SAAS;QACT,WAAW;QACX,QAAQ;QACR,gBAAgB;KACR,CAAC,CAAA;IAEX,gEAAgE;IAChE,IAAI,IAAI,KAAK,SAAS,CAAC,CAAC,UAAU,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC5D,OAAO,MAAM,aAAa,CAAC,MAAM,EAAE;YACjC,GAAG,UAAU;YACb,SAAS;SACV,CAAC,CAAA;IAEJ,MAAM,aAAa,GAAG;QACpB,OAAO,EAAE,gBAAgB,CAAC,OAAO;QACjC,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;QACzC,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC;QACrC,CAAC,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAChD,CAAC,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAChD,OAAO,EAAE,gBAAgB,CAAC,OAAO;KACzB,CAAA;IAEV,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC;QACtC,OAAO;QACP,aAAa;KACd,CAAC,CAAA;IACF,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,iBAAiB,EAAE,CAAA;IAEzC,2BAA2B;IAC3B,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;QAC1E,GAAG,CAAC,gBAAgB;YAClB,CAAC,CAAC,EAAE,EAAE,EAAE,gBAAgB,EAAE;YAC1B,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;QACjC,iBAAiB,EAAE,CAAC,aAAa,CAAC;QAClC,SAAS;QACT,WAAW;QACX,QAAQ,EAAE,QAAQ,IAAI,SAAS;QAC/B,IAAI,EAAE,kBAAkB,CAAC;YACvB,GAAG,EAAE,aAAa;YAClB,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE;gBACJ;oBACE,GAAG,CAAC,QAAQ;wBACV,CAAC,CAAE;4BACC;gCACE,YAAY,EAAE,IAAI;gCAClB,MAAM,EAAE,EAAE,IAAI,OAAO;gCACrB,QAAQ,EAAE,QAAQ;6BACnB;yBACQ;wBACb,CAAC,CAAC,EAAE,CAAC;oBACP;wBACE,YAAY,EAAE,IAAI;wBAClB,MAAM,EAAE,OAAO;wBACf,QAAQ,EAAE,kBAAkB,CAAC;4BAC3B,GAAG,EAAE,UAAU;4BACf,YAAY,EAAE,kBAAkB;4BAChC,IAAI,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC;yBACxB,CAAC;qBACH;iBACF;aACF;SACF,CAAC;QACF,gBAAgB;KACC,CAAC,CAAA;IACpB,MAAM,OAAO,GAAG,oBAAoB,CAAC;QACnC,GAAG,EAAE,aAAa;QAClB,YAAY,EAAE,YAAY;QAC1B,IAAI,EAAE,cAAc,IAAI,IAAI;KAC7B,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAE1C,IAAI,MAAM,EAAE,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,IAAI,CAAA;IAC9E,MAAM,IAAI,iBAAiB,EAAE,CAAA;AAC/B,CAAC;AAeD,gBAAgB;AAChB,qDAAqD;AACrD,KAAK,UAAU,aAAa,CAC1B,MAAc,EACd,UAAoC;IAEpC,MAAM,EACJ,OAAO,EACP,OAAO,EACP,WAAW,EACX,IAAI,EACJ,SAAS,EACT,eAAe,EACf,GAAG,IAAI,EACR,GAAG,UAAU,CAAA;IAEd,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE;QACzC,uEAAuE;QACvE,4EAA4E;QAC5E,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW;YAAE,OAAO,SAAS,CAAA;QAE9C,6DAA6D;QAC7D,IAAI,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAA;QAE1D,+EAA+E;QAC/E,wCAAwC;QACxC,OAAO,gBAAgB,CAAC,IAAI,CAAC;YAC3B,IAAI,EAAE,WAAY;YAClB,SAAS;YACT,EAAE,EAAE,OAAQ;SACb,CAAC,CAAA;IACJ,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,IAAI,GAAG,eAAe;QAC1B,CAAC,CAAE;YACC,KAAK,EAAE,KAAK;YACZ,EAAE,EAAE,eAAe;YACnB,IAAI,EAAE,kBAAkB,CAAC;gBACvB,GAAG,EAAE,4BAA4B;gBACjC,YAAY,EAAE,YAAY;gBAC1B,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC;aACxC,CAAC;YACF,GAAG,IAAI;SACsB;QACjC,CAAC,CAAE;YACC,IAAI,EAAE,gBAAgB,CAAC;gBACrB,GAAG,EAAE,4BAA4B;gBACjC,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC;gBACvC,QAAQ,EAAE,iCAAiC;aAC5C,CAAC;YACF,GAAG,IAAI;SACsB,CAAA;IAEnC,qEAAqE;IACrE,oEAAoE;IACpE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC,KAAK,CACrE,CAAC,KAAK,EAAE,EAAE;QACR,IAAI,KAAK,YAAY,kBAAkB;YAAE,MAAM,IAAI,iBAAiB,EAAE,CAAA;QACtE,MAAM,KAAK,CAAA;IACb,CAAC,CACF,CAAA;IAED,IAAI,SAAS,CAAC,IAAI,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IACzC,MAAM,IAAI,iBAAiB,EAAE,CAAA;AAC/B,CAAC;AAeD,gBAAgB;AAChB,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,UAAoC;IAEpC,MAAM,EACJ,OAAO,EACP,SAAS,EACT,WAAW,EACX,QAAQ,EACR,IAAI,EACJ,gBAAgB,EAChB,SAAS,GACV,GAAG,UAAU,CAAA;IAEd,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;QAC1D,KAAK,EAAE,KAAK;QACZ,SAAS;QACT,WAAW;QACX,QAAQ;QACR,IAAI,EAAE,kBAAkB,CAAC;YACvB,GAAG,EAAE,UAAU;YACf,YAAY,EAAE,kBAAkB;YAChC,IAAI,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC;SACxB,CAAC;QACF,gBAAgB;QAChB,EAAE,EAAE,OAAO;KACM,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACnC,IAAI,KAAK,YAAY,kBAAkB;YAAE,MAAM,IAAI,iBAAiB,EAAE,CAAA;QACtE,MAAM,KAAK,CAAA;IACb,CAAC,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC;YACH,OAAO,oBAAoB,CAAC;gBAC1B,GAAG,EAAE,UAAU;gBACf,YAAY,EAAE,kBAAkB;gBAChC,IAAI,EAAE,IAAI,IAAI,IAAI;aACnB,CAAC,CAAA;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,iBAAiB,EAAE,CAAA;QAC/B,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;IAEJ,IAAI,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,IAAI,CAAA;IAChD,MAAM,IAAI,iBAAiB,EAAE,CAAA;AAC/B,CAAC;AAaD,MAAM,iBAAkB,SAAQ,KAAK;CAAG"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { BlockNotFoundError } from '../../errors/block.js';
|
|
2
2
|
import { MethodNotFoundRpcError, MethodNotSupportedRpcError, } from '../../errors/rpc.js';
|
|
3
3
|
import { TransactionNotFoundError, TransactionReceiptNotFoundError, WaitForTransactionReceiptTimeoutError, } from '../../errors/transaction.js';
|
|
4
|
+
import { getAbortError, } from '../../errors/utils.js';
|
|
4
5
|
import { isAddressEqual } from '../../utils/address/isAddressEqual.js';
|
|
5
6
|
import { getAction } from '../../utils/getAction.js';
|
|
6
7
|
import { observe } from '../../utils/observe.js';
|
|
7
8
|
import { withResolvers } from '../../utils/promise/withResolvers.js';
|
|
8
9
|
import { withRetry, } from '../../utils/promise/withRetry.js';
|
|
9
10
|
import { stringify } from '../../utils/stringify.js';
|
|
11
|
+
import { uid } from '../../utils/uid.js';
|
|
10
12
|
import { getBlock } from './getBlock.js';
|
|
11
13
|
import { getTransaction, } from './getTransaction.js';
|
|
12
14
|
import { getTransactionReceipt, } from './getTransactionReceipt.js';
|
|
@@ -55,7 +57,9 @@ import { watchBlockNumber, } from './watchBlockNumber.js';
|
|
|
55
57
|
export async function waitForTransactionReceipt(client, parameters) {
|
|
56
58
|
const { checkReplacement = client.chain?.supportsTransactionReplacementDetection ??
|
|
57
59
|
true, confirmations = 1, hash, onReplaced, retryCount = 6, retryDelay = ({ count }) => ~~(1 << count) * 200, // exponential backoff
|
|
58
|
-
timeout = 180_000, } = parameters;
|
|
60
|
+
signal, timeout = 180_000, } = parameters;
|
|
61
|
+
if (signal?.aborted)
|
|
62
|
+
throw getAbortError(signal);
|
|
59
63
|
// On chains with their own replacement keys, a sender and nonce do not
|
|
60
64
|
// identify a nonce slot.
|
|
61
65
|
const replacement = client.chain?.transactionReplacement?.getKey
|
|
@@ -83,6 +87,9 @@ export async function waitForTransactionReceipt(client, parameters) {
|
|
|
83
87
|
pollingInterval,
|
|
84
88
|
replacement,
|
|
85
89
|
retryCount,
|
|
90
|
+
// A cancellable wait polls on its own, so aborting it cannot stop
|
|
91
|
+
// polling for another caller.
|
|
92
|
+
signal: signal ? uid() : undefined,
|
|
86
93
|
timeout,
|
|
87
94
|
},
|
|
88
95
|
]);
|
|
@@ -105,8 +112,17 @@ export async function waitForTransactionReceipt(client, parameters) {
|
|
|
105
112
|
reject(new WaitForTransactionReceiptTimeoutError({ hash }));
|
|
106
113
|
}, timeout)
|
|
107
114
|
: undefined;
|
|
115
|
+
const onAbort = () => {
|
|
116
|
+
clearTimeout(timer);
|
|
117
|
+
_unwatch?.();
|
|
118
|
+
_unobserve?.();
|
|
119
|
+
reject(getAbortError(signal));
|
|
120
|
+
};
|
|
121
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
108
122
|
_unobserve = observe(observerId, { onReplaced, resolve, reject }, async (emit) => {
|
|
109
123
|
receipt = await getAction(client, getTransactionReceipt, 'getTransactionReceipt')({ hash }).catch(() => undefined);
|
|
124
|
+
if (signal?.aborted)
|
|
125
|
+
return;
|
|
110
126
|
if (receipt && confirmations <= 1) {
|
|
111
127
|
clearTimeout(timer);
|
|
112
128
|
emit.resolve(receipt);
|
|
@@ -175,6 +191,7 @@ export async function waitForTransactionReceipt(client, parameters) {
|
|
|
175
191
|
}, {
|
|
176
192
|
delay: retryDelay,
|
|
177
193
|
retryCount,
|
|
194
|
+
signal,
|
|
178
195
|
// A dropped transaction does not reappear, so a known
|
|
179
196
|
// sender and nonce are looked up without the retries.
|
|
180
197
|
shouldRetry: ({ error }) => !(replacement && error instanceof TransactionNotFoundError),
|
|
@@ -279,6 +296,7 @@ export async function waitForTransactionReceipt(client, parameters) {
|
|
|
279
296
|
}), {
|
|
280
297
|
delay: retryDelay,
|
|
281
298
|
retryCount,
|
|
299
|
+
signal,
|
|
282
300
|
shouldRetry: ({ error }) => error instanceof BlockNotFoundError,
|
|
283
301
|
});
|
|
284
302
|
retrying = false;
|
|
@@ -344,6 +362,7 @@ export async function waitForTransactionReceipt(client, parameters) {
|
|
|
344
362
|
// never start polling again. The timer is cleared here as well, since a
|
|
345
363
|
// caller that resolves through another caller's poll never reaches `done`.
|
|
346
364
|
return promise.finally(() => {
|
|
365
|
+
signal?.removeEventListener('abort', onAbort);
|
|
347
366
|
clearTimeout(timer);
|
|
348
367
|
_unobserve?.();
|
|
349
368
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { formatBlock } from '../../utils/formatters/block.js';
|
|
2
2
|
import { observe } from '../../utils/observe.js';
|
|
3
3
|
import { stringify } from '../../utils/stringify.js';
|
|
4
|
+
import { getSubscriptionTransport } from './internal/watchTransport.js';
|
|
4
5
|
const blockFields = [
|
|
5
6
|
'size',
|
|
6
7
|
'totalDifficulty',
|
|
@@ -40,16 +41,7 @@ export function watchBlockHeaders(client, { onBlockHeader, onError, }) {
|
|
|
40
41
|
let unsubscribe = () => (active = false);
|
|
41
42
|
(async () => {
|
|
42
43
|
try {
|
|
43
|
-
const transport = (
|
|
44
|
-
if (client.transport.type === 'fallback') {
|
|
45
|
-
const transport = client.transport.transports.find((transport) => transport.config.type === 'webSocket' ||
|
|
46
|
-
transport.config.type === 'ipc');
|
|
47
|
-
if (!transport)
|
|
48
|
-
return client.transport;
|
|
49
|
-
return transport.value;
|
|
50
|
-
}
|
|
51
|
-
return client.transport;
|
|
52
|
-
})();
|
|
44
|
+
const transport = getSubscriptionTransport(client);
|
|
53
45
|
const { unsubscribe: unsubscribe_ } = await transport.subscribe({
|
|
54
46
|
params: ['newHeads'],
|
|
55
47
|
onData(data) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchBlockHeaders.js","sourceRoot":"","sources":["../../../actions/public/watchBlockHeaders.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAA2B,SAAS,EAAE,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"watchBlockHeaders.js","sourceRoot":"","sources":["../../../actions/public/watchBlockHeaders.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAA2B,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAG7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAA;AAEvE,MAAM,WAAW,GAAG;IAClB,MAAM;IACN,iBAAiB;IACjB,cAAc;IACd,QAAQ;IACR,aAAa;CACL,CAAA;AA4BV;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,iBAAiB,CAI/B,MAAgC,EAChC,EACE,aAAa,EACb,OAAO,GAGA;IAET,IAAI,eAA0D,CAAA;IAE9D,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,mBAAmB,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;IAE/D,OAAO,OAAO,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9D,IAAI,MAAM,GAAG,IAAI,CAAA;QACjB,IAAI,UAAU,GAAG,KAAK,CAAA;QACtB,IAAI,WAAW,GAAG,GAAG,EAAE,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC,CACvC;QAAA,CAAC,KAAK,IAAI,EAAE;YACX,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAA;gBAElD,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC;oBAC9D,MAAM,EAAE,CAAC,UAAU,CAAC;oBACpB,MAAM,CAAC,IAAS;wBACd,IAAI,CAAC,MAAM;4BAAE,OAAM;wBACnB,MAAM,WAAW,GAAG,CAClB,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,IAAI,WAAW,CACvD,CAAC,IAAI,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;wBACnC,KAAK,MAAM,KAAK,IAAI,WAAW;4BAAE,OAAO,WAAW,CAAC,KAAK,CAAC,CAAA;wBAC1D,IAAI,CAAC,aAAa,CAChB,WAA4C,EAC5C,eAAe,CAChB,CAAA;wBACD,eAAe,GAAG,WAA4C,CAAA;oBAChE,CAAC;oBACD,OAAO,CAAC,KAAY;wBAClB,IAAI,UAAU;4BAAE,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAA;oBACvC,CAAC;iBACF,CAAC,CAAA;gBACF,UAAU,GAAG,IAAI,CAAA;gBACjB,WAAW,GAAG,YAAY,CAAA;gBAC1B,IAAI,CAAC,MAAM;oBAAE,WAAW,EAAE,CAAA;YAC5B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,OAAO,EAAE,CAAC,GAAY,CAAC,CAAA;YAC9B,CAAC;QACH,CAAC,CAAC,EAAE,CAAA;QACJ,OAAO,GAAG,EAAE,CAAC,WAAW,EAAE,CAAA;IAC5B,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { observe } from '../../utils/observe.js';
|
|
|
4
4
|
import { poll } from '../../utils/poll.js';
|
|
5
5
|
import { stringify } from '../../utils/stringify.js';
|
|
6
6
|
import { getBlockNumber, } from './getBlockNumber.js';
|
|
7
|
+
import { getSubscriptionTransport, shouldPoll, } from './internal/watchTransport.js';
|
|
7
8
|
/**
|
|
8
9
|
* Watches and returns incoming block numbers.
|
|
9
10
|
*
|
|
@@ -33,14 +34,7 @@ export function watchBlockNumber(client, { emitOnBegin = false, emitMissed: emit
|
|
|
33
34
|
const enablePolling = (() => {
|
|
34
35
|
if (typeof poll_ !== 'undefined')
|
|
35
36
|
return poll_;
|
|
36
|
-
|
|
37
|
-
client.transport.type === 'ipc')
|
|
38
|
-
return false;
|
|
39
|
-
if (client.transport.type === 'fallback' &&
|
|
40
|
-
(client.transport.transports[0].config.type === 'webSocket' ||
|
|
41
|
-
client.transport.transports[0].config.type === 'ipc'))
|
|
42
|
-
return false;
|
|
43
|
-
return true;
|
|
37
|
+
return shouldPoll(client);
|
|
44
38
|
})();
|
|
45
39
|
// Polling less than twice per block skips blocks, so emit the missed
|
|
46
40
|
// ones unless told otherwise.
|
|
@@ -100,16 +94,7 @@ export function watchBlockNumber(client, { emitOnBegin = false, emitMissed: emit
|
|
|
100
94
|
let unsubscribe = () => (active = false);
|
|
101
95
|
(async () => {
|
|
102
96
|
try {
|
|
103
|
-
const transport = (
|
|
104
|
-
if (client.transport.type === 'fallback') {
|
|
105
|
-
const transport = client.transport.transports.find((transport) => transport.config.type === 'webSocket' ||
|
|
106
|
-
transport.config.type === 'ipc');
|
|
107
|
-
if (!transport)
|
|
108
|
-
return client.transport;
|
|
109
|
-
return transport.value;
|
|
110
|
-
}
|
|
111
|
-
return client.transport;
|
|
112
|
-
})();
|
|
97
|
+
const transport = getSubscriptionTransport(client);
|
|
113
98
|
const { unsubscribe: unsubscribe_ } = await transport.subscribe({
|
|
114
99
|
params: ['newHeads'],
|
|
115
100
|
onData(data) {
|
|
@@ -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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"}
|
|
@@ -3,6 +3,7 @@ import { observe } from '../../utils/observe.js';
|
|
|
3
3
|
import { poll } from '../../utils/poll.js';
|
|
4
4
|
import { stringify } from '../../utils/stringify.js';
|
|
5
5
|
import { getBlock } from './getBlock.js';
|
|
6
|
+
import { getSubscriptionTransport, shouldPoll, } from './internal/watchTransport.js';
|
|
6
7
|
/**
|
|
7
8
|
* Watches and returns information for incoming blocks.
|
|
8
9
|
*
|
|
@@ -32,14 +33,7 @@ export function watchBlocks(client, { blockTag = client.experimental_blockTag ??
|
|
|
32
33
|
const enablePolling = (() => {
|
|
33
34
|
if (typeof poll_ !== 'undefined')
|
|
34
35
|
return poll_;
|
|
35
|
-
|
|
36
|
-
client.transport.type === 'ipc')
|
|
37
|
-
return false;
|
|
38
|
-
if (client.transport.type === 'fallback' &&
|
|
39
|
-
(client.transport.transports[0].config.type === 'webSocket' ||
|
|
40
|
-
client.transport.transports[0].config.type === 'ipc'))
|
|
41
|
-
return false;
|
|
42
|
-
return true;
|
|
36
|
+
return shouldPoll(client);
|
|
43
37
|
})();
|
|
44
38
|
const includeTransactions = includeTransactions_ ?? false;
|
|
45
39
|
// Polling less than twice per block skips blocks, so emit the missed
|
|
@@ -138,16 +132,7 @@ export function watchBlocks(client, { blockTag = client.experimental_blockTag ??
|
|
|
138
132
|
})
|
|
139
133
|
.catch(onError);
|
|
140
134
|
}
|
|
141
|
-
const transport = (
|
|
142
|
-
if (client.transport.type === 'fallback') {
|
|
143
|
-
const transport = client.transport.transports.find((transport) => transport.config.type === 'webSocket' ||
|
|
144
|
-
transport.config.type === 'ipc');
|
|
145
|
-
if (!transport)
|
|
146
|
-
return client.transport;
|
|
147
|
-
return transport.value;
|
|
148
|
-
}
|
|
149
|
-
return client.transport;
|
|
150
|
-
})();
|
|
135
|
+
const transport = getSubscriptionTransport(client);
|
|
151
136
|
const { unsubscribe: unsubscribe_ } = await transport.subscribe({
|
|
152
137
|
params: ['newHeads'],
|
|
153
138
|
async onData(data) {
|
|
@@ -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,6 +1,4 @@
|
|
|
1
1
|
import { AbiEventSignatureEmptyTopicsError, AbiEventSignatureNotFoundError, DecodeLogDataMismatch, DecodeLogTopicsMismatch, } from '../../errors/abi.js';
|
|
2
|
-
import { BaseError } from '../../errors/base.js';
|
|
3
|
-
import { HttpRequestError, RpcRequestError } from '../../errors/request.js';
|
|
4
2
|
import { InvalidInputRpcError } from '../../errors/rpc.js';
|
|
5
3
|
import { AbiEventAmbiguityError, decodeEventLog, } from '../../utils/abi/decodeEventLog.js';
|
|
6
4
|
import { encodeEventTopics, } from '../../utils/abi/encodeEventTopics.js';
|
|
@@ -13,6 +11,8 @@ import { createContractEventFilter } from './createContractEventFilter.js';
|
|
|
13
11
|
import { getBlockNumber } from './getBlockNumber.js';
|
|
14
12
|
import { getContractEvents, } from './getContractEvents.js';
|
|
15
13
|
import { getFilterChanges } from './getFilterChanges.js';
|
|
14
|
+
import { isRangeError } from './internal/isRangeError.js';
|
|
15
|
+
import { getSubscriptionTransport, shouldPoll, } from './internal/watchTransport.js';
|
|
16
16
|
import { uninstallFilter } from './uninstallFilter.js';
|
|
17
17
|
/**
|
|
18
18
|
* Watches and returns emitted contract event logs.
|
|
@@ -51,14 +51,7 @@ export function watchContractEvent(client, parameters) {
|
|
|
51
51
|
return poll_;
|
|
52
52
|
if (typeof fromBlock === 'bigint')
|
|
53
53
|
return true;
|
|
54
|
-
|
|
55
|
-
client.transport.type === 'ipc')
|
|
56
|
-
return false;
|
|
57
|
-
if (client.transport.type === 'fallback' &&
|
|
58
|
-
(client.transport.transports[0].config.type === 'webSocket' ||
|
|
59
|
-
client.transport.transports[0].config.type === 'ipc'))
|
|
60
|
-
return false;
|
|
61
|
-
return true;
|
|
54
|
+
return shouldPoll(client);
|
|
62
55
|
})();
|
|
63
56
|
const pollContractEvent = () => {
|
|
64
57
|
const strict = strict_ ?? false;
|
|
@@ -187,16 +180,7 @@ export function watchContractEvent(client, parameters) {
|
|
|
187
180
|
;
|
|
188
181
|
(async () => {
|
|
189
182
|
try {
|
|
190
|
-
const transport = (
|
|
191
|
-
if (client.transport.type === 'fallback') {
|
|
192
|
-
const transport = client.transport.transports.find((transport) => transport.config.type === 'webSocket' ||
|
|
193
|
-
transport.config.type === 'ipc');
|
|
194
|
-
if (!transport)
|
|
195
|
-
return client.transport;
|
|
196
|
-
return transport.value;
|
|
197
|
-
}
|
|
198
|
-
return client.transport;
|
|
199
|
-
})();
|
|
183
|
+
const transport = getSubscriptionTransport(client);
|
|
200
184
|
// A topic filter cannot select an anonymous event, so the
|
|
201
185
|
// subscription can deliver logs that match no requested event. Skip
|
|
202
186
|
// them when the watch names an event, as the polling path does.
|
|
@@ -269,20 +253,4 @@ export function watchContractEvent(client, parameters) {
|
|
|
269
253
|
};
|
|
270
254
|
return enablePolling ? pollContractEvent() : subscribeContractEvent();
|
|
271
255
|
}
|
|
272
|
-
/** Returns whether a failed `eth_getLogs` request may succeed with a smaller block range. */
|
|
273
|
-
function isRangeError(error) {
|
|
274
|
-
if (!(error instanceof BaseError))
|
|
275
|
-
return true;
|
|
276
|
-
const cause = error.walk((err) => err instanceof HttpRequestError || err instanceof RpcRequestError);
|
|
277
|
-
if (!cause)
|
|
278
|
-
return true;
|
|
279
|
-
// Rate limited.
|
|
280
|
-
if (cause instanceof RpcRequestError && cause.code === 429)
|
|
281
|
-
return false;
|
|
282
|
-
// Unreachable.
|
|
283
|
-
if (cause instanceof HttpRequestError && cause.status === undefined)
|
|
284
|
-
return false;
|
|
285
|
-
// Unauthorized, forbidden or rate limited.
|
|
286
|
-
return cause.status !== 401 && cause.status !== 403 && cause.status !== 429;
|
|
287
|
-
}
|
|
288
256
|
//# sourceMappingURL=watchContractEvent.js.map
|