viem 2.57.17 → 2.57.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +80 -0
- package/_cjs/account-abstraction/actions/paymaster/getPaymasterData.js +4 -2
- package/_cjs/account-abstraction/actions/paymaster/getPaymasterData.js.map +1 -1
- package/_cjs/account-abstraction/actions/paymaster/getPaymasterStubData.js +6 -2
- package/_cjs/account-abstraction/actions/paymaster/getPaymasterStubData.js.map +1 -1
- package/_cjs/actions/ens/getEnsAddress.js +11 -1
- package/_cjs/actions/ens/getEnsAddress.js.map +1 -1
- package/_cjs/actions/index.js +5 -3
- package/_cjs/actions/index.js.map +1 -1
- package/_cjs/actions/public/call.js +13 -2
- package/_cjs/actions/public/call.js.map +1 -1
- package/_cjs/actions/public/getLogs.js +18 -1
- package/_cjs/actions/public/getLogs.js.map +1 -1
- package/_cjs/actions/public/internal/isRangeError.js +18 -0
- package/_cjs/actions/public/internal/isRangeError.js.map +1 -0
- package/_cjs/actions/public/internal/watchTransport.js +24 -0
- package/_cjs/actions/public/internal/watchTransport.js.map +1 -0
- package/_cjs/actions/public/iterateLogs.js +48 -0
- package/_cjs/actions/public/iterateLogs.js.map +1 -0
- package/_cjs/actions/public/simulateContract.js +4 -4
- package/_cjs/actions/public/simulateContract.js.map +1 -1
- package/_cjs/actions/public/verifyHash.js +72 -39
- package/_cjs/actions/public/verifyHash.js.map +1 -1
- package/_cjs/actions/public/waitForTransactionReceipt.js +18 -1
- package/_cjs/actions/public/waitForTransactionReceipt.js.map +1 -1
- package/_cjs/actions/public/watchBlockHeaders.js +2 -10
- package/_cjs/actions/public/watchBlockHeaders.js.map +1 -1
- package/_cjs/actions/public/watchBlockNumber.js +3 -18
- package/_cjs/actions/public/watchBlockNumber.js.map +1 -1
- package/_cjs/actions/public/watchBlocks.js +3 -18
- package/_cjs/actions/public/watchBlocks.js.map +1 -1
- package/_cjs/actions/public/watchContractEvent.js +5 -33
- package/_cjs/actions/public/watchContractEvent.js.map +1 -1
- package/_cjs/actions/public/watchEvent.js +5 -33
- package/_cjs/actions/public/watchEvent.js.map +1 -1
- package/_cjs/actions/wallet/prepareTransactionRequest.js +16 -3
- package/_cjs/actions/wallet/prepareTransactionRequest.js.map +1 -1
- package/_cjs/celo/serializers.js +1 -1
- package/_cjs/celo/serializers.js.map +1 -1
- package/_cjs/clients/decorators/public.js +2 -0
- package/_cjs/clients/decorators/public.js.map +1 -1
- package/_cjs/constants/contracts.js +1 -1
- package/_cjs/constants/contracts.js.map +1 -1
- package/_cjs/errors/chain.js +2 -2
- package/_cjs/errors/chain.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/index.js +5 -4
- package/_cjs/index.js.map +1 -1
- package/_cjs/op-stack/actions/buildProveWithdrawal.js +5 -5
- package/_cjs/op-stack/actions/buildProveWithdrawal.js.map +1 -1
- package/_cjs/op-stack/actions/getL2Output.js +13 -9
- package/_cjs/op-stack/actions/getL2Output.js.map +1 -1
- package/_cjs/op-stack/actions/waitToProve.js +1 -0
- package/_cjs/op-stack/actions/waitToProve.js.map +1 -1
- package/_cjs/tempo/Account.js +30 -0
- package/_cjs/tempo/Account.js.map +1 -1
- package/_cjs/tempo/actions/accessKey.js +1 -1
- package/_cjs/tempo/actions/accessKey.js.map +1 -1
- package/_cjs/tempo/actions/accounts.js +5 -5
- package/_cjs/tempo/actions/accounts.js.map +1 -1
- package/_cjs/tempo/actions/earn/deployment.js +1 -1
- package/_cjs/tempo/actions/earn/deployment.js.map +1 -1
- package/_cjs/tempo/actions/earn.js +3 -3
- package/_cjs/tempo/actions/earn.js.map +1 -1
- package/_cjs/tempo/actions/propAmm.js +1 -1
- package/_cjs/tempo/actions/propAmm.js.map +1 -1
- package/_cjs/tempo/actions/token.js +10 -2
- package/_cjs/tempo/actions/token.js.map +1 -1
- package/_cjs/tempo/chainConfig.js +14 -0
- package/_cjs/tempo/chainConfig.js.map +1 -1
- package/_cjs/tempo/internal/preAuthorized.js +214 -0
- package/_cjs/tempo/internal/preAuthorized.js.map +1 -0
- package/_cjs/tempo/internal/relay/feePayer.js +25 -7
- package/_cjs/tempo/internal/relay/feePayer.js.map +1 -1
- package/_cjs/utils/abi/decodeAbiParameters.js +33 -9
- package/_cjs/utils/abi/decodeAbiParameters.js.map +1 -1
- package/_cjs/utils/abi/encodeAbiParameters.js +5 -4
- package/_cjs/utils/abi/encodeAbiParameters.js.map +1 -1
- package/_cjs/utils/abi/encodePacked.js +4 -2
- package/_cjs/utils/abi/encodePacked.js.map +1 -1
- package/_cjs/utils/ccip.js +5 -1
- package/_cjs/utils/ccip.js.map +1 -1
- package/_cjs/utils/chain/getChainContractAddress.js +2 -2
- package/_cjs/utils/chain/getChainContractAddress.js.map +1 -1
- package/_cjs/utils/encoding/toBytes.js +5 -6
- package/_cjs/utils/encoding/toBytes.js.map +1 -1
- package/_cjs/utils/ens/avatar/utils.js +25 -5
- package/_cjs/utils/ens/avatar/utils.js.map +1 -1
- package/_cjs/utils/ens/localBatchGatewayRequest.js +13 -1
- package/_cjs/utils/ens/localBatchGatewayRequest.js.map +1 -1
- package/_cjs/utils/promise/createBatchScheduler.js +1 -1
- package/_cjs/utils/promise/createBatchScheduler.js.map +1 -1
- package/_cjs/utils/siwe/validateSiweMessage.js +5 -0
- package/_cjs/utils/siwe/validateSiweMessage.js.map +1 -1
- package/_cjs/zksync/actions/estimateFee.js +1 -1
- package/_cjs/zksync/actions/estimateFee.js.map +1 -1
- package/_cjs/zksync/actions/estimateGasL1ToL2.js +1 -1
- package/_cjs/zksync/actions/estimateGasL1ToL2.js.map +1 -1
- package/_cjs/zksync/actions/finalizeWithdrawal.js +3 -3
- package/_cjs/zksync/actions/finalizeWithdrawal.js.map +1 -1
- package/_cjs/zksync/actions/sendEip712Transaction.js +10 -2
- package/_cjs/zksync/actions/sendEip712Transaction.js.map +1 -1
- package/_cjs/zksync/actions/signEip712Transaction.js +2 -2
- package/_cjs/zksync/actions/signEip712Transaction.js.map +1 -1
- package/_esm/account-abstraction/actions/paymaster/getPaymasterData.js +4 -2
- package/_esm/account-abstraction/actions/paymaster/getPaymasterData.js.map +1 -1
- package/_esm/account-abstraction/actions/paymaster/getPaymasterStubData.js +6 -2
- package/_esm/account-abstraction/actions/paymaster/getPaymasterStubData.js.map +1 -1
- package/_esm/actions/ens/getEnsAddress.js +12 -1
- package/_esm/actions/ens/getEnsAddress.js.map +1 -1
- package/_esm/actions/index.js +1 -0
- package/_esm/actions/index.js.map +1 -1
- package/_esm/actions/public/call.js +13 -2
- package/_esm/actions/public/call.js.map +1 -1
- package/_esm/actions/public/getLogs.js +18 -1
- package/_esm/actions/public/getLogs.js.map +1 -1
- package/_esm/actions/public/internal/isRangeError.js +19 -0
- package/_esm/actions/public/internal/isRangeError.js.map +1 -0
- package/_esm/actions/public/internal/watchTransport.js +22 -0
- package/_esm/actions/public/internal/watchTransport.js.map +1 -0
- package/_esm/actions/public/iterateLogs.js +84 -0
- package/_esm/actions/public/iterateLogs.js.map +1 -0
- package/_esm/actions/public/simulateContract.js +5 -4
- package/_esm/actions/public/simulateContract.js.map +1 -1
- package/_esm/actions/public/verifyHash.js +77 -40
- package/_esm/actions/public/verifyHash.js.map +1 -1
- package/_esm/actions/public/waitForTransactionReceipt.js +20 -1
- package/_esm/actions/public/waitForTransactionReceipt.js.map +1 -1
- package/_esm/actions/public/watchBlockHeaders.js +2 -10
- package/_esm/actions/public/watchBlockHeaders.js.map +1 -1
- package/_esm/actions/public/watchBlockNumber.js +3 -18
- package/_esm/actions/public/watchBlockNumber.js.map +1 -1
- package/_esm/actions/public/watchBlocks.js +3 -18
- package/_esm/actions/public/watchBlocks.js.map +1 -1
- package/_esm/actions/public/watchContractEvent.js +4 -36
- package/_esm/actions/public/watchContractEvent.js.map +1 -1
- package/_esm/actions/public/watchEvent.js +4 -36
- package/_esm/actions/public/watchEvent.js.map +1 -1
- package/_esm/actions/wallet/prepareTransactionRequest.js +17 -3
- package/_esm/actions/wallet/prepareTransactionRequest.js.map +1 -1
- package/_esm/celo/serializers.js +1 -1
- package/_esm/celo/serializers.js.map +1 -1
- package/_esm/clients/decorators/public.js +2 -0
- package/_esm/clients/decorators/public.js.map +1 -1
- package/_esm/constants/contracts.js +1 -1
- package/_esm/constants/contracts.js.map +1 -1
- package/_esm/errors/chain.js +2 -2
- package/_esm/errors/chain.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/index.js +1 -1
- package/_esm/index.js.map +1 -1
- package/_esm/op-stack/actions/buildProveWithdrawal.js +5 -5
- package/_esm/op-stack/actions/buildProveWithdrawal.js.map +1 -1
- package/_esm/op-stack/actions/getL2Output.js +14 -9
- package/_esm/op-stack/actions/getL2Output.js.map +1 -1
- package/_esm/op-stack/actions/waitToProve.js +1 -0
- package/_esm/op-stack/actions/waitToProve.js.map +1 -1
- package/_esm/tempo/Account.js +33 -1
- package/_esm/tempo/Account.js.map +1 -1
- package/_esm/tempo/actions/accessKey.js +1 -1
- package/_esm/tempo/actions/accessKey.js.map +1 -1
- package/_esm/tempo/actions/accounts.js +5 -5
- package/_esm/tempo/actions/accounts.js.map +1 -1
- package/_esm/tempo/actions/earn/deployment.js +1 -1
- package/_esm/tempo/actions/earn/deployment.js.map +1 -1
- package/_esm/tempo/actions/earn.js +3 -3
- package/_esm/tempo/actions/earn.js.map +1 -1
- package/_esm/tempo/actions/propAmm.js +1 -1
- package/_esm/tempo/actions/propAmm.js.map +1 -1
- package/_esm/tempo/actions/token.js +10 -2
- package/_esm/tempo/actions/token.js.map +1 -1
- package/_esm/tempo/chainConfig.js +16 -0
- package/_esm/tempo/chainConfig.js.map +1 -1
- package/_esm/tempo/internal/preAuthorized.js +244 -0
- package/_esm/tempo/internal/preAuthorized.js.map +1 -0
- package/_esm/tempo/internal/relay/feePayer.js +26 -7
- package/_esm/tempo/internal/relay/feePayer.js.map +1 -1
- package/_esm/utils/abi/decodeAbiParameters.js +37 -9
- package/_esm/utils/abi/decodeAbiParameters.js.map +1 -1
- package/_esm/utils/abi/encodeAbiParameters.js +6 -4
- package/_esm/utils/abi/encodeAbiParameters.js.map +1 -1
- package/_esm/utils/abi/encodePacked.js +5 -2
- package/_esm/utils/abi/encodePacked.js.map +1 -1
- package/_esm/utils/ccip.js +8 -3
- package/_esm/utils/ccip.js.map +1 -1
- package/_esm/utils/chain/getChainContractAddress.js +2 -2
- package/_esm/utils/chain/getChainContractAddress.js.map +1 -1
- package/_esm/utils/encoding/toBytes.js +5 -6
- package/_esm/utils/encoding/toBytes.js.map +1 -1
- package/_esm/utils/ens/avatar/utils.js +26 -5
- package/_esm/utils/ens/avatar/utils.js.map +1 -1
- package/_esm/utils/ens/localBatchGatewayRequest.js +17 -1
- package/_esm/utils/ens/localBatchGatewayRequest.js.map +1 -1
- package/_esm/utils/promise/createBatchScheduler.js +2 -1
- package/_esm/utils/promise/createBatchScheduler.js.map +1 -1
- package/_esm/utils/siwe/validateSiweMessage.js +6 -0
- package/_esm/utils/siwe/validateSiweMessage.js.map +1 -1
- package/_esm/zksync/actions/estimateFee.js +1 -1
- package/_esm/zksync/actions/estimateFee.js.map +1 -1
- package/_esm/zksync/actions/estimateGasL1ToL2.js +1 -1
- package/_esm/zksync/actions/estimateGasL1ToL2.js.map +1 -1
- package/_esm/zksync/actions/finalizeWithdrawal.js +3 -3
- package/_esm/zksync/actions/finalizeWithdrawal.js.map +1 -1
- package/_esm/zksync/actions/sendEip712Transaction.js +12 -2
- package/_esm/zksync/actions/sendEip712Transaction.js.map +1 -1
- package/_esm/zksync/actions/signEip712Transaction.js +2 -2
- package/_esm/zksync/actions/signEip712Transaction.js.map +1 -1
- package/_types/account-abstraction/actions/paymaster/getPaymasterData.d.ts.map +1 -1
- package/_types/account-abstraction/actions/paymaster/getPaymasterStubData.d.ts.map +1 -1
- package/_types/actions/ens/getEnsAddress.d.ts +2 -1
- package/_types/actions/ens/getEnsAddress.d.ts.map +1 -1
- package/_types/actions/index.d.ts +1 -0
- package/_types/actions/index.d.ts.map +1 -1
- package/_types/actions/public/call.d.ts.map +1 -1
- package/_types/actions/public/getLogs.d.ts +20 -2
- package/_types/actions/public/getLogs.d.ts.map +1 -1
- package/_types/actions/public/internal/isRangeError.d.ts +3 -0
- package/_types/actions/public/internal/isRangeError.d.ts.map +1 -0
- package/_types/actions/public/internal/watchTransport.d.ts +6 -0
- package/_types/actions/public/internal/watchTransport.d.ts.map +1 -0
- package/_types/actions/public/iterateLogs.d.ts +94 -0
- package/_types/actions/public/iterateLogs.d.ts.map +1 -0
- package/_types/actions/public/simulateContract.d.ts.map +1 -1
- package/_types/actions/public/verifyHash.d.ts +2 -1
- package/_types/actions/public/verifyHash.d.ts.map +1 -1
- package/_types/actions/public/waitForTransactionReceipt.d.ts +7 -2
- package/_types/actions/public/waitForTransactionReceipt.d.ts.map +1 -1
- package/_types/actions/public/watchBlockHeaders.d.ts.map +1 -1
- package/_types/actions/public/watchBlockNumber.d.ts.map +1 -1
- package/_types/actions/public/watchBlocks.d.ts.map +1 -1
- package/_types/actions/public/watchContractEvent.d.ts.map +1 -1
- package/_types/actions/public/watchEvent.d.ts.map +1 -1
- package/_types/actions/wallet/prepareTransactionRequest.d.ts +2 -1
- package/_types/actions/wallet/prepareTransactionRequest.d.ts.map +1 -1
- package/_types/celo/serializers.d.ts.map +1 -1
- package/_types/clients/decorators/public.d.ts +33 -0
- package/_types/clients/decorators/public.d.ts.map +1 -1
- package/_types/constants/contracts.d.ts +1 -1
- package/_types/constants/contracts.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/index.d.ts +2 -1
- package/_types/index.d.ts.map +1 -1
- package/_types/op-stack/actions/getL2Output.d.ts +6 -0
- package/_types/op-stack/actions/getL2Output.d.ts.map +1 -1
- package/_types/op-stack/actions/waitToProve.d.ts.map +1 -1
- package/_types/tempo/Account.d.ts +5 -1
- package/_types/tempo/Account.d.ts.map +1 -1
- package/_types/tempo/actions/earn/deployment.d.ts.map +1 -1
- package/_types/tempo/actions/propAmm.d.ts.map +1 -1
- package/_types/tempo/actions/token.d.ts.map +1 -1
- package/_types/tempo/chainConfig.d.ts.map +1 -1
- package/_types/tempo/internal/preAuthorized.d.ts +41 -0
- package/_types/tempo/internal/preAuthorized.d.ts.map +1 -0
- package/_types/tempo/internal/relay/feePayer.d.ts.map +1 -1
- package/_types/utils/abi/decodeAbiParameters.d.ts +15 -1
- package/_types/utils/abi/decodeAbiParameters.d.ts.map +1 -1
- package/_types/utils/abi/encodeAbiParameters.d.ts.map +1 -1
- package/_types/utils/ccip.d.ts +4 -3
- package/_types/utils/ccip.d.ts.map +1 -1
- package/_types/utils/encoding/toBytes.d.ts +1 -1
- package/_types/utils/encoding/toBytes.d.ts.map +1 -1
- package/_types/utils/ens/avatar/utils.d.ts +6 -2
- package/_types/utils/ens/avatar/utils.d.ts.map +1 -1
- package/_types/utils/ens/localBatchGatewayRequest.d.ts +6 -1
- package/_types/utils/ens/localBatchGatewayRequest.d.ts.map +1 -1
- package/_types/utils/promise/createBatchScheduler.d.ts.map +1 -1
- package/_types/utils/siwe/validateSiweMessage.d.ts.map +1 -1
- package/_types/zksync/actions/estimateFee.d.ts.map +1 -1
- package/_types/zksync/actions/estimateGasL1ToL2.d.ts.map +1 -1
- package/_types/zksync/actions/finalizeWithdrawal.d.ts.map +1 -1
- package/_types/zksync/actions/sendEip712Transaction.d.ts +1 -1
- package/_types/zksync/actions/sendEip712Transaction.d.ts.map +1 -1
- package/account-abstraction/actions/paymaster/getPaymasterData.ts +23 -16
- package/account-abstraction/actions/paymaster/getPaymasterStubData.ts +27 -16
- package/actions/ens/getEnsAddress.ts +15 -1
- package/actions/index.ts +6 -0
- package/actions/public/call.ts +15 -2
- package/actions/public/getLogs.ts +44 -0
- package/actions/public/internal/isRangeError.ts +18 -0
- package/actions/public/internal/watchTransport.ts +29 -0
- package/actions/public/iterateLogs.ts +209 -0
- package/actions/public/simulateContract.ts +6 -4
- package/actions/public/verifyHash.ts +87 -60
- package/actions/public/waitForTransactionReceipt.ts +31 -1
- package/actions/public/watchBlockHeaders.ts +2 -12
- package/actions/public/watchBlockNumber.ts +6 -24
- package/actions/public/watchBlocks.ts +6 -24
- package/actions/public/watchContractEvent.ts +7 -42
- package/actions/public/watchEvent.ts +7 -42
- package/actions/wallet/prepareTransactionRequest.ts +23 -3
- package/celo/serializers.ts +5 -2
- package/clients/decorators/public.ts +47 -0
- package/constants/contracts.ts +1 -1
- package/errors/chain.ts +2 -2
- package/errors/version.ts +1 -1
- package/index.ts +7 -0
- package/op-stack/actions/buildProveWithdrawal.ts +5 -5
- package/op-stack/actions/getL2Output.ts +24 -11
- package/op-stack/actions/waitToProve.ts +1 -0
- package/package.json +2 -2
- package/tempo/Account.ts +38 -1
- package/tempo/actions/accessKey.ts +1 -1
- package/tempo/actions/accounts.ts +5 -5
- package/tempo/actions/earn/deployment.ts +2 -1
- package/tempo/actions/earn.ts +2 -2
- package/tempo/actions/propAmm.ts +2 -1
- package/tempo/actions/token.ts +10 -2
- package/tempo/chainConfig.ts +20 -0
- package/tempo/internal/preAuthorized.ts +309 -0
- package/tempo/internal/relay/feePayer.ts +33 -11
- package/utils/abi/decodeAbiParameters.ts +60 -9
- package/utils/abi/encodeAbiParameters.ts +6 -4
- package/utils/abi/encodePacked.ts +5 -1
- package/utils/ccip.ts +17 -3
- package/utils/chain/getChainContractAddress.ts +2 -2
- package/utils/encoding/toBytes.ts +4 -6
- package/utils/ens/avatar/utils.ts +38 -4
- package/utils/ens/localBatchGatewayRequest.ts +21 -2
- package/utils/promise/createBatchScheduler.ts +2 -1
- package/utils/siwe/validateSiweMessage.ts +7 -0
- package/zksync/actions/estimateFee.ts +2 -1
- package/zksync/actions/estimateGasL1ToL2.ts +2 -1
- package/zksync/actions/finalizeWithdrawal.ts +4 -3
- package/zksync/actions/sendEip712Transaction.ts +21 -8
- package/zksync/actions/signEip712Transaction.ts +3 -3
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AbiDecodingSizeLimitExceededError = void 0;
|
|
3
4
|
exports.decodeAbiParameters = decodeAbiParameters;
|
|
4
5
|
const abi_js_1 = require("../../errors/abi.js");
|
|
6
|
+
const base_js_1 = require("../../errors/base.js");
|
|
5
7
|
const getAddress_js_1 = require("../address/getAddress.js");
|
|
6
8
|
const cursor_js_1 = require("../cursor.js");
|
|
7
9
|
const size_js_1 = require("../data/size.js");
|
|
@@ -21,6 +23,7 @@ function decodeAbiParameters(params, data) {
|
|
|
21
23
|
params: params,
|
|
22
24
|
size: (0, size_js_1.size)(data),
|
|
23
25
|
});
|
|
26
|
+
const budget = { limit: bytes.length * 32, used: 0 };
|
|
24
27
|
let consumed = 0;
|
|
25
28
|
const values = [];
|
|
26
29
|
for (let i = 0; i < params.length; ++i) {
|
|
@@ -28,6 +31,7 @@ function decodeAbiParameters(params, data) {
|
|
|
28
31
|
if (consumed < bytes.length)
|
|
29
32
|
cursor.setPosition(consumed);
|
|
30
33
|
const [data, consumed_] = decodeParameter(cursor, param, {
|
|
34
|
+
budget,
|
|
31
35
|
staticPosition: 0,
|
|
32
36
|
});
|
|
33
37
|
consumed += consumed_;
|
|
@@ -35,24 +39,27 @@ function decodeAbiParameters(params, data) {
|
|
|
35
39
|
}
|
|
36
40
|
return values;
|
|
37
41
|
}
|
|
38
|
-
function decodeParameter(cursor, param, { staticPosition }) {
|
|
42
|
+
function decodeParameter(cursor, param, { budget, staticPosition }) {
|
|
39
43
|
const arrayComponents = (0, encodeAbiParameters_js_1.getArrayComponents)(param.type);
|
|
40
44
|
if (arrayComponents) {
|
|
41
45
|
const [length, type] = arrayComponents;
|
|
42
|
-
return decodeArray(cursor, { ...param, type }, { length, staticPosition });
|
|
46
|
+
return decodeArray(cursor, { ...param, type }, { budget, length, staticPosition });
|
|
43
47
|
}
|
|
44
48
|
if (param.type === 'tuple')
|
|
45
|
-
return decodeTuple(cursor, param, {
|
|
49
|
+
return decodeTuple(cursor, param, {
|
|
50
|
+
budget,
|
|
51
|
+
staticPosition,
|
|
52
|
+
});
|
|
46
53
|
if (param.type === 'address')
|
|
47
54
|
return decodeAddress(cursor);
|
|
48
55
|
if (param.type === 'bool')
|
|
49
56
|
return decodeBool(cursor);
|
|
50
57
|
if (param.type.startsWith('bytes'))
|
|
51
|
-
return decodeBytes(cursor, param, { staticPosition });
|
|
58
|
+
return decodeBytes(cursor, param, { budget, staticPosition });
|
|
52
59
|
if (param.type.startsWith('uint') || param.type.startsWith('int'))
|
|
53
60
|
return decodeNumber(cursor, param);
|
|
54
61
|
if (param.type === 'string')
|
|
55
|
-
return decodeString(cursor, { staticPosition });
|
|
62
|
+
return decodeString(cursor, { budget, staticPosition });
|
|
56
63
|
throw new abi_js_1.InvalidAbiDecodingTypeError(param.type, {
|
|
57
64
|
docsPath: '/docs/contract/decodeAbiParameters',
|
|
58
65
|
});
|
|
@@ -63,7 +70,7 @@ function decodeAddress(cursor) {
|
|
|
63
70
|
const value = cursor.readBytes(32);
|
|
64
71
|
return [(0, getAddress_js_1.checksumAddress)((0, toHex_js_1.bytesToHex)((0, slice_js_1.sliceBytes)(value, -20))), 32];
|
|
65
72
|
}
|
|
66
|
-
function decodeArray(cursor, param, { length, staticPosition }) {
|
|
73
|
+
function decodeArray(cursor, param, { budget, length, staticPosition, }) {
|
|
67
74
|
if (length === null) {
|
|
68
75
|
const offset = (0, fromBytes_js_1.bytesToNumber)(cursor.readBytes(sizeOfOffset));
|
|
69
76
|
const start = staticPosition + offset;
|
|
@@ -76,6 +83,7 @@ function decodeArray(cursor, param, { length, staticPosition }) {
|
|
|
76
83
|
for (let i = 0; i < length; ++i) {
|
|
77
84
|
cursor.setPosition(startOfData + (dynamicChild ? i * 32 : consumed));
|
|
78
85
|
const [data, consumed_] = decodeParameter(cursor, param, {
|
|
86
|
+
budget,
|
|
79
87
|
staticPosition: startOfData,
|
|
80
88
|
});
|
|
81
89
|
consumed += consumed_;
|
|
@@ -95,6 +103,7 @@ function decodeArray(cursor, param, { length, staticPosition }) {
|
|
|
95
103
|
for (let i = 0; i < length; ++i) {
|
|
96
104
|
cursor.setPosition(start + i * 32);
|
|
97
105
|
const [data] = decodeParameter(cursor, param, {
|
|
106
|
+
budget,
|
|
98
107
|
staticPosition: start,
|
|
99
108
|
});
|
|
100
109
|
value.push(data);
|
|
@@ -106,6 +115,7 @@ function decodeArray(cursor, param, { length, staticPosition }) {
|
|
|
106
115
|
const value = [];
|
|
107
116
|
for (let i = 0; i < length; ++i) {
|
|
108
117
|
const [data, consumed_] = decodeParameter(cursor, param, {
|
|
118
|
+
budget,
|
|
109
119
|
staticPosition: staticPosition + consumed,
|
|
110
120
|
});
|
|
111
121
|
consumed += consumed_;
|
|
@@ -120,7 +130,7 @@ function decodeArray(cursor, param, { length, staticPosition }) {
|
|
|
120
130
|
function decodeBool(cursor) {
|
|
121
131
|
return [(0, fromBytes_js_1.bytesToBool)(cursor.readBytes(32), { size: 32 }), 32];
|
|
122
132
|
}
|
|
123
|
-
function decodeBytes(cursor, param, { staticPosition }) {
|
|
133
|
+
function decodeBytes(cursor, param, { budget, staticPosition }) {
|
|
124
134
|
const [_, size] = param.type.split('bytes');
|
|
125
135
|
if (!size) {
|
|
126
136
|
const offset = (0, fromBytes_js_1.bytesToNumber)(cursor.readBytes(32));
|
|
@@ -131,6 +141,9 @@ function decodeBytes(cursor, param, { staticPosition }) {
|
|
|
131
141
|
return ['0x', 32];
|
|
132
142
|
}
|
|
133
143
|
const data = cursor.readBytes(length);
|
|
144
|
+
budget.used += length;
|
|
145
|
+
if (budget.used > budget.limit)
|
|
146
|
+
throw new AbiDecodingSizeLimitExceededError({ limit: budget.limit });
|
|
134
147
|
cursor.setPosition(staticPosition + 32);
|
|
135
148
|
return [(0, toHex_js_1.bytesToHex)(data), 32];
|
|
136
149
|
}
|
|
@@ -148,7 +161,7 @@ function decodeNumber(cursor, param) {
|
|
|
148
161
|
32,
|
|
149
162
|
];
|
|
150
163
|
}
|
|
151
|
-
function decodeTuple(cursor, param, { staticPosition }) {
|
|
164
|
+
function decodeTuple(cursor, param, { budget, staticPosition }) {
|
|
152
165
|
const hasUnnamedChild = param.components.length === 0 || param.components.some(({ name }) => !name);
|
|
153
166
|
const value = hasUnnamedChild ? [] : {};
|
|
154
167
|
let consumed = 0;
|
|
@@ -159,6 +172,7 @@ function decodeTuple(cursor, param, { staticPosition }) {
|
|
|
159
172
|
const component = param.components[i];
|
|
160
173
|
cursor.setPosition(start + consumed);
|
|
161
174
|
const [data, consumed_] = decodeParameter(cursor, component, {
|
|
175
|
+
budget,
|
|
162
176
|
staticPosition: start,
|
|
163
177
|
});
|
|
164
178
|
consumed += consumed_;
|
|
@@ -170,6 +184,7 @@ function decodeTuple(cursor, param, { staticPosition }) {
|
|
|
170
184
|
for (let i = 0; i < param.components.length; ++i) {
|
|
171
185
|
const component = param.components[i];
|
|
172
186
|
const [data, consumed_] = decodeParameter(cursor, component, {
|
|
187
|
+
budget,
|
|
173
188
|
staticPosition,
|
|
174
189
|
});
|
|
175
190
|
value[hasUnnamedChild ? i : component?.name] = data;
|
|
@@ -177,7 +192,7 @@ function decodeTuple(cursor, param, { staticPosition }) {
|
|
|
177
192
|
}
|
|
178
193
|
return [value, consumed];
|
|
179
194
|
}
|
|
180
|
-
function decodeString(cursor, { staticPosition }) {
|
|
195
|
+
function decodeString(cursor, { budget, staticPosition }) {
|
|
181
196
|
const offset = (0, fromBytes_js_1.bytesToNumber)(cursor.readBytes(32));
|
|
182
197
|
const start = staticPosition + offset;
|
|
183
198
|
cursor.setPosition(start);
|
|
@@ -187,6 +202,9 @@ function decodeString(cursor, { staticPosition }) {
|
|
|
187
202
|
return ['', 32];
|
|
188
203
|
}
|
|
189
204
|
const data = cursor.readBytes(length, 32);
|
|
205
|
+
budget.used += length;
|
|
206
|
+
if (budget.used > budget.limit)
|
|
207
|
+
throw new AbiDecodingSizeLimitExceededError({ limit: budget.limit });
|
|
190
208
|
const value = (0, fromBytes_js_1.bytesToString)(data);
|
|
191
209
|
cursor.setPosition(staticPosition + 32);
|
|
192
210
|
return [value, 32];
|
|
@@ -207,4 +225,10 @@ function hasDynamicChild(param) {
|
|
|
207
225
|
return true;
|
|
208
226
|
return false;
|
|
209
227
|
}
|
|
228
|
+
class AbiDecodingSizeLimitExceededError extends base_js_1.BaseError {
|
|
229
|
+
constructor({ limit }) {
|
|
230
|
+
super(`Decoded \`bytes\` and \`string\` values exceed the size limit of ${limit} bytes.`, { name: 'AbiDecodingSizeLimitExceededError' });
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
exports.AbiDecodingSizeLimitExceededError = AbiDecodingSizeLimitExceededError;
|
|
210
234
|
//# sourceMappingURL=decodeAbiParameters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decodeAbiParameters.js","sourceRoot":"","sources":["../../../utils/abi/decodeAbiParameters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"decodeAbiParameters.js","sourceRoot":"","sources":["../../../utils/abi/decodeAbiParameters.ts"],"names":[],"mappings":"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"}
|
|
@@ -134,13 +134,14 @@ function encodeArray(value, { length, param, }) {
|
|
|
134
134
|
}
|
|
135
135
|
function encodeBytes(value, { param }) {
|
|
136
136
|
const [, paramSize] = param.type.split('bytes');
|
|
137
|
-
const
|
|
137
|
+
const hex = value.length % 2 ? `0x0${value.slice(2)}` : value;
|
|
138
|
+
const bytesSize = (0, size_js_1.size)(hex);
|
|
138
139
|
if (!paramSize) {
|
|
139
|
-
let value_ =
|
|
140
|
+
let value_ = hex;
|
|
140
141
|
if (bytesSize % 32 !== 0)
|
|
141
142
|
value_ = (0, pad_js_1.padHex)(value_, {
|
|
142
143
|
dir: 'right',
|
|
143
|
-
size: Math.ceil(
|
|
144
|
+
size: Math.ceil(bytesSize / 32) * 32,
|
|
144
145
|
});
|
|
145
146
|
return {
|
|
146
147
|
dynamic: true,
|
|
@@ -155,7 +156,7 @@ function encodeBytes(value, { param }) {
|
|
|
155
156
|
expectedSize: Number.parseInt(paramSize, 10),
|
|
156
157
|
value,
|
|
157
158
|
});
|
|
158
|
-
return { dynamic: false, encoded: (0, pad_js_1.padHex)(
|
|
159
|
+
return { dynamic: false, encoded: (0, pad_js_1.padHex)(hex, { dir: 'right' }) };
|
|
159
160
|
}
|
|
160
161
|
function encodeBool(value) {
|
|
161
162
|
if (typeof value !== 'boolean')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encodeAbiParameters.js","sourceRoot":"","sources":["../../../utils/abi/encodeAbiParameters.ts"],"names":[],"mappings":";;AAqFA,kDAmBC;
|
|
1
|
+
{"version":3,"file":"encodeAbiParameters.js","sourceRoot":"","sources":["../../../utils/abi/encodeAbiParameters.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,8 +33,10 @@ function encode(type, value, isArray = false) {
|
|
|
33
33
|
}
|
|
34
34
|
if (type === 'string')
|
|
35
35
|
return (0, toHex_js_1.stringToHex)(value);
|
|
36
|
-
if (type === 'bytes')
|
|
37
|
-
|
|
36
|
+
if (type === 'bytes') {
|
|
37
|
+
const hex = value;
|
|
38
|
+
return hex.length % 2 ? `0x0${hex.slice(2)}` : hex;
|
|
39
|
+
}
|
|
38
40
|
if (type === 'bool')
|
|
39
41
|
return (0, pad_js_1.pad)((0, toHex_js_1.boolToHex)(value), { size: isArray ? 32 : 1 });
|
|
40
42
|
const intMatch = type.match(regex_js_1.integerRegex);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encodePacked.js","sourceRoot":"","sources":["../../../utils/abi/encodePacked.ts"],"names":[],"mappings":";;AA4DA,oCAgBC;AAhED,gDAM4B;AAC5B,wDAGgC;AAGhC,0DAA4E;AAC5E,iDAAsE;AACtE,2CAAuD;AACvD,mDAO6B;AAC7B,0CAAkE;AAwBlE,SAAgB,YAAY,CAE1B,KAAqB,EAAE,MAA0C;IACjE,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;QAChC,MAAM,IAAI,uCAA8B,CAAC;YACvC,cAAc,EAAE,KAAK,CAAC,MAAgB;YACtC,WAAW,EAAE,MAAM,CAAC,MAAgB;SACrC,CAAC,CAAA;IAEJ,MAAM,IAAI,GAAU,EAAE,CAAA;IACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAI,KAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACvB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;IAChC,CAAC;IACD,OAAO,IAAA,qBAAS,EAAC,IAAI,CAAC,CAAA;AACxB,CAAC;AAaD,SAAS,MAAM,CACb,IAAmB,EACnB,KAA6C,EAC7C,OAAO,GAAG,KAAK;IAEf,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,KAAgB,CAAA;QAChC,IAAI,CAAC,IAAA,wBAAS,EAAC,OAAO,CAAC;YAAE,MAAM,IAAI,gCAAmB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;QACnE,OAAO,IAAA,YAAG,EAAC,OAAO,CAAC,WAAW,EAAS,EAAE;YACvC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI;SAC1B,CAAY,CAAA;IACf,CAAC;IACD,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAA,sBAAW,EAAC,KAAe,CAAC,CAAA;IAC1D,IAAI,IAAI,KAAK,OAAO;
|
|
1
|
+
{"version":3,"file":"encodePacked.js","sourceRoot":"","sources":["../../../utils/abi/encodePacked.ts"],"names":[],"mappings":"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"}
|
package/_cjs/utils/ccip.js
CHANGED
|
@@ -45,7 +45,7 @@ exports.offchainLookupAbiItem = {
|
|
|
45
45
|
},
|
|
46
46
|
],
|
|
47
47
|
};
|
|
48
|
-
async function offchainLookup(client, { blockNumber, blockTag, budget = (0, localBatchGatewayRequest_js_1.createCcipReadBudget)(), data, depth = 0, requestOptions, to, }) {
|
|
48
|
+
async function offchainLookup(client, { blockHash, blockNumber, blockTag, budget = (0, localBatchGatewayRequest_js_1.createCcipReadBudget)(), data, depth = 0, requestOptions, requireCanonical, to, }) {
|
|
49
49
|
const { args } = (0, decodeErrorResult_js_1.decodeErrorResult)({
|
|
50
50
|
data,
|
|
51
51
|
abi: [exports.offchainLookupAbiItem],
|
|
@@ -96,10 +96,12 @@ async function offchainLookup(client, { blockNumber, blockTag, budget = (0, loca
|
|
|
96
96
|
]);
|
|
97
97
|
try {
|
|
98
98
|
const { data: data_ } = await (0, call_js_1.call)({ ...client, ccipRead: false }, {
|
|
99
|
+
blockHash,
|
|
99
100
|
blockNumber,
|
|
100
101
|
blockTag,
|
|
101
102
|
data: callbackData,
|
|
102
103
|
requestOptions,
|
|
104
|
+
requireCanonical,
|
|
103
105
|
to,
|
|
104
106
|
});
|
|
105
107
|
return data_;
|
|
@@ -109,12 +111,14 @@ async function offchainLookup(client, { blockNumber, blockTag, budget = (0, loca
|
|
|
109
111
|
if (revertData?.slice(0, 10) !== exports.offchainLookupSignature)
|
|
110
112
|
throw err;
|
|
111
113
|
return await offchainLookup(client, {
|
|
114
|
+
blockHash,
|
|
112
115
|
blockNumber,
|
|
113
116
|
blockTag,
|
|
114
117
|
budget,
|
|
115
118
|
data: revertData,
|
|
116
119
|
depth: depth + 1,
|
|
117
120
|
requestOptions,
|
|
121
|
+
requireCanonical,
|
|
118
122
|
to,
|
|
119
123
|
});
|
|
120
124
|
}
|
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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"}
|
|
@@ -9,8 +9,8 @@ function getChainContractAddress({ blockNumber, chain, contract: name, }) {
|
|
|
9
9
|
chain,
|
|
10
10
|
contract: { name },
|
|
11
11
|
});
|
|
12
|
-
if (blockNumber &&
|
|
13
|
-
contract.blockCreated &&
|
|
12
|
+
if (blockNumber !== undefined &&
|
|
13
|
+
contract.blockCreated !== undefined &&
|
|
14
14
|
contract.blockCreated > blockNumber)
|
|
15
15
|
throw new chain_js_1.ChainDoesNotSupportContract({
|
|
16
16
|
blockNumber,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getChainContractAddress.js","sourceRoot":"","sources":["../../../utils/chain/getChainContractAddress.ts"],"names":[],"mappings":";;AASA,0DA+BC;AAxCD,oDAG8B;AAM9B,SAAgB,uBAAuB,CAAC,EACtC,WAAW,EACX,KAAK,EACL,QAAQ,EAAE,IAAI,GAKf;IACC,MAAM,QAAQ,GAAI,KAAK,EAAE,SAA2C,EAAE,CAAC,IAAI,CAAC,CAAA;IAC5E,IAAI,CAAC,QAAQ;QACX,MAAM,IAAI,sCAA2B,CAAC;YACpC,KAAK;YACL,QAAQ,EAAE,EAAE,IAAI,EAAE;SACnB,CAAC,CAAA;IAEJ,IACE,WAAW;
|
|
1
|
+
{"version":3,"file":"getChainContractAddress.js","sourceRoot":"","sources":["../../../utils/chain/getChainContractAddress.ts"],"names":[],"mappings":";;AASA,0DA+BC;AAxCD,oDAG8B;AAM9B,SAAgB,uBAAuB,CAAC,EACtC,WAAW,EACX,KAAK,EACL,QAAQ,EAAE,IAAI,GAKf;IACC,MAAM,QAAQ,GAAI,KAAK,EAAE,SAA2C,EAAE,CAAC,IAAI,CAAC,CAAA;IAC5E,IAAI,CAAC,QAAQ;QACX,MAAM,IAAI,sCAA2B,CAAC;YACpC,KAAK;YACL,QAAQ,EAAE,EAAE,IAAI,EAAE;SACnB,CAAC,CAAA;IAEJ,IACE,WAAW,KAAK,SAAS;QACzB,QAAQ,CAAC,YAAY,KAAK,SAAS;QACnC,QAAQ,CAAC,YAAY,GAAG,WAAW;QAEnC,MAAM,IAAI,sCAA2B,CAAC;YACpC,WAAW;YACX,KAAK;YACL,QAAQ,EAAE;gBACR,IAAI;gBACJ,YAAY,EAAE,QAAQ,CAAC,YAAY;aACpC;SACF,CAAC,CAAA;IAEJ,OAAO,QAAQ,CAAC,OAAO,CAAA;AACzB,CAAC"}
|
|
@@ -46,15 +46,14 @@ function charCodeToBase16(char) {
|
|
|
46
46
|
return char - (charCodeMap.a - 10);
|
|
47
47
|
return undefined;
|
|
48
48
|
}
|
|
49
|
-
function hexToBytes(
|
|
50
|
-
let hex = hex_;
|
|
51
|
-
if (opts.size) {
|
|
52
|
-
(0, fromHex_js_1.assertSize)(hex, { size: opts.size });
|
|
53
|
-
hex = (0, pad_js_1.pad)(hex, { dir: 'right', size: opts.size });
|
|
54
|
-
}
|
|
49
|
+
function hexToBytes(hex, opts = {}) {
|
|
55
50
|
let hexString = hex.slice(2);
|
|
56
51
|
if (hexString.length % 2)
|
|
57
52
|
hexString = `0${hexString}`;
|
|
53
|
+
if (opts.size) {
|
|
54
|
+
(0, fromHex_js_1.assertSize)(hex, { size: opts.size });
|
|
55
|
+
hexString = hexString.padEnd(opts.size * 2, '0');
|
|
56
|
+
}
|
|
58
57
|
const length = hexString.length / 2;
|
|
59
58
|
const bytes = new Uint8Array(length);
|
|
60
59
|
for (let index = 0, j = 0; index < length; index++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toBytes.js","sourceRoot":"","sources":["../../../utils/encoding/toBytes.ts"],"names":[],"mappings":";;AAqDA,0BASC;AA+BD,kCAQC;AAgDD,
|
|
1
|
+
{"version":3,"file":"toBytes.js","sourceRoot":"","sources":["../../../utils/encoding/toBytes.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,14 +12,23 @@ exports.getNftMetadataUri = getNftMetadataUri;
|
|
|
12
12
|
const Base64 = require("ox/Base64");
|
|
13
13
|
const readContract_js_1 = require("../../../actions/public/readContract.js");
|
|
14
14
|
const ens_js_1 = require("../../../errors/ens.js");
|
|
15
|
+
const request_js_1 = require("../../../errors/request.js");
|
|
15
16
|
const toHex_js_1 = require("../../encoding/toHex.js");
|
|
17
|
+
const http_js_1 = require("../../internal/http.js");
|
|
18
|
+
const withTimeout_js_1 = require("../../promise/withTimeout.js");
|
|
16
19
|
const networkRegex = /(?<protocol>https?:\/\/[^/]*|ipfs:\/|ipns:\/|ar:\/)?(?<root>\/)?(?<subpath>ipfs\/|ipns\/)?(?<target>[\w\-.]+)(?<subtarget>\/.*)?/;
|
|
17
20
|
const ipfsHashRegex = /^(Qm[1-9A-HJ-NP-Za-km-z]{44,}|b[A-Za-z2-7]{58,}|B[A-Z2-7]{58,}|z[1-9A-HJ-NP-Za-km-z]{48,}|F[0-9A-F]{50,})(\/(?<target>[\w\-.]+))?(?<subtarget>\/.*)?$/;
|
|
18
21
|
const base64Regex = /^data:([a-zA-Z\-/+]*);base64,([^"].*)/;
|
|
19
22
|
const dataURIRegex = /^data:([a-zA-Z\-/+]*)?(;[a-zA-Z0-9].*?)?(,)/;
|
|
20
|
-
|
|
23
|
+
const fetchTimeout = 10_000;
|
|
24
|
+
const maxMetadataBytes = 10_485_760;
|
|
25
|
+
async function isImageUri(uri, { timeout = fetchTimeout } = {}) {
|
|
21
26
|
try {
|
|
22
|
-
const res = await fetch(uri, { method: 'HEAD' })
|
|
27
|
+
const res = await (0, withTimeout_js_1.withTimeout)(({ signal }) => fetch(uri, { method: 'HEAD', ...(signal ? { signal } : {}) }), {
|
|
28
|
+
errorInstance: new request_js_1.TimeoutError({ body: {}, url: uri }),
|
|
29
|
+
signal: true,
|
|
30
|
+
timeout,
|
|
31
|
+
});
|
|
23
32
|
if (res.status === 200) {
|
|
24
33
|
const contentType = res.headers.get('content-type');
|
|
25
34
|
return contentType?.startsWith('image/');
|
|
@@ -27,6 +36,8 @@ async function isImageUri(uri) {
|
|
|
27
36
|
return false;
|
|
28
37
|
}
|
|
29
38
|
catch (error) {
|
|
39
|
+
if (error instanceof request_js_1.TimeoutError)
|
|
40
|
+
return false;
|
|
30
41
|
if (typeof error === 'object' && typeof error.response !== 'undefined') {
|
|
31
42
|
return false;
|
|
32
43
|
}
|
|
@@ -101,12 +112,21 @@ function getJsonImage(data) {
|
|
|
101
112
|
}
|
|
102
113
|
return data.image || data.image_url || data.image_data;
|
|
103
114
|
}
|
|
104
|
-
async function getMetadataAvatarUri({ gatewayUrls, uri, }) {
|
|
115
|
+
async function getMetadataAvatarUri({ gatewayUrls, timeout = fetchTimeout, uri, }) {
|
|
105
116
|
try {
|
|
106
|
-
const
|
|
117
|
+
const body = await (0, withTimeout_js_1.withTimeout)(async ({ signal }) => {
|
|
118
|
+
const response = await fetch(uri, signal ? { signal } : {});
|
|
119
|
+
return (0, http_js_1.readResponseBody)(response, {
|
|
120
|
+
maxResponseBodySize: maxMetadataBytes,
|
|
121
|
+
});
|
|
122
|
+
}, {
|
|
123
|
+
errorInstance: new request_js_1.TimeoutError({ body: {}, url: uri }),
|
|
124
|
+
signal: true,
|
|
125
|
+
timeout,
|
|
126
|
+
});
|
|
107
127
|
const image = await parseAvatarUri({
|
|
108
128
|
gatewayUrls,
|
|
109
|
-
uri: getJsonImage(
|
|
129
|
+
uri: getJsonImage(JSON.parse(body)),
|
|
110
130
|
});
|
|
111
131
|
return image;
|
|
112
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../utils/ens/avatar/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../utils/ens/avatar/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,10 @@ const request_js_1 = require("../../errors/request.js");
|
|
|
9
9
|
const decodeFunctionData_js_1 = require("../abi/decodeFunctionData.js");
|
|
10
10
|
const encodeErrorResult_js_1 = require("../abi/encodeErrorResult.js");
|
|
11
11
|
const encodeFunctionResult_js_1 = require("../abi/encodeFunctionResult.js");
|
|
12
|
+
const size_js_1 = require("../data/size.js");
|
|
12
13
|
exports.localBatchGatewayUrl = 'x-batch-gateway:true';
|
|
13
14
|
exports.ccipReadLimit = {
|
|
15
|
+
bytes: 10_485_760,
|
|
14
16
|
concurrency: 16,
|
|
15
17
|
depth: 4,
|
|
16
18
|
queries: 256,
|
|
@@ -19,6 +21,7 @@ function createCcipReadBudget() {
|
|
|
19
21
|
let active = 0;
|
|
20
22
|
const queue = [];
|
|
21
23
|
return {
|
|
24
|
+
bytes: exports.ccipReadLimit.bytes,
|
|
22
25
|
queries: exports.ccipReadLimit.queries,
|
|
23
26
|
async run(fn) {
|
|
24
27
|
if (active >= exports.ccipReadLimit.concurrency)
|
|
@@ -66,11 +69,20 @@ async function localBatchGatewayRequest(parameters) {
|
|
|
66
69
|
});
|
|
67
70
|
const urls = query.urls.slice(0, budget.queries);
|
|
68
71
|
budget.queries -= Math.max(1, urls.length);
|
|
69
|
-
|
|
72
|
+
const response = await budget.run(async () => budget.bytes < 0 ? '0x' : ccipRequest({ ...query, urls }));
|
|
73
|
+
budget.bytes -= (0, size_js_1.size)(response);
|
|
74
|
+
if (budget.bytes < 0)
|
|
75
|
+
throw new request_js_1.HttpRequestError({
|
|
76
|
+
details: `CCIP Read exceeded the maximum response size (${exports.ccipReadLimit.bytes} bytes).`,
|
|
77
|
+
url: exports.localBatchGatewayUrl,
|
|
78
|
+
});
|
|
79
|
+
responses[i] = response;
|
|
70
80
|
}
|
|
71
81
|
failures[i] = false;
|
|
72
82
|
}
|
|
73
83
|
catch (err) {
|
|
84
|
+
if (budget.bytes < 0)
|
|
85
|
+
throw err;
|
|
74
86
|
failures[i] = true;
|
|
75
87
|
responses[i] = encodeError(err);
|
|
76
88
|
}
|
|
@@ -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":";;;AA8CA,oDAqBC;AAED,4DA2EC;AAhJD,qDAAyD;AACzD,6DAA2D;AAC3D,wDAA0D;AAE1D,wEAAiE;AACjE,sEAA+D;AAC/D,4EAAqE;AAMrE,6CAAsC;AAEzB,QAAA,oBAAoB,GAAG,sBAAsB,CAAA;AAc7C,QAAA,aAAa,GAAG;IAC3B,KAAK,EAAE,UAAU;IACjB,WAAW,EAAE,EAAE;IACf,KAAK,EAAE,CAAC;IACR,OAAO,EAAE,GAAG;CACJ,CAAA;AAaV,SAAgB,oBAAoB;IAClC,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,MAAM,KAAK,GAAmB,EAAE,CAAA;IAChC,OAAO;QACL,KAAK,EAAE,qBAAa,CAAC,KAAK;QAC1B,OAAO,EAAE,qBAAa,CAAC,OAAO;QAC9B,KAAK,CAAC,GAAG,CAAC,EAAE;YACV,IAAI,MAAM,IAAI,qBAAa,CAAC,WAAW;gBACrC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;;gBACtD,MAAM,EAAE,CAAA;YACb,IAAI,CAAC;gBACH,OAAO,MAAM,EAAE,EAAE,CAAA;YACnB,CAAC;oBAAS,CAAC;gBAGT,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;gBAC1B,IAAI,IAAI;oBAAE,IAAI,EAAE,CAAA;;oBACX,MAAM,EAAE,CAAA;YACf,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAEM,KAAK,UAAU,wBAAwB,CAAC,UAO9C;IACC,MAAM,EACJ,IAAI,EACJ,WAAW,EACX,MAAM,GAAG,oBAAoB,EAAE,EAC/B,KAAK,GAAG,CAAC,GACV,GAAG,UAAU,CAAA;IAEd,MAAM,EACJ,IAAI,EAAE,CAAC,OAAO,CAAC,GAChB,GAAG,IAAA,0CAAkB,EAAC,EAAE,GAAG,EAAE,yBAAe,EAAE,IAAI,EAAE,CAAC,CAAA;IAEtD,MAAM,QAAQ,GAAc,EAAE,CAAA;IAC9B,MAAM,SAAS,GAAU,EAAE,CAAA;IAC3B,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC7B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,4BAAoB,CAAC,CAAA;YACxD,IAAI,MAAM,IAAI,KAAK,GAAG,CAAC,IAAI,qBAAa,CAAC,KAAK;gBAC5C,MAAM,IAAI,6BAAgB,CAAC;oBACzB,OAAO,EAAE,+CAA+C,qBAAa,CAAC,KAAK,IAAI;oBAC/E,GAAG,EAAE,4BAAoB;iBAC1B,CAAC,CAAA;YACJ,IAAI,MAAM;gBACR,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,wBAAwB,CAAC;oBAC5C,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,WAAW;oBACX,MAAM;oBACN,KAAK,EAAE,KAAK,GAAG,CAAC;iBACjB,CAAC,CAAA;iBACC,CAAC;gBACJ,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC;oBACrB,MAAM,IAAI,6BAAgB,CAAC;wBACzB,OAAO,EAAE,qDAAqD,qBAAa,CAAC,OAAO,IAAI;wBACvF,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;qBACzB,CAAC,CAAA;gBAIJ,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;gBAChD,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;gBAE1C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAC3C,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,CAC1D,CAAA;gBACD,MAAM,CAAC,KAAK,IAAI,IAAA,cAAI,EAAC,QAAQ,CAAC,CAAA;gBAC9B,IAAI,MAAM,CAAC,KAAK,GAAG,CAAC;oBAClB,MAAM,IAAI,6BAAgB,CAAC;wBACzB,OAAO,EAAE,iDAAiD,qBAAa,CAAC,KAAK,UAAU;wBACvF,GAAG,EAAE,4BAAoB;qBAC1B,CAAC,CAAA;gBACJ,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAA;YACzB,CAAC;YACD,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YAEb,IAAI,MAAM,CAAC,KAAK,GAAG,CAAC;gBAAE,MAAM,GAAG,CAAA;YAC/B,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;YAClB,SAAS,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,GAA2B,CAAC,CAAA;QACzD,CAAC;IACH,CAAC,CAAC,CACH,CAAA;IAED,OAAO,IAAA,8CAAoB,EAAC;QAC1B,GAAG,EAAE,yBAAe;QACpB,YAAY,EAAE,OAAO;QACrB,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;KAC9B,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAA2B;IAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,IAAI,KAAK,CAAC,MAAM;QACnD,OAAO,IAAA,wCAAiB,EAAC;YACvB,GAAG,EAAE,yBAAe;YACpB,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC;SACzC,CAAC,CAAA;IACJ,OAAO,IAAA,wCAAiB,EAAC;QACvB,GAAG,EAAE,CAAC,2BAAa,CAAC;QACpB,SAAS,EAAE,OAAO;QAClB,IAAI,EAAE,CAAC,cAAc,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;KACrE,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -10,7 +10,7 @@ function createBatchScheduler({ fn, id, shouldSplitBatch, wait = 0, sort, }) {
|
|
|
10
10
|
const args = scheduler.map(({ args }) => args);
|
|
11
11
|
if (args.length === 0)
|
|
12
12
|
return;
|
|
13
|
-
fn(args)
|
|
13
|
+
new Promise((resolve) => resolve(fn(args)))
|
|
14
14
|
.then((data) => {
|
|
15
15
|
if (sort && Array.isArray(data))
|
|
16
16
|
data.sort(sort);
|