viem 2.57.14 → 2.57.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +58 -0
- package/_cjs/account-abstraction/utils/formatters/userOperationReceipt.js +2 -0
- package/_cjs/account-abstraction/utils/formatters/userOperationReceipt.js.map +1 -1
- package/_cjs/actions/public/estimateGas.js +5 -2
- package/_cjs/actions/public/estimateGas.js.map +1 -1
- package/_cjs/actions/public/fillTransaction.js +2 -0
- package/_cjs/actions/public/fillTransaction.js.map +1 -1
- package/_cjs/actions/public/getFilterChanges.js +1 -0
- package/_cjs/actions/public/getFilterChanges.js.map +1 -1
- package/_cjs/actions/public/getFilterLogs.js +1 -0
- package/_cjs/actions/public/getFilterLogs.js.map +1 -1
- package/_cjs/actions/public/watchBlockNumber.js +3 -1
- package/_cjs/actions/public/watchBlockNumber.js.map +1 -1
- package/_cjs/actions/public/watchBlocks.js +20 -8
- package/_cjs/actions/public/watchBlocks.js.map +1 -1
- package/_cjs/actions/public/watchContractEvent.js +10 -3
- package/_cjs/actions/public/watchContractEvent.js.map +1 -1
- package/_cjs/actions/public/watchEvent.js +5 -0
- package/_cjs/actions/public/watchEvent.js.map +1 -1
- package/_cjs/actions/wallet/prepareTransactionRequest.js +3 -2
- package/_cjs/actions/wallet/prepareTransactionRequest.js.map +1 -1
- package/_cjs/actions/wallet/sendTransaction.js +4 -2
- package/_cjs/actions/wallet/sendTransaction.js.map +1 -1
- package/_cjs/actions/wallet/sendTransactionSync.js +48 -7
- package/_cjs/actions/wallet/sendTransactionSync.js.map +1 -1
- package/_cjs/chains/definitions/hashKeyChain.js +4 -4
- package/_cjs/chains/definitions/hashKeyChain.js.map +1 -1
- package/_cjs/chains/definitions/hashkeyChainTestnet.js +4 -4
- package/_cjs/chains/definitions/hashkeyChainTestnet.js.map +1 -1
- package/_cjs/chains/definitions/turkchain.js +26 -0
- package/_cjs/chains/definitions/turkchain.js.map +1 -0
- package/_cjs/chains/definitions/zksync.js +1 -1
- package/_cjs/chains/definitions/zksync.js.map +1 -1
- package/_cjs/chains/index.js +4 -2
- package/_cjs/chains/index.js.map +1 -1
- package/_cjs/clients/createClient.js.map +1 -1
- package/_cjs/clients/transports/fallback.js +5 -0
- package/_cjs/clients/transports/fallback.js.map +1 -1
- package/_cjs/errors/node.js +10 -4
- package/_cjs/errors/node.js.map +1 -1
- package/_cjs/errors/typedData.js +4 -2
- package/_cjs/errors/typedData.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/index.js +5 -4
- package/_cjs/index.js.map +1 -1
- package/_cjs/tempo/Account.js +85 -12
- package/_cjs/tempo/Account.js.map +1 -1
- package/_cjs/tempo/Gateway.js +195 -0
- package/_cjs/tempo/Gateway.js.map +1 -0
- package/_cjs/tempo/GatewayDecorator.js +168 -0
- package/_cjs/tempo/GatewayDecorator.js.map +1 -0
- package/_cjs/tempo/Transaction.js +2 -1
- package/_cjs/tempo/Transaction.js.map +1 -1
- package/_cjs/tempo/actions/ai.js +69 -0
- package/_cjs/tempo/actions/ai.js.map +1 -0
- package/_cjs/tempo/actions/bucket.js +85 -0
- package/_cjs/tempo/actions/bucket.js.map +1 -0
- package/_cjs/tempo/actions/compute.js +165 -0
- package/_cjs/tempo/actions/compute.js.map +1 -0
- package/_cjs/tempo/actions/gateway.js +8 -0
- package/_cjs/tempo/actions/gateway.js.map +1 -0
- package/_cjs/tempo/actions/index.js +6 -1
- package/_cjs/tempo/actions/index.js.map +1 -1
- package/_cjs/tempo/actions/kv.js +44 -0
- package/_cjs/tempo/actions/kv.js.map +1 -0
- package/_cjs/tempo/chainConfig.js +4 -12
- package/_cjs/tempo/chainConfig.js.map +1 -1
- package/_cjs/tempo/index.js +4 -1
- package/_cjs/tempo/index.js.map +1 -1
- package/_cjs/tempo/internal/ndjson.js +43 -0
- package/_cjs/tempo/internal/ndjson.js.map +1 -0
- package/_cjs/tempo/internal/relay/feePayer.js +18 -5
- package/_cjs/tempo/internal/relay/feePayer.js.map +1 -1
- package/_cjs/utils/abi/decodeEventLog.js +57 -7
- package/_cjs/utils/abi/decodeEventLog.js.map +1 -1
- package/_cjs/utils/abi/getAbiItem.js +27 -6
- package/_cjs/utils/abi/getAbiItem.js.map +1 -1
- package/_cjs/utils/abi/parseEventLogs.js +27 -4
- package/_cjs/utils/abi/parseEventLogs.js.map +1 -1
- package/_cjs/utils/authorization/recoverAuthorizationAddress.js +9 -2
- package/_cjs/utils/authorization/recoverAuthorizationAddress.js.map +1 -1
- package/_cjs/utils/authorization/verifyAuthorization.js +14 -4
- package/_cjs/utils/authorization/verifyAuthorization.js.map +1 -1
- package/_cjs/utils/buildRequest.js +4 -0
- package/_cjs/utils/buildRequest.js.map +1 -1
- package/_cjs/utils/ccip.js +134 -28
- package/_cjs/utils/ccip.js.map +1 -1
- package/_cjs/utils/ccipTunnel.js +5 -1
- package/_cjs/utils/ccipTunnel.js.map +1 -1
- package/_cjs/utils/ens/localBatchGatewayRequest.js +55 -5
- package/_cjs/utils/ens/localBatchGatewayRequest.js.map +1 -1
- package/_cjs/utils/hash/toSignatureHash.js +10 -1
- package/_cjs/utils/hash/toSignatureHash.js.map +1 -1
- package/_cjs/utils/internal/http.js +79 -0
- package/_cjs/utils/internal/http.js.map +1 -0
- package/_cjs/utils/nonceManager.js.map +1 -1
- package/_cjs/utils/rpc/http.js +9 -76
- package/_cjs/utils/rpc/http.js.map +1 -1
- package/_cjs/utils/rpc/socket.js +20 -9
- package/_cjs/utils/rpc/socket.js.map +1 -1
- package/_cjs/utils/transaction/assertRequest.js +2 -2
- package/_cjs/utils/transaction/assertRequest.js.map +1 -1
- package/_cjs/utils/transaction/assertTransaction.js +2 -2
- package/_cjs/utils/transaction/assertTransaction.js.map +1 -1
- package/_cjs/utils/transaction/parseTransaction.js +21 -7
- package/_cjs/utils/transaction/parseTransaction.js.map +1 -1
- package/_cjs/utils/typedData.js +19 -6
- package/_cjs/utils/typedData.js.map +1 -1
- package/_cjs/zksync/actions/finalizeWithdrawal.js +4 -2
- package/_cjs/zksync/actions/finalizeWithdrawal.js.map +1 -1
- package/_cjs/zksync/actions/isWithdrawalFinalized.js +4 -5
- package/_cjs/zksync/actions/isWithdrawalFinalized.js.map +1 -1
- package/_esm/account-abstraction/utils/formatters/userOperationReceipt.js +2 -0
- package/_esm/account-abstraction/utils/formatters/userOperationReceipt.js.map +1 -1
- package/_esm/actions/public/estimateGas.js +10 -5
- package/_esm/actions/public/estimateGas.js.map +1 -1
- package/_esm/actions/public/fillTransaction.js +2 -0
- package/_esm/actions/public/fillTransaction.js.map +1 -1
- package/_esm/actions/public/getFilterChanges.js +1 -0
- package/_esm/actions/public/getFilterChanges.js.map +1 -1
- package/_esm/actions/public/getFilterLogs.js +1 -0
- package/_esm/actions/public/getFilterLogs.js.map +1 -1
- package/_esm/actions/public/watchBlockNumber.js +5 -1
- package/_esm/actions/public/watchBlockNumber.js.map +1 -1
- package/_esm/actions/public/watchBlocks.js +28 -8
- package/_esm/actions/public/watchBlocks.js.map +1 -1
- package/_esm/actions/public/watchContractEvent.js +15 -5
- package/_esm/actions/public/watchContractEvent.js.map +1 -1
- package/_esm/actions/public/watchEvent.js +11 -2
- package/_esm/actions/public/watchEvent.js.map +1 -1
- package/_esm/actions/wallet/prepareTransactionRequest.js +3 -2
- package/_esm/actions/wallet/prepareTransactionRequest.js.map +1 -1
- package/_esm/actions/wallet/sendTransaction.js +6 -2
- package/_esm/actions/wallet/sendTransaction.js.map +1 -1
- package/_esm/actions/wallet/sendTransactionSync.js +59 -8
- package/_esm/actions/wallet/sendTransactionSync.js.map +1 -1
- package/_esm/chains/definitions/hashKeyChain.js +4 -4
- package/_esm/chains/definitions/hashKeyChain.js.map +1 -1
- package/_esm/chains/definitions/hashkeyChainTestnet.js +4 -4
- package/_esm/chains/definitions/hashkeyChainTestnet.js.map +1 -1
- package/_esm/chains/definitions/turkchain.js +23 -0
- package/_esm/chains/definitions/turkchain.js.map +1 -0
- package/_esm/chains/definitions/zksync.js +1 -1
- package/_esm/chains/definitions/zksync.js.map +1 -1
- package/_esm/chains/index.js +1 -0
- package/_esm/chains/index.js.map +1 -1
- package/_esm/clients/createClient.js.map +1 -1
- package/_esm/clients/transports/fallback.js +8 -0
- package/_esm/clients/transports/fallback.js.map +1 -1
- package/_esm/errors/node.js +10 -4
- package/_esm/errors/node.js.map +1 -1
- package/_esm/errors/typedData.js +5 -2
- package/_esm/errors/typedData.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/index.js +1 -1
- package/_esm/index.js.map +1 -1
- package/_esm/tempo/Account.js +122 -11
- package/_esm/tempo/Account.js.map +1 -1
- package/_esm/tempo/Gateway.js +294 -0
- package/_esm/tempo/Gateway.js.map +1 -0
- package/_esm/tempo/GatewayDecorator.js +207 -0
- package/_esm/tempo/GatewayDecorator.js.map +1 -0
- package/_esm/tempo/Transaction.js +2 -0
- package/_esm/tempo/Transaction.js.map +1 -1
- package/_esm/tempo/actions/ai.js +132 -0
- package/_esm/tempo/actions/ai.js.map +1 -0
- package/_esm/tempo/actions/bucket.js +181 -0
- package/_esm/tempo/actions/bucket.js.map +1 -0
- package/_esm/tempo/actions/compute.js +424 -0
- package/_esm/tempo/actions/compute.js.map +1 -0
- package/_esm/tempo/actions/gateway.js +22 -0
- package/_esm/tempo/actions/gateway.js.map +1 -0
- package/_esm/tempo/actions/index.js +10 -0
- package/_esm/tempo/actions/index.js.map +1 -1
- package/_esm/tempo/actions/kv.js +124 -0
- package/_esm/tempo/actions/kv.js.map +1 -0
- package/_esm/tempo/chainConfig.js +13 -15
- package/_esm/tempo/chainConfig.js.map +1 -1
- package/_esm/tempo/index.js +9 -0
- package/_esm/tempo/index.js.map +1 -1
- package/_esm/tempo/internal/ndjson.js +45 -0
- package/_esm/tempo/internal/ndjson.js.map +1 -0
- package/_esm/tempo/internal/relay/feePayer.js +24 -7
- package/_esm/tempo/internal/relay/feePayer.js.map +1 -1
- package/_esm/utils/abi/decodeEventLog.js +69 -7
- package/_esm/utils/abi/decodeEventLog.js.map +1 -1
- package/_esm/utils/abi/getAbiItem.js +34 -6
- package/_esm/utils/abi/getAbiItem.js.map +1 -1
- package/_esm/utils/abi/parseEventLogs.js +43 -10
- package/_esm/utils/abi/parseEventLogs.js.map +1 -1
- package/_esm/utils/authorization/recoverAuthorizationAddress.js +11 -2
- package/_esm/utils/authorization/recoverAuthorizationAddress.js.map +1 -1
- package/_esm/utils/authorization/verifyAuthorization.js +15 -4
- package/_esm/utils/authorization/verifyAuthorization.js.map +1 -1
- package/_esm/utils/buildRequest.js +6 -0
- package/_esm/utils/buildRequest.js.map +1 -1
- package/_esm/utils/ccip.js +163 -31
- package/_esm/utils/ccip.js.map +1 -1
- package/_esm/utils/ccipTunnel.js +5 -1
- package/_esm/utils/ccipTunnel.js.map +1 -1
- package/_esm/utils/ens/localBatchGatewayRequest.js +69 -4
- package/_esm/utils/ens/localBatchGatewayRequest.js.map +1 -1
- package/_esm/utils/hash/toSignatureHash.js +11 -1
- package/_esm/utils/hash/toSignatureHash.js.map +1 -1
- package/_esm/utils/internal/http.js +83 -0
- package/_esm/utils/internal/http.js.map +1 -0
- package/_esm/utils/nonceManager.js.map +1 -1
- package/_esm/utils/rpc/http.js +12 -78
- package/_esm/utils/rpc/http.js.map +1 -1
- package/_esm/utils/rpc/socket.js +24 -9
- package/_esm/utils/rpc/socket.js.map +1 -1
- package/_esm/utils/transaction/assertRequest.js +2 -2
- package/_esm/utils/transaction/assertRequest.js.map +1 -1
- package/_esm/utils/transaction/assertTransaction.js +2 -2
- package/_esm/utils/transaction/assertTransaction.js.map +1 -1
- package/_esm/utils/transaction/parseTransaction.js +24 -7
- package/_esm/utils/transaction/parseTransaction.js.map +1 -1
- package/_esm/utils/typedData.js +25 -8
- package/_esm/utils/typedData.js.map +1 -1
- package/_esm/zksync/actions/finalizeWithdrawal.js +5 -2
- package/_esm/zksync/actions/finalizeWithdrawal.js.map +1 -1
- package/_esm/zksync/actions/isWithdrawalFinalized.js +5 -5
- package/_esm/zksync/actions/isWithdrawalFinalized.js.map +1 -1
- package/_types/account-abstraction/utils/formatters/userOperationReceipt.d.ts.map +1 -1
- package/_types/actions/public/estimateGas.d.ts.map +1 -1
- package/_types/actions/public/fillTransaction.d.ts.map +1 -1
- package/_types/actions/public/getFilterChanges.d.ts.map +1 -1
- package/_types/actions/public/getFilterLogs.d.ts.map +1 -1
- package/_types/actions/public/watchBlockNumber.d.ts +6 -2
- package/_types/actions/public/watchBlockNumber.d.ts.map +1 -1
- package/_types/actions/public/watchBlocks.d.ts +7 -2
- package/_types/actions/public/watchBlocks.d.ts.map +1 -1
- package/_types/actions/public/watchContractEvent.d.ts.map +1 -1
- package/_types/actions/public/watchEvent.d.ts.map +1 -1
- package/_types/actions/wallet/prepareTransactionRequest.d.ts.map +1 -1
- package/_types/actions/wallet/sendTransaction.d.ts.map +1 -1
- package/_types/actions/wallet/sendTransactionSync.d.ts.map +1 -1
- package/_types/chains/definitions/hashKeyChain.d.ts +4 -4
- package/_types/chains/definitions/hashkeyChainTestnet.d.ts +4 -4
- package/_types/chains/definitions/turkchain.d.ts +53 -0
- package/_types/chains/definitions/turkchain.d.ts.map +1 -0
- package/_types/chains/definitions/zksync.d.ts +1 -1
- package/_types/chains/index.d.ts +1 -0
- package/_types/chains/index.d.ts.map +1 -1
- package/_types/clients/createClient.d.ts +6 -0
- package/_types/clients/createClient.d.ts.map +1 -1
- package/_types/clients/transports/fallback.d.ts.map +1 -1
- package/_types/errors/node.d.ts.map +1 -1
- package/_types/errors/typedData.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/index.d.ts +1 -1
- package/_types/index.d.ts.map +1 -1
- package/_types/tempo/Account.d.ts +77 -4
- package/_types/tempo/Account.d.ts.map +1 -1
- package/_types/tempo/Gateway.d.ts +337 -0
- package/_types/tempo/Gateway.d.ts.map +1 -0
- package/_types/tempo/GatewayDecorator.d.ts +635 -0
- package/_types/tempo/GatewayDecorator.d.ts.map +1 -0
- package/_types/tempo/Relay.d.ts +1 -1
- package/_types/tempo/Relay.d.ts.map +1 -1
- package/_types/tempo/Transaction.d.ts +2 -0
- package/_types/tempo/Transaction.d.ts.map +1 -1
- package/_types/tempo/actions/ai.d.ts +145 -0
- package/_types/tempo/actions/ai.d.ts.map +1 -0
- package/_types/tempo/actions/bucket.d.ts +210 -0
- package/_types/tempo/actions/bucket.d.ts.map +1 -0
- package/_types/tempo/actions/compute.d.ts +628 -0
- package/_types/tempo/actions/compute.d.ts.map +1 -0
- package/_types/tempo/actions/gateway.d.ts +25 -0
- package/_types/tempo/actions/gateway.d.ts.map +1 -0
- package/_types/tempo/actions/index.d.ts +10 -0
- package/_types/tempo/actions/index.d.ts.map +1 -1
- package/_types/tempo/actions/kv.d.ts +167 -0
- package/_types/tempo/actions/kv.d.ts.map +1 -0
- package/_types/tempo/chainConfig.d.ts.map +1 -1
- package/_types/tempo/index.d.ts +11 -0
- package/_types/tempo/index.d.ts.map +1 -1
- package/_types/tempo/internal/ndjson.d.ts +9 -0
- package/_types/tempo/internal/ndjson.d.ts.map +1 -0
- package/_types/tempo/internal/relay/feePayer.d.ts.map +1 -1
- package/_types/tempo/internal/relay/utils.d.ts +8 -8
- package/_types/utils/abi/decodeEventLog.d.ts +13 -1
- package/_types/utils/abi/decodeEventLog.d.ts.map +1 -1
- package/_types/utils/abi/getAbiItem.d.ts.map +1 -1
- package/_types/utils/abi/parseEventLogs.d.ts.map +1 -1
- package/_types/utils/authorization/recoverAuthorizationAddress.d.ts +2 -1
- package/_types/utils/authorization/recoverAuthorizationAddress.d.ts.map +1 -1
- package/_types/utils/authorization/verifyAuthorization.d.ts.map +1 -1
- package/_types/utils/buildRequest.d.ts.map +1 -1
- package/_types/utils/ccip.d.ts +24 -4
- package/_types/utils/ccip.d.ts.map +1 -1
- package/_types/utils/ccipTunnel.d.ts.map +1 -1
- package/_types/utils/ens/localBatchGatewayRequest.d.ts +26 -0
- package/_types/utils/ens/localBatchGatewayRequest.d.ts.map +1 -1
- package/_types/utils/hash/toSignatureHash.d.ts +1 -1
- package/_types/utils/hash/toSignatureHash.d.ts.map +1 -1
- package/_types/utils/internal/http.d.ts +16 -0
- package/_types/utils/internal/http.d.ts.map +1 -0
- package/_types/utils/nonceManager.d.ts +15 -1
- package/_types/utils/nonceManager.d.ts.map +1 -1
- package/_types/utils/rpc/http.d.ts.map +1 -1
- package/_types/utils/rpc/socket.d.ts.map +1 -1
- package/_types/utils/transaction/parseTransaction.d.ts.map +1 -1
- package/_types/utils/typedData.d.ts.map +1 -1
- package/account-abstraction/utils/formatters/userOperationReceipt.ts +1 -0
- package/actions/public/estimateGas.ts +12 -5
- package/actions/public/fillTransaction.ts +2 -0
- package/actions/public/getFilterChanges.ts +1 -0
- package/actions/public/getFilterLogs.ts +1 -0
- package/actions/public/watchBlockNumber.ts +11 -2
- package/actions/public/watchBlocks.ts +46 -14
- package/actions/public/watchContractEvent.ts +22 -4
- package/actions/public/watchEvent.ts +17 -1
- package/actions/wallet/prepareTransactionRequest.ts +6 -2
- package/actions/wallet/sendTransaction.ts +9 -3
- package/actions/wallet/sendTransactionSync.ts +74 -12
- package/chains/definitions/hashKeyChain.ts +4 -4
- package/chains/definitions/hashkeyChainTestnet.ts +4 -4
- package/chains/definitions/turkchain.ts +23 -0
- package/chains/definitions/zksync.ts +1 -1
- package/chains/index.ts +1 -0
- package/clients/createClient.ts +6 -0
- package/clients/transports/fallback.ts +11 -0
- package/errors/node.ts +11 -5
- package/errors/typedData.ts +5 -2
- package/errors/version.ts +1 -1
- package/index.ts +2 -0
- package/package.json +5 -1
- package/tempo/Account.ts +202 -16
- package/tempo/Gateway.ts +477 -0
- package/tempo/GatewayDecorator.ts +909 -0
- package/tempo/Relay.ts +1 -1
- package/tempo/Transaction.ts +3 -0
- package/tempo/actions/ai.ts +250 -0
- package/tempo/actions/bucket.ts +324 -0
- package/tempo/actions/compute.ts +894 -0
- package/tempo/actions/gateway.ts +33 -0
- package/tempo/actions/index.ts +10 -0
- package/tempo/actions/kv.ts +229 -0
- package/tempo/chainConfig.ts +13 -15
- package/tempo/index.ts +12 -0
- package/tempo/internal/ndjson.ts +51 -0
- package/tempo/internal/relay/feePayer.ts +30 -7
- package/utils/abi/decodeEventLog.ts +97 -10
- package/utils/abi/getAbiItem.ts +35 -5
- package/utils/abi/parseEventLogs.ts +48 -11
- package/utils/authorization/recoverAuthorizationAddress.ts +18 -2
- package/utils/authorization/verifyAuthorization.ts +12 -7
- package/utils/buildRequest.ts +4 -0
- package/utils/ccip.ts +199 -33
- package/utils/ccipTunnel.ts +5 -1
- package/utils/ens/localBatchGatewayRequest.ts +82 -4
- package/utils/hash/toSignatureHash.ts +12 -2
- package/utils/internal/http.ts +92 -0
- package/utils/nonceManager.ts +16 -1
- package/utils/rpc/http.ts +12 -86
- package/utils/rpc/socket.ts +28 -15
- package/utils/transaction/assertRequest.ts +2 -2
- package/utils/transaction/assertTransaction.ts +2 -2
- package/utils/transaction/parseTransaction.ts +32 -7
- package/utils/typedData.ts +31 -8
- package/zksync/actions/finalizeWithdrawal.ts +5 -2
- package/zksync/actions/isWithdrawalFinalized.ts +5 -5
|
@@ -1,19 +1,84 @@
|
|
|
1
1
|
import { batchGatewayAbi } from '../../constants/abis.js';
|
|
2
2
|
import { solidityError } from '../../constants/solidity.js';
|
|
3
|
+
import { HttpRequestError } from '../../errors/request.js';
|
|
3
4
|
import { decodeFunctionData } from '../abi/decodeFunctionData.js';
|
|
4
5
|
import { encodeErrorResult } from '../abi/encodeErrorResult.js';
|
|
5
6
|
import { encodeFunctionResult } from '../abi/encodeFunctionResult.js';
|
|
6
7
|
export const localBatchGatewayUrl = 'x-batch-gateway:true';
|
|
8
|
+
/**
|
|
9
|
+
* Caps for one CCIP-Read lookup.
|
|
10
|
+
*
|
|
11
|
+
* - `concurrency`: gateway requests in flight at once, across nested batches.
|
|
12
|
+
* - `depth`: nested callbacks, and separately, nested local batches.
|
|
13
|
+
* - `queries`: gateway requests in total, across callbacks and nested batches.
|
|
14
|
+
* Each contract-chosen URL counts once, and a query with none counts once.
|
|
15
|
+
* Gateways a custom `ccipRead.request` adds (such as `ccipReadTunnel`'s
|
|
16
|
+
* `batchGateways`) are the caller's own and are not counted separately.
|
|
17
|
+
*/
|
|
18
|
+
export const ccipReadLimit = {
|
|
19
|
+
concurrency: 16,
|
|
20
|
+
depth: 4,
|
|
21
|
+
queries: 256,
|
|
22
|
+
};
|
|
23
|
+
/** Creates the budget for one CCIP-Read lookup. */
|
|
24
|
+
export function createCcipReadBudget() {
|
|
25
|
+
let active = 0;
|
|
26
|
+
const queue = [];
|
|
27
|
+
return {
|
|
28
|
+
queries: ccipReadLimit.queries,
|
|
29
|
+
async run(fn) {
|
|
30
|
+
if (active >= ccipReadLimit.concurrency)
|
|
31
|
+
await new Promise((resolve) => queue.push(resolve));
|
|
32
|
+
else
|
|
33
|
+
active++;
|
|
34
|
+
try {
|
|
35
|
+
return await fn();
|
|
36
|
+
}
|
|
37
|
+
finally {
|
|
38
|
+
// Hand the slot straight to the next waiter so a new caller cannot
|
|
39
|
+
// take it in between.
|
|
40
|
+
const next = queue.shift();
|
|
41
|
+
if (next)
|
|
42
|
+
next();
|
|
43
|
+
else
|
|
44
|
+
active--;
|
|
45
|
+
}
|
|
46
|
+
},
|
|
47
|
+
};
|
|
48
|
+
}
|
|
7
49
|
export async function localBatchGatewayRequest(parameters) {
|
|
8
|
-
const { data, ccipRequest } = parameters;
|
|
50
|
+
const { data, ccipRequest, budget = createCcipReadBudget(), depth = 0, } = parameters;
|
|
9
51
|
const { args: [queries], } = decodeFunctionData({ abi: batchGatewayAbi, data });
|
|
10
52
|
const failures = [];
|
|
11
53
|
const responses = [];
|
|
12
54
|
await Promise.all(queries.map(async (query, i) => {
|
|
13
55
|
try {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
56
|
+
const nested = query.urls.includes(localBatchGatewayUrl);
|
|
57
|
+
if (nested && depth + 1 >= ccipReadLimit.depth)
|
|
58
|
+
throw new HttpRequestError({
|
|
59
|
+
details: `CCIP Read exceeded the maximum batch depth (${ccipReadLimit.depth}).`,
|
|
60
|
+
url: localBatchGatewayUrl,
|
|
61
|
+
});
|
|
62
|
+
if (nested)
|
|
63
|
+
responses[i] = await localBatchGatewayRequest({
|
|
64
|
+
data: query.data,
|
|
65
|
+
ccipRequest,
|
|
66
|
+
budget,
|
|
67
|
+
depth: depth + 1,
|
|
68
|
+
});
|
|
69
|
+
else {
|
|
70
|
+
if (budget.queries <= 0)
|
|
71
|
+
throw new HttpRequestError({
|
|
72
|
+
details: `CCIP Read exceeded the maximum number of queries (${ccipReadLimit.queries}).`,
|
|
73
|
+
url: query.urls[0] ?? '',
|
|
74
|
+
});
|
|
75
|
+
// Each URL is a gateway request, so each one draws from the budget.
|
|
76
|
+
// A query with no URLs still costs one, since a custom request (such
|
|
77
|
+
// as `ccipReadTunnel`) may send it elsewhere.
|
|
78
|
+
const urls = query.urls.slice(0, budget.queries);
|
|
79
|
+
budget.queries -= Math.max(1, urls.length);
|
|
80
|
+
responses[i] = await budget.run(() => ccipRequest({ ...query, urls }));
|
|
81
|
+
}
|
|
17
82
|
failures[i] = false;
|
|
18
83
|
}
|
|
19
84
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localBatchGatewayRequest.js","sourceRoot":"","sources":["../../../utils/ens/localBatchGatewayRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"localBatchGatewayRequest.js","sourceRoot":"","sources":["../../../utils/ens/localBatchGatewayRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,19 @@
|
|
|
1
|
+
import { formatAbiItem } from 'abitype';
|
|
2
|
+
import { LruMap } from '../lru.js';
|
|
1
3
|
import { hashSignature } from './hashSignature.js';
|
|
2
4
|
import { toSignature } from './toSignature.js';
|
|
5
|
+
/** Signature hashes keyed by their definition, since hashing is costly. */
|
|
6
|
+
const signatureHashCache = /*#__PURE__*/ new LruMap(8192);
|
|
3
7
|
/**
|
|
4
8
|
* Returns the hash (of the function/event/error signature) for a given function, event, or error definition.
|
|
5
9
|
*/
|
|
6
10
|
export function toSignatureHash(fn) {
|
|
7
|
-
|
|
11
|
+
const definition = typeof fn === 'string' ? fn : formatAbiItem(fn);
|
|
12
|
+
const cached = signatureHashCache.get(definition);
|
|
13
|
+
if (cached)
|
|
14
|
+
return cached;
|
|
15
|
+
const hash = hashSignature(toSignature(definition));
|
|
16
|
+
signatureHashCache.set(definition, hash);
|
|
17
|
+
return hash;
|
|
8
18
|
}
|
|
9
19
|
//# sourceMappingURL=toSignatureHash.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toSignatureHash.js","sourceRoot":"","sources":["../../../utils/hash/toSignatureHash.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"toSignatureHash.js","sourceRoot":"","sources":["../../../utils/hash/toSignatureHash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,aAAa,EAAE,MAAM,SAAS,CAAA;AAIxE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAA+B,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAC/E,OAAO,EAA6B,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAEzE,2EAA2E;AAC3E,MAAM,kBAAkB,GAAG,aAAa,CAAC,IAAI,MAAM,CAAM,IAAI,CAAC,CAAA;AAO9D;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,EAAmC;IACjE,MAAM,UAAU,GAAG,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IAClE,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACjD,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IACzB,MAAM,IAAI,GAAG,aAAa,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAA;IACnD,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IACxC,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { ResponseBodyTooLargeError } from '../../errors/request.js';
|
|
2
|
+
/**
|
|
3
|
+
* Returns a signal that aborts as soon as any of `signals` aborts, and a
|
|
4
|
+
* `cleanup` function that detaches the listeners added to `signals`.
|
|
5
|
+
*/
|
|
6
|
+
export function anySignal(signals) {
|
|
7
|
+
const signals_ = signals.filter((signal) => !!signal);
|
|
8
|
+
if (signals_.length < 2)
|
|
9
|
+
return { signal: signals_[0] ?? null, cleanup: () => { } };
|
|
10
|
+
const controller = new AbortController();
|
|
11
|
+
const onAbort = () => {
|
|
12
|
+
cleanup();
|
|
13
|
+
controller.abort(signals_.find((signal) => signal.aborted)?.reason);
|
|
14
|
+
};
|
|
15
|
+
const cleanup = () => {
|
|
16
|
+
for (const signal of signals_)
|
|
17
|
+
signal.removeEventListener('abort', onAbort);
|
|
18
|
+
};
|
|
19
|
+
for (const signal of signals_) {
|
|
20
|
+
if (signal.aborted) {
|
|
21
|
+
cleanup();
|
|
22
|
+
controller.abort(signal.reason);
|
|
23
|
+
break;
|
|
24
|
+
}
|
|
25
|
+
signal.addEventListener('abort', onAbort);
|
|
26
|
+
}
|
|
27
|
+
return { signal: controller.signal, cleanup };
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Reads a response body as text, throwing once it exceeds
|
|
31
|
+
* `maxResponseBodySize` bytes (`false` reads it whole).
|
|
32
|
+
*/
|
|
33
|
+
export async function readResponseBody(response, { maxResponseBodySize }) {
|
|
34
|
+
if (maxResponseBodySize === false)
|
|
35
|
+
return response.text();
|
|
36
|
+
const contentLength = response.headers.get('Content-Length');
|
|
37
|
+
if (contentLength) {
|
|
38
|
+
const size = Number(contentLength);
|
|
39
|
+
if (size > maxResponseBodySize) {
|
|
40
|
+
await response.body?.cancel();
|
|
41
|
+
throw new ResponseBodyTooLargeError({
|
|
42
|
+
maxSize: maxResponseBodySize,
|
|
43
|
+
size,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
if (!response.body) {
|
|
48
|
+
const body = await response.text();
|
|
49
|
+
const size = new TextEncoder().encode(body).length;
|
|
50
|
+
if (size > maxResponseBodySize)
|
|
51
|
+
throw new ResponseBodyTooLargeError({
|
|
52
|
+
maxSize: maxResponseBodySize,
|
|
53
|
+
size,
|
|
54
|
+
});
|
|
55
|
+
return body;
|
|
56
|
+
}
|
|
57
|
+
const reader = response.body.getReader();
|
|
58
|
+
const decoder = new TextDecoder();
|
|
59
|
+
let body = '';
|
|
60
|
+
let size = 0;
|
|
61
|
+
try {
|
|
62
|
+
while (true) {
|
|
63
|
+
const { done, value } = await reader.read();
|
|
64
|
+
if (done)
|
|
65
|
+
break;
|
|
66
|
+
size += value.byteLength;
|
|
67
|
+
if (size > maxResponseBodySize) {
|
|
68
|
+
await reader.cancel();
|
|
69
|
+
throw new ResponseBodyTooLargeError({
|
|
70
|
+
maxSize: maxResponseBodySize,
|
|
71
|
+
size,
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
body += decoder.decode(value, { stream: true });
|
|
75
|
+
}
|
|
76
|
+
body += decoder.decode();
|
|
77
|
+
return body;
|
|
78
|
+
}
|
|
79
|
+
finally {
|
|
80
|
+
reader.releaseLock();
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=http.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../utils/internal/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nonceManager.js","sourceRoot":"","sources":["../../utils/nonceManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;AAG9E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"nonceManager.js","sourceRoot":"","sources":["../../utils/nonceManager.ts"],"names":[],"mappings":"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"}
|
package/_esm/utils/rpc/http.js
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import { HttpRequestError, ResponseBodyTooLargeError, RpcRequestError, TimeoutError, } from '../../errors/request.js';
|
|
2
2
|
import { getAbortError, isAbortError, } from '../../errors/utils.js';
|
|
3
|
+
import { anySignal, readResponseBody } from '../internal/http.js';
|
|
3
4
|
import { withTimeout, } from '../promise/withTimeout.js';
|
|
4
5
|
import { stringify } from '../stringify.js';
|
|
5
6
|
import { idCache } from './id.js';
|
|
6
7
|
const defaultMaxResponseBodySize = 10_485_760;
|
|
8
|
+
/**
|
|
9
|
+
* Rejection of a request that timed out. Replaced by a `TimeoutError`, which
|
|
10
|
+
* serializes the request body, only once a request actually times out.
|
|
11
|
+
*/
|
|
12
|
+
const timedOut = /*#__PURE__*/ new Error('timed out');
|
|
7
13
|
export function getHttpRpcClient(url_, options = {}) {
|
|
8
14
|
const { url, headers: headers_url } = parseUrl(url_);
|
|
9
15
|
return {
|
|
@@ -45,8 +51,9 @@ export function getHttpRpcClient(url_, options = {}) {
|
|
|
45
51
|
method: method || 'POST',
|
|
46
52
|
signal,
|
|
47
53
|
};
|
|
48
|
-
|
|
49
|
-
const args = (
|
|
54
|
+
// Only the hook needs a `Request`, which is costly to construct.
|
|
55
|
+
const args = (onRequest &&
|
|
56
|
+
(await onRequest(new Request(url, init), init))) ?? {
|
|
50
57
|
...init,
|
|
51
58
|
url,
|
|
52
59
|
};
|
|
@@ -64,7 +71,7 @@ export function getHttpRpcClient(url_, options = {}) {
|
|
|
64
71
|
cleanup();
|
|
65
72
|
}
|
|
66
73
|
}, {
|
|
67
|
-
errorInstance:
|
|
74
|
+
errorInstance: timedOut,
|
|
68
75
|
timeout,
|
|
69
76
|
signal: true,
|
|
70
77
|
});
|
|
@@ -117,6 +124,8 @@ export function getHttpRpcClient(url_, options = {}) {
|
|
|
117
124
|
catch (err) {
|
|
118
125
|
if (signal_?.aborted)
|
|
119
126
|
throw getAbortError(signal_);
|
|
127
|
+
if (err === timedOut)
|
|
128
|
+
throw new TimeoutError({ body, url });
|
|
120
129
|
if (isAbortError(err))
|
|
121
130
|
throw err;
|
|
122
131
|
if (err instanceof HttpRequestError)
|
|
@@ -136,81 +145,6 @@ export function getHttpRpcClient(url_, options = {}) {
|
|
|
136
145
|
},
|
|
137
146
|
};
|
|
138
147
|
}
|
|
139
|
-
/**
|
|
140
|
-
* Returns a signal that aborts as soon as any of `signals` aborts, and a
|
|
141
|
-
* `cleanup` function that detaches the listeners added to `signals`.
|
|
142
|
-
*/
|
|
143
|
-
function anySignal(signals) {
|
|
144
|
-
const signals_ = signals.filter((signal) => !!signal);
|
|
145
|
-
if (signals_.length < 2)
|
|
146
|
-
return { signal: signals_[0] ?? null, cleanup: () => { } };
|
|
147
|
-
const controller = new AbortController();
|
|
148
|
-
const onAbort = () => {
|
|
149
|
-
cleanup();
|
|
150
|
-
controller.abort(signals_.find((signal) => signal.aborted)?.reason);
|
|
151
|
-
};
|
|
152
|
-
const cleanup = () => {
|
|
153
|
-
for (const signal of signals_)
|
|
154
|
-
signal.removeEventListener('abort', onAbort);
|
|
155
|
-
};
|
|
156
|
-
for (const signal of signals_) {
|
|
157
|
-
if (signal.aborted) {
|
|
158
|
-
cleanup();
|
|
159
|
-
controller.abort(signal.reason);
|
|
160
|
-
break;
|
|
161
|
-
}
|
|
162
|
-
signal.addEventListener('abort', onAbort);
|
|
163
|
-
}
|
|
164
|
-
return { signal: controller.signal, cleanup };
|
|
165
|
-
}
|
|
166
|
-
async function readResponseBody(response, { maxResponseBodySize }) {
|
|
167
|
-
if (maxResponseBodySize === false)
|
|
168
|
-
return response.text();
|
|
169
|
-
const contentLength = response.headers.get('Content-Length');
|
|
170
|
-
if (contentLength) {
|
|
171
|
-
const size = Number(contentLength);
|
|
172
|
-
if (size > maxResponseBodySize)
|
|
173
|
-
throw new ResponseBodyTooLargeError({
|
|
174
|
-
maxSize: maxResponseBodySize,
|
|
175
|
-
size,
|
|
176
|
-
});
|
|
177
|
-
}
|
|
178
|
-
if (!response.body) {
|
|
179
|
-
const body = await response.text();
|
|
180
|
-
const size = new TextEncoder().encode(body).length;
|
|
181
|
-
if (size > maxResponseBodySize)
|
|
182
|
-
throw new ResponseBodyTooLargeError({
|
|
183
|
-
maxSize: maxResponseBodySize,
|
|
184
|
-
size,
|
|
185
|
-
});
|
|
186
|
-
return body;
|
|
187
|
-
}
|
|
188
|
-
const reader = response.body.getReader();
|
|
189
|
-
const decoder = new TextDecoder();
|
|
190
|
-
let body = '';
|
|
191
|
-
let size = 0;
|
|
192
|
-
try {
|
|
193
|
-
while (true) {
|
|
194
|
-
const { done, value } = await reader.read();
|
|
195
|
-
if (done)
|
|
196
|
-
break;
|
|
197
|
-
size += value.byteLength;
|
|
198
|
-
if (size > maxResponseBodySize) {
|
|
199
|
-
await reader.cancel();
|
|
200
|
-
throw new ResponseBodyTooLargeError({
|
|
201
|
-
maxSize: maxResponseBodySize,
|
|
202
|
-
size,
|
|
203
|
-
});
|
|
204
|
-
}
|
|
205
|
-
body += decoder.decode(value, { stream: true });
|
|
206
|
-
}
|
|
207
|
-
body += decoder.decode();
|
|
208
|
-
return body;
|
|
209
|
-
}
|
|
210
|
-
finally {
|
|
211
|
-
reader.releaseLock();
|
|
212
|
-
}
|
|
213
|
-
}
|
|
214
148
|
function isRpcError(data) {
|
|
215
149
|
return (typeof data?.error?.code === 'number' &&
|
|
216
150
|
typeof data?.error?.message === 'string');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../utils/rpc/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEhB,yBAAyB,EAEzB,eAAe,EAEf,YAAY,GAEb,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAEL,aAAa,EACb,YAAY,GACb,MAAM,uBAAuB,CAAA;AAG9B,OAAO,EAEL,WAAW,GACZ,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAgEjC,MAAM,0BAA0B,GAAG,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../utils/rpc/http.ts"],"names":[],"mappings":"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"}
|
package/_esm/utils/rpc/socket.js
CHANGED
|
@@ -3,6 +3,11 @@ import { createBatchScheduler, } from '../promise/createBatchScheduler.js';
|
|
|
3
3
|
import { withTimeout } from '../promise/withTimeout.js';
|
|
4
4
|
import { idCache } from './id.js';
|
|
5
5
|
export const socketClientCache = /*#__PURE__*/ new Map();
|
|
6
|
+
/**
|
|
7
|
+
* Rejection of a request that timed out. Replaced by a `TimeoutError`, which
|
|
8
|
+
* serializes the request body, only once a request actually times out.
|
|
9
|
+
*/
|
|
10
|
+
const timedOut = /*#__PURE__*/ new Error('timed out');
|
|
6
11
|
export async function getSocketRpcClient(parameters) {
|
|
7
12
|
const { getSocket, keepAlive = true, key = 'socket', reconnect = true, url, } = parameters;
|
|
8
13
|
const { interval: keepAliveInterval = 30_000 } = typeof keepAlive === 'object' ? keepAlive : {};
|
|
@@ -165,16 +170,26 @@ export async function getSocketRpcClient(parameters) {
|
|
|
165
170
|
onError?.(error);
|
|
166
171
|
}
|
|
167
172
|
},
|
|
168
|
-
requestAsync({ body, timeout = 10_000 }) {
|
|
173
|
+
async requestAsync({ body, timeout = 10_000 }) {
|
|
169
174
|
const id = body.id ?? idCache.take();
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
175
|
+
try {
|
|
176
|
+
return await withTimeout(() => new Promise((onResponse, onError) => this.request({
|
|
177
|
+
body: { ...body, id },
|
|
178
|
+
onError,
|
|
179
|
+
onResponse,
|
|
180
|
+
})), {
|
|
181
|
+
errorInstance: timedOut,
|
|
182
|
+
timeout,
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
catch (error) {
|
|
186
|
+
if (error === timedOut)
|
|
187
|
+
throw new TimeoutError({ body, url });
|
|
188
|
+
throw error;
|
|
189
|
+
}
|
|
190
|
+
finally {
|
|
191
|
+
requests.delete(id);
|
|
192
|
+
}
|
|
178
193
|
},
|
|
179
194
|
requests,
|
|
180
195
|
subscriptions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../utils/rpc/socket.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../utils/rpc/socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,8 +12,8 @@ export function assertRequest(args) {
|
|
|
12
12
|
throw new InvalidAddressError({ address: to });
|
|
13
13
|
if (maxFeePerGas && maxFeePerGas > maxUint256)
|
|
14
14
|
throw new FeeCapTooHighError({ maxFeePerGas });
|
|
15
|
-
if (maxPriorityFeePerGas &&
|
|
16
|
-
maxFeePerGas &&
|
|
15
|
+
if (typeof maxPriorityFeePerGas === 'bigint' &&
|
|
16
|
+
typeof maxFeePerGas === 'bigint' &&
|
|
17
17
|
maxPriorityFeePerGas > maxFeePerGas)
|
|
18
18
|
throw new TipAboveFeeCapError({ maxFeePerGas, maxPriorityFeePerGas });
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertRequest.js","sourceRoot":"","sources":["../../../utils/transaction/assertRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,GACb,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EACL,mBAAmB,GAEpB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACL,kBAAkB,EAElB,mBAAmB,GAEpB,MAAM,sBAAsB,CAAA;AAK7B,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAcnD,MAAM,UAAU,aAAa,CAAC,IAA6B;IACzD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,oBAAoB,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;IAC1E,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7D,IAAI,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;QACxC,MAAM,IAAI,mBAAmB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC7D,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAAE,MAAM,IAAI,mBAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAA;IAExE,IAAI,YAAY,IAAI,YAAY,GAAG,UAAU;QAC3C,MAAM,IAAI,kBAAkB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAA;IAChD,IACE,oBAAoB;
|
|
1
|
+
{"version":3,"file":"assertRequest.js","sourceRoot":"","sources":["../../../utils/transaction/assertRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,GACb,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EACL,mBAAmB,GAEpB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACL,kBAAkB,EAElB,mBAAmB,GAEpB,MAAM,sBAAsB,CAAA;AAK7B,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAcnD,MAAM,UAAU,aAAa,CAAC,IAA6B;IACzD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,oBAAoB,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;IAC1E,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7D,IAAI,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;QACxC,MAAM,IAAI,mBAAmB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC7D,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAAE,MAAM,IAAI,mBAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAA;IAExE,IAAI,YAAY,IAAI,YAAY,GAAG,UAAU;QAC3C,MAAM,IAAI,kBAAkB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAA;IAChD,IACE,OAAO,oBAAoB,KAAK,QAAQ;QACxC,OAAO,YAAY,KAAK,QAAQ;QAChC,oBAAoB,GAAG,YAAY;QAEnC,MAAM,IAAI,mBAAmB,CAAC,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC,CAAA;AACzE,CAAC"}
|
|
@@ -50,8 +50,8 @@ export function assertTransactionEIP1559(transaction) {
|
|
|
50
50
|
throw new InvalidAddressError({ address: to });
|
|
51
51
|
if (maxFeePerGas && maxFeePerGas > maxUint256)
|
|
52
52
|
throw new FeeCapTooHighError({ maxFeePerGas });
|
|
53
|
-
if (maxPriorityFeePerGas &&
|
|
54
|
-
maxFeePerGas &&
|
|
53
|
+
if (typeof maxPriorityFeePerGas === 'bigint' &&
|
|
54
|
+
typeof maxFeePerGas === 'bigint' &&
|
|
55
55
|
maxPriorityFeePerGas > maxFeePerGas)
|
|
56
56
|
throw new TipAboveFeeCapError({ maxFeePerGas, maxPriorityFeePerGas });
|
|
57
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertTransaction.js","sourceRoot":"","sources":["../../../utils/transaction/assertTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EACL,mBAAmB,GAEpB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,SAAS,EAAsB,MAAM,sBAAsB,CAAA;AACpE,OAAO,EACL,cAAc,EAEd,6BAA6B,EAE7B,gCAAgC,GAEjC,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACL,mBAAmB,GAEpB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EACL,kBAAkB,EAElB,mBAAmB,GAEpB,MAAM,sBAAsB,CAAA;AAS7B,OAAO,EAA2B,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAQpD,MAAM,UAAU,wBAAwB,CACtC,WAA2C;IAE3C,MAAM,EAAE,iBAAiB,EAAE,GAAG,WAAW,CAAA;IACzC,IAAI,iBAAiB,EAAE,CAAC;QACtB,KAAK,MAAM,aAAa,IAAI,iBAAiB,EAAE,CAAC;YAC9C,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAA;YACjC,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAA;YACrC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;gBAAE,MAAM,IAAI,mBAAmB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;YACnE,IAAI,OAAO,GAAG,CAAC;gBAAE,MAAM,IAAI,mBAAmB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;QAC7D,CAAC;IACH,CAAC;IACD,wBAAwB,CAAC,WAAmD,CAAC,CAAA;AAC/E,CAAC;AASD,MAAM,UAAU,wBAAwB,CACtC,WAA2C;IAE3C,MAAM,EAAE,mBAAmB,EAAE,GAAG,WAAW,CAAA;IAC3C,IAAI,mBAAmB,EAAE,CAAC;QACxB,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,cAAc,EAAE,CAAA;QAChE,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;YACxB,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YAC9C,IAAI,KAAK,KAAK,EAAE;gBACd,MAAM,IAAI,6BAA6B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;YAChE,IAAI,OAAO,KAAK,uBAAuB;gBACrC,MAAM,IAAI,gCAAgC,CAAC;oBACzC,IAAI;oBACJ,OAAO;iBACR,CAAC,CAAA;QACN,CAAC;IACH,CAAC;IACD,wBAAwB,CAAC,WAAmD,CAAC,CAAA;AAC/E,CAAC;AAWD,MAAM,UAAU,wBAAwB,CACtC,WAA2C;IAE3C,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,WAAW,CAAA;IACvE,IAAI,OAAO,IAAI,CAAC;QAAE,MAAM,IAAI,mBAAmB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC5D,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAAE,MAAM,IAAI,mBAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAA;IACxE,IAAI,YAAY,IAAI,YAAY,GAAG,UAAU;QAC3C,MAAM,IAAI,kBAAkB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAA;IAChD,IACE,oBAAoB;
|
|
1
|
+
{"version":3,"file":"assertTransaction.js","sourceRoot":"","sources":["../../../utils/transaction/assertTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,10 +63,12 @@ function parseTransactionEIP7702(serializedTransaction) {
|
|
|
63
63
|
transaction.nonce = nonce === '0x' ? 0 : hexToNumber(nonce);
|
|
64
64
|
if (isHex(value) && value !== '0x')
|
|
65
65
|
transaction.value = hexToBigInt(value);
|
|
66
|
-
if (isHex(maxFeePerGas) && maxFeePerGas !== '0x')
|
|
67
|
-
transaction.maxFeePerGas = hexToBigInt(maxFeePerGas);
|
|
68
66
|
if (isHex(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
|
|
69
67
|
transaction.maxPriorityFeePerGas = hexToBigInt(maxPriorityFeePerGas);
|
|
68
|
+
if (isHex(maxFeePerGas) &&
|
|
69
|
+
(maxFeePerGas !== '0x' || transaction.maxPriorityFeePerGas))
|
|
70
|
+
transaction.maxFeePerGas =
|
|
71
|
+
maxFeePerGas === '0x' ? 0n : hexToBigInt(maxFeePerGas);
|
|
70
72
|
if (accessList.length !== 0 && accessList !== '0x')
|
|
71
73
|
transaction.accessList = parseAccessList(accessList);
|
|
72
74
|
if (authorizationList.length !== 0 && authorizationList !== '0x')
|
|
@@ -127,10 +129,12 @@ function parseTransactionEIP4844(serializedTransaction) {
|
|
|
127
129
|
transaction.value = hexToBigInt(value);
|
|
128
130
|
if (isHex(maxFeePerBlobGas) && maxFeePerBlobGas !== '0x')
|
|
129
131
|
transaction.maxFeePerBlobGas = hexToBigInt(maxFeePerBlobGas);
|
|
130
|
-
if (isHex(maxFeePerGas) && maxFeePerGas !== '0x')
|
|
131
|
-
transaction.maxFeePerGas = hexToBigInt(maxFeePerGas);
|
|
132
132
|
if (isHex(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
|
|
133
133
|
transaction.maxPriorityFeePerGas = hexToBigInt(maxPriorityFeePerGas);
|
|
134
|
+
if (isHex(maxFeePerGas) &&
|
|
135
|
+
(maxFeePerGas !== '0x' || transaction.maxPriorityFeePerGas))
|
|
136
|
+
transaction.maxFeePerGas =
|
|
137
|
+
maxFeePerGas === '0x' ? 0n : hexToBigInt(maxFeePerGas);
|
|
134
138
|
if (accessList.length !== 0 && accessList !== '0x')
|
|
135
139
|
transaction.accessList = parseAccessList(accessList);
|
|
136
140
|
if (blobs && commitments && proofs)
|
|
@@ -185,10 +189,12 @@ function parseTransactionEIP1559(serializedTransaction) {
|
|
|
185
189
|
transaction.nonce = nonce === '0x' ? 0 : hexToNumber(nonce);
|
|
186
190
|
if (isHex(value) && value !== '0x')
|
|
187
191
|
transaction.value = hexToBigInt(value);
|
|
188
|
-
if (isHex(maxFeePerGas) && maxFeePerGas !== '0x')
|
|
189
|
-
transaction.maxFeePerGas = hexToBigInt(maxFeePerGas);
|
|
190
192
|
if (isHex(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
|
|
191
193
|
transaction.maxPriorityFeePerGas = hexToBigInt(maxPriorityFeePerGas);
|
|
194
|
+
if (isHex(maxFeePerGas) &&
|
|
195
|
+
(maxFeePerGas !== '0x' || transaction.maxPriorityFeePerGas))
|
|
196
|
+
transaction.maxFeePerGas =
|
|
197
|
+
maxFeePerGas === '0x' ? 0n : hexToBigInt(maxFeePerGas);
|
|
192
198
|
if (accessList.length !== 0 && accessList !== '0x')
|
|
193
199
|
transaction.accessList = parseAccessList(accessList);
|
|
194
200
|
assertTransactionEIP1559(transaction);
|
|
@@ -327,11 +333,22 @@ function parseAuthorizationList(serializedAuthorizationList) {
|
|
|
327
333
|
const authorizationList = [];
|
|
328
334
|
for (let i = 0; i < serializedAuthorizationList.length; i++) {
|
|
329
335
|
const [chainId, address, nonce, yParity, r, s] = serializedAuthorizationList[i];
|
|
336
|
+
// EIP-7702 permits any `y_parity` below 2**8 in an authorization tuple, and a
|
|
337
|
+
// tuple that fails recovery does not invalidate the transaction. Keep such a
|
|
338
|
+
// `yParity` as is, so that the transaction parses and re-serializes unchanged.
|
|
339
|
+
const yParity_ = yParity === '0x' ? 0n : hexToBigInt(yParity);
|
|
340
|
+
const signature = yParity_ > 1n && yParity_ < 256n
|
|
341
|
+
? {
|
|
342
|
+
r: padHex(r, { size: 32 }),
|
|
343
|
+
s: padHex(s, { size: 32 }),
|
|
344
|
+
yParity: Number(yParity_),
|
|
345
|
+
}
|
|
346
|
+
: parseEIP155Signature([yParity, r, s]);
|
|
330
347
|
authorizationList.push({
|
|
331
348
|
address,
|
|
332
349
|
chainId: chainId === '0x' ? 0 : hexToNumber(chainId),
|
|
333
350
|
nonce: nonce === '0x' ? 0 : hexToNumber(nonce),
|
|
334
|
-
...
|
|
351
|
+
...signature,
|
|
335
352
|
});
|
|
336
353
|
}
|
|
337
354
|
return authorizationList;
|