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
|
@@ -20,7 +20,7 @@ var $proxyDeploy;
|
|
|
20
20
|
variable: result.newVar,
|
|
21
21
|
path: serializePath(result.newPath, result.newVar),
|
|
22
22
|
conflicts: result.conflicts,
|
|
23
|
-
message: `${result.type}: Variable ${serializePath(result.newPath, result.newVar)}(${result.newVar.type}) at slot ${result.newVar.slot} conflicts ${conflicts}`
|
|
23
|
+
message: `${result.type}: Variable ${serializePath(result.newPath, result.newVar)}(${result.newVar.type}) at slot ${result.newVar.slot} conflicts with ${conflicts}`
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
26
|
return null;
|
|
@@ -28,20 +28,20 @@ var $proxyDeploy;
|
|
|
28
28
|
$proxyDeploy.compareStorageLayout = compareStorageLayout;
|
|
29
29
|
async function compareStorageLayoutInner(oldVars, newVars, ctx) {
|
|
30
30
|
ctx ??= {};
|
|
31
|
-
// When resolving state variables
|
|
32
|
-
//
|
|
31
|
+
// When resolving state variables, we append '$' characters to overridden variables to avoid name conflicts.
|
|
32
|
+
// Also check for __gap with a possible '$' suffix.
|
|
33
33
|
let rgxGap = /^_+gap\$*$/;
|
|
34
34
|
let oldMemory = oldVars.map(getMemoryPosition);
|
|
35
35
|
let oldLastSlot = (0, alot_1.default)(oldVars).max(x => x.slot);
|
|
36
36
|
for (let i = 0; i < newVars.length; i++) {
|
|
37
37
|
let newVar = newVars[i];
|
|
38
38
|
if (newVar.slot > oldLastSlot) {
|
|
39
|
-
//
|
|
39
|
+
// A new variable was added after the last slot in the current deployment.
|
|
40
40
|
if (ctx.isExtendableMemory === false) {
|
|
41
41
|
return new BaseError(ELayoutError.MEMORY_OVERFLOW, newVar, [], ctx);
|
|
42
42
|
}
|
|
43
|
-
// Find the new variable name in old storage
|
|
44
|
-
// Exclude
|
|
43
|
+
// Find the new variable name in old storage.
|
|
44
|
+
// Exclude variables at the same position, as they might be pushed logically down by the __gap pattern.
|
|
45
45
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
46
46
|
if (oldVarWithName != null && !Variables.eqLocation(oldVarWithName, newVar) && !rgxGap.test(newVar.name)) {
|
|
47
47
|
return new BaseError(ELayoutError.NAME_MISMATCH, newVar, [oldVarWithName], ctx);
|
|
@@ -52,7 +52,7 @@ var $proxyDeploy;
|
|
|
52
52
|
let oldVarAtSamePos = oldVars.find(x => x.slot === newVar.slot && x.position === newVar.position);
|
|
53
53
|
if (oldVarAtSamePos != null) {
|
|
54
54
|
if (oldVarAtSamePos.type === newVar.type) {
|
|
55
|
-
//
|
|
55
|
+
// The new variable is the same.
|
|
56
56
|
if (oldVarAtSamePos.name !== newVar.name) {
|
|
57
57
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
58
58
|
if (oldVarWithName != null) {
|
|
@@ -189,11 +189,11 @@ var $proxyDeploy;
|
|
|
189
189
|
(function (ELayoutError) {
|
|
190
190
|
ELayoutError["TYPE_MISMATCH"] = "TYPE_MISMATCH";
|
|
191
191
|
ELayoutError["TYPE_COLLISION"] = "TYPE_COLLISION";
|
|
192
|
-
/**
|
|
192
|
+
/** Throws an error if memory is not extendable. */
|
|
193
193
|
ELayoutError["ARRAY_LENGTH_MISMATCH"] = "ARRAY_LENGTH_MISMATCH";
|
|
194
|
-
/**
|
|
194
|
+
/** In arrays, memory for a single item is not extendable, but it is extendable in contract root storage or mapping values. */
|
|
195
195
|
ELayoutError["MEMORY_OVERFLOW"] = "MEMORY_OVERFLOW";
|
|
196
|
-
/** Variables on same slot with different names (rename possible)
|
|
196
|
+
/** Variables on the same slot with different names (rename possible), while the same variable also exists in the old layout on a different slot. */
|
|
197
197
|
ELayoutError["NAME_MISMATCH"] = "NAME_MISMATCH";
|
|
198
198
|
})(ELayoutError || (ELayoutError = {}));
|
|
199
199
|
class BaseError {
|
|
@@ -212,7 +212,7 @@ var $proxyDeploy;
|
|
|
212
212
|
}
|
|
213
213
|
function getMemoryPosition($var) {
|
|
214
214
|
if (isDynamicVariable($var)) {
|
|
215
|
-
//
|
|
215
|
+
// Dynamic variables occupy a single slot.
|
|
216
216
|
return {
|
|
217
217
|
variable: $var,
|
|
218
218
|
offset: $var.slot * 256,
|
|
@@ -238,12 +238,12 @@ var $proxyDeploy;
|
|
|
238
238
|
function requireBoth(a, b, aCheck, bCheck) {
|
|
239
239
|
if (!aCheck) {
|
|
240
240
|
return {
|
|
241
|
-
error: `Current variable
|
|
241
|
+
error: `Current variable ${a.name}(${a.type}) is not dynamic, but the new one is: ${b.name}(${b.type})`
|
|
242
242
|
};
|
|
243
243
|
}
|
|
244
244
|
if (!bCheck) {
|
|
245
245
|
return {
|
|
246
|
-
error: `Current variable
|
|
246
|
+
error: `Current variable ${a.name}(${a.type}) is dynamic, but the new one is not: ${b.name}(${b.type})`
|
|
247
247
|
};
|
|
248
248
|
}
|
|
249
249
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$proxyDeploy.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/$proxyDeploy.ts"],"names":[],"mappings":";;;;;;AAAA,gEAA6D;AAE7D,4DAAyD;AACzD,uDAAoD;AACpD,gDAAwB;AAExB,IAAiB,YAAY,CAiT5B;AAjTD,WAAiB,YAAY;IAClB,KAAK,UAAU,oBAAoB,CAAE,OAA6B,EAAE,OAA6B;QAMpG,IAAI,MAAM,GAAG,MAAM,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE;YAC3D,kBAAkB,EAAE,IAAI;SAC3B,CAAC,CAAC;QACH,IAAI,MAAM,EAAE;YACR,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvG,OAAO;gBACH,QAAQ,EAAE,MAAM,CAAC,MAAM;gBACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;gBAClD,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,cAAc,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,aAAa,MAAM,CAAC,MAAM,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"$proxyDeploy.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/$proxyDeploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ const HardhatProvider_1 = require("../../../hardhat/HardhatProvider.js");
|
|
|
16
16
|
const _hex_1 = require("../../../utils/$hex.js");
|
|
17
17
|
const SlotsStorage_1 = require("../../../solidity/SlotsStorage.js");
|
|
18
18
|
const SlotsParser_1 = require("../../../solidity/SlotsParser.js");
|
|
19
|
-
// Supports OpenZeppelin proxy deployments
|
|
19
|
+
// Supports OpenZeppelin proxy deployments.
|
|
20
20
|
class ProxyDeployment {
|
|
21
21
|
constructor(store, opts) {
|
|
22
22
|
this.store = store;
|
|
@@ -25,7 +25,7 @@ class ProxyDeployment {
|
|
|
25
25
|
async ensureProxy(ctx) {
|
|
26
26
|
_require_1.$require.notEmpty(ctx.proxyId, `ProxyId for the contract is required`);
|
|
27
27
|
_require_1.$require.Address(ctx.implementation?.address, `Implementation address is required`);
|
|
28
|
-
//@TODO
|
|
28
|
+
//@TODO Add support for UUPS proxies.
|
|
29
29
|
return this.ensureTransparentProxy(ctx);
|
|
30
30
|
}
|
|
31
31
|
async ensureBeaconProxy(ctx) {
|
|
@@ -34,7 +34,7 @@ class ProxyDeployment {
|
|
|
34
34
|
_require_1.$require.Address(ctx.implementation?.address, `Implementation address is required`);
|
|
35
35
|
return this.ensureBeaconInner(ctx);
|
|
36
36
|
}
|
|
37
|
-
// Supports OpenZeppelin TransparentProxy
|
|
37
|
+
// Supports OpenZeppelin TransparentProxy v4.x and v5.x.
|
|
38
38
|
async ensureTransparentProxy(ctx) {
|
|
39
39
|
let { proxyId, deployer, deployments, ImplementationContract } = ctx;
|
|
40
40
|
let { client } = deployments;
|
|
@@ -49,9 +49,9 @@ class ProxyDeployment {
|
|
|
49
49
|
_require_1.$require.notNull(ProxyAdmin, 'TransparentProxy.ProxyAdmin is required');
|
|
50
50
|
let proxyOpts = {
|
|
51
51
|
id: proxyId,
|
|
52
|
-
//
|
|
52
|
+
// Do not compare contract updates after deployment, as proxies are normally not updated.
|
|
53
53
|
latest: false,
|
|
54
|
-
//
|
|
54
|
+
// Used for verification.
|
|
55
55
|
proxyFor: implAddress,
|
|
56
56
|
arguments: [
|
|
57
57
|
// address _logic, address initialOwner, bytes memory _data
|
|
@@ -60,7 +60,7 @@ class ProxyDeployment {
|
|
|
60
60
|
};
|
|
61
61
|
let proxyAbi = new Proxy().abi;
|
|
62
62
|
let v = proxyAbi.some(x => x.name === 'upgradeToAndCall') || !proxyAbi.some(x => x.type === 'error') ? 'V4' : 'V5';
|
|
63
|
-
/** OpenZeppelin V5 hides admin/upgrade public methods and introduces "error" types*/
|
|
63
|
+
/** OpenZeppelin V5 hides admin/upgrade public methods and introduces "error" types. */
|
|
64
64
|
let hasProxy = await deployments.has(Proxy, proxyOpts);
|
|
65
65
|
let shouldUpdate = ctx.upgradeImplementation ?? true;
|
|
66
66
|
let { contract: contractProxy, receipt: contractProxyReceipt, deployment: contractProxyDeployment } = await deployments.ensure(Proxy, proxyOpts);
|
|
@@ -73,17 +73,17 @@ class ProxyDeployment {
|
|
|
73
73
|
throw new Error(`AdminChanged event was not extracted from the deployment receipt. Invalid TransparentUpgradeableProxy implementation?`);
|
|
74
74
|
}
|
|
75
75
|
if (_address_1.$address.eq(log.params.newAdmin, deployer.address)) {
|
|
76
|
-
//
|
|
76
|
+
// OpenZeppelin < 5 does not deploy AdminContract automatically.
|
|
77
77
|
let { contract } = await deployments.ensure(ProxyAdmin, {
|
|
78
78
|
id: contractProxyAdminId
|
|
79
79
|
});
|
|
80
80
|
contractProxyAdmin = contract;
|
|
81
|
-
//
|
|
81
|
+
// Make sure we upgrade.
|
|
82
82
|
(0, _logger_1.l) `Will change the EOA admin to ProxyAdmin contract`;
|
|
83
83
|
let receipt = await Interfaces.call(deployer, contractProxy, Interfaces.TransparentProxy.V4.contractProxy.changeAdmin, contractProxyAdmin.address);
|
|
84
84
|
}
|
|
85
85
|
else {
|
|
86
|
-
//
|
|
86
|
+
// OpenZeppelin TransparentUpgradeableProxy V5 also creates the ProxyAdmin contract on proxy deployment.
|
|
87
87
|
contractProxyAdmin = new ProxyAdmin(log.params.newAdmin, client);
|
|
88
88
|
await this.store.saveDeployment(contractProxyAdmin, {
|
|
89
89
|
id: contractProxyAdminId,
|
|
@@ -93,7 +93,7 @@ class ProxyDeployment {
|
|
|
93
93
|
}
|
|
94
94
|
else {
|
|
95
95
|
contractProxyAdmin = await deployments.get(ProxyAdmin, { id: contractProxyAdminId });
|
|
96
|
-
_require_1.$require.notNull(contractProxyAdmin, `Proxy was deployed previously, but
|
|
96
|
+
_require_1.$require.notNull(contractProxyAdmin, `Proxy was deployed previously, but ProxyAdmin ${contractProxyAdminId} was not found`);
|
|
97
97
|
}
|
|
98
98
|
if (hasProxy) {
|
|
99
99
|
let SLOT = `0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc`;
|
|
@@ -105,7 +105,7 @@ class ProxyDeployment {
|
|
|
105
105
|
if (_hex_1.$hex.isEmpty(migrationData) === false) {
|
|
106
106
|
let version = await Interfaces.TransparentProxy[v].contractProxy.version(contractProxy);
|
|
107
107
|
if (migrationV <= version) {
|
|
108
|
-
// Clear migration call;
|
|
108
|
+
// Clear the migration call; this upgrade is a raw implementation upgrade.
|
|
109
109
|
migrationData = null;
|
|
110
110
|
}
|
|
111
111
|
}
|
|
@@ -114,12 +114,12 @@ class ProxyDeployment {
|
|
|
114
114
|
await this.saveStorageLayout(proxyId, ctx);
|
|
115
115
|
}
|
|
116
116
|
else {
|
|
117
|
-
_logger_1.$logger.log(`
|
|
117
|
+
_logger_1.$logger.log(`Skipping ProxyAdmin(${contractProxyAdmin.address}) upgrade to ${implAddress} (${v}) from ${address}`);
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
120
|
}
|
|
121
121
|
if (hasProxy === false && contractProxyReceipt != null) {
|
|
122
|
-
//
|
|
122
|
+
// New proxy deployment: save the storage layout.
|
|
123
123
|
await this.saveStorageLayout(proxyId, ctx);
|
|
124
124
|
}
|
|
125
125
|
return {
|
|
@@ -129,7 +129,7 @@ class ProxyDeployment {
|
|
|
129
129
|
};
|
|
130
130
|
}
|
|
131
131
|
async getOpenzeppelinUpgradable(opts) {
|
|
132
|
-
// We
|
|
132
|
+
// We cannot compile OpenZeppelin's contracts directly from the node_modules folder, so create wrappers.
|
|
133
133
|
const baseSource = `./node_modules/@openzeppelin/contracts/proxy`;
|
|
134
134
|
const baseOutput = `./contracts/oz`;
|
|
135
135
|
const deps = {
|
|
@@ -145,7 +145,7 @@ class ProxyDeployment {
|
|
|
145
145
|
template: `
|
|
146
146
|
import \"${deps.TransparentUpgradeableProxy}\";
|
|
147
147
|
`,
|
|
148
|
-
//install: `TransparentUpgradeableProxy,ProxyAdmin`,
|
|
148
|
+
// install: `TransparentUpgradeableProxy,ProxyAdmin`,
|
|
149
149
|
contracts: [`TransparentUpgradeableProxy`, `ProxyAdmin`]
|
|
150
150
|
},
|
|
151
151
|
Beacon: {
|
|
@@ -155,7 +155,7 @@ class ProxyDeployment {
|
|
|
155
155
|
import \"${deps.UpgradeableBeacon}\";
|
|
156
156
|
import \"${deps.BeaconProxy}\";
|
|
157
157
|
`,
|
|
158
|
-
//install: `UpgradeableBeacon,BeaconProxy`,
|
|
158
|
+
// install: `UpgradeableBeacon,BeaconProxy`,
|
|
159
159
|
contracts: [`UpgradeableBeacon`, `BeaconProxy`],
|
|
160
160
|
}
|
|
161
161
|
};
|
|
@@ -231,13 +231,13 @@ class ProxyDeployment {
|
|
|
231
231
|
}
|
|
232
232
|
else {
|
|
233
233
|
if (contractBeaconReceipt?.status) {
|
|
234
|
-
//
|
|
234
|
+
// New beacon deployment: save the storage layout.
|
|
235
235
|
await this.saveStorageLayout(beaconId, ctx);
|
|
236
236
|
}
|
|
237
237
|
}
|
|
238
238
|
let beaconProxyOpts = {
|
|
239
239
|
id: beaconProxyId,
|
|
240
|
-
// Pass the target implementation address for verification
|
|
240
|
+
// Pass the target implementation address for verification.
|
|
241
241
|
proxyFor: implAddress,
|
|
242
242
|
arguments: [
|
|
243
243
|
// address implementation
|
|
@@ -254,7 +254,7 @@ class ProxyDeployment {
|
|
|
254
254
|
};
|
|
255
255
|
}
|
|
256
256
|
async saveStorageLayout(proxyId, ctx) {
|
|
257
|
-
_require_1.$require.notNull(ctx.ImplementationContract, `Implementation
|
|
257
|
+
_require_1.$require.notNull(ctx.ImplementationContract, `Implementation contract class is required to compare the storage layout`);
|
|
258
258
|
let newSlots = new ctx.ImplementationContract().storage?.$storage?.slots ?? [];
|
|
259
259
|
await this.store.saveStorageLayoutInfo({
|
|
260
260
|
id: proxyId,
|
|
@@ -263,9 +263,9 @@ class ProxyDeployment {
|
|
|
263
263
|
}
|
|
264
264
|
async requireCompatibleStorageLayout(proxyId, ctx) {
|
|
265
265
|
if (ctx.options?.skipStorageLayoutCheck !== true) {
|
|
266
|
-
_require_1.$require.notNull(ctx.ImplementationContract, `Implementation
|
|
266
|
+
_require_1.$require.notNull(ctx.ImplementationContract, `Implementation contract class is required to compare the storage layout`);
|
|
267
267
|
let newStorageLayout = new ctx.ImplementationContract().storage?.$storage?.slots;
|
|
268
|
-
_require_1.$require.notNull(newStorageLayout, `No storage layout was generated for ${ctx.ImplementationContract.name}
|
|
268
|
+
_require_1.$require.notNull(newStorageLayout, `No storage layout was generated for ${ctx.ImplementationContract.name}.`);
|
|
269
269
|
let currentStorageLayout = await this.store.getStorageLayoutInfo(proxyId);
|
|
270
270
|
if (currentStorageLayout != null) {
|
|
271
271
|
let error = await _proxyDeploy_1.$proxyDeploy.compareStorageLayout(currentStorageLayout.slots, newStorageLayout);
|
|
@@ -278,7 +278,7 @@ class ProxyDeployment {
|
|
|
278
278
|
}
|
|
279
279
|
getOzVersionByBeacon(Beacon) {
|
|
280
280
|
let $constructor = new Beacon().abi?.find(x => x.type === 'constructor');
|
|
281
|
-
_require_1.$require.notNull($constructor, `Invalid Beacon contract: constructor not found`);
|
|
281
|
+
_require_1.$require.notNull($constructor, `Invalid Beacon contract: constructor was not found`);
|
|
282
282
|
if ($constructor.inputs.length === 1) {
|
|
283
283
|
// constructor(address implementation_)
|
|
284
284
|
return 4;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyDeployment.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/ProxyDeployment.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ProxyDeployment.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/ProxyDeployment.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,18 +45,18 @@ class DeploymentsStorage {
|
|
|
45
45
|
if (deploymentsByAddress.length > 1) {
|
|
46
46
|
let asProxy = deploymentsByAddress.filter(x => x.proxyFor != null);
|
|
47
47
|
if (asProxy.length > 0) {
|
|
48
|
-
_require_1.$require.eq(asProxy.length, 1, '
|
|
48
|
+
_require_1.$require.eq(asProxy.length, 1, 'Expected only one deployment per address.');
|
|
49
49
|
return asProxy[0];
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
if (deploymentsByAddress.length === 0) {
|
|
53
53
|
let asImplementations = deployments.filter(x => _address_1.$address.eq(x.implementation, byAddress));
|
|
54
54
|
if (asImplementations.length > 0) {
|
|
55
|
-
_require_1.$require.eq(asImplementations.length, 1, '
|
|
55
|
+
_require_1.$require.eq(asImplementations.length, 1, 'Expected only one deployment per address.');
|
|
56
56
|
return asImplementations[0];
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
|
-
throw new Error(`Deployment not found for
|
|
59
|
+
throw new Error(`Deployment was not found for address: ${byAddress}`);
|
|
60
60
|
}
|
|
61
61
|
let id = typeof mix === 'string' ? mix : mix.name;
|
|
62
62
|
let deployment = await store.getSingle(id);
|
|
@@ -94,6 +94,7 @@ class DeploymentsStorage {
|
|
|
94
94
|
let deployment = {
|
|
95
95
|
id: info.id,
|
|
96
96
|
name: info.name,
|
|
97
|
+
immutablesKey: info.immutablesKey,
|
|
97
98
|
main: _path_1.$path.getRelativePath(contract.$meta?.class ?? contract.$meta?.artifact ?? contract.$meta.source),
|
|
98
99
|
bytecodeHash: info.bytecodeHash,
|
|
99
100
|
address: contract.address,
|
|
@@ -102,7 +103,7 @@ class DeploymentsStorage {
|
|
|
102
103
|
gas: receipt.gasUsed,
|
|
103
104
|
deployer: this.deployer.address,
|
|
104
105
|
timestamp: _date_1.$date.toUnixTimestamp(new Date()),
|
|
105
|
-
// If current deployment is the implementation, set the field to null
|
|
106
|
+
// If the current deployment is the implementation, set the field to null for later reconfiguration. Otherwise, keep the field uninitialized.
|
|
106
107
|
implementation: currentDeployment?.implementation ? null : void 0,
|
|
107
108
|
};
|
|
108
109
|
if (currentDeployment) {
|
|
@@ -169,11 +170,11 @@ class DeploymentsStorage {
|
|
|
169
170
|
let upstreamDeployments;
|
|
170
171
|
let shouldCopy = true;
|
|
171
172
|
if (await atma_io_1.File.existsAsync(path)) {
|
|
172
|
-
// forked deployments path already exists
|
|
173
|
+
// The forked deployments path already exists; check whether it is stale.
|
|
173
174
|
let blockNumber = await this.client.getBlockNumber();
|
|
174
175
|
if (upstreamDeploymentExists) {
|
|
175
176
|
upstreamDeployments = await atma_io_1.File.readAsync(upstreamDeploymentsPath);
|
|
176
|
-
// 1. Check
|
|
177
|
+
// 1. Check whether the original (upstream) network has more recent deployments.
|
|
177
178
|
let hasNewDeployments = upstreamDeployments.some(x => x.block > blockNumber);
|
|
178
179
|
shouldCopy = hasNewDeployments;
|
|
179
180
|
}
|
|
@@ -187,11 +188,11 @@ class DeploymentsStorage {
|
|
|
187
188
|
shouldCopy = true;
|
|
188
189
|
}
|
|
189
190
|
if (shouldCopy === false) {
|
|
190
|
-
// 3. Just
|
|
191
|
+
// 3. Just in case, check whether any deployments have a higher block number than the current HEAD.
|
|
191
192
|
let hasNewDeployments = deployments.some(x => x.block > blockNumber);
|
|
192
193
|
shouldCopy = hasNewDeployments;
|
|
193
194
|
if (shouldCopy === false) {
|
|
194
|
-
// 4. Check
|
|
195
|
+
// 4. Check whether the latest deployment transaction exists in the current forked network.
|
|
195
196
|
let latestDeployment = (0, alot_1.default)(deployments).maxItem(x => x.block);
|
|
196
197
|
if (latestDeployment != null) {
|
|
197
198
|
try {
|
|
@@ -205,7 +206,7 @@ class DeploymentsStorage {
|
|
|
205
206
|
}
|
|
206
207
|
}
|
|
207
208
|
if (shouldCopy === false && upstreamDeployments?.length > 0) {
|
|
208
|
-
// 5. Just
|
|
209
|
+
// 5. Just in case, check for upstream deployments with a lower block number than the current HEAD that are missing from the current forked network.
|
|
209
210
|
let deploymentIds = (0, alot_1.default)(deployments).toDictionary(x => x.id);
|
|
210
211
|
let hasNewDeployments = upstreamDeployments
|
|
211
212
|
.filter(x => x.block <= blockNumber)
|
|
@@ -215,7 +216,7 @@ class DeploymentsStorage {
|
|
|
215
216
|
}
|
|
216
217
|
}
|
|
217
218
|
if (shouldCopy) {
|
|
218
|
-
//
|
|
219
|
+
// Current forked deployments are stale; copy the upstream deployments or clear them.
|
|
219
220
|
if (upstreamDeploymentExists) {
|
|
220
221
|
await atma_io_1.File.copyToAsync(upstreamDeploymentsPath, path, {
|
|
221
222
|
silent: true
|
|
@@ -223,7 +224,7 @@ class DeploymentsStorage {
|
|
|
223
224
|
atma_io_1.File.clearCache();
|
|
224
225
|
}
|
|
225
226
|
else {
|
|
226
|
-
//
|
|
227
|
+
// Clear.
|
|
227
228
|
await atma_io_1.File.writeAsync(path, []);
|
|
228
229
|
}
|
|
229
230
|
}
|
|
@@ -246,7 +247,7 @@ class DeploymentsStorage {
|
|
|
246
247
|
]);
|
|
247
248
|
let deployments = await store.getAll();
|
|
248
249
|
if (deployments.length === 0) {
|
|
249
|
-
// Nothing to remove:
|
|
250
|
+
// Nothing to remove: no deployments.
|
|
250
251
|
return;
|
|
251
252
|
}
|
|
252
253
|
if (block0 == null) {
|
|
@@ -254,9 +255,9 @@ class DeploymentsStorage {
|
|
|
254
255
|
}
|
|
255
256
|
let stale = deployments.filter(x => {
|
|
256
257
|
return x.timestamp == null
|
|
257
|
-
//
|
|
258
|
+
// Was deployed earlier than the current genesis block.
|
|
258
259
|
|| x.timestamp < block0.timestamp
|
|
259
|
-
//
|
|
260
|
+
// Was deployed in a later block than the current block.
|
|
260
261
|
|| x.block > blockNumberHead;
|
|
261
262
|
});
|
|
262
263
|
if (stale.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeploymentsStorage.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/storage/DeploymentsStorage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DeploymentsStorage.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/storage/DeploymentsStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ var AbiDeserializer;
|
|
|
9
9
|
(function (AbiDeserializer) {
|
|
10
10
|
function process(result, types) {
|
|
11
11
|
if (types == null || types.length === 0) {
|
|
12
|
-
//
|
|
12
|
+
// Return as is.
|
|
13
13
|
return result;
|
|
14
14
|
}
|
|
15
15
|
let type = _abiParser_1.$abiParser.getReturnTypeFromTypes(types);
|
|
@@ -45,7 +45,7 @@ var AbiDeserializer;
|
|
|
45
45
|
}
|
|
46
46
|
if (type.type === 'tuple[]') {
|
|
47
47
|
if (Array.isArray(val) === false) {
|
|
48
|
-
throw new Error(`${type.name} tuple[] expects array to deserialize. Got ${val}`);
|
|
48
|
+
throw new Error(`${type.name} tuple[] expects an array to deserialize. Got ${val}`);
|
|
49
49
|
}
|
|
50
50
|
return val.map(item => {
|
|
51
51
|
return process(item, type.components);
|
|
@@ -56,7 +56,7 @@ var AbiDeserializer;
|
|
|
56
56
|
function toArray(value, types) {
|
|
57
57
|
value = normalizeArray(value);
|
|
58
58
|
if (Array.isArray(value) === false) {
|
|
59
|
-
throw new Error(`
|
|
59
|
+
throw new Error(`Expected an array of types: ${types.map(x => x.type)}; got ${value}`);
|
|
60
60
|
}
|
|
61
61
|
let out = [];
|
|
62
62
|
for (let i = 0; i < types.length; i++) {
|
|
@@ -79,7 +79,7 @@ var AbiDeserializer;
|
|
|
79
79
|
}
|
|
80
80
|
return out;
|
|
81
81
|
}
|
|
82
|
-
// { 0: a, 1: b, 2: c } to array
|
|
82
|
+
// Convert { 0: a, 1: b, 2: c } to an array.
|
|
83
83
|
function normalizeArray(val) {
|
|
84
84
|
if (Array.isArray(val)) {
|
|
85
85
|
return val;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbiDeserializer.js","sourceRoot":"","sources":["../../../../src/contracts/utils/AbiDeserializer.ts"],"names":[],"mappings":";;;AAAA,wDAAqD;AACrD,uDAAoD;AACpD,6CAA0C;AAE1C,uDAAoD;AAEpD,IAAiB,eAAe,CAwG/B;AAxGD,WAAiB,eAAe;IAI5B,SAAgB,OAAO,CAAC,MAAW,EAAE,KAAmB;QACpD,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACrC,
|
|
1
|
+
{"version":3,"file":"AbiDeserializer.js","sourceRoot":"","sources":["../../../../src/contracts/utils/AbiDeserializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,13 +9,13 @@ var ContractBaseUtils;
|
|
|
9
9
|
function $getAbiItem(abi, type, name, argsCount) {
|
|
10
10
|
let arr = abi.filter(x => x.type === type && x.name === name);
|
|
11
11
|
if (arr.length === 0) {
|
|
12
|
-
throw new Error(`TAbiItem ${name} not found`);
|
|
12
|
+
throw new Error(`TAbiItem ${name} was not found`);
|
|
13
13
|
}
|
|
14
14
|
if (arr.length === 1) {
|
|
15
15
|
return arr[0];
|
|
16
16
|
}
|
|
17
17
|
if (argsCount == null) {
|
|
18
|
-
throw new Error(`Found multiple TAbiItems for ${name}.
|
|
18
|
+
throw new Error(`Found multiple TAbiItems for ${name}. Argument count was not specified to pick one`);
|
|
19
19
|
}
|
|
20
20
|
return arr.find(x => (x.inputs?.length ?? 0) === argsCount);
|
|
21
21
|
}
|
|
@@ -78,7 +78,7 @@ var ContractBaseUtils;
|
|
|
78
78
|
});
|
|
79
79
|
let tx = await writer.writeAsync(account, abi, params);
|
|
80
80
|
let { error, result } = await _promise_1.$promise.caught(tx.onSigned);
|
|
81
|
-
//
|
|
81
|
+
// Get the transaction hash.
|
|
82
82
|
let hash = result != null ? _contract_1.$contract.keccak256(result) : null;
|
|
83
83
|
return { error, signed: result, hash };
|
|
84
84
|
}
|