dequanto 0.2.38 → 0.2.40
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/lib/cjs/abi/$abiCoder.js +1 -1
- package/lib/cjs/abi/$abiCoder.js.map +1 -1
- package/lib/cjs/abi/Logger.js +1 -1
- package/lib/cjs/abi/abi-coder-packed.js +3 -3
- package/lib/cjs/abi/abi-coder.js +16 -16
- package/lib/cjs/abi/coders/abstract-coder.js +31 -31
- package/lib/cjs/abi/coders/abstract-coder.js.map +1 -1
- package/lib/cjs/abi/fragments.js +90 -90
- package/lib/cjs/abi/fragments.js.map +1 -1
- package/lib/cjs/blocks/BlockDateResolver.js +9 -9
- package/lib/cjs/blocks/BlockDateResolver.js.map +1 -1
- package/lib/cjs/class/PackedRanges.js +46 -46
- package/lib/cjs/class/PackedRanges.js.map +1 -1
- package/lib/cjs/clients/ClientEventsStream.js +1 -1
- package/lib/cjs/clients/ClientEventsStream.js.map +1 -1
- package/lib/cjs/clients/ClientPool.js +23 -23
- package/lib/cjs/clients/ClientPool.js.map +1 -1
- package/lib/cjs/clients/WalletClient.js +3 -3
- package/lib/cjs/clients/WalletClient.js.map +1 -1
- package/lib/cjs/clients/Web3Client.js +14 -14
- package/lib/cjs/clients/Web3Client.js.map +1 -1
- package/lib/cjs/clients/Web3ClientFactory.js +1 -1
- package/lib/cjs/clients/Web3ClientFactory.js.map +1 -1
- package/lib/cjs/clients/compatibility/Web3.js +2 -2
- package/lib/cjs/clients/compatibility/Web3.js.map +1 -1
- package/lib/cjs/clients/handlers/RateLimitGuard.js +16 -16
- package/lib/cjs/clients/handlers/RateLimitGuard.js.map +1 -1
- package/lib/cjs/clients/model/PromiEventWrap.js +1 -1
- package/lib/cjs/clients/model/PromiEventWrap.js.map +1 -1
- package/lib/cjs/clients/utils/$web3Abi.js +2 -2
- package/lib/cjs/clients/utils/$web3Abi.js.map +1 -1
- package/lib/cjs/clients/utils/ClientErrorUtil.js +4 -0
- package/lib/cjs/clients/utils/ClientErrorUtil.js.map +1 -1
- package/lib/cjs/config/Config.js.map +1 -1
- package/lib/cjs/contracts/Contract.js +1 -1
- package/lib/cjs/contracts/Contract.js.map +1 -1
- package/lib/cjs/contracts/ContractAbiProvider.js +6 -6
- package/lib/cjs/contracts/ContractAbiProvider.js.map +1 -1
- package/lib/cjs/contracts/ContractBase.js +10 -10
- package/lib/cjs/contracts/ContractBase.js.map +1 -1
- package/lib/cjs/contracts/ContractProvider.js +1 -1
- package/lib/cjs/contracts/ContractProvider.js.map +1 -1
- package/lib/cjs/contracts/ContractReader.js +5 -5
- package/lib/cjs/contracts/ContractReader.js.map +1 -1
- package/lib/cjs/contracts/ContractWriter.js +4 -4
- package/lib/cjs/contracts/ContractWriter.js.map +1 -1
- package/lib/cjs/contracts/deploy/ContractDeployer.js +4 -4
- package/lib/cjs/contracts/deploy/ContractDeployer.js.map +1 -1
- package/lib/cjs/contracts/deploy/Deployments.js +36 -21
- package/lib/cjs/contracts/deploy/Deployments.js.map +1 -1
- package/lib/cjs/contracts/deploy/proxy/$proxyDeploy.js +13 -13
- package/lib/cjs/contracts/deploy/proxy/$proxyDeploy.js.map +1 -1
- package/lib/cjs/contracts/deploy/proxy/ProxyDeployment.js +22 -22
- package/lib/cjs/contracts/deploy/proxy/ProxyDeployment.js.map +1 -1
- package/lib/cjs/contracts/deploy/storage/DeploymentsStorage.js +15 -14
- package/lib/cjs/contracts/deploy/storage/DeploymentsStorage.js.map +1 -1
- package/lib/cjs/contracts/utils/AbiDeserializer.js +4 -4
- package/lib/cjs/contracts/utils/AbiDeserializer.js.map +1 -1
- package/lib/cjs/contracts/utils/ContractBaseUtils.js +3 -3
- package/lib/cjs/contracts/utils/ContractBaseUtils.js.map +1 -1
- package/lib/cjs/evm/OpcodesWalker.js +1 -1
- package/lib/cjs/evm/OpcodesWalker.js.map +1 -1
- package/lib/cjs/explorer/BlockchainExplorer.js +1 -1
- package/lib/cjs/explorer/BlockchainExplorer.js.map +1 -1
- package/lib/cjs/explorer/BlockchainExplorerFactory.js +1 -1
- package/lib/cjs/explorer/BlockchainExplorerStorage.js +12 -12
- package/lib/cjs/explorer/BlockchainExplorerStorage.js.map +1 -1
- package/lib/cjs/explorer/Evmscan.js +1 -1
- package/lib/cjs/explorer/verifiers/FsHtmlVerifier.js +7 -7
- package/lib/cjs/explorer/verifiers/FsHtmlVerifier.js.map +1 -1
- package/lib/cjs/flashbots/FlashbotWeb3Client.js +1 -1
- package/lib/cjs/flashbots/FlashbotWeb3Client.js.map +1 -1
- package/lib/cjs/hardhat/HardhatProvider.js +7 -7
- package/lib/cjs/hardhat/HardhatProvider.js.map +1 -1
- package/lib/cjs/indexer/BlocksTxIndexer.js +2 -2
- package/lib/cjs/indexer/BlocksTxIndexer.js.map +1 -1
- package/lib/cjs/indexer/EventsIndexer.js +11 -11
- package/lib/cjs/indexer/EventsIndexer.js.map +1 -1
- package/lib/cjs/indexer/PendingTxIndexer.js +2 -2
- package/lib/cjs/indexer/PendingTxIndexer.js.map +1 -1
- package/lib/cjs/indexer/handlers/BlocksWalker.js +9 -9
- package/lib/cjs/indexer/handlers/BlocksWalker.js.map +1 -1
- package/lib/cjs/indexer/handlers/TxQueueLoader.js +1 -1
- package/lib/cjs/indexer/storage/FsEventsIndexerStore.js +3 -3
- package/lib/cjs/indexer/storage/FsEventsIndexerStore.js.map +1 -1
- package/lib/cjs/indexer/storage/FsEventsStoreUtils.js +1 -1
- package/lib/cjs/indexer/storage/FsEventsStoreUtils.js.map +1 -1
- package/lib/cjs/json/JsonArrayMultiStore.js +1 -1
- package/lib/cjs/json/JsonArrayMultiStore.js.map +1 -1
- package/lib/cjs/json/JsonStoreFs.js +1 -1
- package/lib/cjs/json/JsonStoreFs.js.map +1 -1
- package/lib/cjs/rpc/$rpc.js +2 -2
- package/lib/cjs/rpc/$rpc.js.map +1 -1
- package/lib/cjs/rpc/Rpc.js +2 -2
- package/lib/cjs/rpc/RpcBase.js +2 -2
- package/lib/cjs/rpc/RpcBase.js.map +1 -1
- package/lib/cjs/rpc/RpcContract.js +4 -3
- package/lib/cjs/rpc/RpcContract.js.map +1 -1
- package/lib/cjs/rpc/RpcSubscription.js +1 -1
- package/lib/cjs/rpc/RpcSubscription.js.map +1 -1
- package/lib/cjs/rpc/transports/compatibility/EIP1193Transport.js +4 -4
- package/lib/cjs/rpc/transports/compatibility/EIP1193Transport.js.map +1 -1
- package/lib/cjs/rpc/transports/compatibility/Web3Transport.js +1 -1
- package/lib/cjs/rpc/transports/compatibility/Web3Transport.js.map +1 -1
- package/lib/cjs/services/TimelockService/TimelockService.js +2 -2
- package/lib/cjs/services/TimelockService/TimelockServiceFallbackSafe.js +2 -2
- package/lib/cjs/solidity/SlotsDump.js +1 -1
- package/lib/cjs/solidity/SlotsDump.js.map +1 -1
- package/lib/cjs/solidity/SlotsParser/MappingSettersResolver.js +3 -3
- package/lib/cjs/solidity/SlotsParser/MappingSettersResolver.js.map +1 -1
- package/lib/cjs/solidity/SlotsParser/SourceFile.js +3 -3
- package/lib/cjs/solidity/SlotsParser/SourceFile.js.map +1 -1
- package/lib/cjs/solidity/SolidityParser.js +1 -1
- package/lib/cjs/solidity/SolidityParser.js.map +1 -1
- package/lib/cjs/solidity/SourceCodeProvider.js +1 -1
- package/lib/cjs/solidity/SourceCodeProvider.js.map +1 -1
- package/lib/cjs/solidity/storage/Accessor.js +1 -1
- package/lib/cjs/solidity/storage/Accessor.js.map +1 -1
- package/lib/cjs/solidity/storage/SlotFixedArray.js +1 -1
- package/lib/cjs/solidity/storage/SlotFixedArray.js.map +1 -1
- package/lib/cjs/solidity/storage/SlotsStorageTransport.js +3 -3
- package/lib/cjs/solidity/storage/SlotsStorageTransport.js.map +1 -1
- package/lib/cjs/solidity/storage/handlers/SlotBytesHandler.js +1 -1
- package/lib/cjs/solidity/storage/handlers/SlotBytesHandler.js.map +1 -1
- package/lib/cjs/solidity/storage/handlers/SlotDynamicArrayHandler.js +1 -1
- package/lib/cjs/solidity/storage/handlers/SlotDynamicArrayHandler.js.map +1 -1
- package/lib/cjs/solidity/storage/handlers/SlotFixedArrayHandler.js +1 -1
- package/lib/cjs/solidity/storage/handlers/SlotFixedArrayHandler.js.map +1 -1
- package/lib/cjs/solidity/storage/handlers/SlotValueConstantHandler.js +1 -1
- package/lib/cjs/solidity/storage/handlers/SlotValueConstantHandler.js.map +1 -1
- package/lib/cjs/solidity/storage/handlers/SlotValueHandler.js +1 -1
- package/lib/cjs/solidity/storage/handlers/SlotValueHandler.js.map +1 -1
- package/lib/cjs/solidity/storage/handlers/SlotValueImmutableHandler.js +4 -4
- package/lib/cjs/solidity/storage/handlers/SlotValueImmutableHandler.js.map +1 -1
- package/lib/cjs/tokens/TokenDataProvider.js +2 -2
- package/lib/cjs/tokens/TokenDataProvider.js.map +1 -1
- package/lib/cjs/tokens/TokenExchangeService.js +1 -1
- package/lib/cjs/tokens/TokenExchangeService.js.map +1 -1
- package/lib/cjs/tokens/TokenExchanges/AmmBase/V2/AmmPairV2Service.js +2 -2
- package/lib/cjs/tokens/TokenExchanges/AmmBase/V2/AmmPairV2Service.js.map +1 -1
- package/lib/cjs/tokens/TokenExchanges/AmmV2PriceQuote.js +2 -2
- package/lib/cjs/tokens/TokenExchanges/AmmV2PriceQuote.js.map +1 -1
- package/lib/cjs/tokens/TokenOracles/amm/AmmV1Oracle.js +2 -2
- package/lib/cjs/tokens/TokenOracles/amm/AmmV1Oracle.js.map +1 -1
- package/lib/cjs/tokens/TokenTransferService.js +2 -2
- package/lib/cjs/tokens/TokenTransferService.js.map +1 -1
- package/lib/cjs/tokens/TokensService.js +1 -1
- package/lib/cjs/tokens/TokensService.js.map +1 -1
- package/lib/cjs/txs/TxNonceManager.js +1 -1
- package/lib/cjs/txs/TxWriter.js +9 -0
- package/lib/cjs/txs/TxWriter.js.map +1 -1
- package/lib/cjs/txs/conditional/GasWatcherTx.js +1 -1
- package/lib/cjs/txs/conditional/GasWatcherTx.js.map +1 -1
- package/lib/cjs/txs/receipt/TxLogParser.js +1 -1
- package/lib/cjs/utils/$crypto.js +1 -1
- package/lib/cjs/utils/$crypto.js.map +1 -1
- package/lib/cjs/utils/$date.js +1 -1
- package/lib/cjs/utils/$date.js.map +1 -1
- package/lib/cjs/utils/$hex.js +1 -1
- package/lib/cjs/utils/$logger.js +1 -1
- package/lib/cjs/utils/$logger.js.map +1 -1
- package/lib/cjs/utils/$machine.js +2 -2
- package/lib/cjs/utils/$machine.js.map +1 -1
- package/lib/cjs/utils/$traces.js +1 -1
- package/lib/cjs/utils/$traces.js.map +1 -1
- package/lib/esm/abi/$abiCoder.js.map +1 -1
- package/lib/esm/abi/$abiCoder.mjs +1 -1
- package/lib/esm/abi/Logger.mjs +1 -1
- package/lib/esm/abi/abi-coder-packed.mjs +3 -3
- package/lib/esm/abi/abi-coder.mjs +16 -16
- package/lib/esm/abi/coders/abstract-coder.js.map +1 -1
- package/lib/esm/abi/coders/abstract-coder.mjs +31 -31
- package/lib/esm/abi/fragments.js.map +1 -1
- package/lib/esm/abi/fragments.mjs +90 -90
- package/lib/esm/blocks/BlockDateResolver.js.map +1 -1
- package/lib/esm/blocks/BlockDateResolver.mjs +9 -9
- package/lib/esm/class/PackedRanges.js.map +1 -1
- package/lib/esm/class/PackedRanges.mjs +46 -46
- package/lib/esm/clients/ClientEventsStream.js.map +1 -1
- package/lib/esm/clients/ClientEventsStream.mjs +1 -1
- package/lib/esm/clients/ClientPool.js.map +1 -1
- package/lib/esm/clients/ClientPool.mjs +23 -23
- package/lib/esm/clients/WalletClient.js.map +1 -1
- package/lib/esm/clients/WalletClient.mjs +3 -3
- package/lib/esm/clients/Web3Client.js.map +1 -1
- package/lib/esm/clients/Web3Client.mjs +14 -14
- package/lib/esm/clients/Web3ClientFactory.js.map +1 -1
- package/lib/esm/clients/Web3ClientFactory.mjs +1 -1
- package/lib/esm/clients/compatibility/Web3.js.map +1 -1
- package/lib/esm/clients/compatibility/Web3.mjs +2 -2
- package/lib/esm/clients/handlers/RateLimitGuard.js.map +1 -1
- package/lib/esm/clients/handlers/RateLimitGuard.mjs +16 -16
- package/lib/esm/clients/model/PromiEventWrap.js.map +1 -1
- package/lib/esm/clients/model/PromiEventWrap.mjs +1 -1
- package/lib/esm/clients/utils/$web3Abi.js.map +1 -1
- package/lib/esm/clients/utils/$web3Abi.mjs +2 -2
- package/lib/esm/clients/utils/ClientErrorUtil.js.map +1 -1
- package/lib/esm/clients/utils/ClientErrorUtil.mjs +4 -0
- package/lib/esm/config/Config.js.map +1 -1
- package/lib/esm/contracts/Contract.js.map +1 -1
- package/lib/esm/contracts/Contract.mjs +1 -1
- package/lib/esm/contracts/ContractAbiProvider.js.map +1 -1
- package/lib/esm/contracts/ContractAbiProvider.mjs +6 -6
- package/lib/esm/contracts/ContractBase.js.map +1 -1
- package/lib/esm/contracts/ContractBase.mjs +10 -10
- package/lib/esm/contracts/ContractProvider.js.map +1 -1
- package/lib/esm/contracts/ContractProvider.mjs +1 -1
- package/lib/esm/contracts/ContractReader.js.map +1 -1
- package/lib/esm/contracts/ContractReader.mjs +5 -5
- package/lib/esm/contracts/ContractWriter.js.map +1 -1
- package/lib/esm/contracts/ContractWriter.mjs +4 -4
- package/lib/esm/contracts/deploy/ContractDeployer.js.map +1 -1
- package/lib/esm/contracts/deploy/ContractDeployer.mjs +4 -4
- package/lib/esm/contracts/deploy/Deployments.js.map +1 -1
- package/lib/esm/contracts/deploy/Deployments.mjs +36 -21
- package/lib/esm/contracts/deploy/proxy/$proxyDeploy.js.map +1 -1
- package/lib/esm/contracts/deploy/proxy/$proxyDeploy.mjs +13 -13
- package/lib/esm/contracts/deploy/proxy/ProxyDeployment.js.map +1 -1
- package/lib/esm/contracts/deploy/proxy/ProxyDeployment.mjs +22 -22
- package/lib/esm/contracts/deploy/storage/DeploymentsStorage.js.map +1 -1
- package/lib/esm/contracts/deploy/storage/DeploymentsStorage.mjs +15 -14
- package/lib/esm/contracts/utils/AbiDeserializer.js.map +1 -1
- package/lib/esm/contracts/utils/AbiDeserializer.mjs +4 -4
- package/lib/esm/contracts/utils/ContractBaseUtils.js.map +1 -1
- package/lib/esm/contracts/utils/ContractBaseUtils.mjs +3 -3
- package/lib/esm/evm/OpcodesWalker.js.map +1 -1
- package/lib/esm/evm/OpcodesWalker.mjs +1 -1
- package/lib/esm/explorer/BlockchainExplorer.js.map +1 -1
- package/lib/esm/explorer/BlockchainExplorer.mjs +1 -1
- package/lib/esm/explorer/BlockchainExplorerFactory.mjs +1 -1
- package/lib/esm/explorer/BlockchainExplorerStorage.js.map +1 -1
- package/lib/esm/explorer/BlockchainExplorerStorage.mjs +12 -12
- package/lib/esm/explorer/Evmscan.mjs +1 -1
- package/lib/esm/explorer/verifiers/FsHtmlVerifier.js.map +1 -1
- package/lib/esm/explorer/verifiers/FsHtmlVerifier.mjs +7 -7
- package/lib/esm/flashbots/FlashbotWeb3Client.js.map +1 -1
- package/lib/esm/flashbots/FlashbotWeb3Client.mjs +1 -1
- package/lib/esm/hardhat/HardhatProvider.js.map +1 -1
- package/lib/esm/hardhat/HardhatProvider.mjs +7 -7
- package/lib/esm/indexer/BlocksTxIndexer.js.map +1 -1
- package/lib/esm/indexer/BlocksTxIndexer.mjs +2 -2
- package/lib/esm/indexer/EventsIndexer.js.map +1 -1
- package/lib/esm/indexer/EventsIndexer.mjs +11 -11
- package/lib/esm/indexer/PendingTxIndexer.js.map +1 -1
- package/lib/esm/indexer/PendingTxIndexer.mjs +2 -2
- package/lib/esm/indexer/handlers/BlocksWalker.js.map +1 -1
- package/lib/esm/indexer/handlers/BlocksWalker.mjs +9 -9
- package/lib/esm/indexer/handlers/TxQueueLoader.mjs +1 -1
- package/lib/esm/indexer/storage/FsEventsIndexerStore.js.map +1 -1
- package/lib/esm/indexer/storage/FsEventsIndexerStore.mjs +3 -3
- package/lib/esm/indexer/storage/FsEventsStoreUtils.js.map +1 -1
- package/lib/esm/indexer/storage/FsEventsStoreUtils.mjs +1 -1
- package/lib/esm/json/JsonArrayMultiStore.js.map +1 -1
- package/lib/esm/json/JsonArrayMultiStore.mjs +1 -1
- package/lib/esm/json/JsonStoreFs.js.map +1 -1
- package/lib/esm/json/JsonStoreFs.mjs +1 -1
- package/lib/esm/rpc/$rpc.js.map +1 -1
- package/lib/esm/rpc/$rpc.mjs +2 -2
- package/lib/esm/rpc/Rpc.mjs +2 -2
- package/lib/esm/rpc/RpcBase.js.map +1 -1
- package/lib/esm/rpc/RpcBase.mjs +2 -2
- package/lib/esm/rpc/RpcContract.js.map +1 -1
- package/lib/esm/rpc/RpcContract.mjs +4 -3
- package/lib/esm/rpc/RpcSubscription.js.map +1 -1
- package/lib/esm/rpc/RpcSubscription.mjs +1 -1
- package/lib/esm/rpc/transports/compatibility/EIP1193Transport.js.map +1 -1
- package/lib/esm/rpc/transports/compatibility/EIP1193Transport.mjs +4 -4
- package/lib/esm/rpc/transports/compatibility/Web3Transport.js.map +1 -1
- package/lib/esm/rpc/transports/compatibility/Web3Transport.mjs +1 -1
- package/lib/esm/services/TimelockService/TimelockService.mjs +2 -2
- package/lib/esm/services/TimelockService/TimelockServiceFallbackSafe.mjs +2 -2
- package/lib/esm/solidity/SlotsDump.js.map +1 -1
- package/lib/esm/solidity/SlotsDump.mjs +1 -1
- package/lib/esm/solidity/SlotsParser/MappingSettersResolver.js.map +1 -1
- package/lib/esm/solidity/SlotsParser/MappingSettersResolver.mjs +3 -3
- package/lib/esm/solidity/SlotsParser/SourceFile.js.map +1 -1
- package/lib/esm/solidity/SlotsParser/SourceFile.mjs +3 -3
- package/lib/esm/solidity/SolidityParser.js.map +1 -1
- package/lib/esm/solidity/SolidityParser.mjs +1 -1
- package/lib/esm/solidity/SourceCodeProvider.js.map +1 -1
- package/lib/esm/solidity/SourceCodeProvider.mjs +1 -1
- package/lib/esm/solidity/storage/Accessor.js.map +1 -1
- package/lib/esm/solidity/storage/Accessor.mjs +1 -1
- package/lib/esm/solidity/storage/SlotFixedArray.js.map +1 -1
- package/lib/esm/solidity/storage/SlotFixedArray.mjs +1 -1
- package/lib/esm/solidity/storage/SlotsStorageTransport.js.map +1 -1
- package/lib/esm/solidity/storage/SlotsStorageTransport.mjs +3 -3
- package/lib/esm/solidity/storage/handlers/SlotBytesHandler.js.map +1 -1
- package/lib/esm/solidity/storage/handlers/SlotBytesHandler.mjs +1 -1
- package/lib/esm/solidity/storage/handlers/SlotDynamicArrayHandler.js.map +1 -1
- package/lib/esm/solidity/storage/handlers/SlotDynamicArrayHandler.mjs +1 -1
- package/lib/esm/solidity/storage/handlers/SlotFixedArrayHandler.js.map +1 -1
- package/lib/esm/solidity/storage/handlers/SlotFixedArrayHandler.mjs +1 -1
- package/lib/esm/solidity/storage/handlers/SlotValueConstantHandler.js.map +1 -1
- package/lib/esm/solidity/storage/handlers/SlotValueConstantHandler.mjs +1 -1
- package/lib/esm/solidity/storage/handlers/SlotValueHandler.js.map +1 -1
- package/lib/esm/solidity/storage/handlers/SlotValueHandler.mjs +1 -1
- package/lib/esm/solidity/storage/handlers/SlotValueImmutableHandler.js.map +1 -1
- package/lib/esm/solidity/storage/handlers/SlotValueImmutableHandler.mjs +4 -4
- package/lib/esm/tokens/TokenDataProvider.js.map +1 -1
- package/lib/esm/tokens/TokenDataProvider.mjs +2 -2
- package/lib/esm/tokens/TokenExchangeService.js.map +1 -1
- package/lib/esm/tokens/TokenExchangeService.mjs +1 -1
- package/lib/esm/tokens/TokenExchanges/AmmBase/V2/AmmPairV2Service.js.map +1 -1
- package/lib/esm/tokens/TokenExchanges/AmmBase/V2/AmmPairV2Service.mjs +2 -2
- package/lib/esm/tokens/TokenExchanges/AmmV2PriceQuote.js.map +1 -1
- package/lib/esm/tokens/TokenExchanges/AmmV2PriceQuote.mjs +2 -2
- package/lib/esm/tokens/TokenOracles/amm/AmmV1Oracle.js.map +1 -1
- package/lib/esm/tokens/TokenOracles/amm/AmmV1Oracle.mjs +2 -2
- package/lib/esm/tokens/TokenTransferService.js.map +1 -1
- package/lib/esm/tokens/TokenTransferService.mjs +2 -2
- package/lib/esm/tokens/TokensService.js.map +1 -1
- package/lib/esm/tokens/TokensService.mjs +1 -1
- package/lib/esm/txs/TxNonceManager.mjs +1 -1
- package/lib/esm/txs/TxWriter.js.map +1 -1
- package/lib/esm/txs/TxWriter.mjs +9 -0
- package/lib/esm/txs/conditional/GasWatcherTx.js.map +1 -1
- package/lib/esm/txs/conditional/GasWatcherTx.mjs +1 -1
- package/lib/esm/txs/receipt/TxLogParser.mjs +1 -1
- package/lib/esm/utils/$crypto.js.map +1 -1
- package/lib/esm/utils/$crypto.mjs +1 -1
- package/lib/esm/utils/$date.js.map +1 -1
- package/lib/esm/utils/$date.mjs +1 -1
- package/lib/esm/utils/$hex.mjs +1 -1
- package/lib/esm/utils/$logger.js.map +1 -1
- package/lib/esm/utils/$logger.mjs +1 -1
- package/lib/esm/utils/$machine.js.map +1 -1
- package/lib/esm/utils/$machine.mjs +2 -2
- package/lib/esm/utils/$traces.js.map +1 -1
- package/lib/esm/utils/$traces.mjs +1 -1
- package/lib/types/abi/abi-coder-packed.d.ts +1 -1
- package/lib/types/abi/abi-coder.d.ts +13 -13
- package/lib/types/abi/coders/abstract-coder.d.ts +14 -14
- package/lib/types/abi/fragments.d.ts +95 -95
- package/lib/types/blocks/BlockDateResolver.d.ts +7 -7
- package/lib/types/class/PackedRanges.d.ts +44 -44
- package/lib/types/clients/ClientPool.d.ts +10 -10
- package/lib/types/clients/WalletClient.d.ts +2 -2
- package/lib/types/clients/Web3Client.d.ts +6 -6
- package/lib/types/clients/Web3ClientFactory.d.ts +1 -1
- package/lib/types/clients/handlers/RateLimitGuard.d.ts +5 -5
- package/lib/types/clients/model/PromiEventWrap.d.ts +1 -1
- package/lib/types/clients/utils/$web3Abi.d.ts +1 -1
- package/lib/types/clients/utils/ClientErrorUtil.d.ts +1 -0
- package/lib/types/config/Config.d.ts +3 -2
- package/lib/types/contracts/ContractBase.d.ts +4 -4
- package/lib/types/contracts/ContractReader.d.ts +2 -2
- package/lib/types/contracts/ContractWriter.d.ts +3 -3
- package/lib/types/contracts/deploy/Deployments.d.ts +13 -14
- package/lib/types/contracts/deploy/storage/DeploymentsStorage.d.ts +2 -0
- package/lib/types/explorer/BlockchainExplorerFactory.d.ts +1 -1
- package/lib/types/explorer/Evmscan.d.ts +1 -1
- package/lib/types/indexer/BlocksTxIndexer.d.ts +4 -4
- package/lib/types/indexer/EventsIndexer.d.ts +4 -4
- package/lib/types/indexer/PendingTxIndexer.d.ts +1 -1
- package/lib/types/indexer/handlers/BlocksWalker.d.ts +2 -2
- package/lib/types/indexer/storage/FsEventsIndexerStore.d.ts +4 -4
- package/lib/types/ns/providers/INsProvider.d.ts +1 -1
- package/lib/types/rpc/Rpc.d.ts +2 -2
- package/lib/types/services/TimelockService/ITimelockService.d.ts +2 -2
- package/lib/types/services/TimelockService/TimelockService.d.ts +2 -2
- package/lib/types/services/TimelockService/TimelockServiceFallbackSafe.d.ts +2 -2
- package/lib/types/solidity/SlotsParser/SourceFile.d.ts +1 -1
- package/lib/types/solidity/storage/SlotFixedArray.d.ts +1 -1
- package/lib/types/tokens/TokenDataProvider.d.ts +2 -2
- package/lib/types/tokens/TokensService.d.ts +1 -1
- package/lib/types/txs/ITxBuilderOptions.d.ts +1 -1
- package/lib/types/txs/TxNonceManager.d.ts +1 -1
- package/lib/types/txs/TxWriter.d.ts +4 -4
- package/lib/types/txs/receipt/TxLogParser.d.ts +1 -1
- package/lib/types/utils/$date.d.ts +1 -1
- package/lib/types/utils/$hex.d.ts +1 -1
- package/package.json +1 -1
- package/readme.md +105 -83
- package/src/abi/$abiCoder.ts +1 -1
- package/src/abi/Logger.ts +1 -1
- package/src/abi/abi-coder-packed.ts +3 -3
- package/src/abi/abi-coder.ts +16 -16
- package/src/abi/coders/abstract-coder.ts +36 -36
- package/src/abi/fragments.ts +137 -137
- package/src/blocks/BlockDateResolver.ts +9 -9
- package/src/bridges/hop/HopBridge.ts +1 -1
- package/src/class/PackedRanges.ts +46 -46
- package/src/clients/ClientEventsStream.ts +1 -1
- package/src/clients/ClientPool.ts +38 -38
- package/src/clients/WalletClient.ts +3 -3
- package/src/clients/Web3BatchRequests.ts +3 -3
- package/src/clients/Web3Client.ts +21 -21
- package/src/clients/Web3ClientFactory.ts +1 -1
- package/src/clients/compatibility/Web3.ts +2 -2
- package/src/clients/handlers/RateLimitGuard.ts +16 -16
- package/src/clients/interfaces/IWeb3Client.ts +2 -2
- package/src/clients/model/PromiEventWrap.ts +1 -1
- package/src/clients/utils/$web3Abi.ts +2 -2
- package/src/clients/utils/ClientErrorUtil.ts +4 -0
- package/src/config/Config.ts +4 -3
- package/src/contracts/Contract.ts +1 -1
- package/src/contracts/ContractAbiProvider.ts +6 -6
- package/src/contracts/ContractBase.ts +14 -14
- package/src/contracts/ContractProvider.ts +1 -1
- package/src/contracts/ContractReader.ts +7 -7
- package/src/contracts/ContractWriter.ts +4 -4
- package/src/contracts/deploy/ContractDeployer.ts +4 -4
- package/src/contracts/deploy/ContractDeployment.ts +1 -1
- package/src/contracts/deploy/Deployments.ts +69 -56
- package/src/contracts/deploy/proxy/$proxyDeploy.ts +14 -14
- package/src/contracts/deploy/proxy/ProxyDeployment.ts +22 -22
- package/src/contracts/deploy/storage/DeploymentsStorage.ts +21 -18
- package/src/contracts/utils/AbiDeserializer.ts +4 -4
- package/src/contracts/utils/ContractBaseUtils.ts +3 -3
- package/src/erc4337/models/UserOperation.ts +2 -2
- package/src/evm/OpcodesWalker.ts +1 -1
- package/src/explorer/BlockchainExplorer.ts +1 -1
- package/src/explorer/BlockchainExplorerFactory.ts +1 -1
- package/src/explorer/BlockchainExplorerStorage.ts +12 -12
- package/src/explorer/Evmscan.ts +1 -1
- package/src/explorer/verifiers/FsHtmlVerifier.ts +7 -7
- package/src/flashbots/FlashbotWeb3Client.ts +1 -1
- package/src/hardhat/HardhatProvider.ts +7 -7
- package/src/indexer/BlocksTxIndexer.ts +6 -6
- package/src/indexer/EventsIndexer.ts +20 -20
- package/src/indexer/PendingTxIndexer.ts +3 -3
- package/src/indexer/handlers/BlocksWalker.ts +9 -9
- package/src/indexer/handlers/TxQueueLoader.ts +1 -1
- package/src/indexer/storage/FsEventsIndexerStore.ts +9 -9
- package/src/indexer/storage/FsEventsMetaStore.ts +1 -1
- package/src/indexer/storage/FsEventsStoreUtils.ts +1 -1
- package/src/json/JsonArrayMultiStore.ts +1 -1
- package/src/json/JsonStoreFs.ts +1 -1
- package/src/ns/providers/INsProvider.ts +1 -1
- package/src/rpc/$rpc.ts +2 -2
- package/src/rpc/Rpc.ts +2 -2
- package/src/rpc/RpcBase.ts +2 -2
- package/src/rpc/RpcContract.ts +6 -6
- package/src/rpc/RpcSubscription.ts +1 -1
- package/src/rpc/transports/compatibility/EIP1193Transport.ts +4 -4
- package/src/rpc/transports/compatibility/Web3Transport.ts +1 -1
- package/src/services/TimelockService/ITimelockService.ts +2 -2
- package/src/services/TimelockService/TimelockService.ts +2 -2
- package/src/services/TimelockService/TimelockServiceFallbackSafe.ts +2 -2
- package/src/solidity/SlotsDump.ts +1 -1
- package/src/solidity/SlotsParser/MappingSettersResolver.ts +3 -3
- package/src/solidity/SlotsParser/SourceFile.ts +3 -3
- package/src/solidity/SolidityParser.ts +1 -1
- package/src/solidity/SourceCodeProvider.ts +1 -1
- package/src/solidity/storage/Accessor.spec.ts +1 -1
- package/src/solidity/storage/Accessor.ts +1 -1
- package/src/solidity/storage/SlotDynamicArray.ts +1 -1
- package/src/solidity/storage/SlotFixedArray.ts +1 -1
- package/src/solidity/storage/SlotsStorageTransport.ts +3 -3
- package/src/solidity/storage/handlers/SlotBytesHandler.ts +1 -1
- package/src/solidity/storage/handlers/SlotDynamicArrayHandler.ts +1 -1
- package/src/solidity/storage/handlers/SlotFixedArrayHandler.ts +1 -1
- package/src/solidity/storage/handlers/SlotValueConstantHandler.ts +1 -1
- package/src/solidity/storage/handlers/SlotValueHandler.ts +1 -1
- package/src/solidity/storage/handlers/SlotValueImmutableHandler.ts +4 -4
- package/src/tokens/TokenDataProvider.ts +2 -2
- package/src/tokens/TokenExchangeService.ts +1 -1
- package/src/tokens/TokenExchanges/AmmBase/V2/AmmPairV2Service.ts +2 -2
- package/src/tokens/TokenExchanges/AmmV2PriceQuote.ts +2 -2
- package/src/tokens/TokenOracles/amm/AmmV1Oracle.ts +2 -2
- package/src/tokens/TokenTransferService.ts +2 -2
- package/src/tokens/TokensService.ts +1 -1
- package/src/txs/ITxBuilderOptions.ts +1 -1
- package/src/txs/TxNonceManager.ts +1 -1
- package/src/txs/TxWriter.ts +15 -4
- package/src/txs/agents/BatchAgent.ts +1 -1
- package/src/txs/conditional/GasWatcherTx.ts +1 -1
- package/src/txs/receipt/TxLogParser.ts +1 -1
- package/src/utils/$crypto.ts +1 -1
- package/src/utils/$date.ts +1 -1
- package/src/utils/$hex.ts +1 -1
- package/src/utils/$logger.ts +1 -1
- package/src/utils/$machine.ts +2 -2
- package/src/utils/$traces.ts +1 -1
- package/src/wallets/EIP6963ProviderFactory.ts +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Web3Client.js","sourceRoot":"","sources":["../../../src/clients/Web3Client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Web3Client.js","sourceRoot":"","sources":["../../../src/clients/Web3Client.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ var Web3ClientFactory;
|
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
30
|
Web3ClientFactory.get = get;
|
|
31
|
-
/** Same as sync
|
|
31
|
+
/** Same as the sync variant, but ensures the config is fetched */
|
|
32
32
|
async function getAsync(platform, opts) {
|
|
33
33
|
let cfg = await Config_1.Config.get();
|
|
34
34
|
return get(platform, opts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Web3ClientFactory.js","sourceRoot":"","sources":["../../../src/clients/Web3ClientFactory.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAsB;AAGtB,uEAAoE;AACpE,oDAAiD;AACjD,mDAAgD;AAChD,uDAAoD;AACpD,qDAAkD;AAElD,IAAiB,iBAAiB,CAwBjC;AAxBD,WAAiB,iBAAiB;IAE9B,SAAgB,GAAG,CAAE,QAA4B,EAAE,IAA2B;QAC1E,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE;YACxF,IAAI,MAAM,GAAG,cAAE,CAAC,OAAO,CAAC,iCAAe,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YACnE,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;gBAC5B,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3C;YACD,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,OAAO,GAAG,iBAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC/C,mBAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,wBAAwB,QAAQ,kBAAkB,CAAC,CAAA;QAC7E,OAAO,IAAI,6BAAa,CAAC;YACrB,GAAG,OAAO;YACV,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;SAClB,CAAC,CAAC;IACP,CAAC;IAfe,qBAAG,MAelB,CAAA;IAED,
|
|
1
|
+
{"version":3,"file":"Web3ClientFactory.js","sourceRoot":"","sources":["../../../src/clients/Web3ClientFactory.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAsB;AAGtB,uEAAoE;AACpE,oDAAiD;AACjD,mDAAgD;AAChD,uDAAoD;AACpD,qDAAkD;AAElD,IAAiB,iBAAiB,CAwBjC;AAxBD,WAAiB,iBAAiB;IAE9B,SAAgB,GAAG,CAAE,QAA4B,EAAE,IAA2B;QAC1E,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE;YACxF,IAAI,MAAM,GAAG,cAAE,CAAC,OAAO,CAAC,iCAAe,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YACnE,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;gBAC5B,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3C;YACD,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,OAAO,GAAG,iBAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC/C,mBAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,wBAAwB,QAAQ,kBAAkB,CAAC,CAAA;QAC7E,OAAO,IAAI,6BAAa,CAAC;YACrB,GAAG,OAAO;YACV,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;SAClB,CAAC,CAAC;IACP,CAAC;IAfe,qBAAG,MAelB,CAAA;IAED,kEAAkE;IAC3D,KAAK,UAAU,QAAQ,CAAE,QAAqC,EAAE,IAA2B;QAC9F,IAAI,GAAG,GAAG,MAAM,eAAM,CAAC,GAAG,EAAE,CAAC;QAC7B,OAAO,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAHqB,0BAAQ,WAG7B,CAAA;AACL,CAAC,EAxBgB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAwBjC"}
|
|
@@ -90,7 +90,7 @@ var $Web3Contract;
|
|
|
90
90
|
get(target, method, receiver) {
|
|
91
91
|
let abiItem = target.abi.find(item => item.name === method);
|
|
92
92
|
if (abiItem == null) {
|
|
93
|
-
throw new Error(`Method ${method.toString()} not found. Available methods: ${target.abi.map(item => item.name).join(', ')}`);
|
|
93
|
+
throw new Error(`Method ${method.toString()} was not found. Available methods: ${target.abi.map(item => item.name).join(', ')}`);
|
|
94
94
|
}
|
|
95
95
|
return (...args) => {
|
|
96
96
|
return new Web3ContractMethod(target.eth, abiItem, target.abi, target.address, args);
|
|
@@ -130,7 +130,7 @@ var $Web3Contract;
|
|
|
130
130
|
}
|
|
131
131
|
send(opts) {
|
|
132
132
|
let account = this.eth.accounts.wallet.get(opts.from);
|
|
133
|
-
_require_1.$require.notNull(account, `Account ${opts.from} not found`);
|
|
133
|
+
_require_1.$require.notNull(account, `Account ${opts.from} was not found`);
|
|
134
134
|
let builder = new TxDataBuilder_1.TxDataBuilder(this.eth.client, account, {
|
|
135
135
|
to: this.address,
|
|
136
136
|
input: this.encodeABI(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Web3.js","sourceRoot":"","sources":["../../../../src/clients/compatibility/Web3.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Web3.js","sourceRoot":"","sources":["../../../../src/clients/compatibility/Web3.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ const alot_1 = __importDefault(require("alot"));
|
|
|
17
17
|
const memd_1 = __importDefault(require("memd"));
|
|
18
18
|
let rateLimitRgx = {
|
|
19
19
|
checks: [
|
|
20
|
-
//
|
|
20
|
+
// Extracted from known and common rate-limit messages
|
|
21
21
|
/rate.+limit/i,
|
|
22
22
|
/too.+many.+request/i,
|
|
23
23
|
/exceed.+request/i,
|
|
@@ -92,9 +92,9 @@ class RateLimitGuard {
|
|
|
92
92
|
if (/backoff|next|reset/i.test(key) && /^\d+$/.test(String(val))) {
|
|
93
93
|
val = Number(val);
|
|
94
94
|
if (val < 50000) {
|
|
95
|
-
//
|
|
95
|
+
// Relative time
|
|
96
96
|
if (val < 1000) {
|
|
97
|
-
//
|
|
97
|
+
// In seconds
|
|
98
98
|
val = val * 1000;
|
|
99
99
|
}
|
|
100
100
|
val = Date.now() + val;
|
|
@@ -168,7 +168,7 @@ class RateLimitGuard {
|
|
|
168
168
|
if (info.backoff) {
|
|
169
169
|
this.backoff = info.backoff;
|
|
170
170
|
}
|
|
171
|
-
if (info.spanLimit && info.spanMs) {
|
|
171
|
+
if (info.spanLimit != null && info.spanMs != null) {
|
|
172
172
|
(0, _logger_1.l) `Updating the yellow<rate limits> for ${this.id} using: bold<${info.spanLimit}> per bold<${info.spanMs}ms>`;
|
|
173
173
|
let rate = this.rates.find(x => x.spanMs === info.spanMs);
|
|
174
174
|
if (rate) {
|
|
@@ -214,10 +214,10 @@ class RateLimitGuard {
|
|
|
214
214
|
onThrottle(ms) {
|
|
215
215
|
let awaited = this.awaited;
|
|
216
216
|
if (awaited.count > 0 && awaited.count % 20 === 0) {
|
|
217
|
-
(0, _logger_1.l) `The
|
|
217
|
+
(0, _logger_1.l) `The node ${this.id} with (${this.rates[0].counter} req) was throttled ${awaited.count}x for ${_date_1.$date.formatTimespan(awaited.total)} in total. Current wait time: ${_date_1.$date.formatTimespan(ms)}`;
|
|
218
218
|
}
|
|
219
219
|
else if (ms > 30000) {
|
|
220
|
-
(0, _logger_1.l) `The
|
|
220
|
+
(0, _logger_1.l) `The node ${this.id} with (${this.rates[0].counter} req) is now waiting ${_date_1.$date.formatTimespan(ms)} to continue.`;
|
|
221
221
|
}
|
|
222
222
|
//-this.rates[1].printStatus()
|
|
223
223
|
}
|
|
@@ -227,9 +227,9 @@ __decorate([
|
|
|
227
227
|
], RateLimitGuard.prototype, "wait", null);
|
|
228
228
|
exports.RateLimitGuard = RateLimitGuard;
|
|
229
229
|
/**
|
|
230
|
-
* In short
|
|
230
|
+
* In the short-epoch rate limiter (1s, 1m, 1h), we track each request
|
|
231
231
|
*
|
|
232
|
-
* sliding(rolling) window | fixed window
|
|
232
|
+
* sliding (rolling) window | fixed window
|
|
233
233
|
*/
|
|
234
234
|
class ShortEpochRateLimitData {
|
|
235
235
|
constructor(spanMs, spanLimit) {
|
|
@@ -243,7 +243,7 @@ class ShortEpochRateLimitData {
|
|
|
243
243
|
let rgx = /^(?<limit>\d+)[\\/](?<time>\w+)$/;
|
|
244
244
|
let match = rgx.exec(rate);
|
|
245
245
|
if (match == null) {
|
|
246
|
-
throw new Error(`Invalid value for rate limit: ${rate}.
|
|
246
|
+
throw new Error(`Invalid value for rate limit: ${rate}. Expected to match the regex: ${rgx.toString()}`);
|
|
247
247
|
}
|
|
248
248
|
let spanMs = Number(match.groups.limit);
|
|
249
249
|
let spanLimit = _date_1.$date.parseTimespan(match.groups.time);
|
|
@@ -278,9 +278,9 @@ class ShortEpochRateLimitData {
|
|
|
278
278
|
}
|
|
279
279
|
}
|
|
280
280
|
/**
|
|
281
|
-
* The server has own request time
|
|
282
|
-
* Here we should update the times AFTER the response received,
|
|
283
|
-
* otherwise the
|
|
281
|
+
* The server has its own request time. With `addTicks`, we save the time BEFORE sending to the server
|
|
282
|
+
* Here we should update the times AFTER the response is received,
|
|
283
|
+
* otherwise the request could be removed locally from TimeWindow earlier than it is cleared on the backend
|
|
284
284
|
*/
|
|
285
285
|
updateRequests(tick, newTick) {
|
|
286
286
|
for (let i = 0; i < this.ticks.length; i++) {
|
|
@@ -295,18 +295,18 @@ class ShortEpochRateLimitData {
|
|
|
295
295
|
let spanStart = now - this.spanMs;
|
|
296
296
|
for (let i = 0; i < ticks.length; i++) {
|
|
297
297
|
if (ticks[i] < spanStart) {
|
|
298
|
-
//
|
|
298
|
+
// Older ticks; continue and slice later
|
|
299
299
|
continue;
|
|
300
300
|
}
|
|
301
301
|
if (i > 0) {
|
|
302
|
-
//
|
|
302
|
+
// Remove older requests
|
|
303
303
|
ticks.splice(0, i);
|
|
304
304
|
}
|
|
305
|
-
//
|
|
305
|
+
// In-range tick found
|
|
306
306
|
break;
|
|
307
307
|
}
|
|
308
308
|
if ((ticks.length + ticksCount) <= this.spanLimit) {
|
|
309
|
-
// We can add requests to current span
|
|
309
|
+
// We can add requests to the current span
|
|
310
310
|
return 0;
|
|
311
311
|
}
|
|
312
312
|
let timeWeCanAdd = ticks[0] + this.spanMs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RateLimitGuard.js","sourceRoot":"","sources":["../../../../src/clients/handlers/RateLimitGuard.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"RateLimitGuard.js","sourceRoot":"","sources":["../../../../src/clients/handlers/RateLimitGuard.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ class PromiseEventWrap extends atma_utils_1.class_Dfr {
|
|
|
24
24
|
emit(event, ...args) {
|
|
25
25
|
this._events.emit(event, ...args);
|
|
26
26
|
}
|
|
27
|
-
/**
|
|
27
|
+
/** Attaches this wrapper to the promiseEvent */
|
|
28
28
|
bind(promiseEvent) {
|
|
29
29
|
this.$source = promiseEvent;
|
|
30
30
|
for (let event in this._events._listeners) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PromiEventWrap.js","sourceRoot":"","sources":["../../../../src/clients/model/PromiEventWrap.ts"],"names":[],"mappings":";;;AAEA,2CAA2D;AAG3D,MAAa,gBAAiB,SAAQ,sBAAS;IAA/C;;QAEY,YAAO,GAAG,IAAI,+BAAkB,EAAE,CAAC;IAsD/C,CAAC;IAlDG,EAAE,CAAE,KAAK,EAAE,EAAE;QAET,IAAI,KAAK,KAAK,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,CAAE,KAAK,EAAE,EAAE;QACX,IAAI,KAAK,KAAK,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE;YACnC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SAC1B;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,CAAE,KAAK,EAAE,GAAG,IAAI;QAChB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"PromiEventWrap.js","sourceRoot":"","sources":["../../../../src/clients/model/PromiEventWrap.ts"],"names":[],"mappings":";;;AAEA,2CAA2D;AAG3D,MAAa,gBAAiB,SAAQ,sBAAS;IAA/C;;QAEY,YAAO,GAAG,IAAI,+BAAkB,EAAE,CAAC;IAsD/C,CAAC;IAlDG,EAAE,CAAE,KAAK,EAAE,EAAE;QAET,IAAI,KAAK,KAAK,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,CAAE,KAAK,EAAE,EAAE;QACX,IAAI,KAAK,KAAK,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE;YACnC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SAC1B;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,CAAE,KAAK,EAAE,GAAG,IAAI;QAChB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,gDAAgD;IAChD,IAAI,CAAE,YAA+B;QAEjC,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC;QAE5B,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvC,IAAI,KAAK,KAAK,OAAO,EAAE;gBACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACtB;SACJ;QACD,YAAY,CAAC,IAAI,CACb,MAAM,CAAC,EAAE;YACL,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACxB,CAAC,EACD,GAAG,CAAC,EAAE;YACF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC,CACJ,CAAC;IACN,CAAC;IAGO,MAAM,CAAE,KAAK;QACjB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAY,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE;YACtC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACP,CAAC;IACO,UAAU,CAAE,KAAK;QACrB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAY,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAxDD,4CAwDC"}
|
|
@@ -4,7 +4,7 @@ exports.$web3Abi = void 0;
|
|
|
4
4
|
const _abiParser_1 = require("../../utils/$abiParser.js");
|
|
5
5
|
var $web3Abi;
|
|
6
6
|
(function ($web3Abi) {
|
|
7
|
-
/**
|
|
7
|
+
/** Normalizes user input into an array of TAbiItems */
|
|
8
8
|
function ensureAbis(abi) {
|
|
9
9
|
let arr;
|
|
10
10
|
if (typeof abi === 'string') {
|
|
@@ -18,7 +18,7 @@ var $web3Abi;
|
|
|
18
18
|
}
|
|
19
19
|
let first = abi[0];
|
|
20
20
|
if (first.outputs == null || first.outputs.length === 0) {
|
|
21
|
-
// Normalize outputs
|
|
21
|
+
// Normalize outputs to read at least bytes if nothing is set
|
|
22
22
|
first.outputs = [
|
|
23
23
|
{
|
|
24
24
|
type: 'bytes32',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$web3Abi.js","sourceRoot":"","sources":["../../../../src/clients/utils/$web3Abi.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,IAAiB,QAAQ,CAyBxB;AAzBD,WAAiB,QAAQ;IAErB,
|
|
1
|
+
{"version":3,"file":"$web3Abi.js","sourceRoot":"","sources":["../../../../src/clients/utils/$web3Abi.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,IAAiB,QAAQ,CAyBxB;AAzBD,WAAiB,QAAQ;IAErB,uDAAuD;IACvD,SAAgB,UAAU,CAAC,GAAmC;QAC1D,IAAI,GAAe,CAAC;QACpB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,GAAG,GAAG,CAAE,uBAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAE,CAAC;SACzC;aAAO,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC5B,GAAG,GAAG,GAAG,CAAC;SACb;aAAM;YACH,GAAG,GAAG,CAAE,GAAG,CAAE,CAAC;SACjB;QAED,IAAI,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACrD,6DAA6D;YAC7D,KAAK,CAAC,OAAO,GAAG;gBACZ;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,EAAE;iBACX;aACJ,CAAC;SACL;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IArBe,mBAAU,aAqBzB,CAAA;AACL,CAAC,EAzBgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAyBxB"}
|
|
@@ -33,6 +33,10 @@ var ClientErrorUtil;
|
|
|
33
33
|
return /nonce too high/i.test(error.message);
|
|
34
34
|
}
|
|
35
35
|
ClientErrorUtil.IsNonceTooHigh = IsNonceTooHigh;
|
|
36
|
+
function IsUnderpriced(error) {
|
|
37
|
+
return /underpriced/i.test(error.message);
|
|
38
|
+
}
|
|
39
|
+
ClientErrorUtil.IsUnderpriced = IsUnderpriced;
|
|
36
40
|
})(ClientErrorUtil = exports.ClientErrorUtil || (exports.ClientErrorUtil = {}));
|
|
37
41
|
//# sourceMappingURL=ClientErrorUtil.js.map
|
|
38
42
|
//# sourceMappingURL=ClientErrorUtil.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientErrorUtil.js","sourceRoot":"","sources":["../../../../src/clients/utils/ClientErrorUtil.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AAGpD,IAAiB,eAAe,
|
|
1
|
+
{"version":3,"file":"ClientErrorUtil.js","sourceRoot":"","sources":["../../../../src/clients/utils/ClientErrorUtil.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AAGpD,IAAiB,eAAe,CAiC/B;AAjCD,WAAiB,eAAe;IAC5B,SAAgB,kBAAkB,CAAE,KAAiC;QACjE,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,KAAK,mBAAmB,EAAE;YAC7D,OAAO,IAAI,CAAC;SACf;QACD,IAAI,GAAG,GAAG,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC;QACvC,mBAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,4BAA6B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAE,EAAE,CAAC,CAAC;QAE7E,IAAI,GAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,2BAA2B,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAG;YACzH,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAXe,kCAAkB,qBAWjC,CAAA;IACD,SAAgB,cAAc,CAAE,KAAiC;QAC7D,OAAO,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAFe,8BAAc,iBAE7B,CAAA;IAED,SAAgB,mBAAmB,CAAE,KAAY;QAC7C,8DAA8D;QAC9D,OAAO,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAHe,mCAAmB,sBAGlC,CAAA;IAED,SAAgB,aAAa,CAAC,KAAY;QACtC,OAAO,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAFe,6BAAa,gBAE5B,CAAA;IAED,SAAgB,cAAc,CAAC,KAAY;QACvC,OAAO,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAFe,8BAAc,iBAE7B,CAAA;IAED,SAAgB,aAAa,CAAC,KAAY;QACtC,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAFe,6BAAa,gBAE5B,CAAA;AACL,CAAC,EAjCgB,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAiC/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../../src/config/Config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAwB;
|
|
1
|
+
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../../src/config/Config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAwB;AAExB,2CAAmD;AAGnD,qDAAkD;AAClD,8CAA2C;AAE3C,MAAa,MAAM;IAGF,AAAb,MAAM,CAAC,KAAK,CAAC,KAAK,CAAE,UAAqD;QACrE,SAAS,KAAK,IAAI,sBAAS,EAAE,CAAC;QAE9B,IAAI,GAAG,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAA,uBAAU,EAAC,cAAM,EAAE,GAAG,CAAC,CAAC;QAExB,IAAI,cAAM,CAAC,IAAI,IAAI,IAAI,IAAI,cAAM,CAAC,MAAM,IAAI,IAAI,EAAE;YAC9C,IAAI,OAAO,GAAG,wCAAwC,CAAC;YACvD,iBAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACrB,SAAS,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YACrC,OAAO;SACV;QAED,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,GAAG,CAAC;IACf,CAAC;IAED,kIAAkI;IAClI,MAAM,CAAC,KAAK,CAAC,GAAG;QACZ,IAAI,SAAS,IAAI,IAAI,EAAE;YACnB,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,sFAAsF;IACtF,uCAAuC;IAEvC,IAAI;IAEJ,MAAM,CAAC,KAAK,CAAC,MAAM,CAAE,IAAI;QACrB,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CACJ;AAlCgB;IADZ,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE;yBAiBnB;AAnBL,wBAqCC;AAEY,QAAA,MAAM,GAAG,EAAkB,CAAC;AAEzC,IAAI,QAAQ,GAAG,IAAI,+BAAc,EAAE,CAAC;AACpC,IAAI,SAAS,GAAiD,IAAI,CAAC"}
|
|
@@ -72,7 +72,7 @@ class Contract {
|
|
|
72
72
|
if (info == null) {
|
|
73
73
|
let byName = _is_1.$is.Address(mix) === false;
|
|
74
74
|
if (byName) {
|
|
75
|
-
throw new Error(`Contract by name not found ${mix}`);
|
|
75
|
+
throw new Error(`Contract by name was not found: ${mix}`);
|
|
76
76
|
}
|
|
77
77
|
info = { address: mix };
|
|
78
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Contract.js","sourceRoot":"","sources":["../../../src/contracts/Contract.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAqB;AACrB,gDAAuB;AAGvB,yDAAwE;AAIxE,+DAA2D;AAC3D,qDAAiD;AAGjD,6CAAyC;AACzC,yDAAqD;AAYrD,MAAsB,QAAQ;IAc1B,YAAa,IAA+B,EAAE,IAAmB;QAbjE,SAAI,GAAW,IAAI,CAAA;QACnB,YAAO,GAAiB,IAAI,CAAA;QAC5B,cAAS,GAAW,IAAI,CAAA;QACxB,WAAM,GAAW,IAAI,CAAA;QACrB,QAAG,GAAwB,IAAI,CAAA;QAU3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,SAAS,CAAU,SAAiB,EAAE,GAAG,MAAM;QAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAU,OAAkB,EAAE,YAAoB,EAAE,GAAG,MAAM;QAEpF,IAAI,SAAS,GAAG,IAAI,6BAAa,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE;YACpD,EAAE,EAAE,IAAI,CAAC,OAAO;SACnB,CAAC,CAAC;QAEH,SAAS,CAAC,mBAAmB,CAAC,YAAY,EAAE,GAAG,MAAM,CAAC,CAAC;QACvD,MAAM,OAAO,CAAC,GAAG,CAAC;YACd,SAAS,CAAC,MAAM,EAAE;YAClB,SAAS,CAAC,QAAQ,EAAE;SACvB,CAAC,CAAC;QAEH,OAAO,mBAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAE,OAAqB,EAAE,IAA2B;QACxE,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACvD,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QACzE,IAAI,IAAI,EAAE,MAAM,EAAE;YACd,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;SAC3C;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAE,EAAe;QACnC,IAAI,UAAU,GAAG,IAAI,CAAC,MAAM;eACrB,IAAI,CAAC,SAAS;eACd,IAAI,CAAC,OAAO;eACZ,EAAE,CAAC,EAAE,CAAC;QAEb,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7D,IAAI,QAAQ,GAAG,qBAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC;QAEvE,OAAO;YACH,GAAG,EAAE;YACL,OAAO,EAAE;gBACL,GAAG,QAAQ;aACd;SACJ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAE,GAAkB;QACvC,OAAO,MAAM,IAAA,cAAI,EAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YACvC,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAKS,MAAM,CAAC,KAAK,CAAC,MAAM,CAAsB,GAAW,EAAE,IAAoB;QAChF,IAAI,QAAQ,GAAG,cAAE,CAAC,OAAO,CAAC,mCAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QAE1D,IAAI,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACtC,IAAI,IAAI,IAAI,IAAI,EAAE;YACd,IAAI,MAAM,GAAG,SAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC;YACxC,IAAI,MAAM,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"Contract.js","sourceRoot":"","sources":["../../../src/contracts/Contract.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ class ContractAbiProvider {
|
|
|
14
14
|
this.explorer = explorer;
|
|
15
15
|
}
|
|
16
16
|
async getAbi(abi, opts = null) {
|
|
17
|
-
_require_1.$require.notNull(abi, `
|
|
17
|
+
_require_1.$require.notNull(abi, `ABI source is required`);
|
|
18
18
|
let abiJson;
|
|
19
19
|
let implementation;
|
|
20
20
|
if (_is_1.$is.Address(abi)) {
|
|
@@ -26,7 +26,7 @@ class ContractAbiProvider {
|
|
|
26
26
|
let path = abi;
|
|
27
27
|
let location = opts?.location;
|
|
28
28
|
if (location && _path_1.$path.isAbsolute(path) === false) {
|
|
29
|
-
//
|
|
29
|
+
// If the path is not absolute, check the file relative to the class file location.
|
|
30
30
|
let relPath = atma_utils_1.class_Uri.combine(location, path);
|
|
31
31
|
if (await atma_io_1.File.existsAsync(relPath)) {
|
|
32
32
|
path = relPath;
|
|
@@ -35,15 +35,15 @@ class ContractAbiProvider {
|
|
|
35
35
|
let json = await atma_io_1.File.readAsync(path);
|
|
36
36
|
abiJson = Array.isArray(json) ? json : json.abi;
|
|
37
37
|
}
|
|
38
|
-
opts?.optional !== true && _require_1.$require.notNull(abiJson, `
|
|
38
|
+
opts?.optional !== true && _require_1.$require.notNull(abiJson, `ABI was not resolved from ${abi}`);
|
|
39
39
|
return { abiJson, implementation };
|
|
40
40
|
}
|
|
41
41
|
async getAbiByAddress(abi, opts) {
|
|
42
|
-
let address = _address_1.$address.expectValid(abi, '
|
|
42
|
+
let address = _address_1.$address.expectValid(abi, 'Contract address is not valid');
|
|
43
43
|
let platform = this.client.platform;
|
|
44
44
|
let explorer = _require_1.$require.notNull(this.explorer, `Explorer not resolved for network: ${platform}`);
|
|
45
45
|
try {
|
|
46
|
-
_logger_1.$logger.log(`Loading
|
|
46
|
+
_logger_1.$logger.log(`Loading contract ABI for ${address}. `);
|
|
47
47
|
let { abi, implementation } = await explorer.getContractAbi(address, opts);
|
|
48
48
|
let hasProxy = _address_1.$address.eq(address, implementation) === false;
|
|
49
49
|
_logger_1.$logger.log(`Proxy detected: ${hasProxy ? 'YES' : 'NO'}`, hasProxy ? implementation : '');
|
|
@@ -52,7 +52,7 @@ class ContractAbiProvider {
|
|
|
52
52
|
}
|
|
53
53
|
catch (error) {
|
|
54
54
|
_logger_1.$logger.error(error);
|
|
55
|
-
throw new Error(`ABI
|
|
55
|
+
throw new Error(`ABI was not resolved from ${platform}/${address}: ${error.message ?? error}`);
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContractAbiProvider.js","sourceRoot":"","sources":["../../../src/contracts/ContractAbiProvider.ts"],"names":[],"mappings":";;;AAEA,uDAAoD;AACpD,uDAAoD;AAGpD,qCAA+B;AAC/B,2CAAuC;AACvC,iDAA8C;AAC9C,qDAAkD;AAElD,6CAA0C;AAG1C,MAAa,mBAAmB;IAE5B,YAAoB,MAAkB,EAAS,QAA6B;QAAxD,WAAM,GAAN,MAAM,CAAY;QAAS,aAAQ,GAAR,QAAQ,CAAqB;IAE5E,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAsB,EAAE,OAA2E,IAAI;QAEhH,mBAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"ContractAbiProvider.js","sourceRoot":"","sources":["../../../src/contracts/ContractAbiProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,7 +118,7 @@ class ContractBase {
|
|
|
118
118
|
}
|
|
119
119
|
let data = writer.builder.data;
|
|
120
120
|
if (!params?.estimateGas) {
|
|
121
|
-
//
|
|
121
|
+
// Remove default values.
|
|
122
122
|
delete data.gasPrice;
|
|
123
123
|
delete data.maxPriorityFeePerGas;
|
|
124
124
|
delete data.maxFeePerGas;
|
|
@@ -307,7 +307,7 @@ class ContractBase {
|
|
|
307
307
|
})
|
|
308
308
|
.filter(x => (x.inputs?.length ?? 0) === args.length);
|
|
309
309
|
if ($abis.length === 0) {
|
|
310
|
-
throw new Error(`ABI not found in overloads \n${abis.join('\n')}\n by
|
|
310
|
+
throw new Error(`ABI was not found in overloads \n${abis.join('\n')}\n by argument count. Got ${args.length} arguments`);
|
|
311
311
|
}
|
|
312
312
|
if ($abis.length === 1) {
|
|
313
313
|
return $abis[0];
|
|
@@ -324,7 +324,7 @@ class ContractBase {
|
|
|
324
324
|
if ($abis.length === 1) {
|
|
325
325
|
return $abis[0];
|
|
326
326
|
}
|
|
327
|
-
throw new Error(`ABI not found. Got multiple overloads for the argument count ${args.length}.
|
|
327
|
+
throw new Error(`ABI was not found. Got multiple overloads for the argument count ${args.length}. The ABI should be selected by parameter types.`);
|
|
328
328
|
}
|
|
329
329
|
$extractLogs(tx, abiItem) {
|
|
330
330
|
let logs = _contract_1.$contract.extractLogsForAbi(tx, abiItem);
|
|
@@ -413,7 +413,7 @@ class ContractBase {
|
|
|
413
413
|
}
|
|
414
414
|
getContractWriter() {
|
|
415
415
|
if (this.abi != null) {
|
|
416
|
-
//
|
|
416
|
+
// Update the singleton instance.
|
|
417
417
|
let logParser = a_di_1.default.resolve(TxTopicInMemoryProvider_1.TxTopicInMemoryProvider);
|
|
418
418
|
logParser.register(this.abi);
|
|
419
419
|
}
|
|
@@ -474,10 +474,10 @@ var BlockWalker;
|
|
|
474
474
|
}
|
|
475
475
|
BlockWalker.onBlock = onBlock;
|
|
476
476
|
})(BlockWalker || (BlockWalker = {}));
|
|
477
|
-
// Tuple check type detects how an argument satisfies the "tuple"
|
|
478
|
-
// shallow: checks only that the argument is an object type
|
|
479
|
-
// single: checks that all tuple components (keys) are present in the argument
|
|
480
|
-
// both: checks that all tuple components are present in the argument AND all argument keys exist in the tuple components
|
|
477
|
+
// Tuple check type detects how an argument satisfies the "tuple" type.
|
|
478
|
+
// shallow: checks only that the argument is an object type.
|
|
479
|
+
// single: checks that all tuple components (keys) are present in the argument.
|
|
480
|
+
// both: checks that all tuple components are present in the argument AND all argument keys exist in the tuple components.
|
|
481
481
|
function filterABIbyArguments(abis, args, tupleCheck) {
|
|
482
482
|
return abis.filter(abi => {
|
|
483
483
|
for (let i = 0; i < args.length; i++) {
|
|
@@ -517,8 +517,8 @@ function filterABIbyArguments(abis, args, tupleCheck) {
|
|
|
517
517
|
// E.g. Solidity structs:
|
|
518
518
|
// 1. struct FooV1 { uint256 a; uint256 b; }
|
|
519
519
|
// 2. struct FooV2 { uint256 a; uint256 b; uint256 c; }
|
|
520
|
-
// If we call the
|
|
521
|
-
//
|
|
520
|
+
// If we call the second overloaded function, the single check will match both structs.
|
|
521
|
+
// Therefore, we need to call later with tupleCheck === 'both' to detect the correct overload.
|
|
522
522
|
const components = item.components ?? [];
|
|
523
523
|
const satisfies = components.every(x => x.name in arg) ?? false;
|
|
524
524
|
if (!satisfies) {
|