viem 0.0.1-alpha.2 → 0.0.1-alpha.20
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/chains/package.json +1 -1
- package/clients/package.json +1 -1
- package/dist/{rpc-655c0ba4.d.ts → chain-32f56cfa.d.ts} +78 -17
- package/dist/chain-f12cdc7f.d.ts +5 -0
- package/dist/chains.d.ts +1291 -74
- package/dist/chains.js +125 -129
- package/dist/chains.js.map +1 -0
- package/dist/chains.mjs +129 -0
- package/dist/chains.mjs.map +1 -0
- package/dist/{chunk-3EOU525X.js → chunk-5Q6FSUU2.mjs} +1199 -562
- package/dist/chunk-5Q6FSUU2.mjs.map +1 -0
- package/dist/chunk-FHXXG7I6.js +259 -0
- package/dist/chunk-FHXXG7I6.js.map +1 -0
- package/dist/chunk-IAQPMSGJ.js +176 -0
- package/dist/chunk-IAQPMSGJ.js.map +1 -0
- package/dist/{chunk-4HNVS7AM.js → chunk-MYQNZSWD.mjs} +330 -539
- package/dist/chunk-MYQNZSWD.mjs.map +1 -0
- package/dist/chunk-NHAKUPTF.js +889 -0
- package/dist/chunk-NHAKUPTF.js.map +1 -0
- package/dist/chunk-SF4I2NKC.js +2683 -0
- package/dist/chunk-SF4I2NKC.js.map +1 -0
- package/dist/chunk-T7CBAKLI.mjs +176 -0
- package/dist/chunk-T7CBAKLI.mjs.map +1 -0
- package/dist/chunk-YFKR74XG.js +256 -0
- package/dist/chunk-YFKR74XG.js.map +1 -0
- package/dist/chunk-YODUQCHJ.mjs +256 -0
- package/dist/chunk-YODUQCHJ.mjs.map +1 -0
- package/dist/{chunk-YQRTXQ2G.js → chunk-ZVGTYLKU.mjs} +3 -15
- package/dist/chunk-ZVGTYLKU.mjs.map +1 -0
- package/dist/clients/index.d.ts +8 -7
- package/dist/clients/index.js +24 -25
- package/dist/clients/index.js.map +1 -0
- package/dist/clients/index.mjs +24 -0
- package/dist/clients/index.mjs.map +1 -0
- package/dist/contract-9af4608b.d.ts +142 -0
- package/dist/createClient-5d316c7e.d.ts +62 -0
- package/dist/createPublicClient-9d2b42e1.d.ts +19 -0
- package/dist/createTestClient-79498dab.d.ts +34 -0
- package/dist/createWalletClient-f69a5230.d.ts +30 -0
- package/dist/{eip1193-8f7c22ce.d.ts → eip1193-6c485d63.d.ts} +13 -10
- package/dist/index.d.ts +424 -11
- package/dist/index.js +395 -292
- package/dist/index.js.map +1 -0
- package/dist/index.mjs +395 -0
- package/dist/index.mjs.map +1 -0
- package/dist/{parseGwei-fd7a0f7d.d.ts → parseGwei-4308ad80.d.ts} +82 -139
- package/dist/public.d.ts +11 -0
- package/dist/public.js +59 -0
- package/dist/public.js.map +1 -0
- package/dist/public.mjs +59 -0
- package/dist/public.mjs.map +1 -0
- package/dist/{rpc-3c0e3985.d.ts → rpc-26932bae.d.ts} +1 -38
- package/dist/sendTransaction-1c8290a9.d.ts +12 -0
- package/dist/stopImpersonatingAccount-7781842a.d.ts +156 -0
- package/dist/test.d.ts +6 -0
- package/dist/test.js +60 -0
- package/dist/test.js.map +1 -0
- package/dist/test.mjs +60 -0
- package/dist/test.mjs.map +1 -0
- package/dist/transactionRequest-341b6ed2.d.ts +15 -0
- package/dist/utils/index.d.ts +51 -8
- package/dist/utils/index.js +171 -156
- package/dist/utils/index.js.map +1 -0
- package/dist/utils/index.mjs +171 -0
- package/dist/utils/index.mjs.map +1 -0
- package/dist/wallet.d.ts +8 -0
- package/dist/wallet.js +24 -0
- package/dist/wallet.js.map +1 -0
- package/dist/wallet.mjs +24 -0
- package/dist/wallet.mjs.map +1 -0
- package/dist/watchAsset-afaad3c7.d.ts +38 -0
- package/dist/{watchAsset-04ab8db5.d.ts → watchPendingTransactions-3b722547.d.ts} +67 -217
- package/dist/{webSocket-c6e0d26f.d.ts → webSocket-b180e679.d.ts} +4 -9
- package/dist/window.d.ts +3 -2
- package/dist/window.js +1 -0
- package/dist/window.js.map +1 -0
- package/dist/window.mjs +1 -0
- package/dist/window.mjs.map +1 -0
- package/package.json +30 -66
- package/src/_test/abis.ts +1413 -0
- package/src/_test/bench.ts +15 -0
- package/src/_test/constants.ts +60 -0
- package/src/_test/globalSetup.ts +11 -0
- package/src/_test/index.ts +23 -0
- package/src/_test/setup.ts +8 -0
- package/src/_test/utils.ts +112 -0
- package/src/actions/index.test.ts +78 -0
- package/src/actions/index.ts +174 -0
- package/src/actions/public/call.bench.ts +48 -0
- package/src/actions/public/call.test.ts +99 -0
- package/src/actions/public/call.ts +97 -0
- package/src/actions/public/createBlockFilter.bench.ts +11 -0
- package/src/actions/public/createBlockFilter.test.ts +9 -0
- package/src/actions/public/createBlockFilter.ts +14 -0
- package/src/actions/public/createContractEventFilter.test.ts +119 -0
- package/src/actions/public/createContractEventFilter.ts +69 -0
- package/src/actions/public/createEventFilter.test.ts +245 -0
- package/src/actions/public/createEventFilter.ts +76 -0
- package/src/actions/public/createPendingTransactionFilter.bench.ts +11 -0
- package/src/actions/public/createPendingTransactionFilter.test.ts +9 -0
- package/src/actions/public/createPendingTransactionFilter.ts +14 -0
- package/src/actions/public/deployContract.test.ts +56 -0
- package/src/actions/public/deployContract.ts +38 -0
- package/src/actions/public/estimateGas.bench.ts +46 -0
- package/src/actions/public/estimateGas.test.ts +92 -0
- package/src/actions/public/estimateGas.ts +61 -0
- package/src/actions/public/getBalance.test.ts +83 -0
- package/src/actions/public/getBalance.ts +37 -0
- package/src/actions/public/getBlock.bench.ts +28 -0
- package/src/actions/public/getBlock.test.ts +575 -0
- package/src/actions/public/getBlock.ts +65 -0
- package/src/actions/public/getBlockNumber.bench.ts +28 -0
- package/src/actions/public/getBlockNumber.test.ts +27 -0
- package/src/actions/public/getBlockNumber.ts +32 -0
- package/src/actions/public/getBlockTransactionCount.bench.ts +15 -0
- package/src/actions/public/getBlockTransactionCount.test.ts +57 -0
- package/src/actions/public/getBlockTransactionCount.ts +52 -0
- package/src/actions/public/getBytecode.test.ts +27 -0
- package/src/actions/public/getBytecode.ts +32 -0
- package/src/actions/public/getChainId.bench.ts +15 -0
- package/src/actions/public/getChainId.test.ts +8 -0
- package/src/actions/public/getChainId.ts +7 -0
- package/src/actions/public/getFeeHistory.bench.ts +18 -0
- package/src/actions/public/getFeeHistory.test.ts +137 -0
- package/src/actions/public/getFeeHistory.ts +44 -0
- package/src/actions/public/getFilterChanges.bench.ts +13 -0
- package/src/actions/public/getFilterChanges.test.ts +189 -0
- package/src/actions/public/getFilterChanges.ts +23 -0
- package/src/actions/public/getFilterLogs.test.ts +104 -0
- package/src/actions/public/getFilterLogs.ts +20 -0
- package/src/actions/public/getGasPrice.bench.ts +28 -0
- package/src/actions/public/getGasPrice.test.ts +8 -0
- package/src/actions/public/getGasPrice.ts +15 -0
- package/src/actions/public/getLogs.test.ts +107 -0
- package/src/actions/public/getLogs.ts +84 -0
- package/src/actions/public/getStorageAt.test.ts +34 -0
- package/src/actions/public/getStorageAt.ts +32 -0
- package/src/actions/public/getTransaction.bench.ts +33 -0
- package/src/actions/public/getTransaction.test.ts +311 -0
- package/src/actions/public/getTransaction.ts +95 -0
- package/src/actions/public/getTransactionConfirmations.test.ts +69 -0
- package/src/actions/public/getTransactionConfirmations.ts +38 -0
- package/src/actions/public/getTransactionCount.test.ts +56 -0
- package/src/actions/public/getTransactionCount.ts +34 -0
- package/src/actions/public/getTransactionReceipt.bench.ts +33 -0
- package/src/actions/public/getTransactionReceipt.test.ts +179 -0
- package/src/actions/public/getTransactionReceipt.ts +34 -0
- package/src/actions/public/index.test.ts +43 -0
- package/src/actions/public/index.ts +149 -0
- package/src/actions/public/readContract.test.ts +128 -0
- package/src/actions/public/readContract.ts +87 -0
- package/src/actions/public/simulateContract.bench.ts +31 -0
- package/src/actions/public/simulateContract.test.ts +238 -0
- package/src/actions/public/simulateContract.ts +98 -0
- package/src/actions/public/uninstallFilter.bench.ts +13 -0
- package/src/actions/public/uninstallFilter.test.ts +65 -0
- package/src/actions/public/uninstallFilter.ts +17 -0
- package/src/actions/public/waitForTransactionReceipt.test.ts +322 -0
- package/src/actions/public/waitForTransactionReceipt.ts +170 -0
- package/src/actions/public/watchBlockNumber.test.ts +166 -0
- package/src/actions/public/watchBlockNumber.ts +79 -0
- package/src/actions/public/watchBlocks.test.ts +210 -0
- package/src/actions/public/watchBlocks.ts +114 -0
- package/src/actions/public/watchContractEvent.test.ts +301 -0
- package/src/actions/public/watchContractEvent.ts +108 -0
- package/src/actions/public/watchEvent.test.ts +190 -0
- package/src/actions/public/watchEvent.ts +95 -0
- package/src/actions/public/watchPendingTransactions.test.ts +116 -0
- package/src/actions/public/watchPendingTransactions.ts +74 -0
- package/src/actions/test/dropTransaction.test.ts +34 -0
- package/src/actions/test/dropTransaction.ts +17 -0
- package/src/actions/test/getAutomine.test.ts +14 -0
- package/src/actions/test/getAutomine.ts +11 -0
- package/src/actions/test/getTxpoolContent.test.ts +45 -0
- package/src/actions/test/getTxpoolContent.ts +7 -0
- package/src/actions/test/getTxpoolStatus.test.ts +41 -0
- package/src/actions/test/getTxpoolStatus.ts +12 -0
- package/src/actions/test/impersonateAccount.test.ts +28 -0
- package/src/actions/test/impersonateAccount.ts +17 -0
- package/src/actions/test/increaseTime.test.ts +18 -0
- package/src/actions/test/increaseTime.ts +17 -0
- package/src/actions/test/index.test.ts +38 -0
- package/src/actions/test/index.ts +77 -0
- package/src/actions/test/inspectTxpool.test.ts +50 -0
- package/src/actions/test/inspectTxpool.ts +7 -0
- package/src/actions/test/mine.test.ts +20 -0
- package/src/actions/test/mine.ts +16 -0
- package/src/actions/test/removeBlockTimestampInterval.test.ts +23 -0
- package/src/actions/test/removeBlockTimestampInterval.ts +7 -0
- package/src/actions/test/reset.test.ts +19 -0
- package/src/actions/test/reset.ts +18 -0
- package/src/actions/test/revert.test.ts +39 -0
- package/src/actions/test/revert.ts +14 -0
- package/src/actions/test/sendUnsignedTransaction.test.ts +52 -0
- package/src/actions/test/sendUnsignedTransaction.ts +19 -0
- package/src/actions/test/setAutomine.test.ts +14 -0
- package/src/actions/test/setAutomine.ts +8 -0
- package/src/actions/test/setBalance.test.ts +29 -0
- package/src/actions/test/setBalance.ts +20 -0
- package/src/actions/test/setBlockGasLimit.test.ts +21 -0
- package/src/actions/test/setBlockGasLimit.ts +17 -0
- package/src/actions/test/setBlockTimestampInterval.test.ts +23 -0
- package/src/actions/test/setBlockTimestampInterval.ts +16 -0
- package/src/actions/test/setCode.test.ts +26 -0
- package/src/actions/test/setCode.ts +19 -0
- package/src/actions/test/setCoinbase.test.ts +11 -0
- package/src/actions/test/setCoinbase.ts +17 -0
- package/src/actions/test/setIntervalMining.test.ts +30 -0
- package/src/actions/test/setIntervalMining.ts +16 -0
- package/src/actions/test/setLoggingEnabled.test.ts +10 -0
- package/src/actions/test/setLoggingEnabled.ts +8 -0
- package/src/actions/test/setMinGasPrice.test.ts +22 -0
- package/src/actions/test/setMinGasPrice.ts +17 -0
- package/src/actions/test/setNextBlockBaseFeePerGas.test.ts +23 -0
- package/src/actions/test/setNextBlockBaseFeePerGas.ts +17 -0
- package/src/actions/test/setNextBlockTimestamp.test.ts +19 -0
- package/src/actions/test/setNextBlockTimestamp.ts +17 -0
- package/src/actions/test/setNonce.test.ts +28 -0
- package/src/actions/test/setNonce.ts +20 -0
- package/src/actions/test/setRpcUrl.test.ts +9 -0
- package/src/actions/test/setRpcUrl.ts +8 -0
- package/src/actions/test/setStorageAt.test.ts +36 -0
- package/src/actions/test/setStorageAt.ts +26 -0
- package/src/actions/test/snapshot.test.ts +18 -0
- package/src/actions/test/snapshot.ts +7 -0
- package/src/actions/test/stopImpersonatingAccount.test.ts +31 -0
- package/src/actions/test/stopImpersonatingAccount.ts +17 -0
- package/src/actions/wallet/addChain.test.ts +14 -0
- package/src/actions/wallet/addChain.ts +21 -0
- package/src/actions/wallet/getAccounts.test.ts +22 -0
- package/src/actions/wallet/getAccounts.ts +7 -0
- package/src/actions/wallet/getPermissions.test.ts +24 -0
- package/src/actions/wallet/getPermissions.ts +9 -0
- package/src/actions/wallet/index.test.ts +20 -0
- package/src/actions/wallet/index.ts +30 -0
- package/src/actions/wallet/requestAccounts.test.ts +13 -0
- package/src/actions/wallet/requestAccounts.ts +7 -0
- package/src/actions/wallet/requestPermissions.test.ts +26 -0
- package/src/actions/wallet/requestPermissions.ts +19 -0
- package/src/actions/wallet/sendTransaction.bench.ts +57 -0
- package/src/actions/wallet/sendTransaction.test.ts +440 -0
- package/src/actions/wallet/sendTransaction.ts +77 -0
- package/src/actions/wallet/signMessage.test.ts +62 -0
- package/src/actions/wallet/signMessage.ts +35 -0
- package/src/actions/wallet/switchChain.test.ts +22 -0
- package/src/actions/wallet/switchChain.ts +19 -0
- package/src/actions/wallet/watchAsset.test.ts +41 -0
- package/src/actions/wallet/watchAsset.ts +16 -0
- package/src/actions/wallet/writeContract.test.ts +54 -0
- package/src/actions/wallet/writeContract.ts +56 -0
- package/src/chains.test.ts +1912 -0
- package/src/chains.ts +99 -0
- package/src/clients/createClient.test.ts +295 -0
- package/src/clients/createClient.ts +81 -0
- package/src/clients/createPublicClient.test.ts +165 -0
- package/src/clients/createPublicClient.ts +49 -0
- package/src/clients/createTestClient.test.ts +145 -0
- package/src/clients/createTestClient.ts +72 -0
- package/src/clients/createWalletClient.test.ts +121 -0
- package/src/clients/createWalletClient.ts +54 -0
- package/src/clients/index.test.ts +19 -0
- package/src/clients/index.ts +31 -0
- package/src/clients/transports/createTransport.test.ts +58 -0
- package/src/clients/transports/createTransport.ts +48 -0
- package/src/clients/transports/custom.test.ts +98 -0
- package/src/clients/transports/custom.ts +34 -0
- package/src/clients/transports/fallback.test.ts +223 -0
- package/src/clients/transports/fallback.ts +48 -0
- package/src/clients/transports/http.test.ts +110 -0
- package/src/clients/transports/http.ts +51 -0
- package/src/clients/transports/index.test.ts +15 -0
- package/src/clients/transports/index.ts +17 -0
- package/src/clients/transports/webSocket.test.ts +164 -0
- package/src/clients/transports/webSocket.ts +117 -0
- package/src/errors/abi.test.ts +83 -0
- package/src/errors/abi.ts +238 -0
- package/src/errors/address.test.ts +14 -0
- package/src/errors/address.ts +9 -0
- package/src/errors/base.test.ts +72 -0
- package/src/errors/base.ts +57 -0
- package/src/errors/block.test.ts +24 -0
- package/src/errors/block.ts +18 -0
- package/src/errors/contract.ts +125 -0
- package/src/errors/data.ts +20 -0
- package/src/errors/encoding.ts +60 -0
- package/src/errors/index.ts +77 -0
- package/src/errors/log.ts +8 -0
- package/src/errors/request.test.ts +331 -0
- package/src/errors/request.ts +163 -0
- package/src/errors/rpc.test.ts +88 -0
- package/src/errors/rpc.ts +113 -0
- package/src/errors/transaction.test.ts +83 -0
- package/src/errors/transaction.ts +54 -0
- package/src/errors/transport.test.ts +12 -0
- package/src/errors/transport.ts +12 -0
- package/src/index.test.ts +214 -0
- package/src/index.ts +373 -0
- package/src/public.ts +80 -0
- package/src/test.ts +51 -0
- package/src/types/block.ts +71 -0
- package/src/types/chain.ts +6 -0
- package/src/types/contract.ts +342 -0
- package/src/types/eip1193.ts +1041 -0
- package/src/types/fee.ts +47 -0
- package/src/types/filter.ts +8 -0
- package/src/types/formatter.ts +23 -0
- package/src/types/index.ts +78 -0
- package/src/types/log.ts +22 -0
- package/src/types/misc.ts +5 -0
- package/src/types/rpc.ts +35 -0
- package/src/types/transaction.ts +145 -0
- package/src/types/utils.ts +67 -0
- package/src/types/window.ts +9 -0
- package/src/utils/abi/decodeAbi.bench.ts +135 -0
- package/src/utils/abi/decodeAbi.test.ts +1615 -0
- package/src/utils/abi/decodeAbi.ts +296 -0
- package/src/utils/abi/decodeDeployData.test.ts +159 -0
- package/src/utils/abi/decodeDeployData.ts +41 -0
- package/src/utils/abi/decodeErrorResult.test.ts +130 -0
- package/src/utils/abi/decodeErrorResult.ts +28 -0
- package/src/utils/abi/decodeFunctionData.test.ts +140 -0
- package/src/utils/abi/decodeFunctionData.ts +29 -0
- package/src/utils/abi/decodeFunctionResult.test.ts +262 -0
- package/src/utils/abi/decodeFunctionResult.ts +53 -0
- package/src/utils/abi/encodeAbi.bench.ts +163 -0
- package/src/utils/abi/encodeAbi.test.ts +1414 -0
- package/src/utils/abi/encodeAbi.ts +258 -0
- package/src/utils/abi/encodeDeployData.test.ts +131 -0
- package/src/utils/abi/encodeDeployData.ts +37 -0
- package/src/utils/abi/encodeErrorResult.test.ts +197 -0
- package/src/utils/abi/encodeErrorResult.ts +40 -0
- package/src/utils/abi/encodeEventTopics.test.ts +348 -0
- package/src/utils/abi/encodeEventTopics.ts +69 -0
- package/src/utils/abi/encodeFunctionData.test.ts +140 -0
- package/src/utils/abi/encodeFunctionData.ts +38 -0
- package/src/utils/abi/encodeFunctionResult.test.ts +284 -0
- package/src/utils/abi/encodeFunctionResult.ts +39 -0
- package/src/utils/abi/formatAbiItem.test.ts +335 -0
- package/src/utils/abi/formatAbiItem.ts +41 -0
- package/src/utils/abi/formatAbiItemWithArgs.test.ts +291 -0
- package/src/utils/abi/formatAbiItemWithArgs.ts +27 -0
- package/src/utils/abi/getAbiItem.ts +5 -0
- package/src/utils/abi/index.test.ts +23 -0
- package/src/utils/abi/index.ts +38 -0
- package/src/utils/address/getAddress.bench.ts +22 -0
- package/src/utils/address/getAddress.test.ts +46 -0
- package/src/utils/address/getAddress.ts +28 -0
- package/src/utils/address/getContractAddress.bench.ts +20 -0
- package/src/utils/address/getContractAddress.test.ts +78 -0
- package/src/utils/address/getContractAddress.ts +59 -0
- package/src/utils/address/index.test.ts +17 -0
- package/src/utils/address/index.ts +16 -0
- package/src/utils/address/isAddress.test.ts +10 -0
- package/src/utils/address/isAddress.ts +10 -0
- package/src/utils/address/isAddressEqual.test.ts +55 -0
- package/src/utils/address/isAddressEqual.ts +6 -0
- package/src/utils/buildRequest.test.ts +365 -0
- package/src/utils/buildRequest.ts +45 -0
- package/src/utils/chain.test.ts +43 -0
- package/src/utils/chain.ts +8 -0
- package/src/utils/contract/extractFunctionParts.test.ts +109 -0
- package/src/utils/contract/extractFunctionParts.ts +27 -0
- package/src/utils/contract/getContractError.test.ts +97 -0
- package/src/utils/contract/getContractError.ts +66 -0
- package/src/utils/contract/index.test.ts +15 -0
- package/src/utils/contract/index.ts +8 -0
- package/src/utils/data/concat.test.ts +35 -0
- package/src/utils/data/concat.ts +34 -0
- package/src/utils/data/index.test.ts +23 -0
- package/src/utils/data/index.ts +13 -0
- package/src/utils/data/isBytes.test.ts +9 -0
- package/src/utils/data/isBytes.ts +7 -0
- package/src/utils/data/isHex.test.ts +13 -0
- package/src/utils/data/isHex.ts +5 -0
- package/src/utils/data/pad.bench.ts +39 -0
- package/src/utils/data/pad.test.ts +367 -0
- package/src/utils/data/pad.ts +53 -0
- package/src/utils/data/size.test.ts +18 -0
- package/src/utils/data/size.ts +13 -0
- package/src/utils/data/slice.test.ts +203 -0
- package/src/utils/data/slice.ts +60 -0
- package/src/utils/data/trim.bench.ts +50 -0
- package/src/utils/data/trim.test.ts +175 -0
- package/src/utils/data/trim.ts +33 -0
- package/src/utils/encoding/decodeBytes.bench.ts +40 -0
- package/src/utils/encoding/decodeBytes.test.ts +144 -0
- package/src/utils/encoding/decodeBytes.ts +63 -0
- package/src/utils/encoding/decodeHex.bench.ts +24 -0
- package/src/utils/encoding/decodeHex.test.ts +167 -0
- package/src/utils/encoding/decodeHex.ts +76 -0
- package/src/utils/encoding/decodeRlp.bench.ts +34 -0
- package/src/utils/encoding/decodeRlp.test.ts +350 -0
- package/src/utils/encoding/decodeRlp.ts +121 -0
- package/src/utils/encoding/encodeBytes.bench.ts +41 -0
- package/src/utils/encoding/encodeBytes.test.ts +676 -0
- package/src/utils/encoding/encodeBytes.ts +59 -0
- package/src/utils/encoding/encodeHex.bench.ts +60 -0
- package/src/utils/encoding/encodeHex.test.ts +232 -0
- package/src/utils/encoding/encodeHex.ts +104 -0
- package/src/utils/encoding/encodeRlp.bench.ts +54 -0
- package/src/utils/encoding/encodeRlp.test.ts +254 -0
- package/src/utils/encoding/encodeRlp.ts +48 -0
- package/src/utils/encoding/index.test.ts +32 -0
- package/src/utils/encoding/index.ts +36 -0
- package/src/utils/formatters/block.bench.ts +51 -0
- package/src/utils/formatters/block.test.ts +115 -0
- package/src/utils/formatters/block.ts +37 -0
- package/src/utils/formatters/extract.test.ts +14 -0
- package/src/utils/formatters/extract.ts +18 -0
- package/src/utils/formatters/feeHistory.test.ts +66 -0
- package/src/utils/formatters/feeHistory.ts +12 -0
- package/src/utils/formatters/format.test.ts +93 -0
- package/src/utils/formatters/format.ts +90 -0
- package/src/utils/formatters/index.test.ts +27 -0
- package/src/utils/formatters/index.ts +34 -0
- package/src/utils/formatters/log.test.ts +79 -0
- package/src/utils/formatters/log.ts +12 -0
- package/src/utils/formatters/transaction.test.ts +271 -0
- package/src/utils/formatters/transaction.ts +63 -0
- package/src/utils/formatters/transactionReceipt.bench.ts +73 -0
- package/src/utils/formatters/transactionReceipt.test.ts +151 -0
- package/src/utils/formatters/transactionReceipt.ts +63 -0
- package/src/utils/formatters/transactionRequest.bench.ts +29 -0
- package/src/utils/formatters/transactionRequest.test.ts +237 -0
- package/src/utils/formatters/transactionRequest.ts +56 -0
- package/src/utils/hash/getEventSignature.test.ts +61 -0
- package/src/utils/hash/getEventSignature.ts +4 -0
- package/src/utils/hash/getFunctionSignature.test.ts +22 -0
- package/src/utils/hash/getFunctionSignature.ts +5 -0
- package/src/utils/hash/hashFunction.test.ts +65 -0
- package/src/utils/hash/hashFunction.ts +12 -0
- package/src/utils/hash/index.test.ts +13 -0
- package/src/utils/hash/index.ts +5 -0
- package/src/utils/hash/keccak256.test.ts +59 -0
- package/src/utils/hash/keccak256.ts +23 -0
- package/src/utils/index.test.ts +110 -0
- package/src/utils/index.ts +137 -0
- package/src/utils/observe.test.ts +176 -0
- package/src/utils/observe.ts +66 -0
- package/src/utils/poll.test.ts +127 -0
- package/src/utils/poll.ts +42 -0
- package/src/utils/promise/index.test.ts +14 -0
- package/src/utils/promise/index.ts +3 -0
- package/src/utils/promise/withCache.test.ts +97 -0
- package/src/utils/promise/withCache.ts +73 -0
- package/src/utils/promise/withRetry.test.ts +231 -0
- package/src/utils/promise/withRetry.ts +61 -0
- package/src/utils/promise/withTimeout.test.ts +37 -0
- package/src/utils/promise/withTimeout.ts +39 -0
- package/src/utils/rpc.test.ts +992 -0
- package/src/utils/rpc.ts +292 -0
- package/src/utils/stringify.test.ts +13 -0
- package/src/utils/stringify.ts +5 -0
- package/src/utils/uid.ts +14 -0
- package/src/utils/unit/constants.test.ts +22 -0
- package/src/utils/unit/constants.ts +12 -0
- package/src/utils/unit/formatEther.test.ts +75 -0
- package/src/utils/unit/formatEther.ts +6 -0
- package/src/utils/unit/formatGwei.test.ts +32 -0
- package/src/utils/unit/formatGwei.ts +6 -0
- package/src/utils/unit/formatUnit.bench.ts +26 -0
- package/src/utils/unit/formatUnit.test.ts +40 -0
- package/src/utils/unit/formatUnit.ts +16 -0
- package/src/utils/unit/index.test.ts +28 -0
- package/src/utils/unit/index.ts +7 -0
- package/src/utils/unit/parseEther.test.ts +126 -0
- package/src/utils/unit/parseEther.ts +6 -0
- package/src/utils/unit/parseGwei.test.ts +50 -0
- package/src/utils/unit/parseGwei.ts +6 -0
- package/src/utils/unit/parseUnit.bench.ts +26 -0
- package/src/utils/unit/parseUnit.test.ts +54 -0
- package/src/utils/unit/parseUnit.ts +27 -0
- package/src/utils/wait.ts +3 -0
- package/src/wallet.ts +23 -0
- package/src/window.ts +1 -0
- package/utils/package.json +1 -1
- package/window/package.json +1 -1
- package/actions/package.json +0 -4
- package/dist/BaseError-7688f84e.d.ts +0 -18
- package/dist/actions/index.d.ts +0 -8
- package/dist/actions/index.js +0 -123
- package/dist/createWalletClient-915223f3.d.ts +0 -130
- package/dist/transactionRequest-ade896ac.d.ts +0 -44
@@ -0,0 +1,238 @@
|
|
1
|
+
/**
|
2
|
+
* TODO: Heaps more test cases :D
|
3
|
+
* - Complex calldata types
|
4
|
+
* - Complex return types (tuple/structs)
|
5
|
+
* - EIP-1559
|
6
|
+
* - Calls against blocks
|
7
|
+
* - Custom chain types
|
8
|
+
* - Custom nonce
|
9
|
+
*/
|
10
|
+
|
11
|
+
import { describe, expect, test } from 'vitest'
|
12
|
+
import {
|
13
|
+
accounts,
|
14
|
+
publicClient,
|
15
|
+
testClient,
|
16
|
+
wagmiContractConfig,
|
17
|
+
walletClient,
|
18
|
+
} from '../../_test'
|
19
|
+
import { baycContractConfig } from '../../_test/abis'
|
20
|
+
import { encodeFunctionData } from '../../utils'
|
21
|
+
import { mine } from '../test'
|
22
|
+
import { sendTransaction } from '../wallet'
|
23
|
+
|
24
|
+
import { deployContract } from './deployContract'
|
25
|
+
import { getTransactionReceipt } from './getTransactionReceipt'
|
26
|
+
import { simulateContract } from './simulateContract'
|
27
|
+
|
28
|
+
describe('wagmi', () => {
|
29
|
+
test('default', async () => {
|
30
|
+
expect(
|
31
|
+
(
|
32
|
+
await simulateContract(publicClient, {
|
33
|
+
...wagmiContractConfig,
|
34
|
+
from: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
|
35
|
+
functionName: 'mint',
|
36
|
+
args: [69420n],
|
37
|
+
})
|
38
|
+
).result,
|
39
|
+
).toEqual(undefined)
|
40
|
+
expect(
|
41
|
+
(
|
42
|
+
await simulateContract(publicClient, {
|
43
|
+
...wagmiContractConfig,
|
44
|
+
functionName: 'safeTransferFrom',
|
45
|
+
from: '0x1a1E021A302C237453D3D45c7B82B19cEEB7E2e6',
|
46
|
+
args: [
|
47
|
+
'0x1a1E021A302C237453D3D45c7B82B19cEEB7E2e6',
|
48
|
+
'0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
|
49
|
+
1n,
|
50
|
+
],
|
51
|
+
})
|
52
|
+
).result,
|
53
|
+
).toEqual(undefined)
|
54
|
+
})
|
55
|
+
|
56
|
+
test('revert', async () => {
|
57
|
+
await expect(() =>
|
58
|
+
simulateContract(publicClient, {
|
59
|
+
...wagmiContractConfig,
|
60
|
+
functionName: 'approve',
|
61
|
+
args: ['0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC', 420n],
|
62
|
+
from: accounts[0].address,
|
63
|
+
}),
|
64
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(`
|
65
|
+
"ERC721: approval to current owner
|
66
|
+
|
67
|
+
Sender: 0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266
|
68
|
+
Contract: 0x0000000000000000000000000000000000000000
|
69
|
+
Function: approve(address to, uint256 tokenId)
|
70
|
+
Arguments: (0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC, 420)
|
71
|
+
|
72
|
+
Details: execution reverted: ERC721: approval to current owner
|
73
|
+
Version: viem@1.0.2"
|
74
|
+
`)
|
75
|
+
await expect(() =>
|
76
|
+
simulateContract(publicClient, {
|
77
|
+
...wagmiContractConfig,
|
78
|
+
functionName: 'mint',
|
79
|
+
args: [1n],
|
80
|
+
from: accounts[0].address,
|
81
|
+
}),
|
82
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(`
|
83
|
+
"Token ID is taken
|
84
|
+
|
85
|
+
Sender: 0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266
|
86
|
+
Contract: 0x0000000000000000000000000000000000000000
|
87
|
+
Function: mint(uint256 tokenId)
|
88
|
+
Arguments: (1)
|
89
|
+
|
90
|
+
Details: execution reverted: Token ID is taken
|
91
|
+
Version: viem@1.0.2"
|
92
|
+
`)
|
93
|
+
await expect(() =>
|
94
|
+
simulateContract(publicClient, {
|
95
|
+
...wagmiContractConfig,
|
96
|
+
functionName: 'safeTransferFrom',
|
97
|
+
from: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
|
98
|
+
args: [
|
99
|
+
'0x1a1E021A302C237453D3D45c7B82B19cEEB7E2e6',
|
100
|
+
'0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
|
101
|
+
1n,
|
102
|
+
],
|
103
|
+
}),
|
104
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(`
|
105
|
+
"ERC721: transfer caller is not owner nor approved
|
106
|
+
|
107
|
+
Sender: 0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC
|
108
|
+
Contract: 0x0000000000000000000000000000000000000000
|
109
|
+
Function: safeTransferFrom(address from, address to, uint256 tokenId)
|
110
|
+
Arguments: (0x1a1E021A302C237453D3D45c7B82B19cEEB7E2e6, 0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC, 1)
|
111
|
+
|
112
|
+
Details: execution reverted: ERC721: transfer caller is not owner nor approved
|
113
|
+
Version: viem@1.0.2"
|
114
|
+
`)
|
115
|
+
})
|
116
|
+
})
|
117
|
+
|
118
|
+
describe('BAYC', () => {
|
119
|
+
describe('default', () => {
|
120
|
+
test('mintApe', async () => {
|
121
|
+
const { contractAddress } = await deployBAYC()
|
122
|
+
|
123
|
+
// Set sale state to active
|
124
|
+
// TODO: replace w/ writeContract
|
125
|
+
await sendTransaction(walletClient, {
|
126
|
+
data: encodeFunctionData({
|
127
|
+
abi: baycContractConfig.abi,
|
128
|
+
functionName: 'flipSaleState',
|
129
|
+
}),
|
130
|
+
from: accounts[0].address,
|
131
|
+
to: contractAddress!,
|
132
|
+
})
|
133
|
+
await mine(testClient, { blocks: 1 })
|
134
|
+
|
135
|
+
// Mint an Ape!
|
136
|
+
expect(
|
137
|
+
(
|
138
|
+
await simulateContract(publicClient, {
|
139
|
+
abi: baycContractConfig.abi,
|
140
|
+
address: contractAddress!,
|
141
|
+
functionName: 'mintApe',
|
142
|
+
from: accounts[0].address,
|
143
|
+
args: [1n],
|
144
|
+
value: 1000000000000000000n,
|
145
|
+
})
|
146
|
+
).result,
|
147
|
+
).toBe(undefined)
|
148
|
+
})
|
149
|
+
|
150
|
+
test('get a free $100k', async () => {
|
151
|
+
const { contractAddress } = await deployBAYC()
|
152
|
+
|
153
|
+
// Reserve apes
|
154
|
+
expect(
|
155
|
+
(
|
156
|
+
await simulateContract(publicClient, {
|
157
|
+
abi: baycContractConfig.abi,
|
158
|
+
address: contractAddress!,
|
159
|
+
functionName: 'reserveApes',
|
160
|
+
from: accounts[0].address,
|
161
|
+
})
|
162
|
+
).result,
|
163
|
+
).toBe(undefined)
|
164
|
+
})
|
165
|
+
})
|
166
|
+
|
167
|
+
describe('revert', () => {
|
168
|
+
test('sale inactive', async () => {
|
169
|
+
const { contractAddress } = await deployBAYC()
|
170
|
+
|
171
|
+
// Expect mint to fail.
|
172
|
+
await expect(() =>
|
173
|
+
simulateContract(publicClient, {
|
174
|
+
abi: baycContractConfig.abi,
|
175
|
+
address: contractAddress!,
|
176
|
+
functionName: 'mintApe',
|
177
|
+
from: accounts[0].address,
|
178
|
+
args: [1n],
|
179
|
+
}),
|
180
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(`
|
181
|
+
"Sale must be active to mint Ape
|
182
|
+
|
183
|
+
Sender: 0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266
|
184
|
+
Contract: 0x0000000000000000000000000000000000000000
|
185
|
+
Function: mintApe(uint256 numberOfTokens)
|
186
|
+
Arguments: (1)
|
187
|
+
|
188
|
+
Details: execution reverted: Sale must be active to mint Ape
|
189
|
+
Version: viem@1.0.2"
|
190
|
+
`)
|
191
|
+
})
|
192
|
+
})
|
193
|
+
})
|
194
|
+
|
195
|
+
test('fake contract address', async () => {
|
196
|
+
await expect(() =>
|
197
|
+
simulateContract(publicClient, {
|
198
|
+
abi: [
|
199
|
+
{
|
200
|
+
name: 'mint',
|
201
|
+
type: 'function',
|
202
|
+
stateMutability: 'nonpayable',
|
203
|
+
inputs: [],
|
204
|
+
outputs: [{ type: 'uint256' }],
|
205
|
+
},
|
206
|
+
],
|
207
|
+
address: '0x0000000000000000000000000000000000000069',
|
208
|
+
functionName: 'mint',
|
209
|
+
from: accounts[0].address,
|
210
|
+
args: [],
|
211
|
+
}),
|
212
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(`
|
213
|
+
"The contract method \\"mint\\" returned no data (\\"0x\\"). This could be due to any of the following:
|
214
|
+
- The contract does not have the function \\"mint\\",
|
215
|
+
- The parameters passed to the contract function may be invalid, or
|
216
|
+
- The address is not a contract.
|
217
|
+
|
218
|
+
Contract: 0x0000000000000000000000000000000000000000
|
219
|
+
Function: mint()
|
220
|
+
> \\"0x\\"
|
221
|
+
|
222
|
+
Version: viem@1.0.2"
|
223
|
+
`)
|
224
|
+
})
|
225
|
+
|
226
|
+
// Deploy BAYC Contract
|
227
|
+
async function deployBAYC() {
|
228
|
+
const hash = await deployContract(walletClient, {
|
229
|
+
...baycContractConfig,
|
230
|
+
args: ['Bored Ape Wagmi Club', 'BAYC', 69420n, 0n],
|
231
|
+
from: accounts[0].address,
|
232
|
+
})
|
233
|
+
await mine(testClient, { blocks: 1 })
|
234
|
+
const { contractAddress } = await getTransactionReceipt(publicClient, {
|
235
|
+
hash,
|
236
|
+
})
|
237
|
+
return { contractAddress }
|
238
|
+
}
|
@@ -0,0 +1,98 @@
|
|
1
|
+
import { Abi } from 'abitype'
|
2
|
+
|
3
|
+
import type { PublicClient } from '../../clients'
|
4
|
+
import type {
|
5
|
+
Address,
|
6
|
+
Chain,
|
7
|
+
ExtractArgsFromAbi,
|
8
|
+
ExtractResultFromAbi,
|
9
|
+
ExtractFunctionNameFromAbi,
|
10
|
+
GetValue,
|
11
|
+
} from '../../types'
|
12
|
+
import {
|
13
|
+
EncodeFunctionDataArgs,
|
14
|
+
decodeFunctionResult,
|
15
|
+
encodeFunctionData,
|
16
|
+
getContractError,
|
17
|
+
} from '../../utils'
|
18
|
+
import { WriteContractArgs } from '../wallet'
|
19
|
+
import { call, CallArgs } from './call'
|
20
|
+
|
21
|
+
export type SimulateContractArgs<
|
22
|
+
TChain extends Chain = Chain,
|
23
|
+
TAbi extends Abi | readonly unknown[] = Abi,
|
24
|
+
TFunctionName extends string = any,
|
25
|
+
> = Omit<CallArgs<TChain>, 'to' | 'data' | 'value'> & {
|
26
|
+
address: Address
|
27
|
+
abi: TAbi
|
28
|
+
functionName: ExtractFunctionNameFromAbi<
|
29
|
+
TAbi,
|
30
|
+
TFunctionName,
|
31
|
+
'payable' | 'nonpayable'
|
32
|
+
>
|
33
|
+
value?: GetValue<TAbi, TFunctionName, CallArgs<TChain>['value']>
|
34
|
+
} & ExtractArgsFromAbi<TAbi, TFunctionName>
|
35
|
+
|
36
|
+
export type SimulateContractResponse<
|
37
|
+
TChain extends Chain = Chain,
|
38
|
+
TAbi extends Abi | readonly unknown[] = Abi,
|
39
|
+
TFunctionName extends string = string,
|
40
|
+
> = {
|
41
|
+
result: ExtractResultFromAbi<TAbi, TFunctionName>
|
42
|
+
request: WriteContractArgs<TChain, TAbi, TFunctionName> & {
|
43
|
+
address: Address
|
44
|
+
abi: TAbi
|
45
|
+
functionName: ExtractFunctionNameFromAbi<TAbi, TFunctionName>
|
46
|
+
} & ExtractArgsFromAbi<TAbi, TFunctionName>
|
47
|
+
}
|
48
|
+
|
49
|
+
export async function simulateContract<
|
50
|
+
TChain extends Chain,
|
51
|
+
TAbi extends Abi = Abi,
|
52
|
+
TFunctionName extends string = any,
|
53
|
+
>(
|
54
|
+
client: PublicClient,
|
55
|
+
{
|
56
|
+
abi,
|
57
|
+
address,
|
58
|
+
args,
|
59
|
+
functionName,
|
60
|
+
...callRequest
|
61
|
+
}: SimulateContractArgs<TChain, TAbi, TFunctionName>,
|
62
|
+
): Promise<SimulateContractResponse<TChain, TAbi, TFunctionName>> {
|
63
|
+
const calldata = encodeFunctionData({
|
64
|
+
abi,
|
65
|
+
args,
|
66
|
+
functionName,
|
67
|
+
} as unknown as EncodeFunctionDataArgs<TAbi, TFunctionName>)
|
68
|
+
try {
|
69
|
+
const { data } = await call(client, {
|
70
|
+
data: calldata,
|
71
|
+
to: address,
|
72
|
+
...callRequest,
|
73
|
+
} as unknown as CallArgs<TChain>)
|
74
|
+
const result = decodeFunctionResult({
|
75
|
+
abi,
|
76
|
+
functionName,
|
77
|
+
data: data || '0x',
|
78
|
+
})
|
79
|
+
return {
|
80
|
+
result,
|
81
|
+
request: {
|
82
|
+
abi,
|
83
|
+
address,
|
84
|
+
args,
|
85
|
+
functionName,
|
86
|
+
...callRequest,
|
87
|
+
},
|
88
|
+
} as unknown as SimulateContractResponse<TChain, TAbi, TFunctionName>
|
89
|
+
} catch (err) {
|
90
|
+
throw getContractError(err, {
|
91
|
+
abi,
|
92
|
+
address,
|
93
|
+
args,
|
94
|
+
functionName,
|
95
|
+
sender: callRequest.from,
|
96
|
+
})
|
97
|
+
}
|
98
|
+
}
|
@@ -0,0 +1,13 @@
|
|
1
|
+
import { bench, describe } from 'vitest'
|
2
|
+
|
3
|
+
import { publicClient } from '../../_test'
|
4
|
+
import { createPendingTransactionFilter } from './createPendingTransactionFilter'
|
5
|
+
import { uninstallFilter } from './uninstallFilter'
|
6
|
+
|
7
|
+
const filter = await createPendingTransactionFilter(publicClient)
|
8
|
+
|
9
|
+
describe('Get Filter Changes', () => {
|
10
|
+
bench('viem: `uninstallFilter`', async () => {
|
11
|
+
await uninstallFilter(publicClient, { filter })
|
12
|
+
})
|
13
|
+
})
|
@@ -0,0 +1,65 @@
|
|
1
|
+
import { assertType, expect, test } from 'vitest'
|
2
|
+
|
3
|
+
import { accounts, publicClient, testClient, walletClient } from '../../_test'
|
4
|
+
|
5
|
+
import { createPendingTransactionFilter } from './createPendingTransactionFilter'
|
6
|
+
import { getFilterChanges } from './getFilterChanges'
|
7
|
+
import { uninstallFilter } from './uninstallFilter'
|
8
|
+
import { mine } from '../test'
|
9
|
+
import { sendTransaction } from '../wallet'
|
10
|
+
import { parseEther } from '../../utils'
|
11
|
+
import type { Hash } from '../../types'
|
12
|
+
|
13
|
+
test('default', async () => {
|
14
|
+
const filter = await createPendingTransactionFilter(publicClient)
|
15
|
+
expect(await uninstallFilter(publicClient, { filter })).toBeTruthy()
|
16
|
+
})
|
17
|
+
|
18
|
+
test('pending txns', async () => {
|
19
|
+
const filter = await createPendingTransactionFilter(publicClient)
|
20
|
+
|
21
|
+
await sendTransaction(walletClient, {
|
22
|
+
from: accounts[0].address,
|
23
|
+
to: accounts[1].address,
|
24
|
+
value: parseEther('1'),
|
25
|
+
})
|
26
|
+
await sendTransaction(walletClient, {
|
27
|
+
from: accounts[0].address,
|
28
|
+
to: accounts[1].address,
|
29
|
+
value: parseEther('1'),
|
30
|
+
})
|
31
|
+
|
32
|
+
let hashes = await getFilterChanges(publicClient, { filter })
|
33
|
+
assertType<Hash[]>(hashes)
|
34
|
+
expect(hashes.length).toBe(2)
|
35
|
+
|
36
|
+
mine(testClient, { blocks: 1 })
|
37
|
+
|
38
|
+
hashes = await getFilterChanges(publicClient, { filter })
|
39
|
+
expect(hashes.length).toBe(0)
|
40
|
+
|
41
|
+
expect(await uninstallFilter(publicClient, { filter })).toBeTruthy()
|
42
|
+
|
43
|
+
await sendTransaction(walletClient, {
|
44
|
+
from: accounts[0].address,
|
45
|
+
to: accounts[1].address,
|
46
|
+
value: parseEther('1'),
|
47
|
+
})
|
48
|
+
|
49
|
+
hashes = await getFilterChanges(publicClient, { filter })
|
50
|
+
expect(hashes.length).toBe(0)
|
51
|
+
})
|
52
|
+
|
53
|
+
test('filter does not exist', async () => {
|
54
|
+
expect(
|
55
|
+
await uninstallFilter(publicClient, {
|
56
|
+
filter: { id: '0x1', type: 'default' },
|
57
|
+
}),
|
58
|
+
).toBeFalsy()
|
59
|
+
})
|
60
|
+
|
61
|
+
test('filter already uninstalled', async () => {
|
62
|
+
const filter = await createPendingTransactionFilter(publicClient)
|
63
|
+
expect(await uninstallFilter(publicClient, { filter })).toBeTruthy()
|
64
|
+
expect(await uninstallFilter(publicClient, { filter })).toBeFalsy()
|
65
|
+
})
|
@@ -0,0 +1,17 @@
|
|
1
|
+
import type { PublicClient } from '../../clients'
|
2
|
+
import type { Filter } from '../../types'
|
3
|
+
|
4
|
+
export type UninstallFilterArgs = {
|
5
|
+
filter: Filter<any>
|
6
|
+
}
|
7
|
+
export type UninstallFilterResponse = boolean
|
8
|
+
|
9
|
+
export async function uninstallFilter(
|
10
|
+
client: PublicClient,
|
11
|
+
{ filter }: UninstallFilterArgs,
|
12
|
+
): Promise<UninstallFilterResponse> {
|
13
|
+
return client.request({
|
14
|
+
method: 'eth_uninstallFilter',
|
15
|
+
params: [filter.id],
|
16
|
+
})
|
17
|
+
}
|