viem 2.57.13 → 2.57.15
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 +60 -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/Formatters.js +4 -1
- package/_cjs/tempo/Formatters.js.map +1 -1
- package/_cjs/tempo/Relay.js +5 -0
- package/_cjs/tempo/Relay.js.map +1 -1
- package/_cjs/tempo/Transaction.js +2 -1
- package/_cjs/tempo/Transaction.js.map +1 -1
- package/_cjs/tempo/chainConfig.js +10 -13
- package/_cjs/tempo/chainConfig.js.map +1 -1
- package/_cjs/tempo/internal/relay/autoSwap.js +200 -0
- package/_cjs/tempo/internal/relay/autoSwap.js.map +1 -0
- package/_cjs/tempo/internal/relay/error.js +5 -1
- package/_cjs/tempo/internal/relay/error.js.map +1 -1
- package/_cjs/tempo/internal/relay/feePayer.js +18 -5
- package/_cjs/tempo/internal/relay/feePayer.js.map +1 -1
- package/_cjs/tempo/internal/relay/feeToken.js +14 -1
- package/_cjs/tempo/internal/relay/feeToken.js.map +1 -1
- package/_cjs/tempo/internal/relay/simulate.js +57 -15
- package/_cjs/tempo/internal/relay/simulate.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/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/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 +3 -73
- package/_cjs/utils/rpc/http.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/_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/Formatters.js +5 -2
- package/_esm/tempo/Formatters.js.map +1 -1
- package/_esm/tempo/Relay.js +20 -0
- package/_esm/tempo/Relay.js.map +1 -1
- package/_esm/tempo/Transaction.js +2 -0
- package/_esm/tempo/Transaction.js.map +1 -1
- package/_esm/tempo/chainConfig.js +20 -14
- package/_esm/tempo/chainConfig.js.map +1 -1
- package/_esm/tempo/internal/relay/autoSwap.js +218 -0
- package/_esm/tempo/internal/relay/autoSwap.js.map +1 -0
- package/_esm/tempo/internal/relay/error.js +6 -2
- package/_esm/tempo/internal/relay/error.js.map +1 -1
- package/_esm/tempo/internal/relay/feePayer.js +24 -7
- package/_esm/tempo/internal/relay/feePayer.js.map +1 -1
- package/_esm/tempo/internal/relay/feeToken.js +17 -3
- package/_esm/tempo/internal/relay/feeToken.js.map +1 -1
- package/_esm/tempo/internal/relay/simulate.js +68 -17
- package/_esm/tempo/internal/relay/simulate.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/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/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 +1 -75
- package/_esm/utils/rpc/http.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/_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 +78 -5
- package/_types/tempo/Account.d.ts.map +1 -1
- package/_types/tempo/Capabilities.d.ts +32 -2
- package/_types/tempo/Capabilities.d.ts.map +1 -1
- package/_types/tempo/Relay.d.ts +27 -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/accessKey.d.ts +2 -2
- package/_types/tempo/chainConfig.d.ts.map +1 -1
- package/_types/tempo/internal/relay/autoSwap.d.ts +3 -0
- package/_types/tempo/internal/relay/autoSwap.d.ts.map +1 -0
- package/_types/tempo/internal/relay/error.d.ts.map +1 -1
- package/_types/tempo/internal/relay/feePayer.d.ts.map +1 -1
- package/_types/tempo/internal/relay/feeToken.d.ts.map +1 -1
- package/_types/tempo/internal/relay/simulate.d.ts +4 -0
- package/_types/tempo/internal/relay/simulate.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/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/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/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 +1 -1
- package/tempo/Account.ts +203 -17
- package/tempo/Capabilities.ts +34 -2
- package/tempo/Formatters.ts +5 -5
- package/tempo/Relay.ts +32 -1
- package/tempo/Transaction.ts +3 -0
- package/tempo/actions/accessKey.ts +2 -2
- package/tempo/chainConfig.ts +22 -14
- package/tempo/internal/relay/autoSwap.ts +263 -0
- package/tempo/internal/relay/error.ts +7 -2
- package/tempo/internal/relay/feePayer.ts +30 -7
- package/tempo/internal/relay/feeToken.ts +21 -3
- package/tempo/internal/relay/simulate.ts +106 -19
- 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/ccip.ts +199 -33
- package/utils/ccipTunnel.ts +5 -1
- package/utils/ens/localBatchGatewayRequest.ts +82 -4
- package/utils/internal/http.ts +92 -0
- package/utils/nonceManager.ts +16 -1
- package/utils/rpc/http.ts +1 -83
- 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/_cjs/utils/ccip.js
CHANGED
|
@@ -13,7 +13,11 @@ const isAddressEqual_js_1 = require("./address/isAddressEqual.js");
|
|
|
13
13
|
const concat_js_1 = require("./data/concat.js");
|
|
14
14
|
const isHex_js_1 = require("./data/isHex.js");
|
|
15
15
|
const localBatchGatewayRequest_js_1 = require("./ens/localBatchGatewayRequest.js");
|
|
16
|
+
const http_js_1 = require("./internal/http.js");
|
|
17
|
+
const withTimeout_js_1 = require("./promise/withTimeout.js");
|
|
16
18
|
const stringify_js_1 = require("./stringify.js");
|
|
19
|
+
const ccipTimeout = 10_000;
|
|
20
|
+
const maxCcipResponseBytes = 10_485_760;
|
|
17
21
|
exports.offchainLookupSignature = '0x556f1830';
|
|
18
22
|
exports.offchainLookupAbiItem = {
|
|
19
23
|
name: 'OffchainLookup',
|
|
@@ -41,7 +45,7 @@ exports.offchainLookupAbiItem = {
|
|
|
41
45
|
},
|
|
42
46
|
],
|
|
43
47
|
};
|
|
44
|
-
async function offchainLookup(client, { blockNumber, blockTag, data, requestOptions, to, }) {
|
|
48
|
+
async function offchainLookup(client, { blockNumber, blockTag, budget = (0, localBatchGatewayRequest_js_1.createCcipReadBudget)(), data, depth = 0, requestOptions, to, }) {
|
|
45
49
|
const { args } = (0, decodeErrorResult_js_1.decodeErrorResult)({
|
|
46
50
|
data,
|
|
47
51
|
abi: [exports.offchainLookupAbiItem],
|
|
@@ -51,26 +55,69 @@ async function offchainLookup(client, { blockNumber, blockTag, data, requestOpti
|
|
|
51
55
|
const ccipRequest_ = ccipRead && typeof ccipRead?.request === 'function'
|
|
52
56
|
? ccipRead.request
|
|
53
57
|
: ccipRequest;
|
|
58
|
+
const timeout = getTransportTimeout(client.transport);
|
|
54
59
|
try {
|
|
60
|
+
if (depth >= localBatchGatewayRequest_js_1.ccipReadLimit.depth)
|
|
61
|
+
throw new request_js_1.HttpRequestError({
|
|
62
|
+
details: `CCIP Read exceeded the maximum callback depth (${localBatchGatewayRequest_js_1.ccipReadLimit.depth}).`,
|
|
63
|
+
url: urls[0] ?? '',
|
|
64
|
+
});
|
|
55
65
|
if (!(0, isAddressEqual_js_1.isAddressEqual)(to, sender))
|
|
56
66
|
throw new ccip_js_1.OffchainLookupSenderMismatchError({ sender, to });
|
|
57
|
-
const result =
|
|
58
|
-
|
|
67
|
+
const result = await (async () => {
|
|
68
|
+
if (urls.includes(localBatchGatewayRequest_js_1.localBatchGatewayUrl))
|
|
69
|
+
return (0, localBatchGatewayRequest_js_1.localBatchGatewayRequest)({
|
|
70
|
+
budget,
|
|
71
|
+
ccipRequest: (parameters) => ccipRequest_({
|
|
72
|
+
...parameters,
|
|
73
|
+
requestOptions,
|
|
74
|
+
timeout: parameters.timeout ?? timeout,
|
|
75
|
+
}),
|
|
76
|
+
data: callData,
|
|
77
|
+
});
|
|
78
|
+
if (budget.queries <= 0)
|
|
79
|
+
throw new request_js_1.HttpRequestError({
|
|
80
|
+
details: `CCIP Read exceeded the maximum number of queries (${localBatchGatewayRequest_js_1.ccipReadLimit.queries}).`,
|
|
81
|
+
url: urls[0] ?? '',
|
|
82
|
+
});
|
|
83
|
+
const urls_ = urls.slice(0, budget.queries);
|
|
84
|
+
budget.queries -= Math.max(1, urls_.length);
|
|
85
|
+
return budget.run(() => ccipRequest_({
|
|
59
86
|
data: callData,
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
87
|
+
requestOptions,
|
|
88
|
+
sender,
|
|
89
|
+
timeout,
|
|
90
|
+
urls: urls_,
|
|
91
|
+
}));
|
|
92
|
+
})();
|
|
93
|
+
const callbackData = (0, concat_js_1.concat)([
|
|
94
|
+
callbackSelector,
|
|
95
|
+
(0, encodeAbiParameters_js_1.encodeAbiParameters)([{ type: 'bytes' }, { type: 'bytes' }], [result, extraData]),
|
|
96
|
+
]);
|
|
97
|
+
try {
|
|
98
|
+
const { data: data_ } = await (0, call_js_1.call)({ ...client, ccipRead: false }, {
|
|
99
|
+
blockNumber,
|
|
100
|
+
blockTag,
|
|
101
|
+
data: callbackData,
|
|
102
|
+
requestOptions,
|
|
103
|
+
to,
|
|
104
|
+
});
|
|
105
|
+
return data_;
|
|
106
|
+
}
|
|
107
|
+
catch (err) {
|
|
108
|
+
const revertData = (0, call_js_1.getRevertErrorData)(err);
|
|
109
|
+
if (revertData?.slice(0, 10) !== exports.offchainLookupSignature)
|
|
110
|
+
throw err;
|
|
111
|
+
return await offchainLookup(client, {
|
|
112
|
+
blockNumber,
|
|
113
|
+
blockTag,
|
|
114
|
+
budget,
|
|
115
|
+
data: revertData,
|
|
116
|
+
depth: depth + 1,
|
|
117
|
+
requestOptions,
|
|
118
|
+
to,
|
|
119
|
+
});
|
|
120
|
+
}
|
|
74
121
|
}
|
|
75
122
|
catch (err) {
|
|
76
123
|
if (requestOptions?.signal?.aborted)
|
|
@@ -87,28 +134,53 @@ async function offchainLookup(client, { blockNumber, blockTag, data, requestOpti
|
|
|
87
134
|
});
|
|
88
135
|
}
|
|
89
136
|
}
|
|
90
|
-
async function ccipRequest({ data, requestOptions, sender, urls, }) {
|
|
137
|
+
async function ccipRequest({ data, requestOptions, sender, timeout = ccipTimeout, urls, }) {
|
|
91
138
|
let error = new Error('An unknown error occurred.');
|
|
92
|
-
for (
|
|
139
|
+
for (const url of urls) {
|
|
93
140
|
if (requestOptions?.signal?.aborted)
|
|
94
141
|
throw (0, utils_js_1.getAbortError)(requestOptions.signal);
|
|
95
|
-
const
|
|
142
|
+
const requestUrl = url
|
|
143
|
+
.replace('{sender}', sender.toLowerCase())
|
|
144
|
+
.replace('{data}', data);
|
|
96
145
|
const method = url.includes('{data}') ? 'GET' : 'POST';
|
|
97
146
|
const body = method === 'POST' ? { data, sender } : undefined;
|
|
98
147
|
const headers = method === 'POST' ? { 'Content-Type': 'application/json' } : {};
|
|
99
148
|
try {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
149
|
+
assertCcipUrl(requestUrl);
|
|
150
|
+
const { response, responseBody } = await (0, withTimeout_js_1.withTimeout)(async ({ signal: timeoutSignal }) => {
|
|
151
|
+
const { signal, cleanup } = (0, http_js_1.anySignal)([
|
|
152
|
+
requestOptions?.signal,
|
|
153
|
+
timeout > 0 ? timeoutSignal : null,
|
|
154
|
+
]);
|
|
155
|
+
try {
|
|
156
|
+
const response = await fetch(requestUrl, {
|
|
157
|
+
body: JSON.stringify(body),
|
|
158
|
+
headers,
|
|
159
|
+
method,
|
|
160
|
+
...(signal ? { signal } : {}),
|
|
161
|
+
});
|
|
162
|
+
const responseBody = await (0, http_js_1.readResponseBody)(response, {
|
|
163
|
+
maxResponseBodySize: maxCcipResponseBytes,
|
|
164
|
+
});
|
|
165
|
+
return { response, responseBody };
|
|
166
|
+
}
|
|
167
|
+
finally {
|
|
168
|
+
cleanup();
|
|
169
|
+
}
|
|
170
|
+
}, {
|
|
171
|
+
errorInstance: new request_js_1.TimeoutError({
|
|
172
|
+
body: body ?? { data, sender },
|
|
173
|
+
url,
|
|
174
|
+
}),
|
|
175
|
+
signal: true,
|
|
176
|
+
timeout,
|
|
105
177
|
});
|
|
106
178
|
let result;
|
|
107
179
|
if (response.headers.get('Content-Type')?.startsWith('application/json')) {
|
|
108
|
-
result =
|
|
180
|
+
result = JSON.parse(responseBody).data;
|
|
109
181
|
}
|
|
110
182
|
else {
|
|
111
|
-
result =
|
|
183
|
+
result = responseBody;
|
|
112
184
|
}
|
|
113
185
|
if (!response.ok) {
|
|
114
186
|
error = new request_js_1.HttpRequestError({
|
|
@@ -136,13 +208,47 @@ async function ccipRequest({ data, requestOptions, sender, urls, }) {
|
|
|
136
208
|
throw (0, utils_js_1.getAbortError)(requestOptions.signal);
|
|
137
209
|
if ((0, utils_js_1.isAbortError)(err))
|
|
138
210
|
throw err;
|
|
211
|
+
if (err instanceof request_js_1.HttpRequestError ||
|
|
212
|
+
err instanceof request_js_1.TimeoutError ||
|
|
213
|
+
err instanceof request_js_1.ResponseBodyTooLargeError) {
|
|
214
|
+
error = err;
|
|
215
|
+
continue;
|
|
216
|
+
}
|
|
139
217
|
error = new request_js_1.HttpRequestError({
|
|
140
218
|
body,
|
|
141
|
-
|
|
219
|
+
cause: err,
|
|
142
220
|
url,
|
|
143
221
|
});
|
|
144
222
|
}
|
|
145
223
|
}
|
|
146
224
|
throw error;
|
|
147
225
|
}
|
|
226
|
+
function assertCcipUrl(url) {
|
|
227
|
+
const parsed = (() => {
|
|
228
|
+
try {
|
|
229
|
+
return new URL(url);
|
|
230
|
+
}
|
|
231
|
+
catch {
|
|
232
|
+
throw new request_js_1.HttpRequestError({
|
|
233
|
+
details: 'CCIP Read URL is invalid.',
|
|
234
|
+
url,
|
|
235
|
+
});
|
|
236
|
+
}
|
|
237
|
+
})();
|
|
238
|
+
if (parsed.protocol === 'http:' || parsed.protocol === 'https:')
|
|
239
|
+
return;
|
|
240
|
+
throw new request_js_1.HttpRequestError({
|
|
241
|
+
details: `CCIP Read URL scheme "${parsed.protocol.slice(0, -1)}" is not allowed.`,
|
|
242
|
+
url,
|
|
243
|
+
});
|
|
244
|
+
}
|
|
245
|
+
function getTransportTimeout(transport) {
|
|
246
|
+
const timeout = transport.timeout ?? transport.config?.timeout;
|
|
247
|
+
if (timeout !== undefined)
|
|
248
|
+
return timeout;
|
|
249
|
+
const timeouts = (transport.transports ?? transport.value?.transports ?? [])
|
|
250
|
+
.map(getTransportTimeout)
|
|
251
|
+
.filter((timeout) => timeout !== undefined);
|
|
252
|
+
return timeouts.length ? Math.max(...timeouts) : undefined;
|
|
253
|
+
}
|
|
148
254
|
//# sourceMappingURL=ccip.js.map
|
package/_cjs/utils/ccip.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../utils/ccip.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../utils/ccip.ts"],"names":[],"mappings":"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"}
|
package/_cjs/utils/ccipTunnel.js
CHANGED
|
@@ -11,11 +11,13 @@ const ccip_js_1 = require("./ccip.js");
|
|
|
11
11
|
const localBatchGatewayRequest_js_1 = require("./ens/localBatchGatewayRequest.js");
|
|
12
12
|
function ccipReadTunnel({ batchGateways, ccipRequest = ccip_js_1.ccipRequest, }) {
|
|
13
13
|
return {
|
|
14
|
-
async request({ data, sender, urls }) {
|
|
14
|
+
async request({ data, requestOptions, sender, timeout, urls }) {
|
|
15
15
|
if (urls.includes(localBatchGatewayRequest_js_1.localBatchGatewayUrl)) {
|
|
16
16
|
return ccipRequest({
|
|
17
17
|
data,
|
|
18
|
+
requestOptions,
|
|
18
19
|
sender,
|
|
20
|
+
timeout,
|
|
19
21
|
urls: batchGateways,
|
|
20
22
|
});
|
|
21
23
|
}
|
|
@@ -29,7 +31,9 @@ function ccipReadTunnel({ batchGateways, ccipRequest = ccip_js_1.ccipRequest, })
|
|
|
29
31
|
functionName: 'query',
|
|
30
32
|
args: [[{ sender, data, urls }]],
|
|
31
33
|
}),
|
|
34
|
+
requestOptions,
|
|
32
35
|
sender,
|
|
36
|
+
timeout,
|
|
33
37
|
urls: batchGateways,
|
|
34
38
|
}),
|
|
35
39
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ccipTunnel.js","sourceRoot":"","sources":["../../utils/ccipTunnel.ts"],"names":[],"mappings":";;AAcA,
|
|
1
|
+
{"version":3,"file":"ccipTunnel.js","sourceRoot":"","sources":["../../utils/ccipTunnel.ts"],"names":[],"mappings":";;AAcA,wCAwDC;AAtED,kDAAsD;AACtD,0DAAwD;AACxD,qDAAuD;AACvD,qEAA8D;AAC9D,2EAAoE;AACpE,uEAAgE;AAChE,uCAAuD;AACvD,mFAAwE;AAOxE,SAAgB,cAAc,CAAC,EAC7B,aAAa,EACb,WAAW,GAAG,qBAAY,GACD;IACzB,OAAO;QACL,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;YAC3D,IAAI,IAAI,CAAC,QAAQ,CAAC,kDAAoB,CAAC,EAAE,CAAC;gBACxC,OAAO,WAAW,CAAC;oBACjB,IAAI;oBACJ,cAAc;oBACd,MAAM;oBACN,OAAO;oBACP,IAAI,EAAE,aAAa;iBACpB,CAAC,CAAA;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAA,8CAAoB,EAAC;oBACjD,GAAG,EAAE,yBAAe;oBACpB,YAAY,EAAE,OAAO;oBACrB,IAAI,EAAE,MAAM,WAAW,CAAC;wBACtB,IAAI,EAAE,IAAA,0CAAkB,EAAC;4BACvB,GAAG,EAAE,yBAAe;4BACpB,YAAY,EAAE,OAAO;4BACrB,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;yBACjC,CAAC;wBACF,cAAc;wBACd,MAAM;wBACN,OAAO;wBACP,IAAI,EAAE,aAAa;qBACpB,CAAC;iBACH,CAAC,CAAA;gBACF,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;oBAChB,IAAI,KAAwB,CAAA;oBAC5B,IAAI,CAAC;wBACH,MAAM,GAAG,GAAG,IAAA,wCAAiB,EAAC;4BAC5B,GAAG,EAAE,CAAC,GAAG,yBAAe,EAAE,2BAAa,CAAC;4BACxC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;yBACnB,CAAC,CAAA;wBACF,IAAI,GAAG,CAAC,SAAS,KAAK,WAAW,EAAE,CAAC;4BAClC,KAAK,GAAG,IAAI,6BAAgB,CAAC;gCAC3B,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gCAC9B,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gCACnB,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;6BACtB,CAAC,CAAA;wBACJ,CAAC;6BAAM,CAAC;4BACN,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;4BAC3B,IAAI,OAAO,EAAE,CAAC;gCACZ,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;4BAC5B,CAAC;wBACH,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC,CAAA,CAAC;oBACV,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;gBACxD,CAAC;gBACD,OAAO,SAAS,CAAC,CAAC,CAAC,CAAA;YACrB,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC"}
|
|
@@ -1,23 +1,73 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.localBatchGatewayUrl = void 0;
|
|
3
|
+
exports.ccipReadLimit = exports.localBatchGatewayUrl = void 0;
|
|
4
|
+
exports.createCcipReadBudget = createCcipReadBudget;
|
|
4
5
|
exports.localBatchGatewayRequest = localBatchGatewayRequest;
|
|
5
6
|
const abis_js_1 = require("../../constants/abis.js");
|
|
6
7
|
const solidity_js_1 = require("../../constants/solidity.js");
|
|
8
|
+
const request_js_1 = require("../../errors/request.js");
|
|
7
9
|
const decodeFunctionData_js_1 = require("../abi/decodeFunctionData.js");
|
|
8
10
|
const encodeErrorResult_js_1 = require("../abi/encodeErrorResult.js");
|
|
9
11
|
const encodeFunctionResult_js_1 = require("../abi/encodeFunctionResult.js");
|
|
10
12
|
exports.localBatchGatewayUrl = 'x-batch-gateway:true';
|
|
13
|
+
exports.ccipReadLimit = {
|
|
14
|
+
concurrency: 16,
|
|
15
|
+
depth: 4,
|
|
16
|
+
queries: 256,
|
|
17
|
+
};
|
|
18
|
+
function createCcipReadBudget() {
|
|
19
|
+
let active = 0;
|
|
20
|
+
const queue = [];
|
|
21
|
+
return {
|
|
22
|
+
queries: exports.ccipReadLimit.queries,
|
|
23
|
+
async run(fn) {
|
|
24
|
+
if (active >= exports.ccipReadLimit.concurrency)
|
|
25
|
+
await new Promise((resolve) => queue.push(resolve));
|
|
26
|
+
else
|
|
27
|
+
active++;
|
|
28
|
+
try {
|
|
29
|
+
return await fn();
|
|
30
|
+
}
|
|
31
|
+
finally {
|
|
32
|
+
const next = queue.shift();
|
|
33
|
+
if (next)
|
|
34
|
+
next();
|
|
35
|
+
else
|
|
36
|
+
active--;
|
|
37
|
+
}
|
|
38
|
+
},
|
|
39
|
+
};
|
|
40
|
+
}
|
|
11
41
|
async function localBatchGatewayRequest(parameters) {
|
|
12
|
-
const { data, ccipRequest } = parameters;
|
|
42
|
+
const { data, ccipRequest, budget = createCcipReadBudget(), depth = 0, } = parameters;
|
|
13
43
|
const { args: [queries], } = (0, decodeFunctionData_js_1.decodeFunctionData)({ abi: abis_js_1.batchGatewayAbi, data });
|
|
14
44
|
const failures = [];
|
|
15
45
|
const responses = [];
|
|
16
46
|
await Promise.all(queries.map(async (query, i) => {
|
|
17
47
|
try {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
48
|
+
const nested = query.urls.includes(exports.localBatchGatewayUrl);
|
|
49
|
+
if (nested && depth + 1 >= exports.ccipReadLimit.depth)
|
|
50
|
+
throw new request_js_1.HttpRequestError({
|
|
51
|
+
details: `CCIP Read exceeded the maximum batch depth (${exports.ccipReadLimit.depth}).`,
|
|
52
|
+
url: exports.localBatchGatewayUrl,
|
|
53
|
+
});
|
|
54
|
+
if (nested)
|
|
55
|
+
responses[i] = await localBatchGatewayRequest({
|
|
56
|
+
data: query.data,
|
|
57
|
+
ccipRequest,
|
|
58
|
+
budget,
|
|
59
|
+
depth: depth + 1,
|
|
60
|
+
});
|
|
61
|
+
else {
|
|
62
|
+
if (budget.queries <= 0)
|
|
63
|
+
throw new request_js_1.HttpRequestError({
|
|
64
|
+
details: `CCIP Read exceeded the maximum number of queries (${exports.ccipReadLimit.queries}).`,
|
|
65
|
+
url: query.urls[0] ?? '',
|
|
66
|
+
});
|
|
67
|
+
const urls = query.urls.slice(0, budget.queries);
|
|
68
|
+
budget.queries -= Math.max(1, urls.length);
|
|
69
|
+
responses[i] = await budget.run(() => ccipRequest({ ...query, urls }));
|
|
70
|
+
}
|
|
21
71
|
failures[i] = false;
|
|
22
72
|
}
|
|
23
73
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localBatchGatewayRequest.js","sourceRoot":"","sources":["../../../utils/ens/localBatchGatewayRequest.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"localBatchGatewayRequest.js","sourceRoot":"","sources":["../../../utils/ens/localBatchGatewayRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":";;AAMA,8BA0BC;AAMD,4CAqDC;AA3FD,wDAAmE;AAMnE,SAAgB,SAAS,CACvB,OAAoD;IAEpD,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IACrD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QACrB,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAA;IAE3D,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IACxC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,OAAO,EAAE,CAAA;QACT,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAA;IACrE,CAAC,CAAA;IACD,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,KAAK,MAAM,MAAM,IAAI,QAAQ;YAAE,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7E,CAAC,CAAA;IAED,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,EAAE,CAAA;YACT,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAC/B,MAAK;QACP,CAAC;QACD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC3C,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,CAAA;AAC/C,CAAC;AAMM,KAAK,UAAU,gBAAgB,CACpC,QAAkB,EAClB,EAAE,mBAAmB,EAA2C;IAEhE,IAAI,mBAAmB,KAAK,KAAK;QAAE,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAA;IAEzD,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;IAC5D,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,CAAA;QAClC,IAAI,IAAI,GAAG,mBAAmB,EAAE,CAAC;YAC/B,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAA;YAC7B,MAAM,IAAI,sCAAyB,CAAC;gBAClC,OAAO,EAAE,mBAAmB;gBAC5B,IAAI;aACL,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAClC,MAAM,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAA;QAClD,IAAI,IAAI,GAAG,mBAAmB;YAC5B,MAAM,IAAI,sCAAyB,CAAC;gBAClC,OAAO,EAAE,mBAAmB;gBAC5B,IAAI;aACL,CAAC,CAAA;QACJ,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAA;IACxC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAA;IACjC,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI,IAAI,GAAG,CAAC,CAAA;IAEZ,IAAI,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;YAC3C,IAAI,IAAI;gBAAE,MAAK;YACf,IAAI,IAAI,KAAK,CAAC,UAAU,CAAA;YACxB,IAAI,IAAI,GAAG,mBAAmB,EAAE,CAAC;gBAC/B,MAAM,MAAM,CAAC,MAAM,EAAE,CAAA;gBACrB,MAAM,IAAI,sCAAyB,CAAC;oBAClC,OAAO,EAAE,mBAAmB;oBAC5B,IAAI;iBACL,CAAC,CAAA;YACJ,CAAC;YACD,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QACjD,CAAC;QACD,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAA;QACxB,OAAO,IAAI,CAAA;IACb,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,WAAW,EAAE,CAAA;IACtB,CAAC;AACH,CAAC"}
|
|
@@ -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,6 +4,7 @@ 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");
|
|
@@ -21,7 +22,7 @@ function getHttpRpcClient(url_, options = {}) {
|
|
|
21
22
|
const { headers, method, signal: signal_ } = fetchOptions;
|
|
22
23
|
try {
|
|
23
24
|
const { response, responseBody } = await (0, withTimeout_js_1.withTimeout)(async ({ signal: timeoutSignal }) => {
|
|
24
|
-
const { signal, cleanup } = anySignal([
|
|
25
|
+
const { signal, cleanup } = (0, http_js_1.anySignal)([
|
|
25
26
|
signal_,
|
|
26
27
|
timeout > 0 ? timeoutSignal : null,
|
|
27
28
|
]);
|
|
@@ -55,7 +56,7 @@ function getHttpRpcClient(url_, options = {}) {
|
|
|
55
56
|
const response = await fetchFn(args.url ?? url, args);
|
|
56
57
|
if (onResponse)
|
|
57
58
|
await onResponse(response);
|
|
58
|
-
const responseBody = await readResponseBody(response, {
|
|
59
|
+
const responseBody = await (0, http_js_1.readResponseBody)(response, {
|
|
59
60
|
maxResponseBodySize,
|
|
60
61
|
});
|
|
61
62
|
return { response, responseBody };
|
|
@@ -132,77 +133,6 @@ function getHttpRpcClient(url_, options = {}) {
|
|
|
132
133
|
},
|
|
133
134
|
};
|
|
134
135
|
}
|
|
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
136
|
function isRpcError(data) {
|
|
207
137
|
return (typeof data?.error?.code === 'number' &&
|
|
208
138
|
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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"}
|
|
@@ -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"}
|