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
|
@@ -6,8 +6,10 @@ exports.verifyErc1271 = verifyErc1271;
|
|
|
6
6
|
const erc6492_1 = require("ox/erc6492");
|
|
7
7
|
const erc8010_1 = require("ox/erc8010");
|
|
8
8
|
const abis_js_1 = require("../../constants/abis.js");
|
|
9
|
+
const address_js_1 = require("../../constants/address.js");
|
|
9
10
|
const contracts_js_1 = require("../../constants/contracts.js");
|
|
10
11
|
const contract_js_1 = require("../../errors/contract.js");
|
|
12
|
+
const decodeFunctionResult_js_1 = require("../../utils/abi/decodeFunctionResult.js");
|
|
11
13
|
const encodeDeployData_js_1 = require("../../utils/abi/encodeDeployData.js");
|
|
12
14
|
const encodeFunctionData_js_1 = require("../../utils/abi/encodeFunctionData.js");
|
|
13
15
|
const getAddress_js_1 = require("../../utils/address/getAddress.js");
|
|
@@ -17,16 +19,24 @@ const concat_js_1 = require("../../utils/data/concat.js");
|
|
|
17
19
|
const isHex_js_1 = require("../../utils/data/isHex.js");
|
|
18
20
|
const fromHex_js_1 = require("../../utils/encoding/fromHex.js");
|
|
19
21
|
const toHex_js_1 = require("../../utils/encoding/toHex.js");
|
|
20
|
-
const getAction_js_1 = require("../../utils/getAction.js");
|
|
21
22
|
const recoverAddress_js_1 = require("../../utils/signature/recoverAddress.js");
|
|
22
23
|
const serializeSignature_js_1 = require("../../utils/signature/serializeSignature.js");
|
|
23
24
|
const call_js_1 = require("./call.js");
|
|
24
25
|
const getCode_js_1 = require("./getCode.js");
|
|
25
|
-
const readContract_js_1 = require("./readContract.js");
|
|
26
26
|
async function verifyHash(client, parameters) {
|
|
27
27
|
const { address, chain = client.chain, hash, erc6492VerifierAddress: verifierAddress = parameters.universalSignatureVerifierAddress ??
|
|
28
|
-
|
|
28
|
+
(() => {
|
|
29
|
+
const { blockNumber } = parameters;
|
|
30
|
+
const verifier = chain?.contracts?.erc6492Verifier;
|
|
31
|
+
if (blockNumber !== undefined &&
|
|
32
|
+
verifier?.blockCreated &&
|
|
33
|
+
verifier.blockCreated > blockNumber)
|
|
34
|
+
return undefined;
|
|
35
|
+
return verifier?.address;
|
|
36
|
+
})(), multicallAddress = parameters.multicallAddress ??
|
|
29
37
|
chain?.contracts?.multicall3?.address, mode = 'auto', } = parameters;
|
|
38
|
+
if (address === address_js_1.zeroAddress)
|
|
39
|
+
return false;
|
|
30
40
|
if (chain?.verifyHash)
|
|
31
41
|
return await chain.verifyHash(client, parameters);
|
|
32
42
|
const signature = (() => {
|
|
@@ -102,42 +112,49 @@ async function verifyErc8010(client, parameters) {
|
|
|
102
112
|
});
|
|
103
113
|
if (!valid)
|
|
104
114
|
throw new VerificationError();
|
|
105
|
-
const
|
|
115
|
+
const { data: aggregate3Data } = await (0, call_js_1.call)({ ...client, ccipRead: false }, {
|
|
106
116
|
...(multicallAddress
|
|
107
|
-
? {
|
|
117
|
+
? { to: multicallAddress }
|
|
108
118
|
: { code: contracts_js_1.multicall3Bytecode }),
|
|
109
119
|
authorizationList: [authorization],
|
|
110
|
-
abi: abis_js_1.multicall3Abi,
|
|
111
120
|
blockHash,
|
|
112
121
|
blockNumber,
|
|
113
|
-
blockTag: 'pending',
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
[
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
122
|
+
blockTag: blockTag ?? 'pending',
|
|
123
|
+
data: (0, encodeFunctionData_js_1.encodeFunctionData)({
|
|
124
|
+
abi: abis_js_1.multicall3Abi,
|
|
125
|
+
functionName: 'aggregate3',
|
|
126
|
+
args: [
|
|
127
|
+
[
|
|
128
|
+
...(initData
|
|
129
|
+
? [
|
|
130
|
+
{
|
|
131
|
+
allowFailure: true,
|
|
132
|
+
target: to ?? address,
|
|
133
|
+
callData: initData,
|
|
134
|
+
},
|
|
135
|
+
]
|
|
136
|
+
: []),
|
|
137
|
+
{
|
|
138
|
+
allowFailure: true,
|
|
139
|
+
target: address,
|
|
140
|
+
callData: (0, encodeFunctionData_js_1.encodeFunctionData)({
|
|
141
|
+
abi: abis_js_1.erc1271Abi,
|
|
142
|
+
functionName: 'isValidSignature',
|
|
143
|
+
args: [hash, signature],
|
|
144
|
+
}),
|
|
145
|
+
},
|
|
146
|
+
],
|
|
136
147
|
],
|
|
137
|
-
|
|
148
|
+
}),
|
|
149
|
+
requireCanonical,
|
|
150
|
+
});
|
|
151
|
+
const results = (0, decodeFunctionResult_js_1.decodeFunctionResult)({
|
|
152
|
+
abi: abis_js_1.multicall3Abi,
|
|
153
|
+
functionName: 'aggregate3',
|
|
154
|
+
data: aggregate3Data ?? '0x',
|
|
138
155
|
});
|
|
139
|
-
const
|
|
140
|
-
if (
|
|
156
|
+
const result = results[results.length - 1];
|
|
157
|
+
if (result?.success && result.returnData.startsWith('0x1626ba7e'))
|
|
141
158
|
return true;
|
|
142
159
|
throw new VerificationError();
|
|
143
160
|
}
|
|
@@ -156,6 +173,7 @@ async function verifyErc6492(client, parameters) {
|
|
|
156
173
|
})();
|
|
157
174
|
const args = verifierAddress
|
|
158
175
|
? {
|
|
176
|
+
batch: false,
|
|
159
177
|
to: verifierAddress,
|
|
160
178
|
data: (0, encodeFunctionData_js_1.encodeFunctionData)({
|
|
161
179
|
abi: abis_js_1.erc6492SignatureValidatorAbi,
|
|
@@ -172,7 +190,7 @@ async function verifyErc6492(client, parameters) {
|
|
|
172
190
|
}),
|
|
173
191
|
...rest,
|
|
174
192
|
};
|
|
175
|
-
const { data } = await (0,
|
|
193
|
+
const { data } = await (0, call_js_1.call)({ ...client, ccipRead: false }, args).catch((error) => {
|
|
176
194
|
if (error instanceof contract_js_1.CallExecutionError)
|
|
177
195
|
throw new VerificationError();
|
|
178
196
|
throw error;
|
|
@@ -183,20 +201,35 @@ async function verifyErc6492(client, parameters) {
|
|
|
183
201
|
}
|
|
184
202
|
async function verifyErc1271(client, parameters) {
|
|
185
203
|
const { address, blockHash, blockNumber, blockTag, hash, requireCanonical, signature, } = parameters;
|
|
186
|
-
const
|
|
187
|
-
|
|
188
|
-
abi: abis_js_1.erc1271Abi,
|
|
189
|
-
args: [hash, signature],
|
|
204
|
+
const { data } = await (0, call_js_1.call)({ ...client, ccipRead: false }, {
|
|
205
|
+
batch: false,
|
|
190
206
|
blockHash,
|
|
191
207
|
blockNumber,
|
|
192
208
|
blockTag,
|
|
193
|
-
|
|
209
|
+
data: (0, encodeFunctionData_js_1.encodeFunctionData)({
|
|
210
|
+
abi: abis_js_1.erc1271Abi,
|
|
211
|
+
functionName: 'isValidSignature',
|
|
212
|
+
args: [hash, signature],
|
|
213
|
+
}),
|
|
194
214
|
requireCanonical,
|
|
215
|
+
to: address,
|
|
195
216
|
}).catch((error) => {
|
|
196
|
-
if (error instanceof contract_js_1.
|
|
217
|
+
if (error instanceof contract_js_1.CallExecutionError)
|
|
197
218
|
throw new VerificationError();
|
|
198
219
|
throw error;
|
|
199
220
|
});
|
|
221
|
+
const result = (() => {
|
|
222
|
+
try {
|
|
223
|
+
return (0, decodeFunctionResult_js_1.decodeFunctionResult)({
|
|
224
|
+
abi: abis_js_1.erc1271Abi,
|
|
225
|
+
functionName: 'isValidSignature',
|
|
226
|
+
data: data ?? '0x',
|
|
227
|
+
});
|
|
228
|
+
}
|
|
229
|
+
catch {
|
|
230
|
+
throw new VerificationError();
|
|
231
|
+
}
|
|
232
|
+
})();
|
|
200
233
|
if (result.startsWith('0x1626ba7e'))
|
|
201
234
|
return true;
|
|
202
235
|
throw new VerificationError();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyHash.js","sourceRoot":"","sources":["../../../actions/public/verifyHash.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"verifyHash.js","sourceRoot":"","sources":["../../../actions/public/verifyHash.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,19 +4,23 @@ exports.waitForTransactionReceipt = waitForTransactionReceipt;
|
|
|
4
4
|
const block_js_1 = require("../../errors/block.js");
|
|
5
5
|
const rpc_js_1 = require("../../errors/rpc.js");
|
|
6
6
|
const transaction_js_1 = require("../../errors/transaction.js");
|
|
7
|
+
const utils_js_1 = require("../../errors/utils.js");
|
|
7
8
|
const isAddressEqual_js_1 = require("../../utils/address/isAddressEqual.js");
|
|
8
9
|
const getAction_js_1 = require("../../utils/getAction.js");
|
|
9
10
|
const observe_js_1 = require("../../utils/observe.js");
|
|
10
11
|
const withResolvers_js_1 = require("../../utils/promise/withResolvers.js");
|
|
11
12
|
const withRetry_js_1 = require("../../utils/promise/withRetry.js");
|
|
12
13
|
const stringify_js_1 = require("../../utils/stringify.js");
|
|
14
|
+
const uid_js_1 = require("../../utils/uid.js");
|
|
13
15
|
const getBlock_js_1 = require("./getBlock.js");
|
|
14
16
|
const getTransaction_js_1 = require("./getTransaction.js");
|
|
15
17
|
const getTransactionReceipt_js_1 = require("./getTransactionReceipt.js");
|
|
16
18
|
const watchBlockNumber_js_1 = require("./watchBlockNumber.js");
|
|
17
19
|
async function waitForTransactionReceipt(client, parameters) {
|
|
18
20
|
const { checkReplacement = client.chain?.supportsTransactionReplacementDetection ??
|
|
19
|
-
true, confirmations = 1, hash, onReplaced, retryCount = 6, retryDelay = ({ count }) => ~~(1 << count) * 200, timeout = 180_000, } = parameters;
|
|
21
|
+
true, confirmations = 1, hash, onReplaced, retryCount = 6, retryDelay = ({ count }) => ~~(1 << count) * 200, signal, timeout = 180_000, } = parameters;
|
|
22
|
+
if (signal?.aborted)
|
|
23
|
+
throw (0, utils_js_1.getAbortError)(signal);
|
|
20
24
|
const replacement = client.chain?.transactionReplacement?.getKey
|
|
21
25
|
? undefined
|
|
22
26
|
: parameters.replacement;
|
|
@@ -39,6 +43,7 @@ async function waitForTransactionReceipt(client, parameters) {
|
|
|
39
43
|
pollingInterval,
|
|
40
44
|
replacement,
|
|
41
45
|
retryCount,
|
|
46
|
+
signal: signal ? (0, uid_js_1.uid)() : undefined,
|
|
42
47
|
timeout,
|
|
43
48
|
},
|
|
44
49
|
]);
|
|
@@ -58,8 +63,17 @@ async function waitForTransactionReceipt(client, parameters) {
|
|
|
58
63
|
reject(new transaction_js_1.WaitForTransactionReceiptTimeoutError({ hash }));
|
|
59
64
|
}, timeout)
|
|
60
65
|
: undefined;
|
|
66
|
+
const onAbort = () => {
|
|
67
|
+
clearTimeout(timer);
|
|
68
|
+
_unwatch?.();
|
|
69
|
+
_unobserve?.();
|
|
70
|
+
reject((0, utils_js_1.getAbortError)(signal));
|
|
71
|
+
};
|
|
72
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
61
73
|
_unobserve = (0, observe_js_1.observe)(observerId, { onReplaced, resolve, reject }, async (emit) => {
|
|
62
74
|
receipt = await (0, getAction_js_1.getAction)(client, getTransactionReceipt_js_1.getTransactionReceipt, 'getTransactionReceipt')({ hash }).catch(() => undefined);
|
|
75
|
+
if (signal?.aborted)
|
|
76
|
+
return;
|
|
63
77
|
if (receipt && confirmations <= 1) {
|
|
64
78
|
clearTimeout(timer);
|
|
65
79
|
emit.resolve(receipt);
|
|
@@ -120,6 +134,7 @@ async function waitForTransactionReceipt(client, parameters) {
|
|
|
120
134
|
}, {
|
|
121
135
|
delay: retryDelay,
|
|
122
136
|
retryCount,
|
|
137
|
+
signal,
|
|
123
138
|
shouldRetry: ({ error }) => !(replacement && error instanceof transaction_js_1.TransactionNotFoundError),
|
|
124
139
|
});
|
|
125
140
|
retrying = false;
|
|
@@ -201,6 +216,7 @@ async function waitForTransactionReceipt(client, parameters) {
|
|
|
201
216
|
}), {
|
|
202
217
|
delay: retryDelay,
|
|
203
218
|
retryCount,
|
|
219
|
+
signal,
|
|
204
220
|
shouldRetry: ({ error }) => error instanceof block_js_1.BlockNotFoundError,
|
|
205
221
|
});
|
|
206
222
|
retrying = false;
|
|
@@ -257,6 +273,7 @@ async function waitForTransactionReceipt(client, parameters) {
|
|
|
257
273
|
});
|
|
258
274
|
});
|
|
259
275
|
return promise.finally(() => {
|
|
276
|
+
signal?.removeEventListener('abort', onAbort);
|
|
260
277
|
clearTimeout(timer);
|
|
261
278
|
_unobserve?.();
|
|
262
279
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.watchBlockHeaders = watchBlockHeaders;
|
|
|
4
4
|
const block_js_1 = require("../../utils/formatters/block.js");
|
|
5
5
|
const observe_js_1 = require("../../utils/observe.js");
|
|
6
6
|
const stringify_js_1 = require("../../utils/stringify.js");
|
|
7
|
+
const watchTransport_js_1 = require("./internal/watchTransport.js");
|
|
7
8
|
const blockFields = [
|
|
8
9
|
'size',
|
|
9
10
|
'totalDifficulty',
|
|
@@ -20,16 +21,7 @@ function watchBlockHeaders(client, { onBlockHeader, onError, }) {
|
|
|
20
21
|
let unsubscribe = () => (active = false);
|
|
21
22
|
(async () => {
|
|
22
23
|
try {
|
|
23
|
-
const transport = (()
|
|
24
|
-
if (client.transport.type === 'fallback') {
|
|
25
|
-
const transport = client.transport.transports.find((transport) => transport.config.type === 'webSocket' ||
|
|
26
|
-
transport.config.type === 'ipc');
|
|
27
|
-
if (!transport)
|
|
28
|
-
return client.transport;
|
|
29
|
-
return transport.value;
|
|
30
|
-
}
|
|
31
|
-
return client.transport;
|
|
32
|
-
})();
|
|
24
|
+
const transport = (0, watchTransport_js_1.getSubscriptionTransport)(client);
|
|
33
25
|
const { unsubscribe: unsubscribe_ } = await transport.subscribe({
|
|
34
26
|
params: ['newHeads'],
|
|
35
27
|
onData(data) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchBlockHeaders.js","sourceRoot":"","sources":["../../../actions/public/watchBlockHeaders.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"watchBlockHeaders.js","sourceRoot":"","sources":["../../../actions/public/watchBlockHeaders.ts"],"names":[],"mappings":";;AAqEA,8CAmDC;AAnHD,8DAA6D;AAC7D,uDAAgD;AAChD,2DAA6E;AAG7E,oEAAuE;AAEvE,MAAM,WAAW,GAAG;IAClB,MAAM;IACN,iBAAiB;IACjB,cAAc;IACd,QAAQ;IACR,aAAa;CACL,CAAA;AAmDV,SAAgB,iBAAiB,CAI/B,MAAgC,EAChC,EACE,aAAa,EACb,OAAO,GAGA;IAET,IAAI,eAA0D,CAAA;IAE9D,MAAM,UAAU,GAAG,IAAA,wBAAS,EAAC,CAAC,mBAAmB,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;IAE/D,OAAO,IAAA,oBAAO,EAAC,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,IAAA,4CAAwB,EAAC,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,sBAAW,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"}
|
|
@@ -7,18 +7,12 @@ const observe_js_1 = require("../../utils/observe.js");
|
|
|
7
7
|
const poll_js_1 = require("../../utils/poll.js");
|
|
8
8
|
const stringify_js_1 = require("../../utils/stringify.js");
|
|
9
9
|
const getBlockNumber_js_1 = require("./getBlockNumber.js");
|
|
10
|
+
const watchTransport_js_1 = require("./internal/watchTransport.js");
|
|
10
11
|
function watchBlockNumber(client, { emitOnBegin = false, emitMissed: emitMissed_, onBlockNumber, onError, poll: poll_, pollingInterval = client.pollingInterval, }) {
|
|
11
12
|
const enablePolling = (() => {
|
|
12
13
|
if (typeof poll_ !== 'undefined')
|
|
13
14
|
return poll_;
|
|
14
|
-
|
|
15
|
-
client.transport.type === 'ipc')
|
|
16
|
-
return false;
|
|
17
|
-
if (client.transport.type === 'fallback' &&
|
|
18
|
-
(client.transport.transports[0].config.type === 'webSocket' ||
|
|
19
|
-
client.transport.transports[0].config.type === 'ipc'))
|
|
20
|
-
return false;
|
|
21
|
-
return true;
|
|
15
|
+
return (0, watchTransport_js_1.shouldPoll)(client);
|
|
22
16
|
})();
|
|
23
17
|
const blockTime = client.chain?.blockTime;
|
|
24
18
|
const emitMissed = emitMissed_ ?? (blockTime !== undefined && pollingInterval > blockTime / 2);
|
|
@@ -70,16 +64,7 @@ function watchBlockNumber(client, { emitOnBegin = false, emitMissed: emitMissed_
|
|
|
70
64
|
let unsubscribe = () => (active = false);
|
|
71
65
|
(async () => {
|
|
72
66
|
try {
|
|
73
|
-
const transport = (()
|
|
74
|
-
if (client.transport.type === 'fallback') {
|
|
75
|
-
const transport = client.transport.transports.find((transport) => transport.config.type === 'webSocket' ||
|
|
76
|
-
transport.config.type === 'ipc');
|
|
77
|
-
if (!transport)
|
|
78
|
-
return client.transport;
|
|
79
|
-
return transport.value;
|
|
80
|
-
}
|
|
81
|
-
return client.transport;
|
|
82
|
-
})();
|
|
67
|
+
const transport = (0, watchTransport_js_1.getSubscriptionTransport)(client);
|
|
83
68
|
const { unsubscribe: unsubscribe_ } = await transport.subscribe({
|
|
84
69
|
params: ['newHeads'],
|
|
85
70
|
onData(data) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchBlockNumber.js","sourceRoot":"","sources":["../../../actions/public/watchBlockNumber.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"watchBlockNumber.js","sourceRoot":"","sources":["../../../actions/public/watchBlockNumber.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,18 +6,12 @@ const observe_js_1 = require("../../utils/observe.js");
|
|
|
6
6
|
const poll_js_1 = require("../../utils/poll.js");
|
|
7
7
|
const stringify_js_1 = require("../../utils/stringify.js");
|
|
8
8
|
const getBlock_js_1 = require("./getBlock.js");
|
|
9
|
+
const watchTransport_js_1 = require("./internal/watchTransport.js");
|
|
9
10
|
function watchBlocks(client, { blockTag = client.experimental_blockTag ?? 'latest', emitMissed: emitMissed_, emitOnBegin = false, onBlock, onError, includeTransactions: includeTransactions_, poll: poll_, pollingInterval = client.pollingInterval, }) {
|
|
10
11
|
const enablePolling = (() => {
|
|
11
12
|
if (typeof poll_ !== 'undefined')
|
|
12
13
|
return poll_;
|
|
13
|
-
|
|
14
|
-
client.transport.type === 'ipc')
|
|
15
|
-
return false;
|
|
16
|
-
if (client.transport.type === 'fallback' &&
|
|
17
|
-
(client.transport.transports[0].config.type === 'webSocket' ||
|
|
18
|
-
client.transport.transports[0].config.type === 'ipc'))
|
|
19
|
-
return false;
|
|
20
|
-
return true;
|
|
14
|
+
return (0, watchTransport_js_1.shouldPoll)(client);
|
|
21
15
|
})();
|
|
22
16
|
const includeTransactions = includeTransactions_ ?? false;
|
|
23
17
|
const blockTime = client.chain?.blockTime;
|
|
@@ -99,16 +93,7 @@ function watchBlocks(client, { blockTag = client.experimental_blockTag ?? 'lates
|
|
|
99
93
|
})
|
|
100
94
|
.catch(onError);
|
|
101
95
|
}
|
|
102
|
-
const transport = (()
|
|
103
|
-
if (client.transport.type === 'fallback') {
|
|
104
|
-
const transport = client.transport.transports.find((transport) => transport.config.type === 'webSocket' ||
|
|
105
|
-
transport.config.type === 'ipc');
|
|
106
|
-
if (!transport)
|
|
107
|
-
return client.transport;
|
|
108
|
-
return transport.value;
|
|
109
|
-
}
|
|
110
|
-
return client.transport;
|
|
111
|
-
})();
|
|
96
|
+
const transport = (0, watchTransport_js_1.getSubscriptionTransport)(client);
|
|
112
97
|
const { unsubscribe: unsubscribe_ } = await transport.subscribe({
|
|
113
98
|
params: ['newHeads'],
|
|
114
99
|
async onData(data) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchBlocks.js","sourceRoot":"","sources":["../../../actions/public/watchBlocks.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"watchBlocks.js","sourceRoot":"","sources":["../../../actions/public/watchBlocks.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.watchContractEvent = watchContractEvent;
|
|
4
4
|
const abi_js_1 = require("../../errors/abi.js");
|
|
5
|
-
const base_js_1 = require("../../errors/base.js");
|
|
6
|
-
const request_js_1 = require("../../errors/request.js");
|
|
7
5
|
const rpc_js_1 = require("../../errors/rpc.js");
|
|
8
6
|
const decodeEventLog_js_1 = require("../../utils/abi/decodeEventLog.js");
|
|
9
7
|
const encodeEventTopics_js_1 = require("../../utils/abi/encodeEventTopics.js");
|
|
@@ -16,6 +14,8 @@ const createContractEventFilter_js_1 = require("./createContractEventFilter.js")
|
|
|
16
14
|
const getBlockNumber_js_1 = require("./getBlockNumber.js");
|
|
17
15
|
const getContractEvents_js_1 = require("./getContractEvents.js");
|
|
18
16
|
const getFilterChanges_js_1 = require("./getFilterChanges.js");
|
|
17
|
+
const isRangeError_js_1 = require("./internal/isRangeError.js");
|
|
18
|
+
const watchTransport_js_1 = require("./internal/watchTransport.js");
|
|
19
19
|
const uninstallFilter_js_1 = require("./uninstallFilter.js");
|
|
20
20
|
function watchContractEvent(client, parameters) {
|
|
21
21
|
const { abi, address, args, batch = true, eventName, fromBlock, onError, onLogs, poll: poll_, pollingInterval = client.pollingInterval, strict: strict_, } = parameters;
|
|
@@ -24,14 +24,7 @@ function watchContractEvent(client, parameters) {
|
|
|
24
24
|
return poll_;
|
|
25
25
|
if (typeof fromBlock === 'bigint')
|
|
26
26
|
return true;
|
|
27
|
-
|
|
28
|
-
client.transport.type === 'ipc')
|
|
29
|
-
return false;
|
|
30
|
-
if (client.transport.type === 'fallback' &&
|
|
31
|
-
(client.transport.transports[0].config.type === 'webSocket' ||
|
|
32
|
-
client.transport.transports[0].config.type === 'ipc'))
|
|
33
|
-
return false;
|
|
34
|
-
return true;
|
|
27
|
+
return (0, watchTransport_js_1.shouldPoll)(client);
|
|
35
28
|
})();
|
|
36
29
|
const pollContractEvent = () => {
|
|
37
30
|
const strict = strict_ ?? false;
|
|
@@ -100,7 +93,7 @@ function watchContractEvent(client, parameters) {
|
|
|
100
93
|
const end = previousBlockNumber + size;
|
|
101
94
|
const to = end < blockNumber ? end : blockNumber;
|
|
102
95
|
const logs = await getLogsInRange(from, to).catch((error) => {
|
|
103
|
-
if (from === to || !isRangeError(error))
|
|
96
|
+
if (from === to || !(0, isRangeError_js_1.isRangeError)(error))
|
|
104
97
|
throw error;
|
|
105
98
|
});
|
|
106
99
|
if (!active)
|
|
@@ -148,16 +141,7 @@ function watchContractEvent(client, parameters) {
|
|
|
148
141
|
;
|
|
149
142
|
(async () => {
|
|
150
143
|
try {
|
|
151
|
-
const transport = (()
|
|
152
|
-
if (client.transport.type === 'fallback') {
|
|
153
|
-
const transport = client.transport.transports.find((transport) => transport.config.type === 'webSocket' ||
|
|
154
|
-
transport.config.type === 'ipc');
|
|
155
|
-
if (!transport)
|
|
156
|
-
return client.transport;
|
|
157
|
-
return transport.value;
|
|
158
|
-
}
|
|
159
|
-
return client.transport;
|
|
160
|
-
})();
|
|
144
|
+
const transport = (0, watchTransport_js_1.getSubscriptionTransport)(client);
|
|
161
145
|
const skipUnmatched = Boolean(eventName || strict_);
|
|
162
146
|
const topics = eventName
|
|
163
147
|
? (0, encodeEventTopics_js_1.encodeEventTopics)({
|
|
@@ -225,16 +209,4 @@ function watchContractEvent(client, parameters) {
|
|
|
225
209
|
};
|
|
226
210
|
return enablePolling ? pollContractEvent() : subscribeContractEvent();
|
|
227
211
|
}
|
|
228
|
-
function isRangeError(error) {
|
|
229
|
-
if (!(error instanceof base_js_1.BaseError))
|
|
230
|
-
return true;
|
|
231
|
-
const cause = error.walk((err) => err instanceof request_js_1.HttpRequestError || err instanceof request_js_1.RpcRequestError);
|
|
232
|
-
if (!cause)
|
|
233
|
-
return true;
|
|
234
|
-
if (cause instanceof request_js_1.RpcRequestError && cause.code === 429)
|
|
235
|
-
return false;
|
|
236
|
-
if (cause instanceof request_js_1.HttpRequestError && cause.status === undefined)
|
|
237
|
-
return false;
|
|
238
|
-
return cause.status !== 401 && cause.status !== 403 && cause.status !== 429;
|
|
239
|
-
}
|
|
240
212
|
//# sourceMappingURL=watchContractEvent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":"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"}
|