dequanto 0.2.38 → 0.2.41
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/$require.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/$require.js.map +1 -1
- 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/lib/types/utils/$require.d.ts +8 -8
- 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/$require.ts +10 -10
- package/src/utils/$traces.ts +1 -1
- package/src/wallets/EIP6963ProviderFactory.ts +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Deployments.js","sourceRoot":"","sources":["../../../../src/contracts/deploy/Deployments.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Deployments.js","sourceRoot":"","sources":["../../../../src/contracts/deploy/Deployments.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,7 @@ export class Deployments {
|
|
|
48
48
|
async get(Ctor, opts) {
|
|
49
49
|
let contract = await this.getOrNull(Ctor, opts);
|
|
50
50
|
if (contract == null) {
|
|
51
|
-
throw new Error(`Deployment ${Ctor.name} ${opts?.id ?? ''} not found in ${this.client.platform} [${this.store.opts?.name ?? this.store.opts?.directory ?? ''}]`);
|
|
51
|
+
throw new Error(`Deployment ${Ctor.name} ${opts?.id ?? ''} was not found in ${this.client.platform} [${this.store.opts?.name ?? this.store.opts?.directory ?? ''}]`);
|
|
52
52
|
}
|
|
53
53
|
return contract;
|
|
54
54
|
}
|
|
@@ -64,7 +64,7 @@ export class Deployments {
|
|
|
64
64
|
return new Ctor(address, this.client);
|
|
65
65
|
}
|
|
66
66
|
/**
|
|
67
|
-
*
|
|
67
|
+
* Gets the deployment for Ctor, but returns the CtorWrapped instance. Useful for proxies, etc.
|
|
68
68
|
* e.g. deployments.getAs(SomeProxy, SomeImplementation);
|
|
69
69
|
*/
|
|
70
70
|
async getAs(Ctor, CtorWrapped, opts) {
|
|
@@ -77,7 +77,7 @@ export class Deployments {
|
|
|
77
77
|
let deployment = await this.store.getDeploymentInfo('', {
|
|
78
78
|
id: params.id
|
|
79
79
|
});
|
|
80
|
-
$require.notNull(deployment, `Deployment for ${params.id} not found`);
|
|
80
|
+
$require.notNull(deployment, `Deployment for ${params.id} was not found`);
|
|
81
81
|
await this.ensureVerification(params.Ctor, deployment, {
|
|
82
82
|
id: params.id,
|
|
83
83
|
constructorParams: params.constructorParams,
|
|
@@ -97,8 +97,13 @@ export class Deployments {
|
|
|
97
97
|
let requireLatest = opts.latest == null
|
|
98
98
|
? (this.client.platform === 'hardhat' || this.opts?.checkBytecode !== false)
|
|
99
99
|
: (opts.latest);
|
|
100
|
-
|
|
101
|
-
|
|
100
|
+
/** For backward compatibility:
|
|
101
|
+
* For older deployments, the deployer should set this if immutablesKey is not present in the deployed state. */
|
|
102
|
+
let hasNewImmutables = opts.checkImmutables === true
|
|
103
|
+
? Boolean(currentDeployment.immutablesKey != opts.immutablesKey)
|
|
104
|
+
: Boolean(currentDeployment.immutablesKey && currentDeployment.immutablesKey != opts.immutablesKey);
|
|
105
|
+
if (opts.force !== true && requireLatest !== true && hasNewImmutables !== true) {
|
|
106
|
+
// Return the already deployed contract.
|
|
102
107
|
$contract.store.register(contract);
|
|
103
108
|
return {
|
|
104
109
|
contract,
|
|
@@ -106,9 +111,9 @@ export class Deployments {
|
|
|
106
111
|
};
|
|
107
112
|
}
|
|
108
113
|
if (requireLatest === true && opts.force !== true) {
|
|
109
|
-
// was already deployed. Check new bytecode hash
|
|
114
|
+
// The contract was already deployed. Check the new bytecode hash.
|
|
110
115
|
let isSame = await this.isSameBytecode(Ctor, currentDeployment);
|
|
111
|
-
if (isSame) {
|
|
116
|
+
if (isSame && hasNewImmutables !== true) {
|
|
112
117
|
$contract.store.register(contract);
|
|
113
118
|
return {
|
|
114
119
|
contract,
|
|
@@ -128,7 +133,7 @@ export class Deployments {
|
|
|
128
133
|
throw new Error(`The bytecode of ${currentDeployment.id} has changed, but 'whenBytecodeChanged' is set to 'throw'`);
|
|
129
134
|
}
|
|
130
135
|
}
|
|
131
|
-
//
|
|
136
|
+
// Deploy the contract: new, forced, or latest.
|
|
132
137
|
let constructorArgs = opts.arguments ?? [];
|
|
133
138
|
let id = opts.id ?? Ctor.name;
|
|
134
139
|
let { receipt, contract: deployedContract, bytecode, deployedBytecode } = await this._hh.deployClass(Ctor, {
|
|
@@ -140,6 +145,7 @@ export class Deployments {
|
|
|
140
145
|
let deployment = await this.store.saveDeployment(deployedContract, {
|
|
141
146
|
id,
|
|
142
147
|
name: Ctor.name,
|
|
148
|
+
immutablesKey: opts.immutablesKey,
|
|
143
149
|
bytecodeHash: this.getBytecodeHash(deployedBytecode)
|
|
144
150
|
}, receipt);
|
|
145
151
|
await this.ensureVerification(Ctor, deployment, {
|
|
@@ -155,9 +161,11 @@ export class Deployments {
|
|
|
155
161
|
async ensureWithProxy(CtorImpl, opts) {
|
|
156
162
|
let id = opts?.id ?? getImplementationId(CtorImpl);
|
|
157
163
|
let proxyId = `${id}Proxy`;
|
|
164
|
+
let immutablesKey = getImmutablesKey(opts?.arguments);
|
|
158
165
|
let { contract: contractImpl, receipt: contractReceipt, deployment: contractImplDeployment } = await this.ensure(CtorImpl, {
|
|
159
166
|
arguments: opts?.arguments,
|
|
160
167
|
id: id,
|
|
168
|
+
immutablesKey,
|
|
161
169
|
force: opts?.force,
|
|
162
170
|
latest: this.opts?.checkBytecode !== false,
|
|
163
171
|
verification: opts?.verification,
|
|
@@ -181,7 +189,7 @@ export class Deployments {
|
|
|
181
189
|
upgradeImplementation: opts.deployment?.upgradeProxy ?? this.opts?.whenUpgradeRequired !== 'ignore'
|
|
182
190
|
});
|
|
183
191
|
if (contractImplDeployment.implementation == null) {
|
|
184
|
-
// Set the
|
|
192
|
+
// Set the proxy contract as the main address.
|
|
185
193
|
contractImplDeployment.implementation = contractImplDeployment.address;
|
|
186
194
|
contractImplDeployment.address = contractProxy.address;
|
|
187
195
|
contractProxyDeployment.proxyFor = contractImplDeployment.implementation;
|
|
@@ -199,11 +207,11 @@ export class Deployments {
|
|
|
199
207
|
};
|
|
200
208
|
}
|
|
201
209
|
/**
|
|
202
|
-
* Deploys the Beacon contract.
|
|
210
|
+
* Deploys the Beacon contract. The implementation is the target contract (can be a proxy or normal contract).
|
|
203
211
|
* https://docs.openzeppelin.com/contracts/5.x/api/proxy#beacon
|
|
204
212
|
**/
|
|
205
213
|
async ensureWithBeacon(CtorImpl, opts) {
|
|
206
|
-
$require.notEmpty(opts?.id, `ID is required for Beacon deployment, as
|
|
214
|
+
$require.notEmpty(opts?.id, `ID is required for Beacon deployment, as the implementation can have multiple Beacons`);
|
|
207
215
|
let beaconProxyId = opts.id;
|
|
208
216
|
let implId = beaconProxyId.includes('/')
|
|
209
217
|
? beaconProxyId.substring(0, beaconProxyId.indexOf('/'))
|
|
@@ -227,7 +235,7 @@ export class Deployments {
|
|
|
227
235
|
implementation: {
|
|
228
236
|
address: implementationAddress,
|
|
229
237
|
initData: data,
|
|
230
|
-
// @TODO
|
|
238
|
+
// @TODO Implement migrations for Beacons.
|
|
231
239
|
migrationData: null
|
|
232
240
|
}
|
|
233
241
|
});
|
|
@@ -256,7 +264,7 @@ export class Deployments {
|
|
|
256
264
|
this._logger.log(`${deployment.id} bytecode has not changed`);
|
|
257
265
|
return true;
|
|
258
266
|
}
|
|
259
|
-
//
|
|
267
|
+
// Recheck v1.
|
|
260
268
|
if (deployment.bytecodeHash != null) {
|
|
261
269
|
let address = deployment.implementation ?? deployment.address;
|
|
262
270
|
let bytecode = await this.client.getCode(address);
|
|
@@ -272,8 +280,8 @@ export class Deployments {
|
|
|
272
280
|
let [localDiff, onchainDiff] = Str.getDifference(bytecodeLocal, bytecodeOnchain);
|
|
273
281
|
if (localDiff === '' || /^0+$/.test(localDiff)) {
|
|
274
282
|
this._logger.log(`${deployment.id} bytecode has only immutable data diff, assume unchanged`);
|
|
275
|
-
// Local deployedBytecode
|
|
276
|
-
//
|
|
283
|
+
// Local deployedBytecode does not contain immutable data.
|
|
284
|
+
// Instead, solc generates bytecode with 0 as the placeholder.
|
|
277
285
|
return true;
|
|
278
286
|
}
|
|
279
287
|
}
|
|
@@ -335,7 +343,7 @@ export class Deployments {
|
|
|
335
343
|
return $contract.keccak256(bytecodeRaw);
|
|
336
344
|
}
|
|
337
345
|
/**
|
|
338
|
-
* A simple method to configure
|
|
346
|
+
* A simple method to configure contract state.
|
|
339
347
|
*/
|
|
340
348
|
async configure(Ctor, opts) {
|
|
341
349
|
let x;
|
|
@@ -389,7 +397,7 @@ function isEqual(a, b) {
|
|
|
389
397
|
// Not strictly equal
|
|
390
398
|
return a == b;
|
|
391
399
|
}
|
|
392
|
-
//
|
|
400
|
+
// Check arrays.
|
|
393
401
|
if (Array.isArray(a) || Array.isArray(b)) {
|
|
394
402
|
if (a.length !== b.length) {
|
|
395
403
|
return false;
|
|
@@ -398,7 +406,7 @@ function isEqual(a, b) {
|
|
|
398
406
|
return isEqual(x, b[i]);
|
|
399
407
|
});
|
|
400
408
|
}
|
|
401
|
-
//
|
|
409
|
+
// Check objects.
|
|
402
410
|
for (let key in a) {
|
|
403
411
|
let aValue = a[key];
|
|
404
412
|
let bValue = b[key];
|
|
@@ -408,7 +416,7 @@ function isEqual(a, b) {
|
|
|
408
416
|
}
|
|
409
417
|
for (let key in b) {
|
|
410
418
|
if (key in a === false && b[key] != null) {
|
|
411
|
-
//
|
|
419
|
+
// Value is present in b, but not in a.
|
|
412
420
|
return false;
|
|
413
421
|
}
|
|
414
422
|
}
|
|
@@ -448,8 +456,8 @@ function serializeMigrationData(id, contract, opts) {
|
|
|
448
456
|
};
|
|
449
457
|
}
|
|
450
458
|
/**
|
|
451
|
-
*
|
|
452
|
-
* "FooV1" is actually the "Foo" contract
|
|
459
|
+
* Normalizes the contract name by removing any version suffix from the name.
|
|
460
|
+
* "FooV1" is actually the "Foo" contract.
|
|
453
461
|
*/
|
|
454
462
|
function getImplementationId(Ctor) {
|
|
455
463
|
let id = Ctor.name;
|
|
@@ -460,6 +468,13 @@ function getImplementationId(Ctor) {
|
|
|
460
468
|
;
|
|
461
469
|
return id;
|
|
462
470
|
}
|
|
471
|
+
function getImmutablesKey(args) {
|
|
472
|
+
if (args == null || args.length === 0) {
|
|
473
|
+
return null;
|
|
474
|
+
}
|
|
475
|
+
let key = args.map(arg => `${arg?.toString()}`).join('-');
|
|
476
|
+
return key;
|
|
477
|
+
}
|
|
463
478
|
var Str;
|
|
464
479
|
(function (Str) {
|
|
465
480
|
function getDifference(a, b) {
|
|
@@ -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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"}
|
|
@@ -14,7 +14,7 @@ export var $proxyDeploy;
|
|
|
14
14
|
variable: result.newVar,
|
|
15
15
|
path: serializePath(result.newPath, result.newVar),
|
|
16
16
|
conflicts: result.conflicts,
|
|
17
|
-
message: `${result.type}: Variable ${serializePath(result.newPath, result.newVar)}(${result.newVar.type}) at slot ${result.newVar.slot} conflicts ${conflicts}`
|
|
17
|
+
message: `${result.type}: Variable ${serializePath(result.newPath, result.newVar)}(${result.newVar.type}) at slot ${result.newVar.slot} conflicts with ${conflicts}`
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
20
|
return null;
|
|
@@ -22,20 +22,20 @@ export var $proxyDeploy;
|
|
|
22
22
|
$proxyDeploy.compareStorageLayout = compareStorageLayout;
|
|
23
23
|
async function compareStorageLayoutInner(oldVars, newVars, ctx) {
|
|
24
24
|
ctx ??= {};
|
|
25
|
-
// When resolving state variables
|
|
26
|
-
//
|
|
25
|
+
// When resolving state variables, we append '$' characters to overridden variables to avoid name conflicts.
|
|
26
|
+
// Also check for __gap with a possible '$' suffix.
|
|
27
27
|
let rgxGap = /^_+gap\$*$/;
|
|
28
28
|
let oldMemory = oldVars.map(getMemoryPosition);
|
|
29
29
|
let oldLastSlot = alot(oldVars).max(x => x.slot);
|
|
30
30
|
for (let i = 0; i < newVars.length; i++) {
|
|
31
31
|
let newVar = newVars[i];
|
|
32
32
|
if (newVar.slot > oldLastSlot) {
|
|
33
|
-
//
|
|
33
|
+
// A new variable was added after the last slot in the current deployment.
|
|
34
34
|
if (ctx.isExtendableMemory === false) {
|
|
35
35
|
return new BaseError(ELayoutError.MEMORY_OVERFLOW, newVar, [], ctx);
|
|
36
36
|
}
|
|
37
|
-
// Find the new variable name in old storage
|
|
38
|
-
// Exclude
|
|
37
|
+
// Find the new variable name in old storage.
|
|
38
|
+
// Exclude variables at the same position, as they might be pushed logically down by the __gap pattern.
|
|
39
39
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
40
40
|
if (oldVarWithName != null && !Variables.eqLocation(oldVarWithName, newVar) && !rgxGap.test(newVar.name)) {
|
|
41
41
|
return new BaseError(ELayoutError.NAME_MISMATCH, newVar, [oldVarWithName], ctx);
|
|
@@ -46,7 +46,7 @@ export var $proxyDeploy;
|
|
|
46
46
|
let oldVarAtSamePos = oldVars.find(x => x.slot === newVar.slot && x.position === newVar.position);
|
|
47
47
|
if (oldVarAtSamePos != null) {
|
|
48
48
|
if (oldVarAtSamePos.type === newVar.type) {
|
|
49
|
-
//
|
|
49
|
+
// The new variable is the same.
|
|
50
50
|
if (oldVarAtSamePos.name !== newVar.name) {
|
|
51
51
|
let oldVarWithName = oldVars.find(x => x.name === newVar.name);
|
|
52
52
|
if (oldVarWithName != null) {
|
|
@@ -183,11 +183,11 @@ export var $proxyDeploy;
|
|
|
183
183
|
(function (ELayoutError) {
|
|
184
184
|
ELayoutError["TYPE_MISMATCH"] = "TYPE_MISMATCH";
|
|
185
185
|
ELayoutError["TYPE_COLLISION"] = "TYPE_COLLISION";
|
|
186
|
-
/**
|
|
186
|
+
/** Throws an error if memory is not extendable. */
|
|
187
187
|
ELayoutError["ARRAY_LENGTH_MISMATCH"] = "ARRAY_LENGTH_MISMATCH";
|
|
188
|
-
/**
|
|
188
|
+
/** In arrays, memory for a single item is not extendable, but it is extendable in contract root storage or mapping values. */
|
|
189
189
|
ELayoutError["MEMORY_OVERFLOW"] = "MEMORY_OVERFLOW";
|
|
190
|
-
/** Variables on same slot with different names (rename possible)
|
|
190
|
+
/** Variables on the same slot with different names (rename possible), while the same variable also exists in the old layout on a different slot. */
|
|
191
191
|
ELayoutError["NAME_MISMATCH"] = "NAME_MISMATCH";
|
|
192
192
|
})(ELayoutError || (ELayoutError = {}));
|
|
193
193
|
class BaseError {
|
|
@@ -206,7 +206,7 @@ export var $proxyDeploy;
|
|
|
206
206
|
}
|
|
207
207
|
function getMemoryPosition($var) {
|
|
208
208
|
if (isDynamicVariable($var)) {
|
|
209
|
-
//
|
|
209
|
+
// Dynamic variables occupy a single slot.
|
|
210
210
|
return {
|
|
211
211
|
variable: $var,
|
|
212
212
|
offset: $var.slot * 256,
|
|
@@ -232,12 +232,12 @@ export var $proxyDeploy;
|
|
|
232
232
|
function requireBoth(a, b, aCheck, bCheck) {
|
|
233
233
|
if (!aCheck) {
|
|
234
234
|
return {
|
|
235
|
-
error: `Current variable
|
|
235
|
+
error: `Current variable ${a.name}(${a.type}) is not dynamic, but the new one is: ${b.name}(${b.type})`
|
|
236
236
|
};
|
|
237
237
|
}
|
|
238
238
|
if (!bCheck) {
|
|
239
239
|
return {
|
|
240
|
-
error: `Current variable
|
|
240
|
+
error: `Current variable ${a.name}(${a.type}) is dynamic, but the new one is not: ${b.name}(${b.type})`
|
|
241
241
|
};
|
|
242
242
|
}
|
|
243
243
|
}
|
|
@@ -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":";;;;;;AAAA,gDAAwB;AAKxB,yDAAsD;AAGtD,uDAAoD;AACpD,uDAAoD;AACpD,qDAAqD;AACrD,uEAAoE;AAEpE,iDAA8C;AAC9C,qCAA+B;AAE/B,uEAAoE;AACpE,+CAA4C;AAC5C,kEAA+D;AAC/D,gEAA6D;AA2D7D,2CAA2C;AAE3C,MAAa,eAAe;IAExB,YAAoB,KAAyB,EAAU,IAStD;QATmB,UAAK,GAAL,KAAK,CAAoB;QAAU,SAAI,GAAJ,IAAI,CAS1D;IAED,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,GAAwB;QACtC,mBAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,sCAAsC,CAAC,CAAC;QACvE,mBAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,EAAE,oCAAoC,CAAC,CAAC;QACpF,qCAAqC;QACrC,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,GAAyB;QAC7C,mBAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,uCAAuC,CAAC,CAAC;QACzE,mBAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,4CAA4C,CAAC,CAAC;QACnF,mBAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,EAAE,oCAAoC,CAAC,CAAC;QAEpF,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAGD,wDAAwD;IAC9C,KAAK,CAAC,sBAAsB,CAAC,GAAwB;QAC3D,IAAI,EACA,OAAO,EACP,QAAQ,EACR,WAAW,EACX,sBAAsB,EACzB,GAAG,GAAG,CAAC;QACR,IAAI,EACA,MAAM,EACT,GAAG,WAAW,CAAC;QAChB,IAAI,EACA,OAAO,EAAE,WAAW,EACpB,QAAQ,EACR,aAAa,EACb,UAAU,GACb,GAAG,GAAG,CAAC,cAAc,CAAC;QACvB,IAAI,EACA,KAAK,EACL,UAAU,GACb,GAAG,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAEvD,IAAI,KAAK,IAAI,IAAI,EAAE;YACf,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACpF,KAAK,GAAG,QAAQ,CAAC,2BAA2B,CAAC;YAC7C,UAAU,GAAG,QAAQ,CAAC,UAAsC,CAAC;SAChE;QAED,mBAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,oCAAoC,CAAC,CAAC;QAC9D,mBAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,yCAAyC,CAAC,CAAC;QAGxE,IAAI,SAAS,GAAyC;YAClD,EAAE,EAAE,OAAO;YACX,yFAAyF;YACzF,MAAM,EAAE,KAAK;YACb,yBAAyB;YACzB,QAAQ,EAAE,WAAW;YACrB,SAAS,EAAE;gBACP,2DAA2D;gBAC3D,WAAW,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ;aAC1C;SACJ,CAAC;QAEF,IAAI,QAAQ,GAAG,IAAI,KAAK,EAAE,CAAC,GAAG,CAAC;QAC/B,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACnH,uFAAuF;QAEvF,IAAI,QAAQ,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,IAAI,YAAY,GAAG,GAAG,CAAC,qBAAqB,IAAI,IAAI,CAAC;QACrD,IAAI,EACA,QAAQ,EAAE,aAAa,EACvB,OAAO,EAAE,oBAAoB,EAC7B,UAAU,EAAE,uBAAuB,EACtC,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAE/C,IAAI,kBAA+B,CAAC;QACpC,IAAI,oBAAoB,GAAG,GAAG,OAAO,OAAO,CAAC;QAE7C,IAAI,oBAAoB,EAAE;YACtB,IAAI,CAAC,GAAG,CAAC,GAAG,qBAAS,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,6DAA6D,CAAC,CAAC;YAC7H,IAAI,GAAG,IAAI,IAAI,EAAE;gBACb,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBACpC,MAAM,IAAI,KAAK,CAAC,uHAAuH,CAAC,CAAC;aAC5I;YAED,IAAI,mBAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACpD,gEAAgE;gBAChE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,UAAU,EAAE;oBACpD,EAAE,EAAE,oBAAoB;iBAC3B,CAAC,CAAC;gBACH,kBAAkB,GAAG,QAAQ,CAAC;gBAC9B,wBAAwB;gBAExB,IAAA,WAAC,EAAA,kDAAkD,CAAC;gBACpD,IAAI,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,CAC/B,QAAQ,EACR,aAAa,EACb,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC,aAAa,CAAC,WAAW,EACxD,kBAAkB,CAAC,OAAO,CAC7B,CAAC;aAEL;iBAAM;gBACH,wGAAwG;gBACxG,kBAAkB,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBACjE,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,kBAAkB,EAAE;oBAChD,EAAE,EAAE,oBAAoB;oBACxB,IAAI,EAAE,YAAY;iBACrB,EAAE,oBAAoB,CAAC,CAAC;aAC5B;SACJ;aAAM;YACH,kBAAkB,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAC;YACrF,mBAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,iDAAiD,oBAAoB,gBAAgB,CAAC,CAAC;SAC/H;QAED,IAAI,QAAQ,EAAE;YACV,IAAI,IAAI,GAAG,oEAA6E,CAAC;YACzF,IAAI,SAAS,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACvE,IAAI,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1C,IAAI,mBAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,KAAK,EAAE;gBAC7C,IAAI,YAAY,EAAE;oBACd,MAAM,IAAI,CAAC,8BAA8B,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;oBACxD,IAAI,WAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,KAAK,EAAE;wBACvC,IAAI,OAAO,GAAG,MAAM,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;wBACxF,IAAI,UAAU,IAAI,OAAO,EAAE;4BACvB,0EAA0E;4BAC1E,aAAa,GAAG,IAAI,CAAC;yBACxB;qBACJ;oBACD,iBAAO,CAAC,GAAG,CAAC,wBAAwB,kBAAkB,CAAC,OAAO,QAAQ,WAAW,KAAK,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;oBAC5G,IAAI,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,CAC/B,GAAG,CAAC,KAAK,IAAI,QAAQ,EACrB,kBAAkB,EAClB,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,cAAc,EAChE,aAAa,CAAC,OAAO,EACrB,WAAW,EACX,aAAa,CAChB,CAAC;oBACF,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAC9C;qBAAM;oBACH,iBAAO,CAAC,GAAG,CAAC,uBAAuB,kBAAkB,CAAC,OAAO,gBAAgB,WAAW,KAAK,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;iBACtH;aACJ;SACJ;QACD,IAAI,QAAQ,KAAK,KAAK,IAAI,oBAAoB,IAAI,IAAI,EAAE;YACpD,iDAAiD;YACjD,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;SAC9C;QACD,OAAO;YACH,aAAa;YACb,uBAAuB;YACvB,kBAAkB;SACrB,CAAA;IACL,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,IAA4C;QAChF,wGAAwG;QACxG,MAAM,UAAU,GAAG,8CAA8C,CAAC;QAClE,MAAM,UAAU,GAAG,gBAAgB,CAAC;QACpC,MAAM,IAAI,GAAG;YACT,2BAA2B,EAAE,2EAA2E;YACxG,UAAU,EAAE,0DAA0D;YACtE,iBAAiB,EAAE,4DAA4D;YAC/E,WAAW,EAAE,sDAAsD;SACtE,CAAC;QACF,MAAM,KAAK,GAAG;YACV,2BAA2B,EAAE;gBACzB,MAAM,EAAE,GAAG,UAAU,8CAA8C;gBACnE,MAAM,EAAE,GAAG,UAAU,YAAY;gBACjC,QAAQ,EAAE;+BACK,IAAI,CAAC,2BAA2B;iBAC9C;gBACD,qDAAqD;gBACrD,SAAS,EAAE,CAAC,6BAA6B,EAAE,YAAY,CAAC;aAC3D;YACD,MAAM,EAAE;gBACJ,MAAM,EAAE,GAAG,UAAU,+BAA+B;gBACpD,MAAM,EAAE,GAAG,UAAU,aAAa;gBAClC,QAAQ,EAAE;+BACK,IAAI,CAAC,iBAAiB;+BACtB,IAAI,CAAC,WAAW;iBAC9B;gBACD,4CAA4C;gBAC5C,SAAS,EAAE,CAAC,mBAAmB,EAAE,aAAa,CAAC;aAClD;SACJ,CAAC;QAEF,IAAI,IAAI,EAAE,MAAM,KAAK,KAAK,EAAE;YACxB,OAAO,KAAK,CAAC,MAAM,CAAC;SACvB;QACD,IAAI,IAAI,EAAE,KAAK,KAAK,KAAK,EAAE;YACvB,OAAO,KAAK,CAAC,2BAA2B,CAAC;SAC5C;QAED,SAAS,GAAG,CAAC,QAAgB;YACzB,IAAI,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClC,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,QAAQ,GAAG,IAAI,iCAAe,EAAE,CAAC;QACrC,IAAI,SAAS,GAAG,MAAM,cAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YAC/D,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC;YACvB,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAE9B,IAAI,MAAM,cAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE;gBAC/C,MAAM,cAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACzC,MAAM,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE;oBACnC,KAAK,EAAE,KAAK;iBACf,CAAC,CAAC;aACN;YAED,OAAO,MAAM,IAAA,cAAI,EAAC,IAAI,CAAC,SAAS,CAAC;iBAC5B,QAAQ,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;gBAClB,IAAI,WAAW,GAAG,MAAM,QAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBACnE,OAAO;oBACH,GAAG,EAAE,GAAG;oBACR,IAAI,EAAE,WAAW,CAAC,YAAY;iBACjC,CAAC;YACN,CAAC,CAAC;iBACD,YAAY,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAEhC,OAAO,IAAA,cAAI,EAAC,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAE1D,CAAC;IACN,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,GAAyB;QACvD,IAAI,EACA,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,sBAAsB,EACzB,GAAG,GAAG,CAAC;QACR,IAAI,EACA,MAAM,EACT,GAAG,WAAW,CAAC;QAChB,IAAI,EACA,OAAO,EAAE,WAAW,EACpB,QAAQ,EACX,GAAG,GAAG,CAAC,cAAc,CAAC;QACvB,IAAI,EACA,MAAM,EACN,WAAW,GACd,GAAG,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;QAEnC,IAAI,MAAM,IAAI,IAAI,EAAE;YAChB,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACpF,WAAW,GAAG,QAAQ,CAAC,WAAwC,CAAC;YAChE,MAAM,GAAG,QAAQ,CAAC,iBAAyC,CAAC;SAC/D;QAED,mBAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;QAC/C,mBAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,yBAAyB,CAAC,CAAC;QAEzD,IAAI,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAElD,IAAI,UAAU,GAAG;YACb,EAAE,EAAE,QAAQ;YACZ,QAAQ,EAAE,WAAW;YACrB,SAAS,EAAE,SAAS,KAAK,CAAC;gBACtB,CAAC,CAAC;oBACE,yBAAyB;oBACzB,WAAW;iBACI;gBACnB,CAAC,CAAC;oBACE,gDAAgD;oBAChD,WAAW;oBACX,QAAQ,CAAC,OAAO;iBACa;SACxC,CAAC;QACF,IAAI,SAAS,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC1D,IAAI,EACA,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,qBAAqB,EAC9B,UAAU,EAAE,wBAAwB,GACvC,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAEjD,IAAI,SAAS,EAAE;YACX,IAAI,OAAO,GAAG,MAAM,cAAc,CAAC,cAAc,EAAE,CAAC;YACpD,IAAI,mBAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,KAAK,EAAE;gBAC7C,MAAM,IAAI,CAAC,8BAA8B,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAEzD,IAAA,WAAC,EAAA,uBAAuB,WAAW,EAAE,CAAC;gBACtC,IAAI,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,CAC/B,QAAQ,EACR,cAAc,EACd,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAClC,WAAW,CACd,CAAC;gBACF,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;aAC/C;SACJ;aAAM;YACH,IAAI,qBAAqB,EAAE,MAAM,EAAE;gBAC/B,kDAAkD;gBAClD,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;aAC/C;SACJ;QAED,IAAI,eAAe,GAAG;YAClB,EAAE,EAAE,aAAa;YACjB,2DAA2D;YAC3D,QAAQ,EAAE,WAAW;YACrB,SAAS,EAAE;gBACP,yBAAyB;gBACzB,cAAc,CAAC,OAAO,EAAE,QAAQ;aACP;SAChC,CAAC;QACF,IAAI,cAAc,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QACzE,IAAI,EACA,QAAQ,EAAE,mBAAmB,EAC7B,OAAO,EAAE,0BAA0B,EACnC,UAAU,EAAE,6BAA6B,EAC5C,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAE3D,OAAO;YACH,cAAc;YACd,wBAAwB;YACxB,mBAAmB;YACnB,6BAA6B;SAChC,CAAA;IACL,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,OAAe,EAAE,GAAmB;QAChE,mBAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,yEAAyE,CAAC,CAAC;QACxH,IAAI,QAAQ,GAAG,IAAI,GAAG,CAAC,sBAAsB,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC;QAC/E,MAAM,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC;YACnC,EAAE,EAAE,OAAO;YACX,KAAK,EAAE,QAAQ;SAClB,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,8BAA8B,CAAC,OAAe,EAAE,GAAmB;QAC7E,IAAI,GAAG,CAAC,OAAO,EAAE,sBAAsB,KAAK,IAAI,EAAE;YAC9C,mBAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,yEAAyE,CAAC,CAAC;YAExH,IAAI,gBAAgB,GAAG,IAAI,GAAG,CAAC,sBAAsB,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC;YACjF,mBAAQ,CAAC,OAAO,CAAC,gBAAgB,EAAE,uCAAuC,GAAG,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC;YAE9G,IAAI,oBAAoB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAC1E,IAAI,oBAAoB,IAAI,IAAI,EAAE;gBAC9B,IAAI,KAAK,GAAG,MAAM,2BAAY,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;gBAClG,IAAI,KAAK,EAAE;oBACP,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;oBAC5C,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;iBACjC;aACJ;SACJ;IACL,CAAC;IAEO,oBAAoB,CAAC,MAA4B;QACrD,IAAI,YAAY,GAAG,IAAI,MAAM,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;QACzE,mBAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,oDAAoD,CAAC,CAAC;QAErF,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAClC,uCAAuC;YACvC,OAAO,CAAC,CAAC;SACZ;QACD,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAClC,6DAA6D;YAC7D,OAAO,CAAC,CAAC;SACZ;QACD,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC9E,CAAC;CACJ;AAzXD,0CAyXC;AAGD,IAAU,UAAU,CAgFnB;AAhFD,WAAU,UAAU;IACT,KAAK,UAAU,IAAI,CACtB,OAAiB,EACf,QAAQ,EACR,MAAsF,EACtF,GAAG,MAAM;QAEX,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC5B,IAAI,MAAM,GAAG,IAAI,+BAAc,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;YAClE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAC1D,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC;SACpB;QACD,IAAI,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC;QACzD,OAAO,OAAO,CAAC;IACnB,CAAC;IAbqB,eAAI,OAazB,CAAA;IACD,IAAiB,gBAAgB,CA0DhC;IA1DD,WAAiB,gBAAgB;QAChB,mBAAE,GAAG;YACd,aAAa,EAAE;gBACX,WAAW,EAAE,wCAAwC;gBACrD,KAAK,CAAC,OAAO,CAAC,QAAsB;oBAChC,MAAM,KAAK,GAAG,MAAM,yBAAW,CAAC,YAAY,CAAC;;qBAE5C,CAAC,CAAC;oBACH,MAAM,OAAO,GAAG,2BAAY,CAAC,gBAAgB,CACzC,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,OAAO,EAChB,KAAK,CACR,CAAC;oBACF,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;oBACtC,OAAO,CAAC,CAAC;gBACb,CAAC;aACJ;YACD,kBAAkB,EAAE;gBAChB,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,qBAAqB,EAAE,IAAI;oBAC7E,IAAI,IAAI,IAAI,IAAI,IAAI,WAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE;wBAC9C,OAAO,IAAI,CACP,OAAO,EACP,QAAQ,EACR,4EAA4E,EAC5E,YAAY,EACZ,qBAAqB,EACrB,IAAI,CACP,CAAC;qBACL;oBACD,OAAO,IAAI,CACP,OAAO,EACP,QAAQ,EACR,yDAAyD,EACzD,YAAY,EACZ,qBAAqB,CACxB,CAAC;gBACN,CAAC;aACJ;SACJ,CAAA;QACY,mBAAE,GAAG;YACd,aAAa,EAAE;gBACX,KAAK,CAAC,OAAO,CAAC,QAAsB;oBAChC,gHAAgH;oBAChH,MAAM,QAAQ,GAAG,oEAAoE,CAAC;oBACtF,MAAM,KAAK,GAAG,MAAM,yBAAW,CAAC,YAAY,CAAC;;qBAE5C,CAAC,CAAC;oBACH,MAAM,OAAO,GAAG,2BAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE;wBACpF,aAAa,EAAE,QAAQ;qBAC1B,CAAC,CAAC;oBACH,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;oBAC3C,OAAO,CAAC,CAAC;gBACb,CAAC;aACJ;YACD,kBAAkB,EAAE;gBAChB,cAAc,EAAE,mFAAmF;aACtG;SACJ,CAAA;IACL,CAAC,EA1DgB,gBAAgB,GAAhB,2BAAgB,KAAhB,2BAAgB,QA0DhC;IAED,IAAiB,MAAM,CAItB;IAJD,WAAiB,QAAM;QACN,eAAM,GAAG;YAClB,SAAS,EAAE,sCAAsC;SACpD,CAAA;IACL,CAAC,EAJgB,MAAM,GAAN,iBAAM,KAAN,iBAAM,QAItB;AACL,CAAC,EAhFS,UAAU,KAAV,UAAU,QAgFnB"}
|