viem 2.49.3 → 2.50.3
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 +54 -0
- package/_cjs/actions/ens/getEnsAddress.js +21 -6
- package/_cjs/actions/ens/getEnsAddress.js.map +1 -1
- package/_cjs/actions/public/call.js +76 -41
- package/_cjs/actions/public/call.js.map +1 -1
- package/_cjs/actions/public/getBalance.js +11 -4
- package/_cjs/actions/public/getBalance.js.map +1 -1
- package/_cjs/actions/public/getCode.js +12 -5
- package/_cjs/actions/public/getCode.js.map +1 -1
- package/_cjs/actions/public/getProof.js +9 -5
- package/_cjs/actions/public/getProof.js.map +1 -1
- package/_cjs/actions/public/getStorageAt.js +9 -4
- package/_cjs/actions/public/getStorageAt.js.map +1 -1
- package/_cjs/actions/public/getTransactionCount.js +10 -7
- package/_cjs/actions/public/getTransactionCount.js.map +1 -1
- package/_cjs/actions/public/multicall.js +3 -1
- package/_cjs/actions/public/multicall.js.map +1 -1
- package/_cjs/actions/public/readContract.js.map +1 -1
- package/_cjs/actions/wallet/prepareTransactionRequest.js.map +1 -1
- package/_cjs/actions/wallet/sendTransaction.js +14 -0
- package/_cjs/actions/wallet/sendTransaction.js.map +1 -1
- package/_cjs/actions/wallet/sendTransactionSync.js +15 -0
- package/_cjs/actions/wallet/sendTransactionSync.js.map +1 -1
- package/_cjs/chains/definitions/mizuhikiTestnetAwaji.js +29 -0
- package/_cjs/chains/definitions/mizuhikiTestnetAwaji.js.map +1 -0
- package/_cjs/chains/definitions/morphHolesky.js +1 -1
- package/_cjs/chains/definitions/morphHolesky.js.map +1 -1
- package/_cjs/chains/definitions/sentrix.js +29 -0
- package/_cjs/chains/definitions/sentrix.js.map +1 -0
- package/_cjs/chains/definitions/sentrixTestnet.js +30 -0
- package/_cjs/chains/definitions/sentrixTestnet.js.map +1 -0
- package/_cjs/chains/definitions/sova.js +1 -1
- package/_cjs/chains/definitions/sova.js.map +1 -1
- package/_cjs/chains/index.js +13 -7
- package/_cjs/chains/index.js.map +1 -1
- package/_cjs/constants/solidity.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/index.js +5 -3
- package/_cjs/index.js.map +1 -1
- package/_cjs/tempo/Chain.js +19 -0
- package/_cjs/tempo/Chain.js.map +1 -0
- package/_cjs/tempo/Decorator.js +1 -0
- package/_cjs/tempo/Decorator.js.map +1 -1
- package/_cjs/tempo/actions/fee.js +61 -0
- package/_cjs/tempo/actions/fee.js.map +1 -1
- package/_cjs/tempo/chainConfig.js +16 -6
- package/_cjs/tempo/chainConfig.js.map +1 -1
- package/_cjs/tempo/chains/index.js +11 -0
- package/_cjs/tempo/chains/index.js.map +1 -0
- package/_cjs/tempo/errors.js +58 -0
- package/_cjs/tempo/errors.js.map +1 -0
- package/_cjs/tempo/index.js +17 -1
- package/_cjs/tempo/index.js.map +1 -1
- package/_cjs/utils/abi/encodeEventTopics.js +4 -2
- package/_cjs/utils/abi/encodeEventTopics.js.map +1 -1
- package/_cjs/utils/block/formatBlockParameter.js +16 -0
- package/_cjs/utils/block/formatBlockParameter.js.map +1 -0
- package/_cjs/utils/ccipTunnel.js +65 -0
- package/_cjs/utils/ccipTunnel.js.map +1 -0
- package/_cjs/utils/index.js +6 -4
- package/_cjs/utils/index.js.map +1 -1
- package/_cjs/utils/nonceManager.js +7 -3
- package/_cjs/utils/nonceManager.js.map +1 -1
- package/_cjs/utils/observe.js +7 -1
- package/_cjs/utils/observe.js.map +1 -1
- package/_cjs/utils/rpc/socket.js +19 -2
- package/_cjs/utils/rpc/socket.js.map +1 -1
- package/_esm/actions/ens/getEnsAddress.js +21 -6
- package/_esm/actions/ens/getEnsAddress.js.map +1 -1
- package/_esm/actions/public/call.js +76 -41
- package/_esm/actions/public/call.js.map +1 -1
- package/_esm/actions/public/getBalance.js +11 -4
- package/_esm/actions/public/getBalance.js.map +1 -1
- package/_esm/actions/public/getCode.js +12 -5
- package/_esm/actions/public/getCode.js.map +1 -1
- package/_esm/actions/public/getProof.js +9 -5
- package/_esm/actions/public/getProof.js.map +1 -1
- package/_esm/actions/public/getStorageAt.js +9 -4
- package/_esm/actions/public/getStorageAt.js.map +1 -1
- package/_esm/actions/public/getTransactionCount.js +10 -7
- package/_esm/actions/public/getTransactionCount.js.map +1 -1
- package/_esm/actions/public/multicall.js +3 -1
- package/_esm/actions/public/multicall.js.map +1 -1
- package/_esm/actions/public/readContract.js.map +1 -1
- package/_esm/actions/wallet/prepareTransactionRequest.js.map +1 -1
- package/_esm/actions/wallet/sendTransaction.js +14 -0
- package/_esm/actions/wallet/sendTransaction.js.map +1 -1
- package/_esm/actions/wallet/sendTransactionSync.js +15 -0
- package/_esm/actions/wallet/sendTransactionSync.js.map +1 -1
- package/_esm/chains/definitions/mizuhikiTestnetAwaji.js +26 -0
- package/_esm/chains/definitions/mizuhikiTestnetAwaji.js.map +1 -0
- package/_esm/chains/definitions/morphHolesky.js +1 -1
- package/_esm/chains/definitions/morphHolesky.js.map +1 -1
- package/_esm/chains/definitions/sentrix.js +26 -0
- package/_esm/chains/definitions/sentrix.js.map +1 -0
- package/_esm/chains/definitions/sentrixTestnet.js +27 -0
- package/_esm/chains/definitions/sentrixTestnet.js.map +1 -0
- package/_esm/chains/definitions/sova.js +1 -1
- package/_esm/chains/definitions/sova.js.map +1 -1
- package/_esm/chains/index.js +3 -0
- package/_esm/chains/index.js.map +1 -1
- package/_esm/constants/solidity.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/index.js +1 -0
- package/_esm/index.js.map +1 -1
- package/_esm/tempo/Chain.js +6 -0
- package/_esm/tempo/Chain.js.map +1 -0
- package/_esm/tempo/Decorator.js +1 -0
- package/_esm/tempo/Decorator.js.map +1 -1
- package/_esm/tempo/actions/fee.js +83 -0
- package/_esm/tempo/actions/fee.js.map +1 -1
- package/_esm/tempo/actions/wallet.js +2 -2
- package/_esm/tempo/chainConfig.js +18 -8
- package/_esm/tempo/chainConfig.js.map +1 -1
- package/_esm/tempo/chains/index.js +3 -0
- package/_esm/tempo/chains/index.js.map +1 -0
- package/_esm/tempo/errors.js +51 -0
- package/_esm/tempo/errors.js.map +1 -0
- package/_esm/tempo/index.js +2 -0
- package/_esm/tempo/index.js.map +1 -1
- package/_esm/utils/abi/encodeEventTopics.js +6 -2
- package/_esm/utils/abi/encodeEventTopics.js.map +1 -1
- package/_esm/utils/block/formatBlockParameter.js +39 -0
- package/_esm/utils/block/formatBlockParameter.js.map +1 -0
- package/_esm/utils/ccipTunnel.js +62 -0
- package/_esm/utils/ccipTunnel.js.map +1 -0
- package/_esm/utils/index.js +1 -0
- package/_esm/utils/index.js.map +1 -1
- package/_esm/utils/nonceManager.js +7 -3
- package/_esm/utils/nonceManager.js.map +1 -1
- package/_esm/utils/observe.js +7 -1
- package/_esm/utils/observe.js.map +1 -1
- package/_esm/utils/rpc/socket.js +20 -2
- package/_esm/utils/rpc/socket.js.map +1 -1
- package/_types/actions/ens/getEnsAddress.d.ts +3 -1
- package/_types/actions/ens/getEnsAddress.d.ts.map +1 -1
- package/_types/actions/public/call.d.ts +17 -6
- package/_types/actions/public/call.d.ts.map +1 -1
- package/_types/actions/public/getBalance.d.ts +15 -3
- package/_types/actions/public/getBalance.d.ts.map +1 -1
- package/_types/actions/public/getCode.d.ts +15 -4
- package/_types/actions/public/getCode.d.ts.map +1 -1
- package/_types/actions/public/getProof.d.ts +14 -3
- package/_types/actions/public/getProof.d.ts.map +1 -1
- package/_types/actions/public/getStorageAt.d.ts +15 -4
- package/_types/actions/public/getStorageAt.d.ts.map +1 -1
- package/_types/actions/public/getTransactionCount.d.ts +15 -3
- package/_types/actions/public/getTransactionCount.d.ts.map +1 -1
- package/_types/actions/public/multicall.d.ts +1 -1
- package/_types/actions/public/multicall.d.ts.map +1 -1
- package/_types/actions/public/readContract.d.ts +1 -1
- package/_types/actions/public/readContract.d.ts.map +1 -1
- package/_types/actions/wallet/prepareTransactionRequest.d.ts +4 -2
- 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/mizuhikiTestnetAwaji.d.ts +46 -0
- package/_types/chains/definitions/mizuhikiTestnetAwaji.d.ts.map +1 -0
- package/_types/chains/definitions/morphHolesky.d.ts +1 -1
- package/_types/chains/definitions/sentrix.d.ts +46 -0
- package/_types/chains/definitions/sentrix.d.ts.map +1 -0
- package/_types/chains/definitions/sentrixTestnet.d.ts +46 -0
- package/_types/chains/definitions/sentrixTestnet.d.ts.map +1 -0
- package/_types/chains/definitions/sova.d.ts +1 -1
- package/_types/chains/index.d.ts +3 -0
- package/_types/chains/index.d.ts.map +1 -1
- package/_types/constants/solidity.d.ts +16 -3
- package/_types/constants/solidity.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/index.d.ts +1 -0
- package/_types/index.d.ts.map +1 -1
- package/_types/tempo/Chain.d.ts +5 -0
- package/_types/tempo/Chain.d.ts.map +1 -0
- package/_types/tempo/Decorator.d.ts +23 -0
- package/_types/tempo/Decorator.d.ts.map +1 -1
- package/_types/tempo/actions/fee.d.ts +38 -0
- package/_types/tempo/actions/fee.d.ts.map +1 -1
- package/_types/tempo/actions/wallet.d.ts +9 -6
- package/_types/tempo/actions/wallet.d.ts.map +1 -1
- package/_types/tempo/chainConfig.d.ts.map +1 -1
- package/_types/tempo/chains/index.d.ts +2 -0
- package/_types/tempo/chains/index.d.ts.map +1 -0
- package/_types/tempo/errors.d.ts +36 -0
- package/_types/tempo/errors.d.ts.map +1 -0
- package/_types/tempo/index.d.ts +2 -0
- package/_types/tempo/index.d.ts.map +1 -1
- package/_types/types/block.d.ts +3 -4
- package/_types/types/block.d.ts.map +1 -1
- package/_types/types/eip1193.d.ts +1 -1
- package/_types/types/eip1193.d.ts.map +1 -1
- package/_types/utils/abi/encodeEventTopics.d.ts +6 -2
- package/_types/utils/abi/encodeEventTopics.d.ts.map +1 -1
- package/_types/utils/block/formatBlockParameter.d.ts +45 -0
- package/_types/utils/block/formatBlockParameter.d.ts.map +1 -0
- package/_types/utils/ccipTunnel.d.ts +9 -0
- package/_types/utils/ccipTunnel.d.ts.map +1 -0
- package/_types/utils/index.d.ts +1 -0
- package/_types/utils/index.d.ts.map +1 -1
- package/_types/utils/nonceManager.d.ts.map +1 -1
- package/_types/utils/observe.d.ts.map +1 -1
- package/_types/utils/rpc/socket.d.ts.map +1 -1
- package/actions/ens/getEnsAddress.ts +34 -6
- package/actions/public/call.ts +125 -51
- package/actions/public/getBalance.ts +30 -9
- package/actions/public/getCode.ts +35 -11
- package/actions/public/getProof.ts +27 -11
- package/actions/public/getStorageAt.ts +33 -10
- package/actions/public/getTransactionCount.ts +33 -11
- package/actions/public/multicall.ts +6 -0
- package/actions/public/readContract.ts +2 -0
- package/actions/wallet/prepareTransactionRequest.ts +11 -15
- package/actions/wallet/sendTransaction.ts +13 -0
- package/actions/wallet/sendTransactionSync.ts +16 -0
- package/chains/definitions/mizuhikiTestnetAwaji.ts +26 -0
- package/chains/definitions/morphHolesky.ts +1 -1
- package/chains/definitions/sentrix.ts +26 -0
- package/chains/definitions/sentrixTestnet.ts +27 -0
- package/chains/definitions/sova.ts +1 -1
- package/chains/index.ts +3 -0
- package/constants/solidity.ts +4 -4
- package/errors/version.ts +1 -1
- package/index.ts +4 -0
- package/package.json +11 -3
- package/tempo/Chain.ts +20 -0
- package/tempo/Decorator.ts +27 -0
- package/tempo/actions/fee.ts +117 -1
- package/tempo/actions/wallet.ts +9 -6
- package/tempo/chainConfig.ts +18 -12
- package/tempo/chains/index.ts +9 -0
- package/tempo/chains/package.json +6 -0
- package/tempo/errors.ts +78 -0
- package/tempo/index.ts +2 -0
- package/types/block.ts +3 -5
- package/types/eip1193.ts +1 -1
- package/utils/abi/encodeEventTopics.ts +25 -6
- package/utils/block/formatBlockParameter.ts +63 -0
- package/utils/ccipTunnel.ts +67 -0
- package/utils/index.ts +4 -0
- package/utils/nonceManager.ts +7 -3
- package/utils/observe.ts +7 -4
- package/utils/rpc/socket.ts +21 -2
package/_cjs/utils/index.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
5
|
-
exports.
|
|
6
|
-
exports.parseUnits = exports.parseGwei = exports.parseEther = exports.formatUnits = exports.formatGwei = exports.formatEther = void 0;
|
|
3
|
+
exports.pad = exports.isHex = exports.isBytes = exports.concatHex = exports.concatBytes = exports.concat = exports.getChainContractAddress = exports.extractChain = exports.defineChain = exports.assertCurrentChain = exports.ccipReadTunnel = exports.offchainLookupSignature = exports.offchainLookupAbiItem = exports.offchainLookup = exports.ccipFetch = exports.ccipRequest = exports.buildRequest = exports.verifyAuthorization = exports.serializeAuthorizationList = exports.recoverAuthorizationAddress = exports.hashAuthorization = exports.isAddressEqual = exports.isAddress = exports.getCreateAddress = exports.getCreate2Address = exports.getContractAddress = exports.getAddress = exports.parseEventLogs = exports.getAbiItem = exports.formatAbiItemWithArgs = exports.formatAbiParams = exports.formatAbiItem = exports.encodePacked = exports.encodeFunctionResult = exports.encodeFunctionData = exports.encodeEventTopics = exports.encodeErrorResult = exports.encodeDeployData = exports.encodeAbiParameters = exports.decodeFunctionResult = exports.decodeFunctionData = exports.decodeEventLog = exports.decodeErrorResult = exports.decodeAbiParameters = exports.publicKeyToAddress = exports.parseAccount = exports.parseAbiParameters = exports.parseAbiParameter = exports.parseAbiItem = exports.parseAbi = void 0;
|
|
4
|
+
exports.keccak256 = exports.isHash = exports.getAction = exports.formatTransactionRequest = exports.defineTransactionRequest = exports.defineTransactionReceipt = exports.transactionType = exports.formatTransaction = exports.defineTransaction = exports.formatLog = exports.defineFormatter = exports.extract = exports.formatBlock = exports.defineBlock = exports.getTransactionError = exports.getNodeError = exports.containsNodeError = exports.getEstimateGasError = exports.getContractError = exports.getCallError = exports.toRlp = exports.toHex = exports.stringToHex = exports.numberToHex = exports.bytesToHex = exports.boolToHex = exports.toBytes = exports.stringToBytes = exports.numberToBytes = exports.hexToBytes = exports.boolToBytes = exports.fromRlp = exports.hexToString = exports.hexToNumber = exports.hexToBool = exports.hexToBigInt = exports.fromHex = exports.fromBytes = exports.bytesToString = exports.bytesToNumber = exports.bytesToBool = exports.bytesToBigint = exports.bytesToBigInt = exports.trim = exports.sliceHex = exports.sliceBytes = exports.slice = exports.size = exports.padHex = exports.padBytes = void 0;
|
|
5
|
+
exports.serializeTypedData = exports.serializeTransaction = exports.serializeAccessList = exports.parseTransaction = exports.getTransactionType = exports.getSerializedTransactionType = exports.assertTransactionLegacy = exports.assertTransactionEIP2930 = exports.assertTransactionEIP1559 = exports.assertRequest = exports.stringify = exports.verifyTypedData = exports.verifyMessage = exports.verifyHash = exports.serializeErc8010Signature = exports.serializeErc6492Signature = exports.recoverTypedDataAddress = exports.recoverPublicKey = exports.recoverMessageAddress = exports.recoverAddress = exports.parseErc8010Signature = exports.parseErc6492Signature = exports.isErc8010Signature = exports.isErc6492Signature = exports.hashTypedData = exports.hashStruct = exports.hashMessage = exports.getWebSocketRpcClient = exports.socketClientCache = exports.getSocketRpcClient = exports.getHttpRpcClient = exports.rpc = exports.getSocket = exports.integerRegex = exports.bytesRegex = exports.arrayRegex = exports.nonceManager = exports.createNonceManager = exports.getFunctionSignature = exports.toFunctionSignature = exports.getFunctionSelector = exports.toFunctionSelector = exports.toFunctionHash = exports.getEventSignature = exports.toEventSignature = exports.getEventSelector = exports.toEventSelector = exports.toEventHash = exports.sha256 = exports.ripemd160 = void 0;
|
|
6
|
+
exports.parseUnits = exports.parseGwei = exports.parseEther = exports.formatUnits = exports.formatGwei = exports.formatEther = exports.validateTypedData = void 0;
|
|
7
7
|
var abitype_1 = require("abitype");
|
|
8
8
|
Object.defineProperty(exports, "parseAbi", { enumerable: true, get: function () { return abitype_1.parseAbi; } });
|
|
9
9
|
Object.defineProperty(exports, "parseAbiItem", { enumerable: true, get: function () { return abitype_1.parseAbiItem; } });
|
|
@@ -72,6 +72,8 @@ Object.defineProperty(exports, "ccipFetch", { enumerable: true, get: function ()
|
|
|
72
72
|
Object.defineProperty(exports, "offchainLookup", { enumerable: true, get: function () { return ccip_js_1.offchainLookup; } });
|
|
73
73
|
Object.defineProperty(exports, "offchainLookupAbiItem", { enumerable: true, get: function () { return ccip_js_1.offchainLookupAbiItem; } });
|
|
74
74
|
Object.defineProperty(exports, "offchainLookupSignature", { enumerable: true, get: function () { return ccip_js_1.offchainLookupSignature; } });
|
|
75
|
+
var ccipTunnel_js_1 = require("./ccipTunnel.js");
|
|
76
|
+
Object.defineProperty(exports, "ccipReadTunnel", { enumerable: true, get: function () { return ccipTunnel_js_1.ccipReadTunnel; } });
|
|
75
77
|
var assertCurrentChain_js_1 = require("./chain/assertCurrentChain.js");
|
|
76
78
|
Object.defineProperty(exports, "assertCurrentChain", { enumerable: true, get: function () { return assertCurrentChain_js_1.assertCurrentChain; } });
|
|
77
79
|
var defineChain_js_1 = require("./chain/defineChain.js");
|
package/_cjs/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":";;;;;;AACA,mCASgB;AAJd,mGAAA,QAAQ,OAAA;AACR,uGAAA,YAAY,OAAA;AACZ,4GAAA,iBAAiB,OAAA;AACjB,6GAAA,kBAAkB,OAAA;AAEpB,qEAG0C;AADxC,+GAAA,YAAY,OAAA;AAEd,iFAGgD;AAD9C,2HAAA,kBAAkB,OAAA;AAEpB,uEAIqC;AADnC,6HAAA,mBAAmB,OAAA;AAErB,mEAKmC;AADjC,yHAAA,iBAAiB,OAAA;AAEnB,6DAKgC;AAD9B,mHAAA,cAAc,OAAA;AAEhB,qEAKoC;AADlC,2HAAA,kBAAkB,OAAA;AAEpB,yEAKsC;AADpC,+HAAA,oBAAoB,OAAA;AAEtB,uEAIqC;AADnC,6HAAA,mBAAmB,OAAA;AAErB,iEAIkC;AADhC,uHAAA,gBAAgB,OAAA;AAElB,mEAImC;AADjC,yHAAA,iBAAiB,OAAA;AAEnB,mEAKmC;AADjC,yHAAA,iBAAiB,OAAA;AAEnB,qEAIoC;AADlC,2HAAA,kBAAkB,OAAA;AAEpB,yEAIsC;AADpC,+HAAA,oBAAoB,OAAA;AAEtB,yDAAgF;AAA3C,+GAAA,YAAY,OAAA;AACjD,2DAM+B;AAF7B,iHAAA,aAAa,OAAA;AACb,mHAAA,eAAe,OAAA;AAEjB,2EAGuC;AADrC,iIAAA,qBAAqB,OAAA;AAEvB,qDAI4B;AAD1B,2GAAA,UAAU,OAAA;AAEZ,6DAKgC;AAD9B,mHAAA,cAAc,OAAA;AAEhB,yDAGgC;AAD9B,2GAAA,UAAU,OAAA;AAEZ,yEASwC;AAHtC,2HAAA,kBAAkB,OAAA;AAClB,0HAAA,iBAAiB,OAAA;AACjB,yHAAA,gBAAgB,OAAA;AAElB,uDAA2E;AAAzC,yGAAA,SAAS,OAAA;AAC3C,iEAGoC;AADlC,mHAAA,cAAc,OAAA;AAEhB,6EAK6C;AAD3C,yHAAA,iBAAiB,OAAA;AAEnB,iGAKuD;AADrD,6IAAA,2BAA2B,OAAA;AAE7B,+FAIsD;AADpD,2IAAA,0BAA0B,OAAA;AAE5B,iFAK+C;AAD7C,6HAAA,mBAAmB,OAAA;AAErB,qDAG0B;AAFxB,+GAAA,YAAY,OAAA;AAGd,qCAQkB;AAPhB,sGAAA,WAAW,OAAA;AAEX,oGAAA,WAAW,OAAa;AAExB,yGAAA,cAAc,OAAA;AACd,gHAAA,qBAAqB,OAAA;AACrB,kHAAA,uBAAuB,OAAA;AAEzB,uEAIsC;AADpC,2HAAA,kBAAkB,OAAA;AAEpB,yDAAoD;AAA3C,6GAAA,WAAW,OAAA;AACpB,2DAKgC;AAD9B,+GAAA,YAAY,OAAA;AAEd,iFAG2C;AADzC,qIAAA,uBAAuB,OAAA;AAEzB,8CAOyB;AAHvB,mGAAA,MAAM,OAAA;AACN,wGAAA,WAAW,OAAA;AACX,sGAAA,SAAS,OAAA;AAEX,gDAAkE;AAAlC,qGAAA,OAAO,OAAA;AACvC,4CAA4D;AAA9B,iGAAA,KAAK,OAAA;AACnC,wCAOsB;AAHpB,6FAAA,GAAG,OAAA;AACH,kGAAA,QAAQ,OAAA;AACR,gGAAA,MAAM,OAAA;AAER,0CAAyD;AAA5B,+FAAA,IAAI,OAAA;AACjC,4CAUwB;AAHtB,iGAAA,KAAK,OAAA;AACL,sGAAA,UAAU,OAAA;AACV,oGAAA,QAAQ,OAAA;AAEV,0CAA8E;AAA5B,+FAAA,IAAI,OAAA;AACtD,wDAkBgC;AAT9B,6GAAA,aAAa,OAAA;AACb,6GAAA,aAAa,OAAiB;AAC9B,2GAAA,WAAW,OAAA;AACX,6GAAA,aAAa,OAAA;AACb,6GAAA,aAAa,OAAA;AAIb,yGAAA,SAAS,OAAA;AAEX,oDAkB8B;AAb5B,qGAAA,OAAO,OAAA;AASP,yGAAA,WAAW,OAAA;AACX,uGAAA,SAAS,OAAA;AACT,yGAAA,WAAW,OAAA;AACX,yGAAA,WAAW,OAAA;AAEb,oDAG8B;AAD5B,qGAAA,OAAO,OAAA;AAET,oDAe8B;AAZ5B,yGAAA,WAAW,OAAA;AAGX,wGAAA,UAAU,OAAA;AAEV,2GAAA,aAAa,OAAA;AAGb,2GAAA,aAAa,OAAA;AAGb,qGAAA,OAAO,OAAA;AAET,gDAgB4B;AAX1B,qGAAA,SAAS,OAAA;AACT,sGAAA,UAAU,OAAA;AAGV,uGAAA,WAAW,OAAA;AAGX,uGAAA,WAAW,OAAA;AAGX,iGAAA,KAAK,OAAA;AAEP,gDAM4B;AAD1B,iGAAA,KAAK,OAAA;AAEP,4DAGiC;AAD/B,+GAAA,YAAY,OAAA;AAEd,oEAGqC;AADnC,uHAAA,gBAAgB,OAAA;AAElB,0EAGwC;AADtC,6HAAA,mBAAmB,OAAA;AAErB,4DAKiC;AAJ/B,oHAAA,iBAAiB,OAAA;AAGjB,+GAAA,YAAY,OAAA;AAEd,0EAIwC;AADtC,6HAAA,mBAAmB,OAAA;AAErB,kDAM8B;AAJ5B,uGAAA,WAAW,OAAA;AAGX,uGAAA,WAAW,OAAA;AAEb,sDAAwE;AAAxC,qGAAA,OAAO,OAAA;AACvC,0DAGkC;AADhC,+GAAA,eAAe,OAAA;AAEjB,8CAAwE;AAAtC,mGAAA,SAAS,OAAA;AAC3C,8DAOoC;AALlC,mHAAA,iBAAiB,OAAA;AAGjB,mHAAA,iBAAiB,OAAA;AACjB,iHAAA,eAAe,OAAA;AAEjB,4EAK2C;AAHzC,iIAAA,wBAAwB,OAAA;AAI1B,4EAM2C;AAJzC,iIAAA,wBAAwB,OAAA;AAGxB,iIAAA,wBAAwB,OAAA;AAE1B,+CAA0C;AAAjC,yGAAA,SAAS,OAAA;AAClB,8CAA+D;AAAhC,mGAAA,MAAM,OAAA;AACrC,oDAAwE;AAAtC,yGAAA,SAAS,OAAA;AAC3C,oDAAwE;AAAtC,yGAAA,SAAS,OAAA;AAC3C,8CAA+D;AAAhC,mGAAA,MAAM,OAAA;AACrC,wDAG8B;AAD5B,6GAAA,WAAW,OAAA;AAEb,gEAOkC;AAHhC,qHAAA,eAAe,OAAA;AAEf,sHAAA,eAAe,OAAoB;AAErC,kEAOmC;AAHjC,uHAAA,gBAAgB,OAAA;AAEhB,wHAAA,gBAAgB,OAAqB;AAEvC,8DAGiC;AAD/B,mHAAA,cAAc,OAAA;AAEhB,sEAOqC;AAHnC,2HAAA,kBAAkB,OAAA;AAElB,4HAAA,kBAAkB,OAAuB;AAE3C,wEAOsC;AAHpC,6HAAA,mBAAmB,OAAA;AAEnB,8HAAA,mBAAmB,OAAwB;AAE7C,qDAM0B;AAJxB,qHAAA,kBAAkB,OAAA;AAGlB,+GAAA,YAAY,OAAA;AAEd,uCAAiE;AAAxD,sGAAA,UAAU,OAAA;AAAE,sGAAA,UAAU,OAAA;AAAE,wGAAA,YAAY,OAAA;AAC7C,6CASwB;AARtB,sGAAA,SAAS,OAAA;AACT,gGAAA,GAAG,OAAA;AAQL,yCAOsB;AANpB,2GAAA,gBAAgB,OAAA;AAOlB,6CAQwB;AAJtB,+GAAA,kBAAkB,OAAA;AAGlB,8GAAA,iBAAiB,OAAA;AAEnB,mDAA0D;AAAjD,qHAAA,qBAAqB,OAAA;AAC9B,6DAImC;AADjC,6GAAA,WAAW,OAAA;AAEb,iEAOqC;AAFnC,8GAAA,UAAU,OAAA;AACV,iHAAA,aAAa,OAAA;AAEf,2EAK0C;AADxC,2HAAA,kBAAkB,OAAA;AAEpB,2EAK0C;AADxC,2HAAA,kBAAkB,OAAA;AAEpB,iFAK6C;AAD3C,iIAAA,qBAAqB,OAAA;AAEvB,iFAK6C;AAD3C,iIAAA,qBAAqB,OAAA;AAEvB,mEAKsC;AADpC,mHAAA,cAAc,OAAA;AAEhB,iFAK6C;AAD3C,iIAAA,qBAAqB,OAAA;AAEvB,uEAKwC;AADtC,uHAAA,gBAAgB,OAAA;AAElB,qFAK+C;AAD7C,qIAAA,uBAAuB,OAAA;AAEzB,yFAKiD;AAD/C,yIAAA,yBAAyB,OAAA;AAE3B,yFAKiD;AAD/C,yIAAA,yBAAyB,OAAA;AAE3B,2DAKkC;AADhC,2GAAA,UAAU,OAAA;AAEZ,iEAKqC;AADnC,iHAAA,aAAa,OAAA;AAEf,qEAKuC;AADrC,qHAAA,eAAe,OAAA;AAEjB,+CAAmE;AAAjC,yGAAA,SAAS,OAAA;AAC3C,mEAGuC;AADrC,iHAAA,aAAa,OAAA;AAEf,2EAO2C;AAHzC,gIAAA,wBAAwB,OAAA;AACxB,gIAAA,wBAAwB,OAAA;AACxB,+HAAA,uBAAuB,OAAA;AAEzB,iGAIsD;AADpD,+IAAA,4BAA4B,OAAA;AAE9B,6EAI4C;AAD1C,2HAAA,kBAAkB,OAAA;AAEpB,yEAG0C;AADxC,uHAAA,gBAAgB,OAAA;AAElB,+EAG6C;AAD3C,6HAAA,mBAAmB,OAAA;AAErB,iFAI8C;AAD5C,+HAAA,oBAAoB,OAAA;AAEtB,+CAMuB;AAHrB,kHAAA,kBAAkB,OAAA;AAElB,iHAAA,iBAAiB,OAAA;AAEnB,wDAA8E;AAA1C,6GAAA,WAAW,OAAA;AAC/C,sDAA2E;AAAxC,2GAAA,UAAU,OAAA;AAC7C,wDAA8E;AAA1C,6GAAA,WAAW,OAAA;AAC/C,sDAA2E;AAAxC,2GAAA,UAAU,OAAA;AAC7C,oDAAwE;AAAtC,yGAAA,SAAS,OAAA;AAC3C,sDAA2E;AAAxC,2GAAA,UAAU,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,10 @@ function createNonceManager(parameters) {
|
|
|
11
11
|
const nonceMap = new lru_js_1.LruMap(8192);
|
|
12
12
|
const promiseMap = new Map();
|
|
13
13
|
const getKey = ({ address, chainId }) => `${address}.${chainId}`;
|
|
14
|
+
const resetCache = (key) => {
|
|
15
|
+
deltaMap.delete(key);
|
|
16
|
+
promiseMap.delete(key);
|
|
17
|
+
};
|
|
14
18
|
return {
|
|
15
19
|
async consume({ address, chainId, client }) {
|
|
16
20
|
const key = getKey({ address, chainId });
|
|
@@ -40,7 +44,7 @@ function createNonceManager(parameters) {
|
|
|
40
44
|
return nonce;
|
|
41
45
|
}
|
|
42
46
|
finally {
|
|
43
|
-
|
|
47
|
+
resetCache(key);
|
|
44
48
|
}
|
|
45
49
|
})();
|
|
46
50
|
promiseMap.set(key, promise);
|
|
@@ -50,8 +54,8 @@ function createNonceManager(parameters) {
|
|
|
50
54
|
},
|
|
51
55
|
reset({ address, chainId }) {
|
|
52
56
|
const key = getKey({ address, chainId });
|
|
53
|
-
|
|
54
|
-
|
|
57
|
+
nonceMap.delete(key);
|
|
58
|
+
resetCache(key);
|
|
55
59
|
},
|
|
56
60
|
};
|
|
57
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nonceManager.js","sourceRoot":"","sources":["../../utils/nonceManager.ts"],"names":[],"mappings":";;;AAyCA,
|
|
1
|
+
{"version":3,"file":"nonceManager.js","sourceRoot":"","sources":["../../utils/nonceManager.ts"],"names":[],"mappings":"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"}
|
package/_cjs/utils/observe.js
CHANGED
|
@@ -10,7 +10,13 @@ function observe(observerId, callbacks, fn) {
|
|
|
10
10
|
const getListeners = () => exports.listenersCache.get(observerId) || [];
|
|
11
11
|
const unsubscribe = () => {
|
|
12
12
|
const listeners = getListeners();
|
|
13
|
-
|
|
13
|
+
const nextListeners = listeners.filter((cb) => cb.id !== callbackId);
|
|
14
|
+
if (nextListeners.length === 0) {
|
|
15
|
+
exports.listenersCache.delete(observerId);
|
|
16
|
+
exports.cleanupCache.delete(observerId);
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
exports.listenersCache.set(observerId, nextListeners);
|
|
14
20
|
};
|
|
15
21
|
const unwatch = () => {
|
|
16
22
|
const listeners = getListeners();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observe.js","sourceRoot":"","sources":["../../utils/observe.ts"],"names":[],"mappings":";;;AA8BA,
|
|
1
|
+
{"version":3,"file":"observe.js","sourceRoot":"","sources":["../../utils/observe.ts"],"names":[],"mappings":";;;AA8BA,0BAsDC;AA3EY,QAAA,cAAc,GAAiB,IAAI,GAAG,EAGhD,CAAA;AAEU,QAAA,YAAY,GAAiB,IAAI,GAAG,EAG9C,CAAA;AAMH,IAAI,aAAa,GAAG,CAAC,CAAA;AAOrB,SAAgB,OAAO,CACrB,UAAkB,EAClB,SAAoB,EACpB,EAA2B;IAE3B,MAAM,UAAU,GAAG,EAAE,aAAa,CAAA;IAElC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,sBAAc,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;IAE/D,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;QAChC,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,EAAO,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,UAAU,CAAC,CAAA;QACzE,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,sBAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YACjC,oBAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YAC/B,OAAM;QACR,CAAC;QACD,sBAAc,CAAC,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAA;IAC/C,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;QAChC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAO,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,UAAU,CAAC;YAAE,OAAM;QAC9D,MAAM,OAAO,GAAG,oBAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAC5C,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;YACtC,MAAM,CAAC,GAAG,OAAO,EAAE,CAAA;YACnB,IAAI,CAAC,YAAY,OAAO;gBAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QAC7C,CAAC;QACD,WAAW,EAAE,CAAA;IACf,CAAC,CAAA;IAED,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;IAChC,sBAAc,CAAC,GAAG,CAAC,UAAU,EAAE;QAC7B,GAAG,SAAS;QACZ,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE;KACnC,CAAC,CAAA;IAEF,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,OAAO,CAAA;IAErD,MAAM,IAAI,GAAc,EAAe,CAAA;IACvC,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CACX,GAAG,IAAyD,EAC5D,EAAE;YACF,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;YAChC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAM;YAClC,KAAK,MAAM,QAAQ,IAAI,SAAS;gBAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAA;QAChE,CAAC,CAAgD,CAAA;IACnD,CAAC;IAED,MAAM,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;IACxB,IAAI,OAAO,OAAO,KAAK,UAAU;QAAE,oBAAY,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IAExE,OAAO,OAAO,CAAA;AAChB,CAAC"}
|
package/_cjs/utils/rpc/socket.js
CHANGED
|
@@ -24,15 +24,22 @@ async function getSocketRpcClient(parameters) {
|
|
|
24
24
|
let error;
|
|
25
25
|
let socket;
|
|
26
26
|
let keepAliveTimer;
|
|
27
|
+
let reconnectTimer;
|
|
27
28
|
let reconnectInProgress = false;
|
|
29
|
+
let intentionallyClosed = false;
|
|
28
30
|
function attemptReconnect() {
|
|
29
|
-
if (reconnect && reconnectCount < attempts) {
|
|
31
|
+
if (reconnect && !intentionallyClosed && reconnectCount < attempts) {
|
|
30
32
|
if (reconnectInProgress)
|
|
31
33
|
return;
|
|
32
34
|
reconnectInProgress = true;
|
|
33
35
|
reconnectCount++;
|
|
34
36
|
socket?.close();
|
|
35
|
-
setTimeout(async () => {
|
|
37
|
+
reconnectTimer = setTimeout(async () => {
|
|
38
|
+
reconnectTimer = undefined;
|
|
39
|
+
if (intentionallyClosed) {
|
|
40
|
+
reconnectInProgress = false;
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
36
43
|
await setup().catch(console.error);
|
|
37
44
|
reconnectInProgress = false;
|
|
38
45
|
}, delay);
|
|
@@ -74,6 +81,10 @@ async function getSocketRpcClient(parameters) {
|
|
|
74
81
|
cache.delete(id);
|
|
75
82
|
},
|
|
76
83
|
});
|
|
84
|
+
if (intentionallyClosed) {
|
|
85
|
+
result.close();
|
|
86
|
+
return result;
|
|
87
|
+
}
|
|
77
88
|
socket = result;
|
|
78
89
|
if (keepAlive) {
|
|
79
90
|
if (keepAliveTimer)
|
|
@@ -95,7 +106,13 @@ async function getSocketRpcClient(parameters) {
|
|
|
95
106
|
error = undefined;
|
|
96
107
|
socketClient = {
|
|
97
108
|
close() {
|
|
109
|
+
intentionallyClosed = true;
|
|
98
110
|
keepAliveTimer && clearInterval(keepAliveTimer);
|
|
111
|
+
if (reconnectTimer) {
|
|
112
|
+
clearTimeout(reconnectTimer);
|
|
113
|
+
reconnectTimer = undefined;
|
|
114
|
+
reconnectInProgress = false;
|
|
115
|
+
}
|
|
99
116
|
socket.close();
|
|
100
117
|
exports.socketClientCache.delete(id);
|
|
101
118
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../utils/rpc/socket.ts"],"names":[],"mappings":";;;AAgGA,
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../utils/rpc/socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { addressResolverAbi, universalResolverResolveAbi, } from '../../constants/abis.js';
|
|
2
2
|
import { decodeFunctionResult, } from '../../utils/abi/decodeFunctionResult.js';
|
|
3
3
|
import { encodeFunctionData, } from '../../utils/abi/encodeFunctionData.js';
|
|
4
|
+
import { getAddress, } from '../../utils/address/getAddress.js';
|
|
4
5
|
import { getChainContractAddress, } from '../../utils/chain/getChainContractAddress.js';
|
|
6
|
+
import { size } from '../../utils/data/size.js';
|
|
5
7
|
import { trim } from '../../utils/data/trim.js';
|
|
6
8
|
import { toHex } from '../../utils/encoding/toHex.js';
|
|
7
9
|
import { isNullUniversalResolverError } from '../../utils/ens/errors.js';
|
|
@@ -82,12 +84,7 @@ export async function getEnsAddress(client, parameters) {
|
|
|
82
84
|
const res = await readContractAction(readContractParameters);
|
|
83
85
|
if (res[0] === '0x')
|
|
84
86
|
return null;
|
|
85
|
-
const address =
|
|
86
|
-
abi: addressResolverAbi,
|
|
87
|
-
args,
|
|
88
|
-
functionName: 'addr',
|
|
89
|
-
data: res[0],
|
|
90
|
-
});
|
|
87
|
+
const address = decodeAddress({ coinType, data: res[0], args });
|
|
91
88
|
if (address === '0x')
|
|
92
89
|
return null;
|
|
93
90
|
if (trim(address) === '0x00')
|
|
@@ -102,4 +99,22 @@ export async function getEnsAddress(client, parameters) {
|
|
|
102
99
|
throw err;
|
|
103
100
|
}
|
|
104
101
|
}
|
|
102
|
+
function decodeAddress({ coinType, data, args, }) {
|
|
103
|
+
try {
|
|
104
|
+
return decodeFunctionResult({
|
|
105
|
+
abi: addressResolverAbi,
|
|
106
|
+
args,
|
|
107
|
+
functionName: 'addr',
|
|
108
|
+
data,
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
catch (err) {
|
|
112
|
+
if (coinType == null)
|
|
113
|
+
throw err;
|
|
114
|
+
const address = trim(data);
|
|
115
|
+
if (size(address) === 20)
|
|
116
|
+
return getAddress(address);
|
|
117
|
+
throw err;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
105
120
|
//# sourceMappingURL=getEnsAddress.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEnsAddress.js","sourceRoot":"","sources":["../../../actions/ens/getEnsAddress.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,kBAAkB,EAClB,2BAA2B,GAC5B,MAAM,yBAAyB,CAAA;AAIhC,OAAO,EAEL,oBAAoB,GACrB,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAEL,kBAAkB,GACnB,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAEL,uBAAuB,GACxB,MAAM,8CAA8C,CAAA;AACrD,OAAO,EAAsB,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,EAAuB,KAAK,EAAE,MAAM,+BAA+B,CAAA;AAC1E,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAA;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAA;AAClF,OAAO,EAA0B,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAC9E,OAAO,EAEL,aAAa,GACd,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAEL,YAAY,GACb,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"getEnsAddress.js","sourceRoot":"","sources":["../../../actions/ens/getEnsAddress.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,9 @@ import { getAbortError, isAbortError, } from '../../errors/utils.js';
|
|
|
11
11
|
import { decodeFunctionResult, } from '../../utils/abi/decodeFunctionResult.js';
|
|
12
12
|
import { encodeDeployData, } from '../../utils/abi/encodeDeployData.js';
|
|
13
13
|
import { encodeFunctionData, } from '../../utils/abi/encodeFunctionData.js';
|
|
14
|
+
import { isAddressEqual } from '../../utils/address/isAddressEqual.js';
|
|
15
|
+
import { formatBlockParameter, } from '../../utils/block/formatBlockParameter.js';
|
|
14
16
|
import { getChainContractAddress, } from '../../utils/chain/getChainContractAddress.js';
|
|
15
|
-
import { numberToHex, } from '../../utils/encoding/toHex.js';
|
|
16
17
|
import { getCallError, } from '../../utils/errors/getCallError.js';
|
|
17
18
|
import { extract } from '../../utils/formatters/extract.js';
|
|
18
19
|
import { formatTransactionRequest, } from '../../utils/formatters/transactionRequest.js';
|
|
@@ -45,7 +46,7 @@ import { assertRequest } from '../../utils/transaction/assertRequest.js';
|
|
|
45
46
|
* })
|
|
46
47
|
*/
|
|
47
48
|
export async function call(client, args) {
|
|
48
|
-
const { account: account_ = client.account, authorizationList, batch = Boolean(client.batch?.multicall), blockNumber, blockTag = client.experimental_blockTag ?? 'latest', accessList, blobs, blockOverrides, code, data: data_, factory, factoryData, gas, gasPrice, maxFeePerBlobGas, maxFeePerGas, maxPriorityFeePerGas, nonce, requestOptions, to, value, stateOverride, ...rest } = args;
|
|
49
|
+
const { account: account_ = client.account, authorizationList, batch = Boolean(client.batch?.multicall), blockHash, blockNumber, blockTag = client.experimental_blockTag ?? 'latest', requireCanonical, accessList, blobs, blockOverrides, code, data: data_, factory, factoryData, gas, gasPrice, maxFeePerBlobGas, maxFeePerGas, maxPriorityFeePerGas, nonce, requestOptions, to, value, stateOverride, ...rest } = args;
|
|
49
50
|
const account = account_ ? parseAccount(account_) : undefined;
|
|
50
51
|
if (code && (factory || factoryData))
|
|
51
52
|
throw new BaseError('Cannot provide both `code` & `factory`/`factoryData` as parameters.');
|
|
@@ -73,8 +74,12 @@ export async function call(client, args) {
|
|
|
73
74
|
})();
|
|
74
75
|
try {
|
|
75
76
|
assertRequest(args);
|
|
76
|
-
const
|
|
77
|
-
|
|
77
|
+
const block = formatBlockParameter({
|
|
78
|
+
blockHash,
|
|
79
|
+
blockNumber,
|
|
80
|
+
blockTag,
|
|
81
|
+
requireCanonical,
|
|
82
|
+
});
|
|
78
83
|
const rpcBlockOverrides = blockOverrides
|
|
79
84
|
? BlockOverrides.toRpc(blockOverrides)
|
|
80
85
|
: undefined;
|
|
@@ -100,15 +105,28 @@ export async function call(client, args) {
|
|
|
100
105
|
}, 'call');
|
|
101
106
|
if (batch &&
|
|
102
107
|
shouldPerformMulticall({ request }) &&
|
|
103
|
-
!
|
|
104
|
-
|
|
108
|
+
!rpcBlockOverrides &&
|
|
109
|
+
blockHash === undefined) {
|
|
105
110
|
try {
|
|
106
|
-
|
|
107
|
-
|
|
111
|
+
const { deployless = false } = typeof client.batch?.multicall === 'object'
|
|
112
|
+
? client.batch.multicall
|
|
113
|
+
: {};
|
|
114
|
+
const multicallAddress = getMulticallAddress(client, {
|
|
108
115
|
blockNumber,
|
|
109
|
-
|
|
110
|
-
requestOptions,
|
|
116
|
+
deployless,
|
|
111
117
|
});
|
|
118
|
+
if (!multicallAddress ||
|
|
119
|
+
!hasStateOverrideForAddress(rpcStateOverride, multicallAddress))
|
|
120
|
+
return await scheduleMulticall(client, {
|
|
121
|
+
...request,
|
|
122
|
+
blockHash,
|
|
123
|
+
blockNumber,
|
|
124
|
+
blockTag,
|
|
125
|
+
multicallAddress,
|
|
126
|
+
requestOptions,
|
|
127
|
+
requireCanonical,
|
|
128
|
+
rpcStateOverride,
|
|
129
|
+
});
|
|
112
130
|
}
|
|
113
131
|
catch (err) {
|
|
114
132
|
if (!(err instanceof ClientChainNotConfiguredError) &&
|
|
@@ -192,25 +210,25 @@ function getRequestOptionsId(requestOptions) {
|
|
|
192
210
|
}
|
|
193
211
|
async function scheduleMulticall(client, args) {
|
|
194
212
|
const { batchSize = 1024, deployless = false, wait = 0, } = typeof client.batch?.multicall === 'object' ? client.batch.multicall : {};
|
|
195
|
-
const { blockNumber, blockTag = client.experimental_blockTag ?? 'latest', data, requestOptions, to, } = args;
|
|
196
|
-
const multicallAddress =
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
213
|
+
const { blockHash, blockNumber, blockTag = client.experimental_blockTag ?? 'latest', requireCanonical, data, multicallAddress: multicallAddress_, requestOptions, rpcStateOverride, to, } = args;
|
|
214
|
+
const multicallAddress = multicallAddress_ !== undefined
|
|
215
|
+
? multicallAddress_
|
|
216
|
+
: getMulticallAddress(client, {
|
|
217
|
+
blockNumber,
|
|
218
|
+
deployless,
|
|
219
|
+
});
|
|
220
|
+
const block = formatBlockParameter({
|
|
221
|
+
blockHash,
|
|
222
|
+
blockNumber,
|
|
223
|
+
blockTag,
|
|
224
|
+
requireCanonical,
|
|
225
|
+
});
|
|
226
|
+
const blockId = typeof block === 'string' ? block : JSON.stringify(block);
|
|
227
|
+
const stateOverrideKey = rpcStateOverride
|
|
228
|
+
? `.${JSON.stringify(rpcStateOverride)}`
|
|
229
|
+
: '';
|
|
212
230
|
const { schedule } = createBatchScheduler({
|
|
213
|
-
id: `${client.uid}.${
|
|
231
|
+
id: `${client.uid}.${blockId}.${getRequestOptionsId(requestOptions)}${stateOverrideKey}`,
|
|
214
232
|
wait,
|
|
215
233
|
shouldSplitBatch(args) {
|
|
216
234
|
const size = args.reduce((size, { data }) => size + (data.length - 2), 0);
|
|
@@ -227,21 +245,21 @@ async function scheduleMulticall(client, args) {
|
|
|
227
245
|
args: [calls],
|
|
228
246
|
functionName: 'aggregate3',
|
|
229
247
|
});
|
|
248
|
+
const multicallRequest = {
|
|
249
|
+
...(multicallAddress === null
|
|
250
|
+
? {
|
|
251
|
+
data: toDeploylessCallViaBytecodeData({
|
|
252
|
+
code: multicall3Bytecode,
|
|
253
|
+
data: calldata,
|
|
254
|
+
}),
|
|
255
|
+
}
|
|
256
|
+
: { to: multicallAddress, data: calldata }),
|
|
257
|
+
};
|
|
230
258
|
const data = await client.request({
|
|
231
259
|
method: 'eth_call',
|
|
232
|
-
params:
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
? {
|
|
236
|
-
data: toDeploylessCallViaBytecodeData({
|
|
237
|
-
code: multicall3Bytecode,
|
|
238
|
-
data: calldata,
|
|
239
|
-
}),
|
|
240
|
-
}
|
|
241
|
-
: { to: multicallAddress, data: calldata }),
|
|
242
|
-
},
|
|
243
|
-
block,
|
|
244
|
-
],
|
|
260
|
+
params: rpcStateOverride
|
|
261
|
+
? [multicallRequest, block, rpcStateOverride]
|
|
262
|
+
: [multicallRequest, block],
|
|
245
263
|
}, requestOptions);
|
|
246
264
|
return decodeFunctionResult({
|
|
247
265
|
abi: multicall3Abi,
|
|
@@ -258,6 +276,23 @@ async function scheduleMulticall(client, args) {
|
|
|
258
276
|
return { data: undefined };
|
|
259
277
|
return { data: returnData };
|
|
260
278
|
}
|
|
279
|
+
function getMulticallAddress(client, parameters) {
|
|
280
|
+
const { blockNumber, deployless } = parameters;
|
|
281
|
+
if (deployless)
|
|
282
|
+
return null;
|
|
283
|
+
if (client.chain)
|
|
284
|
+
return getChainContractAddress({
|
|
285
|
+
blockNumber,
|
|
286
|
+
chain: client.chain,
|
|
287
|
+
contract: 'multicall3',
|
|
288
|
+
});
|
|
289
|
+
throw new ClientChainNotConfiguredError();
|
|
290
|
+
}
|
|
291
|
+
function hasStateOverrideForAddress(rpcStateOverride, address) {
|
|
292
|
+
if (!rpcStateOverride)
|
|
293
|
+
return false;
|
|
294
|
+
return Object.keys(rpcStateOverride).some((stateOverrideAddress) => isAddressEqual(stateOverrideAddress, address));
|
|
295
|
+
}
|
|
261
296
|
function toDeploylessCallViaBytecodeData(parameters) {
|
|
262
297
|
const { code, data } = parameters;
|
|
263
298
|
return encodeDeployData({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call.js","sourceRoot":"","sources":["../../../actions/public/call.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,QAAQ,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,KAAK,cAAc,MAAM,mBAAmB,CAAA;AAGnD,OAAO,EAEL,YAAY,GACb,MAAM,sCAAsC,CAAA;AAG7C,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EACL,iCAAiC,EACjC,gCAAgC,EAChC,kBAAkB,GACnB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EACL,2BAA2B,EAC3B,6BAA6B,GAC9B,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EACL,mCAAmC,EACnC,gBAAgB,GAEjB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAEL,aAAa,EACb,YAAY,GACb,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"call.js","sourceRoot":"","sources":["../../../actions/public/call.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { multicall3Abi } from '../../constants/abis.js';
|
|
2
2
|
import { decodeFunctionResult } from '../../utils/abi/decodeFunctionResult.js';
|
|
3
3
|
import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js';
|
|
4
|
-
import {
|
|
4
|
+
import { formatBlockParameter, } from '../../utils/block/formatBlockParameter.js';
|
|
5
5
|
import { getAction } from '../../utils/getAction.js';
|
|
6
6
|
import { call } from './call.js';
|
|
7
7
|
/**
|
|
@@ -39,7 +39,13 @@ import { call } from './call.js';
|
|
|
39
39
|
* })
|
|
40
40
|
* // 10000000000000000000000n (wei)
|
|
41
41
|
*/
|
|
42
|
-
export async function getBalance(client, { address, blockNumber, blockTag = client.experimental_blockTag ?? 'latest', }) {
|
|
42
|
+
export async function getBalance(client, { address, blockHash, blockNumber, blockTag = client.experimental_blockTag ?? 'latest', requireCanonical, }) {
|
|
43
|
+
const block = formatBlockParameter({
|
|
44
|
+
blockHash,
|
|
45
|
+
blockNumber,
|
|
46
|
+
blockTag,
|
|
47
|
+
requireCanonical,
|
|
48
|
+
});
|
|
43
49
|
if (client.batch?.multicall && client.chain?.contracts?.multicall3) {
|
|
44
50
|
const multicall3Address = client.chain.contracts.multicall3.address;
|
|
45
51
|
const calldata = encodeFunctionData({
|
|
@@ -50,8 +56,10 @@ export async function getBalance(client, { address, blockNumber, blockTag = clie
|
|
|
50
56
|
const { data } = await getAction(client, call, 'call')({
|
|
51
57
|
to: multicall3Address,
|
|
52
58
|
data: calldata,
|
|
59
|
+
blockHash,
|
|
53
60
|
blockNumber,
|
|
54
61
|
blockTag,
|
|
62
|
+
requireCanonical,
|
|
55
63
|
});
|
|
56
64
|
return decodeFunctionResult({
|
|
57
65
|
abi: multicall3Abi,
|
|
@@ -60,10 +68,9 @@ export async function getBalance(client, { address, blockNumber, blockTag = clie
|
|
|
60
68
|
data: data || '0x',
|
|
61
69
|
});
|
|
62
70
|
}
|
|
63
|
-
const blockNumberHex = typeof blockNumber === 'bigint' ? numberToHex(blockNumber) : undefined;
|
|
64
71
|
const balance = await client.request({
|
|
65
72
|
method: 'eth_getBalance',
|
|
66
|
-
params: [address,
|
|
73
|
+
params: [address, block],
|
|
67
74
|
});
|
|
68
75
|
return BigInt(balance);
|
|
69
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBalance.js","sourceRoot":"","sources":["../../../actions/public/getBalance.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"getBalance.js","sourceRoot":"","sources":["../../../actions/public/getBalance.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAKvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAA;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAA;AAC1E,OAAO,EAEL,oBAAoB,GACrB,MAAM,2CAA2C,CAAA;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAuB,IAAI,EAAE,MAAM,WAAW,CAAA;AAqCrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAgC,EAChC,EACE,OAAO,EACP,SAAS,EACT,WAAW,EACX,QAAQ,GAAG,MAAM,CAAC,qBAAqB,IAAI,QAAQ,EACnD,gBAAgB,GACK;IAEvB,MAAM,KAAK,GAAG,oBAAoB,CAAC;QACjC,SAAS;QACT,WAAW;QACX,QAAQ;QACR,gBAAgB;KACjB,CAAC,CAAA;IAEF,IAAI,MAAM,CAAC,KAAK,EAAE,SAAS,IAAI,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;QACnE,MAAM,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAA;QAEnE,MAAM,QAAQ,GAAG,kBAAkB,CAAC;YAClC,GAAG,EAAE,aAAa;YAClB,YAAY,EAAE,eAAe;YAC7B,IAAI,EAAE,CAAC,OAAO,CAAC;SAChB,CAAC,CAAA;QAEF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAC9B,MAAM,EACN,IAAI,EACJ,MAAM,CACP,CAAC;YACA,EAAE,EAAE,iBAAiB;YACrB,IAAI,EAAE,QAAQ;YACd,SAAS;YACT,WAAW;YACX,QAAQ;YACR,gBAAgB;SACmB,CAAC,CAAA;QAEtC,OAAO,oBAAoB,CAAC;YAC1B,GAAG,EAAE,aAAa;YAClB,YAAY,EAAE,eAAe;YAC7B,IAAI,EAAE,CAAC,OAAO,CAAC;YACf,IAAI,EAAE,IAAI,IAAI,IAAI;SACnB,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QACnC,MAAM,EAAE,gBAAgB;QACxB,MAAM,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;KACzB,CAAC,CAAA;IACF,OAAO,MAAM,CAAC,OAAO,CAAC,CAAA;AACxB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { formatBlockParameter, } from '../../utils/block/formatBlockParameter.js';
|
|
2
2
|
/**
|
|
3
3
|
* Retrieves the bytecode at an address.
|
|
4
4
|
*
|
|
@@ -22,12 +22,19 @@ import { numberToHex, } from '../../utils/encoding/toHex.js';
|
|
|
22
22
|
* address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
|
|
23
23
|
* })
|
|
24
24
|
*/
|
|
25
|
-
export async function getCode(client, { address, blockNumber, blockTag = 'latest' }) {
|
|
26
|
-
const
|
|
25
|
+
export async function getCode(client, { address, blockHash, blockNumber, blockTag = 'latest', requireCanonical, }) {
|
|
26
|
+
const block = formatBlockParameter({
|
|
27
|
+
blockHash,
|
|
28
|
+
blockNumber,
|
|
29
|
+
blockTag,
|
|
30
|
+
requireCanonical,
|
|
31
|
+
});
|
|
27
32
|
const hex = await client.request({
|
|
28
33
|
method: 'eth_getCode',
|
|
29
|
-
params: [address,
|
|
30
|
-
}, {
|
|
34
|
+
params: [address, block],
|
|
35
|
+
}, {
|
|
36
|
+
dedupe: typeof blockNumber === 'bigint' || blockHash !== undefined,
|
|
37
|
+
});
|
|
31
38
|
if (hex === '0x')
|
|
32
39
|
return undefined;
|
|
33
40
|
return hex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCode.js","sourceRoot":"","sources":["../../../actions/public/getCode.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getCode.js","sourceRoot":"","sources":["../../../actions/public/getCode.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,oBAAoB,GACrB,MAAM,2CAA2C,CAAA;AAmClD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,MAAgC,EAChC,EACE,OAAO,EACP,SAAS,EACT,WAAW,EACX,QAAQ,GAAG,QAAQ,EACnB,gBAAgB,GACE;IAEpB,MAAM,KAAK,GAAG,oBAAoB,CAAC;QACjC,SAAS;QACT,WAAW;QACX,QAAQ;QACR,gBAAgB;KACjB,CAAC,CAAA;IACF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAC9B;QACE,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;KACzB,EACD;QACE,MAAM,EAAE,OAAO,WAAW,KAAK,QAAQ,IAAI,SAAS,KAAK,SAAS;KACnE,CACF,CAAA;IACD,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,SAAS,CAAA;IAClC,OAAO,GAAG,CAAA;AACZ,CAAC"}
|