dequanto 0.2.37 → 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/hardhat.config.js +10 -1
- 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 +68 -26
- 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 +58 -25
- 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/gen/Generator.js +15 -0
- package/lib/cjs/gen/Generator.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 +68 -26
- 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 +58 -25
- 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/gen/Generator.js.map +1 -1
- package/lib/esm/gen/Generator.mjs +15 -0
- 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 +20 -15
- package/lib/types/contracts/deploy/proxy/ProxyDeployment.d.ts +2 -0
- 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/gen/Generator.d.ts +8 -0
- 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 +110 -53
- package/src/contracts/deploy/proxy/$proxyDeploy.ts +14 -14
- package/src/contracts/deploy/proxy/ProxyDeployment.ts +82 -37
- 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/gen/Generator.ts +17 -0
- 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
|
@@ -11,7 +11,7 @@ import alot from 'alot';
|
|
|
11
11
|
import memd from 'memd';
|
|
12
12
|
let rateLimitRgx = {
|
|
13
13
|
checks: [
|
|
14
|
-
//
|
|
14
|
+
// Extracted from known and common rate-limit messages
|
|
15
15
|
/rate.+limit/i,
|
|
16
16
|
/too.+many.+request/i,
|
|
17
17
|
/exceed.+request/i,
|
|
@@ -86,9 +86,9 @@ export class RateLimitGuard {
|
|
|
86
86
|
if (/backoff|next|reset/i.test(key) && /^\d+$/.test(String(val))) {
|
|
87
87
|
val = Number(val);
|
|
88
88
|
if (val < 50000) {
|
|
89
|
-
//
|
|
89
|
+
// Relative time
|
|
90
90
|
if (val < 1000) {
|
|
91
|
-
//
|
|
91
|
+
// In seconds
|
|
92
92
|
val = val * 1000;
|
|
93
93
|
}
|
|
94
94
|
val = Date.now() + val;
|
|
@@ -162,7 +162,7 @@ export class RateLimitGuard {
|
|
|
162
162
|
if (info.backoff) {
|
|
163
163
|
this.backoff = info.backoff;
|
|
164
164
|
}
|
|
165
|
-
if (info.spanLimit && info.spanMs) {
|
|
165
|
+
if (info.spanLimit != null && info.spanMs != null) {
|
|
166
166
|
l `Updating the yellow<rate limits> for ${this.id} using: bold<${info.spanLimit}> per bold<${info.spanMs}ms>`;
|
|
167
167
|
let rate = this.rates.find(x => x.spanMs === info.spanMs);
|
|
168
168
|
if (rate) {
|
|
@@ -208,10 +208,10 @@ export class RateLimitGuard {
|
|
|
208
208
|
onThrottle(ms) {
|
|
209
209
|
let awaited = this.awaited;
|
|
210
210
|
if (awaited.count > 0 && awaited.count % 20 === 0) {
|
|
211
|
-
l `The
|
|
211
|
+
l `The node ${this.id} with (${this.rates[0].counter} req) was throttled ${awaited.count}x for ${$date.formatTimespan(awaited.total)} in total. Current wait time: ${$date.formatTimespan(ms)}`;
|
|
212
212
|
}
|
|
213
213
|
else if (ms > 30000) {
|
|
214
|
-
l `The
|
|
214
|
+
l `The node ${this.id} with (${this.rates[0].counter} req) is now waiting ${$date.formatTimespan(ms)} to continue.`;
|
|
215
215
|
}
|
|
216
216
|
//-this.rates[1].printStatus()
|
|
217
217
|
}
|
|
@@ -220,9 +220,9 @@ __decorate([
|
|
|
220
220
|
memd.deco.queued()
|
|
221
221
|
], RateLimitGuard.prototype, "wait", null);
|
|
222
222
|
/**
|
|
223
|
-
* In short
|
|
223
|
+
* In the short-epoch rate limiter (1s, 1m, 1h), we track each request
|
|
224
224
|
*
|
|
225
|
-
* sliding(rolling) window | fixed window
|
|
225
|
+
* sliding (rolling) window | fixed window
|
|
226
226
|
*/
|
|
227
227
|
class ShortEpochRateLimitData {
|
|
228
228
|
constructor(spanMs, spanLimit) {
|
|
@@ -236,7 +236,7 @@ class ShortEpochRateLimitData {
|
|
|
236
236
|
let rgx = /^(?<limit>\d+)[\\/](?<time>\w+)$/;
|
|
237
237
|
let match = rgx.exec(rate);
|
|
238
238
|
if (match == null) {
|
|
239
|
-
throw new Error(`Invalid value for rate limit: ${rate}.
|
|
239
|
+
throw new Error(`Invalid value for rate limit: ${rate}. Expected to match the regex: ${rgx.toString()}`);
|
|
240
240
|
}
|
|
241
241
|
let spanMs = Number(match.groups.limit);
|
|
242
242
|
let spanLimit = $date.parseTimespan(match.groups.time);
|
|
@@ -271,9 +271,9 @@ class ShortEpochRateLimitData {
|
|
|
271
271
|
}
|
|
272
272
|
}
|
|
273
273
|
/**
|
|
274
|
-
* The server has own request time
|
|
275
|
-
* Here we should update the times AFTER the response received,
|
|
276
|
-
* otherwise the
|
|
274
|
+
* The server has its own request time. With `addTicks`, we save the time BEFORE sending to the server
|
|
275
|
+
* Here we should update the times AFTER the response is received,
|
|
276
|
+
* otherwise the request could be removed locally from TimeWindow earlier than it is cleared on the backend
|
|
277
277
|
*/
|
|
278
278
|
updateRequests(tick, newTick) {
|
|
279
279
|
for (let i = 0; i < this.ticks.length; i++) {
|
|
@@ -288,18 +288,18 @@ class ShortEpochRateLimitData {
|
|
|
288
288
|
let spanStart = now - this.spanMs;
|
|
289
289
|
for (let i = 0; i < ticks.length; i++) {
|
|
290
290
|
if (ticks[i] < spanStart) {
|
|
291
|
-
//
|
|
291
|
+
// Older ticks; continue and slice later
|
|
292
292
|
continue;
|
|
293
293
|
}
|
|
294
294
|
if (i > 0) {
|
|
295
|
-
//
|
|
295
|
+
// Remove older requests
|
|
296
296
|
ticks.splice(0, i);
|
|
297
297
|
}
|
|
298
|
-
//
|
|
298
|
+
// In-range tick found
|
|
299
299
|
break;
|
|
300
300
|
}
|
|
301
301
|
if ((ticks.length + ticksCount) <= this.spanLimit) {
|
|
302
|
-
// We can add requests to current span
|
|
302
|
+
// We can add requests to the current span
|
|
303
303
|
return 0;
|
|
304
304
|
}
|
|
305
305
|
let timeWeCanAdd = ticks[0] + this.spanMs;
|
|
@@ -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"}
|
|
@@ -21,7 +21,7 @@ export class PromiseEventWrap extends class_Dfr {
|
|
|
21
21
|
emit(event, ...args) {
|
|
22
22
|
this._events.emit(event, ...args);
|
|
23
23
|
}
|
|
24
|
-
/**
|
|
24
|
+
/** Attaches this wrapper to the promiseEvent */
|
|
25
25
|
bind(promiseEvent) {
|
|
26
26
|
this.$source = promiseEvent;
|
|
27
27
|
for (let event in this._events._listeners) {
|
|
@@ -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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { $abiParser } from '../../utils/$abiParser.mjs';
|
|
2
2
|
export var $web3Abi;
|
|
3
3
|
(function ($web3Abi) {
|
|
4
|
-
/**
|
|
4
|
+
/** Normalizes user input into an array of TAbiItems */
|
|
5
5
|
function ensureAbis(abi) {
|
|
6
6
|
let arr;
|
|
7
7
|
if (typeof abi === 'string') {
|
|
@@ -15,7 +15,7 @@ export var $web3Abi;
|
|
|
15
15
|
}
|
|
16
16
|
let first = abi[0];
|
|
17
17
|
if (first.outputs == null || first.outputs.length === 0) {
|
|
18
|
-
// Normalize outputs
|
|
18
|
+
// Normalize outputs to read at least bytes if nothing is set
|
|
19
19
|
first.outputs = [
|
|
20
20
|
{
|
|
21
21
|
type: 'bytes32',
|
|
@@ -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"}
|
|
@@ -30,6 +30,10 @@ export var ClientErrorUtil;
|
|
|
30
30
|
return /nonce too high/i.test(error.message);
|
|
31
31
|
}
|
|
32
32
|
ClientErrorUtil.IsNonceTooHigh = IsNonceTooHigh;
|
|
33
|
+
function IsUnderpriced(error) {
|
|
34
|
+
return /underpriced/i.test(error.message);
|
|
35
|
+
}
|
|
36
|
+
ClientErrorUtil.IsUnderpriced = IsUnderpriced;
|
|
33
37
|
})(ClientErrorUtil || (ClientErrorUtil = {}));
|
|
34
38
|
//# sourceMappingURL=ClientErrorUtil.js.map
|
|
35
39
|
//# sourceMappingURL=ClientErrorUtil.ts.map
|
|
@@ -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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Contract.js","sourceRoot":"","sources":["../../../src/contracts/Contract.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Contract.js","sourceRoot":"","sources":["../../../src/contracts/Contract.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,7 +66,7 @@ export class Contract {
|
|
|
66
66
|
if (info == null) {
|
|
67
67
|
let byName = $is.Address(mix) === false;
|
|
68
68
|
if (byName) {
|
|
69
|
-
throw new Error(`Contract by name not found ${mix}`);
|
|
69
|
+
throw new Error(`Contract by name was not found: ${mix}`);
|
|
70
70
|
}
|
|
71
71
|
info = { address: mix };
|
|
72
72
|
}
|
|
@@ -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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"}
|
|
@@ -11,7 +11,7 @@ export class ContractAbiProvider {
|
|
|
11
11
|
this.explorer = explorer;
|
|
12
12
|
}
|
|
13
13
|
async getAbi(abi, opts = null) {
|
|
14
|
-
$require.notNull(abi, `
|
|
14
|
+
$require.notNull(abi, `ABI source is required`);
|
|
15
15
|
let abiJson;
|
|
16
16
|
let implementation;
|
|
17
17
|
if ($is.Address(abi)) {
|
|
@@ -23,7 +23,7 @@ export class ContractAbiProvider {
|
|
|
23
23
|
let path = abi;
|
|
24
24
|
let location = opts?.location;
|
|
25
25
|
if (location && $path.isAbsolute(path) === false) {
|
|
26
|
-
//
|
|
26
|
+
// If the path is not absolute, check the file relative to the class file location.
|
|
27
27
|
let relPath = class_Uri.combine(location, path);
|
|
28
28
|
if (await File.existsAsync(relPath)) {
|
|
29
29
|
path = relPath;
|
|
@@ -32,15 +32,15 @@ export class ContractAbiProvider {
|
|
|
32
32
|
let json = await File.readAsync(path);
|
|
33
33
|
abiJson = Array.isArray(json) ? json : json.abi;
|
|
34
34
|
}
|
|
35
|
-
opts?.optional !== true && $require.notNull(abiJson, `
|
|
35
|
+
opts?.optional !== true && $require.notNull(abiJson, `ABI was not resolved from ${abi}`);
|
|
36
36
|
return { abiJson, implementation };
|
|
37
37
|
}
|
|
38
38
|
async getAbiByAddress(abi, opts) {
|
|
39
|
-
let address = $address.expectValid(abi, '
|
|
39
|
+
let address = $address.expectValid(abi, 'Contract address is not valid');
|
|
40
40
|
let platform = this.client.platform;
|
|
41
41
|
let explorer = $require.notNull(this.explorer, `Explorer not resolved for network: ${platform}`);
|
|
42
42
|
try {
|
|
43
|
-
$logger.log(`Loading
|
|
43
|
+
$logger.log(`Loading contract ABI for ${address}. `);
|
|
44
44
|
let { abi, implementation } = await explorer.getContractAbi(address, opts);
|
|
45
45
|
let hasProxy = $address.eq(address, implementation) === false;
|
|
46
46
|
$logger.log(`Proxy detected: ${hasProxy ? 'YES' : 'NO'}`, hasProxy ? implementation : '');
|
|
@@ -49,7 +49,7 @@ export class ContractAbiProvider {
|
|
|
49
49
|
}
|
|
50
50
|
catch (error) {
|
|
51
51
|
$logger.error(error);
|
|
52
|
-
throw new Error(`ABI
|
|
52
|
+
throw new Error(`ABI was not resolved from ${platform}/${address}: ${error.message ?? error}`);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContractBase.js","sourceRoot":"","sources":["../../../src/contracts/ContractBase.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ContractBase.js","sourceRoot":"","sources":["../../../src/contracts/ContractBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,7 +112,7 @@ export class ContractBase {
|
|
|
112
112
|
}
|
|
113
113
|
let data = writer.builder.data;
|
|
114
114
|
if (!params?.estimateGas) {
|
|
115
|
-
//
|
|
115
|
+
// Remove default values.
|
|
116
116
|
delete data.gasPrice;
|
|
117
117
|
delete data.maxPriorityFeePerGas;
|
|
118
118
|
delete data.maxFeePerGas;
|
|
@@ -301,7 +301,7 @@ export class ContractBase {
|
|
|
301
301
|
})
|
|
302
302
|
.filter(x => (x.inputs?.length ?? 0) === args.length);
|
|
303
303
|
if ($abis.length === 0) {
|
|
304
|
-
throw new Error(`ABI not found in overloads \n${abis.join('\n')}\n by
|
|
304
|
+
throw new Error(`ABI was not found in overloads \n${abis.join('\n')}\n by argument count. Got ${args.length} arguments`);
|
|
305
305
|
}
|
|
306
306
|
if ($abis.length === 1) {
|
|
307
307
|
return $abis[0];
|
|
@@ -318,7 +318,7 @@ export class ContractBase {
|
|
|
318
318
|
if ($abis.length === 1) {
|
|
319
319
|
return $abis[0];
|
|
320
320
|
}
|
|
321
|
-
throw new Error(`ABI not found. Got multiple overloads for the argument count ${args.length}.
|
|
321
|
+
throw new Error(`ABI was not found. Got multiple overloads for the argument count ${args.length}. The ABI should be selected by parameter types.`);
|
|
322
322
|
}
|
|
323
323
|
$extractLogs(tx, abiItem) {
|
|
324
324
|
let logs = $contract.extractLogsForAbi(tx, abiItem);
|
|
@@ -407,7 +407,7 @@ export class ContractBase {
|
|
|
407
407
|
}
|
|
408
408
|
getContractWriter() {
|
|
409
409
|
if (this.abi != null) {
|
|
410
|
-
//
|
|
410
|
+
// Update the singleton instance.
|
|
411
411
|
let logParser = di.resolve(TxTopicInMemoryProvider);
|
|
412
412
|
logParser.register(this.abi);
|
|
413
413
|
}
|
|
@@ -467,10 +467,10 @@ var BlockWalker;
|
|
|
467
467
|
}
|
|
468
468
|
BlockWalker.onBlock = onBlock;
|
|
469
469
|
})(BlockWalker || (BlockWalker = {}));
|
|
470
|
-
// Tuple check type detects how an argument satisfies the "tuple"
|
|
471
|
-
// shallow: checks only that the argument is an object type
|
|
472
|
-
// single: checks that all tuple components (keys) are present in the argument
|
|
473
|
-
// both: checks that all tuple components are present in the argument AND all argument keys exist in the tuple components
|
|
470
|
+
// Tuple check type detects how an argument satisfies the "tuple" type.
|
|
471
|
+
// shallow: checks only that the argument is an object type.
|
|
472
|
+
// single: checks that all tuple components (keys) are present in the argument.
|
|
473
|
+
// both: checks that all tuple components are present in the argument AND all argument keys exist in the tuple components.
|
|
474
474
|
function filterABIbyArguments(abis, args, tupleCheck) {
|
|
475
475
|
return abis.filter(abi => {
|
|
476
476
|
for (let i = 0; i < args.length; i++) {
|
|
@@ -510,8 +510,8 @@ function filterABIbyArguments(abis, args, tupleCheck) {
|
|
|
510
510
|
// E.g. Solidity structs:
|
|
511
511
|
// 1. struct FooV1 { uint256 a; uint256 b; }
|
|
512
512
|
// 2. struct FooV2 { uint256 a; uint256 b; uint256 c; }
|
|
513
|
-
// If we call the
|
|
514
|
-
//
|
|
513
|
+
// If we call the second overloaded function, the single check will match both structs.
|
|
514
|
+
// Therefore, we need to call later with tupleCheck === 'both' to detect the correct overload.
|
|
515
515
|
const components = item.components ?? [];
|
|
516
516
|
const satisfies = components.every(x => x.name in arg) ?? false;
|
|
517
517
|
if (!satisfies) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContractProvider.js","sourceRoot":"","sources":["../../../src/contracts/ContractProvider.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAyD;AAIzD,gDAAsB;AActB,MAAa,gBAAgB;IAEzB,YAAoB,MAA2B,cAAE,CAAC,OAAO,CAAC,qBAAS,CAAC;QAAhD,QAAG,GAAH,GAAG,CAA6C;IAEpE,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY;QACxB,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC1D,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE1D,OAAO;YACH,GAAG,IAAI;YACP,GAAG;SACN,CAAC;IACN,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,OAAe;QAC/B,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,IAAI,IAAI,IAAI,EAAE;YACd,MAAM,IAAI,KAAK,CAAC
|
|
1
|
+
{"version":3,"file":"ContractProvider.js","sourceRoot":"","sources":["../../../src/contracts/ContractProvider.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAyD;AAIzD,gDAAsB;AActB,MAAa,gBAAgB;IAEzB,YAAoB,MAA2B,cAAE,CAAC,OAAO,CAAC,qBAAS,CAAC;QAAhD,QAAG,GAAH,GAAG,CAA6C;IAEpE,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY;QACxB,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC1D,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE1D,OAAO;YACH,GAAG,IAAI;YACP,GAAG;SACN,CAAC;IACN,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,OAAe;QAC/B,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,IAAI,IAAI,IAAI,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,mCAAmC,OAAO,EAAE,CAAC,CAAA;SAChE;QACD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE1C,OAAO;YACH,GAAG,IAAI;YACP,GAAG;SACN,CAAC;IACN,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,OAAiB;QAC3B,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACrD,OAAO,GAAG,CAAC;IACf,CAAC;IACD,KAAK,CAAC,OAAO,CAAE,CAAS;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;CACJ;AApCD,4CAoCC"}
|
|
@@ -15,7 +15,7 @@ export class ContractProvider {
|
|
|
15
15
|
async getByAddress(address) {
|
|
16
16
|
let info = await this.getInfo(address);
|
|
17
17
|
if (info == null) {
|
|
18
|
-
throw new Error(`Contract info not found for ${address}`);
|
|
18
|
+
throw new Error(`Contract info was not found for ${address}`);
|
|
19
19
|
}
|
|
20
20
|
let abi = await this.getAbi(info.address);
|
|
21
21
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContractReader.js","sourceRoot":"","sources":["../../../src/contracts/ContractReader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ContractReader.js","sourceRoot":"","sources":["../../../src/contracts/ContractReader.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAsB;AACtB,gDAAwB;AACxB,2CAAuC;AAGvC,mEAAgE;AAChE,0EAAuE;AAEvE,6CAA0C;AAC1C,qDAAkD;AAClD,oDAAiD;AACjD,mDAAgD;AAChD,yDAAsD;AACtD,yEAAsE;AACtE,4FAAyF;AAEzF,yDAAsD;AACtD,uDAAoD;AACpD,mDAAgD;AAGhD,2DAA0E;AAE1E,qDAAkD;AAClD,+DAA4D;AAW5D,MAAa,cAAc;IAIvB,YAAmB,SAAqB,cAAE,CAAC,OAAO,CAAC,6BAAa,CAAC,EAAU,GAG1E;QAHkB,WAAM,GAAN,MAAM,CAAwC;QAAU,QAAG,GAAH,GAAG,CAG7E;QALO,YAAO,GAAqB,EAAE,CAAC;IAOvC,CAAC;IACD,QAAQ,CAAE,GAA8B;QACpC,IAAI,GAAG,IAAI,IAAI,EAAE;YACb,OAAO,IAAI,CAAA;SACd;QACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;SACnC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IACD,cAAc,CAAE,WAA+B;QAC3C,IAAI,CAAC,eAAe,GAAG,WAAW,IAAI,IAAI;YACtC,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,UAAU,CAAE,IAAsB;QAC9B,IAAI,IAAI,IAAI,IAAI,EAAE;YACd,IAAI,QAAQ,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClD,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAC3D;aAAM;YACH,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,WAAW,CAAE,OAAiB;QAC1B,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAiB,EAAE,QAAoC;QACtE,IAAI,WAAW,GAAW,KAAK,CAAC,CAAC;QACjC,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,EAAE;YAC9B,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC;SAC5C;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,SAAS,CAAkB,OAAqB,EAAE,SAA4B,EAAE,GAAG,MAAa;QAClG,IAAI,WAAW,GAAW,KAAK,CAAC,CAAC;QACjC,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,EAAE;YAC9B,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC;SAC5C;QAED,IAAI,GAAa,CAAC;QAClB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YAC/B,GAAG,GAAG,uBAAU,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;SAC3C;aAAM;YACH,GAAG,GAAG,SAAS,CAAC;SACnB;QAED,IAAI,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC;QACtB,IAAI,MAAM,GAAG,CAAE,GAAG,CAAE,CAAC;QACrB,IAAI;YACA,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;gBACxC,OAAO;gBACP,GAAG,EAAE,MAAM;gBACX,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,WAAW,EAAE,WAAW;gBAExB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,uBAAuB;aAC1B,CAAC,CAAC;YACH,IAAI,MAAM,IAAI,IAAI,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;aACvD;YACD,OAAO,MAAiB,CAAC;SAC5B;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE1D,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,IAAI;gBACA,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBACtB,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,MAAM,yBAAW,CAAC,cAAc,CAAC;oBAClD,OAAO;oBACP,GAAG,EAAE,MAAM;oBACX,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,MAAM;oBACd,WAAW,EAAE,WAAW;oBACxB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;iBAC1B,CAAC,CAAC;gBACH,IAAI,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAClD,IAAI,MAAM,GAAG,MAAM,iBAAO,CAAC,MAAM,CAAC;oBAC9B,EAAE,EAAE,MAAM;oBACV,MAAM;oBACN,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,KAAK,IAAI,KAAK;oBAC/B,YAAY,EAAE,KAAK;oBACnB,KAAK,CAAC,MAAM,CAAC,OAAO;wBAChB,OAAO,2BAAY,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;oBACxD,CAAC;iBACJ,CAAC,CAAC;gBACH,OAAO,GAAG,cAAc,GAAG,MAAM,CAAC;aACrC;YAAC,OAAO,KAAK,EAAE;gBACZ,SAAS;aACZ;YAED,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,IAAI,OAAO,IAAI,MAAM,IAAI,IAAI,iBAAiB,KAAK,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC,CAAC;YACzH,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YACxB,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAEM,KAAK,CAAC,YAAY,CAA4E,UAAa;QAI9G,0CAA0C;QAC1C,IAAI,QAAQ,GAAG,MAAM,IAAA,cAAI,EAAC,UAAmB,CAAC;aACzC,QAAQ,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE,CAAC,MAAM,CAAC,CAAC;aAC5B,YAAY,EAA+C,CAAC;QAEjE,IAAI,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,SAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,CAAC;QACnE,IAAI,OAAO,IAAI,IAAI,EAAE;YACjB,iBAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,wCAAyC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAE,EAAE,CAAC,CAAC;SAC1F;QAED,IAAI,MAAM,GAAG,MAAM,IAAA,cAAI,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;YACnD,OAAO;gBACH,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,OAAO,EAAE,GAAG,CAAC,OAAO;aACoB,CAAC;QACjD,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;QAElB,IAAI,OAAO,GAAG,MAAM,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5E,OAAO,OAAc,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,aAAa,CAAE,GAAG,IAAiD;QACrE,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC;QAChD,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,CAAE,GAAG,CAAE,GAAG,IAAI,CAAC;QACnB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,qBAAS,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,OAAwB,EAAE,OAIxC;QACG,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAyC,EAAE,OAU9D;QAEG,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACxC,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;SAC9C;QAED,IAAI,OAAO,GAA6B;YACpC,OAAO,EAAE,OAAO,CAAC,OAAO;SAC3B,CAAC;QAEF,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,EAAE;YAC3B,IAAI,OAAO,CAAC,SAAS,KAAK,YAAY,EAAE;gBACpC,IAAI,SAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC5B,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;iBACtE;gBACD,mBAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,mEAAmE,CAAC,CAAA;gBACtG,IAAI;oBACA,IAAI,QAAQ,GAAG,qDAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBACnE,IAAI,YAAY,GAAG,IAAI,mDAAwB,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBACvE,IAAI,IAAI,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBACvD,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;iBACtC;gBAAC,OAAO,KAAK,EAAE;oBACZ,oDAAoD;iBACvD;aACJ;iBAAM;gBACH,OAAO,CAAC,SAAS,GAAG,MAAM,eAAM,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aACjF;SACJ;QACD,IAAI,OAAO,CAAC,OAAO,IAAI,IAAI,EAAE;YACzB,OAAO,CAAC,OAAO,GAAG,MAAM,eAAM,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;SAC7E;QAED,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,GAAG,EAAE;YACxC,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC;SACvB;aAAM;YACH,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBACzB,GAAG,GAAG,uBAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;aACrC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;gBAC9B,IAAI,KAAK,GAAG,qBAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;gBAC7C,IAAI,MAAM,GAAG,CAAE,KAAK,CAAE,CAAC;gBACvB,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE;oBACxB,IAAA,cAAI,EAAC,GAAG,CAAC,MAAM,CAAC;yBACX,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;yBACtB,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;wBAChB,IAAI,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;4BACrC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;4BACnB,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;wBACjC,IAAI,KAAK,IAAI,IAAI,EAAE;4BACf,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;4BACvB,OAAO;yBACV;wBACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACvB,CAAC,CAAC;yBACD,OAAO,EAAE,CAAC;oBAEf,MAAM,GAAG,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;iBACnC;gBACD,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;aAC3B;iBAAM;gBACH,gCAAgC;gBAChC,IAAI,MAAM,GAAG;oBACT,GAAG,CAAC,GAAG,CAAC,qBAAS,CAAC,iBAAiB,CAAC;iBACvC,CAAC;gBACF,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE;oBACxB,IAAI,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;oBAEjE,IAAI,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,KAAK;wBACnD,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;wBAClB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;oBAErB,IAAI,SAAS,GAAG,IAAA,cAAI,EAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;oBACtD,mBAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,EAAE,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,4BAA4B,CAAC,CAAC;oBAE9E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;wBAChC,IAAI,OAAO,GAAG,EAAE,CAAC;wBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;4BAC1C,IAAI,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;4BACpC,IAAI,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;4BAC1B,IAAI,QAAQ,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,EAAE;gCACpC,SAAS;6BACZ;4BACD,IAAI,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;gCAClC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;gCACX,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;4BAE9B,IAAI,UAAU,EAAE;gCACZ,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;6BAC5B;yBACJ;wBACD,MAAM,CAAC,IAAI,CACP,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CACxC,CAAC;qBACL;oBACD,MAAM,GAAG,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;iBACnC;gBACD,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;aAC3B;SACJ;QAED,OAAO,OAA0B,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAE,MAAkB,EAAE,OAAiB,EAAE,SAAiB;QACvE,IAAI,MAAM,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAChD,CAAC;CACJ;AAjRD,wCAiRC;AAED,IAAiB,mBAAmB,CAwFnC;AAxFD,WAAiB,mBAAmB;IAGhC,MAAa,eAAe;QAMxB,YACW,OAQN;YARM,YAAO,GAAP,OAAO,CAQb;YAGD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,sBAAS,EAAE,EAAE;gBAC1C,OAAO,EAAE,IAAI;aAChB,CAAC,CAAC;QACP,CAAC;KACJ;IAtBY,mCAAe,kBAsB3B,CAAA;IAqBM,KAAK,UAAU,cAAc,CAAC,MAAkB,EAAE,QAAwC,EAAE,OAElG;QAEG,IAAI,WAAW,GAAG,MAAM,IAAA,cAAI,EAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;YACvD,IAAI,OAAO,IAAI,IAAI,EAAE;gBACjB,OAAO,IAAI,CAAC;aACf;YACD,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;YACtB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBACzB,GAAG,GAAG,uBAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;aACrC;YACD,IAAI,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;YACtC,IAAI,WAAW,YAAY,IAAI,EAAE;gBAC7B,IAAI,QAAQ,GAAG,cAAE,CAAC,OAAO,CAAC,qCAAiB,EAAE,MAAM,CAAC,CAAC;gBACrD,WAAW,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;aAC/D;YACD,OAAO;gBACH,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,GAAG,EAAE,CAAE,GAAG,CAAE;gBACZ,MAAM,EAAE,GAAG,CAAC,IAAI;gBAChB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,WAAW,EAAE,WAAW;gBACxB,OAAO,EAAE,OAAO,CAAC,OAAO;aACP,CAAC;QAC1B,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;QAElB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,mBAAmB,GAAG,EAAE,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACzC,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;gBACxB,SAAS;aACZ;YACD,IAAI,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACvD,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;SACnB;QAED,IAAI,OAAO,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAC3E,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC5B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;QACtC,CAAC,CAAC,CAAC;IACP,CAAC;IAzCqB,kCAAc,iBAyCnC,CAAA;AACL,CAAC,EAxFgB,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAwFnC"}
|
|
@@ -121,14 +121,14 @@ export class ContractReader {
|
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
123
|
async executeBatch(requestArr) {
|
|
124
|
-
//
|
|
124
|
+
// All inputs should be deferred requests.
|
|
125
125
|
let requests = await alot(requestArr)
|
|
126
126
|
.mapAsync(async (x) => await x)
|
|
127
127
|
.toArrayAsync();
|
|
128
128
|
let invalid = requests.find(x => $is.Address(x.address) === false);
|
|
129
129
|
if (invalid != null) {
|
|
130
130
|
$logger.error('Invalid object', invalid);
|
|
131
|
-
throw new Error(`Invalid
|
|
131
|
+
throw new Error(`Invalid deferred request at position ${requests.indexOf(invalid)}`);
|
|
132
132
|
}
|
|
133
133
|
let inputs = await alot(requests).mapAsync(async (req) => {
|
|
134
134
|
return {
|
|
@@ -163,7 +163,7 @@ export class ContractReader {
|
|
|
163
163
|
if ($is.Array(options.address)) {
|
|
164
164
|
throw new Error('Cannot use "deployment" with multiple addresses');
|
|
165
165
|
}
|
|
166
|
-
$require.Address(options.address, `No contract address provided, but
|
|
166
|
+
$require.Address(options.address, `No contract address was provided, but "fromBlock" is "deployment"`);
|
|
167
167
|
try {
|
|
168
168
|
let explorer = BlockchainExplorerFactory.get(this.client.platform);
|
|
169
169
|
let dateResolver = new ContractCreationResolver(this.client, explorer);
|
|
@@ -171,7 +171,7 @@ export class ContractReader {
|
|
|
171
171
|
filters.fromBlock = info.block - 1;
|
|
172
172
|
}
|
|
173
173
|
catch (error) {
|
|
174
|
-
// Skip any explorer errors and
|
|
174
|
+
// Skip any explorer errors and search from block 0.
|
|
175
175
|
}
|
|
176
176
|
}
|
|
177
177
|
else {
|
|
@@ -210,7 +210,7 @@ export class ContractReader {
|
|
|
210
210
|
filters.topics = topics;
|
|
211
211
|
}
|
|
212
212
|
else {
|
|
213
|
-
//
|
|
213
|
+
// Array: query multiple events.
|
|
214
214
|
let topics = [
|
|
215
215
|
abi.map($abiUtils.getTopicSignature)
|
|
216
216
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContractWriter.js","sourceRoot":"","sources":["../../../src/contracts/ContractWriter.ts"],"names":[],"mappings":";;;AAGA,qDAAoE;AAEpE,+DAA4D;AAE5D,oDAAiD;AAGjD,qDAAkD;AAClD,mDAAgD;AAChD,uDAAoD;AACpD,uDAAoD;AAepD,MAAa,cAAc;IAIvB,YACW,OAAiB,EACjB,MAAkB,EACf,aAAiC,EACjC,YAA+B;QAHlC,YAAO,GAAP,OAAO,CAAU;QACjB,WAAM,GAAN,MAAM,CAAY;QACf,kBAAa,GAAb,aAAa,CAAoB;QACjC,iBAAY,GAAZ,YAAY,CAAmB;IAG7C,CAAC;IAED,OAAO,CAAC,aAAiC,EAAE,YAA+B;QACtE,OAAO,eAAM,CAAC,KAAK,CAAC,IAAI,EAAE;YACtB,aAAa,EAAE;gBACX,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC;gBAC7B,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;aAC3B;YACD,YAAY,EAAE;gBACV,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;gBAC5B,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC;aAC1B;SACJ,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,UAAU,CACZ,OAAmB,EACnB,YAA+B,EAC/B,MAAa,EACb,OAIC;QAGD,mBAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,iCAAiC,CAAC,CAAC;QAC7D,mBAAQ,CAAC,IAAI,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"ContractWriter.js","sourceRoot":"","sources":["../../../src/contracts/ContractWriter.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,9 +25,9 @@ export class ContractWriter {
|
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
/**
|
|
28
|
-
* We split
|
|
29
|
-
* 1. This method prepares
|
|
30
|
-
* 2. With returned writer you can subscribe to events and/or wait for
|
|
28
|
+
* We split transaction sending into two awaitable steps:
|
|
29
|
+
* 1. This method prepares gas, nonce, etc., and sends the transaction.
|
|
30
|
+
* 2. With the returned writer, you can subscribe to events and/or wait for the transaction to be mined.
|
|
31
31
|
* @param account
|
|
32
32
|
* @param interfaceAbi
|
|
33
33
|
* @param params
|
|
@@ -36,7 +36,7 @@ export class ContractWriter {
|
|
|
36
36
|
*/
|
|
37
37
|
async writeAsync(account, interfaceAbi, params, configs) {
|
|
38
38
|
$require.notNull(account, 'Account parameter is undefined.');
|
|
39
|
-
$require.True(typeof account === 'object' || typeof account === 'string', `ContractWriter
|
|
39
|
+
$require.True(typeof account === 'object' || typeof account === 'string', `ContractWriter expects Account as the first parameter, got: ${typeof account}`);
|
|
40
40
|
let value = typeof account !== 'string'
|
|
41
41
|
? account.value
|
|
42
42
|
: null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContractDeployer.js","sourceRoot":"","sources":["../../../../src/contracts/deploy/ContractDeployer.ts"],"names":[],"mappings":";;;AAIA,uDAAoD;AACpD,6DAA0D;AAC1D,6CAA0C;AAC1C,qCAA0C;AA+C1C,MAAa,gBAAgB;IACzB,YAAqB,MAAkB,EAAU,OAAiB;QAA7C,WAAM,GAAN,MAAM,CAAY;QAAU,YAAO,GAAP,OAAO,CAAU;IAElE,CAAC;IAOD,KAAK,CAAC,iBAAiB,CAAE,GAAwH;QAC7I,IAAI,UAAU,IAAI,GAAG,EAAE;YACnB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;SACjC;QACD,IAAI,UAAU,IAAI,GAAG,EAAE;YACnB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;SACjC;QACD,IAAI,MAAM,IAAI,GAAG,EAAE;YACf,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;SACjC;QACD,IAAI,MAAM,IAAI,GAAG,EAAE;YACf,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;SACjC;QACD,IAAI,MAAM,IAAI,GAAG,EAAE;YACf,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SAC7B;QACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAE,GAAsB;QAC1C,mBAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,2BAA2B,CAAC,CAAC;QAExD,IAAI,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,cAAc,CAAC;QAChD,IAAI,KAAK,GAAG,MAAM,mBAAQ,CAAC,QAAQ,CAC/B,mBAAS,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,EAC9C,
|
|
1
|
+
{"version":3,"file":"ContractDeployer.js","sourceRoot":"","sources":["../../../../src/contracts/deploy/ContractDeployer.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,9 +28,9 @@ export class ContractDeployer {
|
|
|
28
28
|
async fromName(ctx) {
|
|
29
29
|
$require.notNull(ctx.name, 'Contract name is required');
|
|
30
30
|
let artifacts = ctx.artifacts ?? './artifacts/';
|
|
31
|
-
let files = await $require.resolved(Directory.readFilesAsync(artifacts, '**.json'), `Artifact files not found for ${ctx.name}`);
|
|
31
|
+
let files = await $require.resolved(Directory.readFilesAsync(artifacts, '**.json'), `Artifact files were not found for ${ctx.name}`);
|
|
32
32
|
let file = files.find(x => x.uri.file === `${ctx.name}.json`);
|
|
33
|
-
$require.notNull(file, `File for
|
|
33
|
+
$require.notNull(file, `File for contract ${ctx.name} was not found in: \n ${files.map(x => x.uri.toString()).join('\n')}`);
|
|
34
34
|
return this.fromMetaFile({
|
|
35
35
|
...ctx,
|
|
36
36
|
path: file.uri.toString()
|
|
@@ -64,7 +64,7 @@ export class ContractDeployer {
|
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
async fromMetaJson(ctx) {
|
|
67
|
-
$require.notNull(ctx.json?.bytecode, 'Contract bytecode is expected in
|
|
67
|
+
$require.notNull(ctx.json?.bytecode, 'Contract bytecode is expected in JSON');
|
|
68
68
|
return this.fromBytecode({
|
|
69
69
|
...ctx,
|
|
70
70
|
bytecode: ctx.json.bytecode,
|
|
@@ -73,7 +73,7 @@ export class ContractDeployer {
|
|
|
73
73
|
});
|
|
74
74
|
}
|
|
75
75
|
async fromBytecode(ctx) {
|
|
76
|
-
$require.True($is.Hex(ctx.bytecode), `
|
|
76
|
+
$require.True($is.Hex(ctx.bytecode), `Bytecode must be a hex string: ${ctx.bytecode}`);
|
|
77
77
|
let deployment = new ContractDeployment({
|
|
78
78
|
client: this.client,
|
|
79
79
|
account: this.account,
|