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
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.anySignal = anySignal;
|
|
4
|
+
exports.readResponseBody = readResponseBody;
|
|
5
|
+
const request_js_1 = require("../../errors/request.js");
|
|
6
|
+
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
|
+
async function readResponseBody(response, { maxResponseBodySize }) {
|
|
30
|
+
if (maxResponseBodySize === false)
|
|
31
|
+
return response.text();
|
|
32
|
+
const contentLength = response.headers.get('Content-Length');
|
|
33
|
+
if (contentLength) {
|
|
34
|
+
const size = Number(contentLength);
|
|
35
|
+
if (size > maxResponseBodySize) {
|
|
36
|
+
await response.body?.cancel();
|
|
37
|
+
throw new request_js_1.ResponseBodyTooLargeError({
|
|
38
|
+
maxSize: maxResponseBodySize,
|
|
39
|
+
size,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
if (!response.body) {
|
|
44
|
+
const body = await response.text();
|
|
45
|
+
const size = new TextEncoder().encode(body).length;
|
|
46
|
+
if (size > maxResponseBodySize)
|
|
47
|
+
throw new request_js_1.ResponseBodyTooLargeError({
|
|
48
|
+
maxSize: maxResponseBodySize,
|
|
49
|
+
size,
|
|
50
|
+
});
|
|
51
|
+
return body;
|
|
52
|
+
}
|
|
53
|
+
const reader = response.body.getReader();
|
|
54
|
+
const decoder = new TextDecoder();
|
|
55
|
+
let body = '';
|
|
56
|
+
let size = 0;
|
|
57
|
+
try {
|
|
58
|
+
while (true) {
|
|
59
|
+
const { done, value } = await reader.read();
|
|
60
|
+
if (done)
|
|
61
|
+
break;
|
|
62
|
+
size += value.byteLength;
|
|
63
|
+
if (size > maxResponseBodySize) {
|
|
64
|
+
await reader.cancel();
|
|
65
|
+
throw new request_js_1.ResponseBodyTooLargeError({
|
|
66
|
+
maxSize: maxResponseBodySize,
|
|
67
|
+
size,
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
body += decoder.decode(value, { stream: true });
|
|
71
|
+
}
|
|
72
|
+
body += decoder.decode();
|
|
73
|
+
return body;
|
|
74
|
+
}
|
|
75
|
+
finally {
|
|
76
|
+
reader.releaseLock();
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
//# 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":";;;
|
|
1
|
+
{"version":3,"file":"nonceManager.js","sourceRoot":"","sources":["../../utils/nonceManager.ts"],"names":[],"mappings":"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"}
|
package/_cjs/utils/rpc/http.js
CHANGED
|
@@ -4,10 +4,12 @@ exports.getHttpRpcClient = getHttpRpcClient;
|
|
|
4
4
|
exports.parseUrl = parseUrl;
|
|
5
5
|
const request_js_1 = require("../../errors/request.js");
|
|
6
6
|
const utils_js_1 = require("../../errors/utils.js");
|
|
7
|
+
const http_js_1 = require("../internal/http.js");
|
|
7
8
|
const withTimeout_js_1 = require("../promise/withTimeout.js");
|
|
8
9
|
const stringify_js_1 = require("../stringify.js");
|
|
9
10
|
const id_js_1 = require("./id.js");
|
|
10
11
|
const defaultMaxResponseBodySize = 10_485_760;
|
|
12
|
+
const timedOut = new Error('timed out');
|
|
11
13
|
function getHttpRpcClient(url_, options = {}) {
|
|
12
14
|
const { url, headers: headers_url } = parseUrl(url_);
|
|
13
15
|
return {
|
|
@@ -21,7 +23,7 @@ function getHttpRpcClient(url_, options = {}) {
|
|
|
21
23
|
const { headers, method, signal: signal_ } = fetchOptions;
|
|
22
24
|
try {
|
|
23
25
|
const { response, responseBody } = await (0, withTimeout_js_1.withTimeout)(async ({ signal: timeoutSignal }) => {
|
|
24
|
-
const { signal, cleanup } = anySignal([
|
|
26
|
+
const { signal, cleanup } = (0, http_js_1.anySignal)([
|
|
25
27
|
signal_,
|
|
26
28
|
timeout > 0 ? timeoutSignal : null,
|
|
27
29
|
]);
|
|
@@ -47,15 +49,15 @@ function getHttpRpcClient(url_, options = {}) {
|
|
|
47
49
|
method: method || 'POST',
|
|
48
50
|
signal,
|
|
49
51
|
};
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
+
const args = (onRequest &&
|
|
53
|
+
(await onRequest(new Request(url, init), init))) ?? {
|
|
52
54
|
...init,
|
|
53
55
|
url,
|
|
54
56
|
};
|
|
55
57
|
const response = await fetchFn(args.url ?? url, args);
|
|
56
58
|
if (onResponse)
|
|
57
59
|
await onResponse(response);
|
|
58
|
-
const responseBody = await readResponseBody(response, {
|
|
60
|
+
const responseBody = await (0, http_js_1.readResponseBody)(response, {
|
|
59
61
|
maxResponseBodySize,
|
|
60
62
|
});
|
|
61
63
|
return { response, responseBody };
|
|
@@ -64,7 +66,7 @@ function getHttpRpcClient(url_, options = {}) {
|
|
|
64
66
|
cleanup();
|
|
65
67
|
}
|
|
66
68
|
}, {
|
|
67
|
-
errorInstance:
|
|
69
|
+
errorInstance: timedOut,
|
|
68
70
|
timeout,
|
|
69
71
|
signal: true,
|
|
70
72
|
});
|
|
@@ -113,6 +115,8 @@ function getHttpRpcClient(url_, options = {}) {
|
|
|
113
115
|
catch (err) {
|
|
114
116
|
if (signal_?.aborted)
|
|
115
117
|
throw (0, utils_js_1.getAbortError)(signal_);
|
|
118
|
+
if (err === timedOut)
|
|
119
|
+
throw new request_js_1.TimeoutError({ body, url });
|
|
116
120
|
if ((0, utils_js_1.isAbortError)(err))
|
|
117
121
|
throw err;
|
|
118
122
|
if (err instanceof request_js_1.HttpRequestError)
|
|
@@ -132,77 +136,6 @@ function getHttpRpcClient(url_, options = {}) {
|
|
|
132
136
|
},
|
|
133
137
|
};
|
|
134
138
|
}
|
|
135
|
-
function anySignal(signals) {
|
|
136
|
-
const signals_ = signals.filter((signal) => !!signal);
|
|
137
|
-
if (signals_.length < 2)
|
|
138
|
-
return { signal: signals_[0] ?? null, cleanup: () => { } };
|
|
139
|
-
const controller = new AbortController();
|
|
140
|
-
const onAbort = () => {
|
|
141
|
-
cleanup();
|
|
142
|
-
controller.abort(signals_.find((signal) => signal.aborted)?.reason);
|
|
143
|
-
};
|
|
144
|
-
const cleanup = () => {
|
|
145
|
-
for (const signal of signals_)
|
|
146
|
-
signal.removeEventListener('abort', onAbort);
|
|
147
|
-
};
|
|
148
|
-
for (const signal of signals_) {
|
|
149
|
-
if (signal.aborted) {
|
|
150
|
-
cleanup();
|
|
151
|
-
controller.abort(signal.reason);
|
|
152
|
-
break;
|
|
153
|
-
}
|
|
154
|
-
signal.addEventListener('abort', onAbort);
|
|
155
|
-
}
|
|
156
|
-
return { signal: controller.signal, cleanup };
|
|
157
|
-
}
|
|
158
|
-
async function readResponseBody(response, { maxResponseBodySize }) {
|
|
159
|
-
if (maxResponseBodySize === false)
|
|
160
|
-
return response.text();
|
|
161
|
-
const contentLength = response.headers.get('Content-Length');
|
|
162
|
-
if (contentLength) {
|
|
163
|
-
const size = Number(contentLength);
|
|
164
|
-
if (size > maxResponseBodySize)
|
|
165
|
-
throw new request_js_1.ResponseBodyTooLargeError({
|
|
166
|
-
maxSize: maxResponseBodySize,
|
|
167
|
-
size,
|
|
168
|
-
});
|
|
169
|
-
}
|
|
170
|
-
if (!response.body) {
|
|
171
|
-
const body = await response.text();
|
|
172
|
-
const size = new TextEncoder().encode(body).length;
|
|
173
|
-
if (size > maxResponseBodySize)
|
|
174
|
-
throw new request_js_1.ResponseBodyTooLargeError({
|
|
175
|
-
maxSize: maxResponseBodySize,
|
|
176
|
-
size,
|
|
177
|
-
});
|
|
178
|
-
return body;
|
|
179
|
-
}
|
|
180
|
-
const reader = response.body.getReader();
|
|
181
|
-
const decoder = new TextDecoder();
|
|
182
|
-
let body = '';
|
|
183
|
-
let size = 0;
|
|
184
|
-
try {
|
|
185
|
-
while (true) {
|
|
186
|
-
const { done, value } = await reader.read();
|
|
187
|
-
if (done)
|
|
188
|
-
break;
|
|
189
|
-
size += value.byteLength;
|
|
190
|
-
if (size > maxResponseBodySize) {
|
|
191
|
-
await reader.cancel();
|
|
192
|
-
throw new request_js_1.ResponseBodyTooLargeError({
|
|
193
|
-
maxSize: maxResponseBodySize,
|
|
194
|
-
size,
|
|
195
|
-
});
|
|
196
|
-
}
|
|
197
|
-
body += decoder.decode(value, { stream: true });
|
|
198
|
-
}
|
|
199
|
-
body += decoder.decode();
|
|
200
|
-
return body;
|
|
201
|
-
}
|
|
202
|
-
finally {
|
|
203
|
-
reader.releaseLock();
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
139
|
function isRpcError(data) {
|
|
207
140
|
return (typeof data?.error?.code === 'number' &&
|
|
208
141
|
typeof data?.error?.message === 'string');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../utils/rpc/http.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../utils/rpc/http.ts"],"names":[],"mappings":"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"}
|
package/_cjs/utils/rpc/socket.js
CHANGED
|
@@ -7,6 +7,7 @@ const createBatchScheduler_js_1 = require("../promise/createBatchScheduler.js");
|
|
|
7
7
|
const withTimeout_js_1 = require("../promise/withTimeout.js");
|
|
8
8
|
const id_js_1 = require("./id.js");
|
|
9
9
|
exports.socketClientCache = new Map();
|
|
10
|
+
const timedOut = new Error('timed out');
|
|
10
11
|
async function getSocketRpcClient(parameters) {
|
|
11
12
|
const { getSocket, keepAlive = true, key = 'socket', reconnect = true, url, } = parameters;
|
|
12
13
|
const { interval: keepAliveInterval = 30_000 } = typeof keepAlive === 'object' ? keepAlive : {};
|
|
@@ -151,16 +152,26 @@ async function getSocketRpcClient(parameters) {
|
|
|
151
152
|
onError?.(error);
|
|
152
153
|
}
|
|
153
154
|
},
|
|
154
|
-
requestAsync({ body, timeout = 10_000 }) {
|
|
155
|
+
async requestAsync({ body, timeout = 10_000 }) {
|
|
155
156
|
const id = body.id ?? id_js_1.idCache.take();
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
157
|
+
try {
|
|
158
|
+
return await (0, withTimeout_js_1.withTimeout)(() => new Promise((onResponse, onError) => this.request({
|
|
159
|
+
body: { ...body, id },
|
|
160
|
+
onError,
|
|
161
|
+
onResponse,
|
|
162
|
+
})), {
|
|
163
|
+
errorInstance: timedOut,
|
|
164
|
+
timeout,
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
catch (error) {
|
|
168
|
+
if (error === timedOut)
|
|
169
|
+
throw new request_js_1.TimeoutError({ body, url });
|
|
170
|
+
throw error;
|
|
171
|
+
}
|
|
172
|
+
finally {
|
|
173
|
+
requests.delete(id);
|
|
174
|
+
}
|
|
164
175
|
},
|
|
165
176
|
requests,
|
|
166
177
|
subscriptions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../utils/rpc/socket.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../utils/rpc/socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,8 @@ function assertRequest(args) {
|
|
|
15
15
|
throw new address_js_1.InvalidAddressError({ address: to });
|
|
16
16
|
if (maxFeePerGas && maxFeePerGas > number_js_1.maxUint256)
|
|
17
17
|
throw new node_js_1.FeeCapTooHighError({ maxFeePerGas });
|
|
18
|
-
if (maxPriorityFeePerGas &&
|
|
19
|
-
maxFeePerGas &&
|
|
18
|
+
if (typeof maxPriorityFeePerGas === 'bigint' &&
|
|
19
|
+
typeof maxFeePerGas === 'bigint' &&
|
|
20
20
|
maxPriorityFeePerGas > maxFeePerGas)
|
|
21
21
|
throw new node_js_1.TipAboveFeeCapError({ maxFeePerGas, maxPriorityFeePerGas });
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertRequest.js","sourceRoot":"","sources":["../../../utils/transaction/assertRequest.ts"],"names":[],"mappings":";;AAkCA,sCAeC;AAjDD,0EAG6C;AAE7C,yDAAsD;AACtD,wDAGgC;AAChC,kDAK6B;AAK7B,0DAAmD;AAcnD,SAAgB,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,IAAA,8BAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7D,IAAI,OAAO,IAAI,CAAC,IAAA,wBAAS,EAAC,OAAO,CAAC,OAAO,CAAC;QACxC,MAAM,IAAI,gCAAmB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC7D,IAAI,EAAE,IAAI,CAAC,IAAA,wBAAS,EAAC,EAAE,CAAC;QAAE,MAAM,IAAI,gCAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAA;IAExE,IAAI,YAAY,IAAI,YAAY,GAAG,sBAAU;QAC3C,MAAM,IAAI,4BAAkB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAA;IAChD,IACE,oBAAoB;
|
|
1
|
+
{"version":3,"file":"assertRequest.js","sourceRoot":"","sources":["../../../utils/transaction/assertRequest.ts"],"names":[],"mappings":";;AAkCA,sCAeC;AAjDD,0EAG6C;AAE7C,yDAAsD;AACtD,wDAGgC;AAChC,kDAK6B;AAK7B,0DAAmD;AAcnD,SAAgB,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,IAAA,8BAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7D,IAAI,OAAO,IAAI,CAAC,IAAA,wBAAS,EAAC,OAAO,CAAC,OAAO,CAAC;QACxC,MAAM,IAAI,gCAAmB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC7D,IAAI,EAAE,IAAI,CAAC,IAAA,wBAAS,EAAC,EAAE,CAAC;QAAE,MAAM,IAAI,gCAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAA;IAExE,IAAI,YAAY,IAAI,YAAY,GAAG,sBAAU;QAC3C,MAAM,IAAI,4BAAkB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAA;IAChD,IACE,OAAO,oBAAoB,KAAK,QAAQ;QACxC,OAAO,YAAY,KAAK,QAAQ;QAChC,oBAAoB,GAAG,YAAY;QAEnC,MAAM,IAAI,6BAAmB,CAAC,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC,CAAA;AACzE,CAAC"}
|
|
@@ -57,8 +57,8 @@ function assertTransactionEIP1559(transaction) {
|
|
|
57
57
|
throw new address_js_1.InvalidAddressError({ address: to });
|
|
58
58
|
if (maxFeePerGas && maxFeePerGas > number_js_1.maxUint256)
|
|
59
59
|
throw new node_js_1.FeeCapTooHighError({ maxFeePerGas });
|
|
60
|
-
if (maxPriorityFeePerGas &&
|
|
61
|
-
maxFeePerGas &&
|
|
60
|
+
if (typeof maxPriorityFeePerGas === 'bigint' &&
|
|
61
|
+
typeof maxFeePerGas === 'bigint' &&
|
|
62
62
|
maxPriorityFeePerGas > maxFeePerGas)
|
|
63
63
|
throw new node_js_1.TipAboveFeeCapError({ maxFeePerGas, maxPriorityFeePerGas });
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertTransaction.js","sourceRoot":"","sources":["../../../utils/transaction/assertTransaction.ts"],"names":[],"mappings":";;AA4CA,4DAaC;AASD,4DAmBC;AAWD,4DAcC;AAUD,4DAaC;AAUD,0DAcC;AA7JD,mDAAgE;AAChE,yDAAsD;AACtD,wDAGgC;AAChC,kDAAoE;AACpE,kDAO6B;AAC7B,oDAG8B;AAC9B,kDAK6B;AAS7B,0DAA4E;AAC5E,6CAAsC;AACtC,+CAAwC;AACxC,uDAAoD;AAQpD,SAAgB,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,IAAA,wBAAS,EAAC,OAAO,CAAC;gBAAE,MAAM,IAAI,gCAAmB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;YACnE,IAAI,OAAO,GAAG,CAAC;gBAAE,MAAM,IAAI,8BAAmB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;QAC7D,CAAC;IACH,CAAC;IACD,wBAAwB,CAAC,WAAmD,CAAC,CAAA;AAC/E,CAAC;AASD,SAAgB,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,wBAAc,EAAE,CAAA;QAChE,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,IAAA,cAAI,EAAC,IAAI,CAAC,CAAA;YACxB,MAAM,OAAO,GAAG,IAAA,wBAAW,EAAC,IAAA,gBAAK,EAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YAC9C,IAAI,KAAK,KAAK,EAAE;gBACd,MAAM,IAAI,uCAA6B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;YAChE,IAAI,OAAO,KAAK,gCAAuB;gBACrC,MAAM,IAAI,0CAAgC,CAAC;oBACzC,IAAI;oBACJ,OAAO;iBACR,CAAC,CAAA;QACN,CAAC;IACH,CAAC;IACD,wBAAwB,CAAC,WAAmD,CAAC,CAAA;AAC/E,CAAC;AAWD,SAAgB,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,8BAAmB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC5D,IAAI,EAAE,IAAI,CAAC,IAAA,wBAAS,EAAC,EAAE,CAAC;QAAE,MAAM,IAAI,gCAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAA;IACxE,IAAI,YAAY,IAAI,YAAY,GAAG,sBAAU;QAC3C,MAAM,IAAI,4BAAkB,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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"}
|
|
@@ -68,10 +68,12 @@ function parseTransactionEIP7702(serializedTransaction) {
|
|
|
68
68
|
transaction.nonce = nonce === '0x' ? 0 : (0, fromHex_js_1.hexToNumber)(nonce);
|
|
69
69
|
if ((0, isHex_js_1.isHex)(value) && value !== '0x')
|
|
70
70
|
transaction.value = (0, fromHex_js_1.hexToBigInt)(value);
|
|
71
|
-
if ((0, isHex_js_1.isHex)(maxFeePerGas) && maxFeePerGas !== '0x')
|
|
72
|
-
transaction.maxFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
|
|
73
71
|
if ((0, isHex_js_1.isHex)(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
|
|
74
72
|
transaction.maxPriorityFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxPriorityFeePerGas);
|
|
73
|
+
if ((0, isHex_js_1.isHex)(maxFeePerGas) &&
|
|
74
|
+
(maxFeePerGas !== '0x' || transaction.maxPriorityFeePerGas))
|
|
75
|
+
transaction.maxFeePerGas =
|
|
76
|
+
maxFeePerGas === '0x' ? 0n : (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
|
|
75
77
|
if (accessList.length !== 0 && accessList !== '0x')
|
|
76
78
|
transaction.accessList = parseAccessList(accessList);
|
|
77
79
|
if (authorizationList.length !== 0 && authorizationList !== '0x')
|
|
@@ -132,10 +134,12 @@ function parseTransactionEIP4844(serializedTransaction) {
|
|
|
132
134
|
transaction.value = (0, fromHex_js_1.hexToBigInt)(value);
|
|
133
135
|
if ((0, isHex_js_1.isHex)(maxFeePerBlobGas) && maxFeePerBlobGas !== '0x')
|
|
134
136
|
transaction.maxFeePerBlobGas = (0, fromHex_js_1.hexToBigInt)(maxFeePerBlobGas);
|
|
135
|
-
if ((0, isHex_js_1.isHex)(maxFeePerGas) && maxFeePerGas !== '0x')
|
|
136
|
-
transaction.maxFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
|
|
137
137
|
if ((0, isHex_js_1.isHex)(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
|
|
138
138
|
transaction.maxPriorityFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxPriorityFeePerGas);
|
|
139
|
+
if ((0, isHex_js_1.isHex)(maxFeePerGas) &&
|
|
140
|
+
(maxFeePerGas !== '0x' || transaction.maxPriorityFeePerGas))
|
|
141
|
+
transaction.maxFeePerGas =
|
|
142
|
+
maxFeePerGas === '0x' ? 0n : (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
|
|
139
143
|
if (accessList.length !== 0 && accessList !== '0x')
|
|
140
144
|
transaction.accessList = parseAccessList(accessList);
|
|
141
145
|
if (blobs && commitments && proofs)
|
|
@@ -190,10 +194,12 @@ function parseTransactionEIP1559(serializedTransaction) {
|
|
|
190
194
|
transaction.nonce = nonce === '0x' ? 0 : (0, fromHex_js_1.hexToNumber)(nonce);
|
|
191
195
|
if ((0, isHex_js_1.isHex)(value) && value !== '0x')
|
|
192
196
|
transaction.value = (0, fromHex_js_1.hexToBigInt)(value);
|
|
193
|
-
if ((0, isHex_js_1.isHex)(maxFeePerGas) && maxFeePerGas !== '0x')
|
|
194
|
-
transaction.maxFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
|
|
195
197
|
if ((0, isHex_js_1.isHex)(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
|
|
196
198
|
transaction.maxPriorityFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxPriorityFeePerGas);
|
|
199
|
+
if ((0, isHex_js_1.isHex)(maxFeePerGas) &&
|
|
200
|
+
(maxFeePerGas !== '0x' || transaction.maxPriorityFeePerGas))
|
|
201
|
+
transaction.maxFeePerGas =
|
|
202
|
+
maxFeePerGas === '0x' ? 0n : (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
|
|
197
203
|
if (accessList.length !== 0 && accessList !== '0x')
|
|
198
204
|
transaction.accessList = parseAccessList(accessList);
|
|
199
205
|
(0, assertTransaction_js_1.assertTransactionEIP1559)(transaction);
|
|
@@ -332,11 +338,19 @@ function parseAuthorizationList(serializedAuthorizationList) {
|
|
|
332
338
|
const authorizationList = [];
|
|
333
339
|
for (let i = 0; i < serializedAuthorizationList.length; i++) {
|
|
334
340
|
const [chainId, address, nonce, yParity, r, s] = serializedAuthorizationList[i];
|
|
341
|
+
const yParity_ = yParity === '0x' ? 0n : (0, fromHex_js_1.hexToBigInt)(yParity);
|
|
342
|
+
const signature = yParity_ > 1n && yParity_ < 256n
|
|
343
|
+
? {
|
|
344
|
+
r: (0, pad_js_1.padHex)(r, { size: 32 }),
|
|
345
|
+
s: (0, pad_js_1.padHex)(s, { size: 32 }),
|
|
346
|
+
yParity: Number(yParity_),
|
|
347
|
+
}
|
|
348
|
+
: parseEIP155Signature([yParity, r, s]);
|
|
335
349
|
authorizationList.push({
|
|
336
350
|
address,
|
|
337
351
|
chainId: chainId === '0x' ? 0 : (0, fromHex_js_1.hexToNumber)(chainId),
|
|
338
352
|
nonce: nonce === '0x' ? 0 : (0, fromHex_js_1.hexToNumber)(nonce),
|
|
339
|
-
...
|
|
353
|
+
...signature,
|
|
340
354
|
});
|
|
341
355
|
}
|
|
342
356
|
return authorizationList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseTransaction.js","sourceRoot":"","sources":["../../../utils/transaction/parseTransaction.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parseTransaction.js","sourceRoot":"","sources":["../../../utils/transaction/parseTransaction.ts"],"names":[],"mappings":"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"}
|
package/_cjs/utils/typedData.js
CHANGED
|
@@ -44,9 +44,6 @@ function validateTypedData(parameters) {
|
|
|
44
44
|
for (const param of struct) {
|
|
45
45
|
const { name, type } = param;
|
|
46
46
|
const value = data[name];
|
|
47
|
-
const baseType = type.replace(/(\[[0-9]*\])+$/, '');
|
|
48
|
-
if (baseType === 'int' || baseType === 'uint')
|
|
49
|
-
throw new typedData_js_1.InvalidTypedDataTypeError({ type });
|
|
50
47
|
const integerMatch = type.match(regex_js_1.integerRegex);
|
|
51
48
|
if (integerMatch &&
|
|
52
49
|
(typeof value === 'number' || typeof value === 'bigint')) {
|
|
@@ -67,13 +64,15 @@ function validateTypedData(parameters) {
|
|
|
67
64
|
givenSize: (0, size_js_1.size)(value),
|
|
68
65
|
});
|
|
69
66
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
validateData(struct, value);
|
|
67
|
+
if (Object.hasOwn(types, type))
|
|
68
|
+
validateData(types[type], value);
|
|
73
69
|
}
|
|
74
70
|
};
|
|
75
71
|
for (const type of Object.keys(types))
|
|
76
72
|
validateReference(type);
|
|
73
|
+
for (const struct of Object.values(types))
|
|
74
|
+
for (const field of struct ?? [])
|
|
75
|
+
validateField(field.type, types);
|
|
77
76
|
if (types.EIP712Domain && domain) {
|
|
78
77
|
if (typeof domain !== 'object')
|
|
79
78
|
throw new typedData_js_1.InvalidDomainError({ domain });
|
|
@@ -110,6 +109,20 @@ function domainSeparator({ domain }) {
|
|
|
110
109
|
},
|
|
111
110
|
});
|
|
112
111
|
}
|
|
112
|
+
function validateField(type, types) {
|
|
113
|
+
const baseType = type.replace(/(\[[0-9]*\])+$/, '');
|
|
114
|
+
if (baseType === 'int' || baseType === 'uint')
|
|
115
|
+
throw new typedData_js_1.InvalidTypedDataTypeError({ type });
|
|
116
|
+
if (!Object.hasOwn(types, baseType) && !isSolidityType(baseType))
|
|
117
|
+
throw new typedData_js_1.InvalidTypedDataTypeError({ type });
|
|
118
|
+
}
|
|
119
|
+
function isSolidityType(type) {
|
|
120
|
+
return (type === 'address' ||
|
|
121
|
+
type === 'bool' ||
|
|
122
|
+
type === 'string' ||
|
|
123
|
+
regex_js_1.bytesRegex.test(type) ||
|
|
124
|
+
regex_js_1.integerRegex.test(type));
|
|
125
|
+
}
|
|
113
126
|
function validateReference(type) {
|
|
114
127
|
if (!/^[A-Za-z0-9_$]+$/.test(type) ||
|
|
115
128
|
type === 'address' ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typedData.js","sourceRoot":"","sources":["../../utils/typedData.ts"],"names":[],"mappings":";;AA8BA,gDAmCC;AASD,
|
|
1
|
+
{"version":3,"file":"typedData.js","sourceRoot":"","sources":["../../utils/typedData.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,8 +52,10 @@ async function finalizeWithdrawal(client, parameters) {
|
|
|
52
52
|
}
|
|
53
53
|
async function getFinalizeWithdrawalParams(client, parameters) {
|
|
54
54
|
const { hash } = parameters;
|
|
55
|
-
const { log, l1BatchTxId } = await
|
|
56
|
-
|
|
55
|
+
const [{ log, l1BatchTxId }, { l2ToL1LogIndex }] = await Promise.all([
|
|
56
|
+
(0, getWithdrawalLog_js_1.getWithdrawalLog)(client, parameters),
|
|
57
|
+
(0, getWithdrawalL2ToL1Log_js_1.getWithdrawalL2ToL1Log)(client, parameters),
|
|
58
|
+
]);
|
|
57
59
|
const sender = (0, index_js_1.slice)(log.topics[1], 12);
|
|
58
60
|
const proof = await (0, getLogProof_js_1.getLogProof)(client, {
|
|
59
61
|
txHash: hash,
|