@across-protocol/sdk 4.3.111-alpha.4 → 4.3.111
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/dist/cjs/addressAggregator/adapters/abstract.js +64 -50
- package/dist/cjs/addressAggregator/adapters/abstract.js.map +1 -1
- package/dist/cjs/addressAggregator/adapters/bybit.js +29 -16
- package/dist/cjs/addressAggregator/adapters/bybit.js.map +1 -1
- package/dist/cjs/addressAggregator/adapters/env.js +15 -11
- package/dist/cjs/addressAggregator/adapters/env.js.map +1 -1
- package/dist/cjs/addressAggregator/adapters/file.js +45 -32
- package/dist/cjs/addressAggregator/adapters/file.js.map +1 -1
- package/dist/cjs/addressAggregator/adapters/index.js +1 -1
- package/dist/cjs/addressAggregator/adapters/risklabs.js +36 -22
- package/dist/cjs/addressAggregator/adapters/risklabs.js.map +1 -1
- package/dist/cjs/addressAggregator/index.js +87 -57
- package/dist/cjs/addressAggregator/index.js.map +1 -1
- package/dist/cjs/apiClient/abstractClient.js +8 -9
- package/dist/cjs/apiClient/abstractClient.js.map +1 -1
- package/dist/cjs/apiClient/index.js +1 -1
- package/dist/cjs/apiClient/mockedClient.js +29 -23
- package/dist/cjs/apiClient/mockedClient.js.map +1 -1
- package/dist/cjs/apiClient/productionClient.js +103 -65
- package/dist/cjs/apiClient/productionClient.js.map +1 -1
- package/dist/cjs/arch/evm/BlockUtils.js +208 -122
- package/dist/cjs/arch/evm/BlockUtils.js.map +1 -1
- package/dist/cjs/arch/evm/MessageUtils.js +1 -1
- package/dist/cjs/arch/evm/MessageUtils.js.map +1 -1
- package/dist/cjs/arch/evm/SpokeUtils.js +288 -134
- package/dist/cjs/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/evm/index.js +1 -1
- package/dist/cjs/arch/evm/utils/index.js +1 -1
- package/dist/cjs/arch/evm/utils/wait.js +49 -38
- package/dist/cjs/arch/evm/utils/wait.js.map +1 -1
- package/dist/cjs/arch/index.js +1 -1
- package/dist/cjs/arch/svm/BlockUtils.js +158 -102
- package/dist/cjs/arch/svm/BlockUtils.js.map +1 -1
- package/dist/cjs/arch/svm/MessageUtils.js +2 -2
- package/dist/cjs/arch/svm/MessageUtils.js.map +1 -1
- package/dist/cjs/arch/svm/SpokeUtils.js +1147 -708
- package/dist/cjs/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/encoders.js +1 -1
- package/dist/cjs/arch/svm/encoders.js.map +1 -1
- package/dist/cjs/arch/svm/eventsClient.js +236 -174
- package/dist/cjs/arch/svm/eventsClient.js.map +1 -1
- package/dist/cjs/arch/svm/index.js +1 -1
- package/dist/cjs/arch/svm/provider.js +3 -3
- package/dist/cjs/arch/svm/provider.js.map +1 -1
- package/dist/cjs/arch/svm/utils.js +355 -166
- package/dist/cjs/arch/svm/utils.js.map +1 -1
- package/dist/cjs/caching/Arweave/ArweaveClient.js +246 -168
- package/dist/cjs/caching/Arweave/ArweaveClient.js.map +1 -1
- package/dist/cjs/caching/Arweave/index.js +1 -1
- package/dist/cjs/caching/IPFS/PinataIPFSClient.js +49 -40
- package/dist/cjs/caching/IPFS/PinataIPFSClient.js.map +1 -1
- package/dist/cjs/caching/IPFS/index.js +1 -1
- package/dist/cjs/caching/Memory/MemoryCacheClient.js +18 -13
- package/dist/cjs/caching/Memory/MemoryCacheClient.js.map +1 -1
- package/dist/cjs/caching/Memory/index.js +1 -1
- package/dist/cjs/caching/index.js +1 -1
- package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js +381 -302
- package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map +1 -1
- package/dist/cjs/clients/AcrossConfigStoreClient/index.js +1 -1
- package/dist/cjs/clients/BaseAbstractClient.js +83 -58
- package/dist/cjs/clients/BaseAbstractClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js +900 -709
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/index.js +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js +128 -95
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js +53 -48
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/MerkleTreeUtils.js +8 -10
- package/dist/cjs/clients/BundleDataClient/utils/MerkleTreeUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js +90 -67
- package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js +24 -46
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/index.js +1 -1
- package/dist/cjs/clients/HubPoolClient.js +708 -526
- package/dist/cjs/clients/HubPoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js +179 -133
- package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SVMSpokePoolClient.js +183 -124
- package/dist/cjs/clients/SpokePoolClient/SVMSpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js +389 -357
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClientManager.js +8 -9
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClientManager.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/index.js +3 -3
- package/dist/cjs/clients/SpokePoolClient/index.js.map +1 -1
- package/dist/cjs/clients/index.js +1 -1
- package/dist/cjs/clients/mocks/MockConfigStoreClient.js +67 -58
- package/dist/cjs/clients/mocks/MockConfigStoreClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockEvents.js +52 -47
- package/dist/cjs/clients/mocks/MockEvents.js.map +1 -1
- package/dist/cjs/clients/mocks/MockHubPoolClient.js +185 -142
- package/dist/cjs/clients/mocks/MockHubPoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js +192 -208
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.js +143 -140
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js +73 -57
- package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/index.js +1 -1
- package/dist/cjs/coingecko/Coingecko.js +437 -285
- package/dist/cjs/coingecko/Coingecko.js.map +1 -1
- package/dist/cjs/coingecko/index.js +1 -1
- package/dist/cjs/constants.js +30 -23
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/contracts/acrossConfigStore.js +48 -27
- package/dist/cjs/contracts/acrossConfigStore.js.map +1 -1
- package/dist/cjs/contracts/hubPool.js +20 -36
- package/dist/cjs/contracts/hubPool.js.map +1 -1
- package/dist/cjs/contracts/index.js +1 -1
- package/dist/cjs/contracts/utils.js +8 -6
- package/dist/cjs/contracts/utils.js.map +1 -1
- package/dist/cjs/gasPriceOracle/adapters/arbitrum.js +16 -7
- package/dist/cjs/gasPriceOracle/adapters/arbitrum.js.map +1 -1
- package/dist/cjs/gasPriceOracle/adapters/ethereum.js +45 -26
- package/dist/cjs/gasPriceOracle/adapters/ethereum.js.map +1 -1
- package/dist/cjs/gasPriceOracle/adapters/linea-viem.js +28 -16
- package/dist/cjs/gasPriceOracle/adapters/linea-viem.js.map +1 -1
- package/dist/cjs/gasPriceOracle/adapters/polygon.js +112 -73
- package/dist/cjs/gasPriceOracle/adapters/polygon.js.map +1 -1
- package/dist/cjs/gasPriceOracle/adapters/solana.js +33 -20
- package/dist/cjs/gasPriceOracle/adapters/solana.js.map +1 -1
- package/dist/cjs/gasPriceOracle/oracle.js +104 -77
- package/dist/cjs/gasPriceOracle/oracle.js.map +1 -1
- package/dist/cjs/gasPriceOracle/types.js +3 -3
- package/dist/cjs/gasPriceOracle/types.js.map +1 -1
- package/dist/cjs/gasPriceOracle/util.js +8 -8
- package/dist/cjs/gasPriceOracle/util.js.map +1 -1
- package/dist/cjs/index.js +1 -1
- package/dist/cjs/interfaces/index.js +1 -1
- package/dist/cjs/lpFeeCalculator/index.js +1 -1
- package/dist/cjs/lpFeeCalculator/lpFeeCalculator.js +35 -33
- package/dist/cjs/lpFeeCalculator/lpFeeCalculator.js.map +1 -1
- package/dist/cjs/lpFeeCalculator/rateModel.js +9 -7
- package/dist/cjs/lpFeeCalculator/rateModel.js.map +1 -1
- package/dist/cjs/merkleDistributor/MerkleDistributor.js +18 -20
- package/dist/cjs/merkleDistributor/MerkleDistributor.js.map +1 -1
- package/dist/cjs/merkleDistributor/index.js +1 -1
- package/dist/cjs/merkleDistributor/model/index.js +1 -1
- package/dist/cjs/pool/TransactionManager.js +100 -45
- package/dist/cjs/pool/TransactionManager.js.map +1 -1
- package/dist/cjs/pool/index.js +1 -1
- package/dist/cjs/pool/poolClient.js +731 -464
- package/dist/cjs/pool/poolClient.js.map +1 -1
- package/dist/cjs/pool/uma/across/index.js +1 -1
- package/dist/cjs/pool/uma/across/transactionManager.js +100 -45
- package/dist/cjs/pool/uma/across/transactionManager.js.map +1 -1
- package/dist/cjs/pool/uma/clients/erc20/client.js +16 -18
- package/dist/cjs/pool/uma/clients/erc20/client.js.map +1 -1
- package/dist/cjs/pool/uma/clients/erc20/index.js +1 -1
- package/dist/cjs/pool/uma/clients/index.js +1 -1
- package/dist/cjs/pool/uma/index.js +1 -1
- package/dist/cjs/pool/uma/oracle/index.js +1 -1
- package/dist/cjs/pool/uma/oracle/utils.js +5 -4
- package/dist/cjs/pool/uma/oracle/utils.js.map +1 -1
- package/dist/cjs/pool/uma/utils.js +30 -11
- package/dist/cjs/pool/uma/utils.js.map +1 -1
- package/dist/cjs/priceClient/adapters/acrossApi.js +39 -22
- package/dist/cjs/priceClient/adapters/acrossApi.js.map +1 -1
- package/dist/cjs/priceClient/adapters/baseAdapter.js +73 -49
- package/dist/cjs/priceClient/adapters/baseAdapter.js.map +1 -1
- package/dist/cjs/priceClient/adapters/coingecko.js +61 -34
- package/dist/cjs/priceClient/adapters/coingecko.js.map +1 -1
- package/dist/cjs/priceClient/adapters/default.js +31 -16
- package/dist/cjs/priceClient/adapters/default.js.map +1 -1
- package/dist/cjs/priceClient/adapters/defiLlama.js +74 -40
- package/dist/cjs/priceClient/adapters/defiLlama.js.map +1 -1
- package/dist/cjs/priceClient/adapters/index.js +1 -1
- package/dist/cjs/priceClient/index.js +1 -1
- package/dist/cjs/priceClient/priceClient.js +159 -110
- package/dist/cjs/priceClient/priceClient.js.map +1 -1
- package/dist/cjs/providers/alchemy.js +19 -17
- package/dist/cjs/providers/alchemy.js.map +1 -1
- package/dist/cjs/providers/cachedProvider.js +129 -88
- package/dist/cjs/providers/cachedProvider.js.map +1 -1
- package/dist/cjs/providers/drpc.js +11 -9
- package/dist/cjs/providers/drpc.js.map +1 -1
- package/dist/cjs/providers/index.js +1 -1
- package/dist/cjs/providers/infura.js +12 -10
- package/dist/cjs/providers/infura.js.map +1 -1
- package/dist/cjs/providers/mocks/MockCachedSolanaRpcFactory.js +15 -7
- package/dist/cjs/providers/mocks/MockCachedSolanaRpcFactory.js.map +1 -1
- package/dist/cjs/providers/mocks/MockRateLimitedSolanaRpcFactory.js +14 -6
- package/dist/cjs/providers/mocks/MockRateLimitedSolanaRpcFactory.js.map +1 -1
- package/dist/cjs/providers/mocks/MockRetrySolanaRpcFactory.js +15 -7
- package/dist/cjs/providers/mocks/MockRetrySolanaRpcFactory.js.map +1 -1
- package/dist/cjs/providers/mocks/MockSolanaRpcFactory.js +66 -42
- package/dist/cjs/providers/mocks/MockSolanaRpcFactory.js.map +1 -1
- package/dist/cjs/providers/mocks/index.js +1 -1
- package/dist/cjs/providers/mocks/mockEthersProvider.js +31 -29
- package/dist/cjs/providers/mocks/mockEthersProvider.js.map +1 -1
- package/dist/cjs/providers/quicknode.js +21 -19
- package/dist/cjs/providers/quicknode.js.map +1 -1
- package/dist/cjs/providers/rateLimitedProvider.js +79 -64
- package/dist/cjs/providers/rateLimitedProvider.js.map +1 -1
- package/dist/cjs/providers/retryProvider.js +246 -163
- package/dist/cjs/providers/retryProvider.js.map +1 -1
- package/dist/cjs/providers/solana/baseRpcFactories.js +18 -14
- package/dist/cjs/providers/solana/baseRpcFactories.js.map +1 -1
- package/dist/cjs/providers/solana/cachedRpcFactory.js +112 -70
- package/dist/cjs/providers/solana/cachedRpcFactory.js.map +1 -1
- package/dist/cjs/providers/solana/defaultRpcFactory.js +15 -8
- package/dist/cjs/providers/solana/defaultRpcFactory.js.map +1 -1
- package/dist/cjs/providers/solana/index.js +1 -1
- package/dist/cjs/providers/solana/quorumFallbackRpcFactory.js +191 -135
- package/dist/cjs/providers/solana/quorumFallbackRpcFactory.js.map +1 -1
- package/dist/cjs/providers/solana/rateLimitedRpcFactory.js +90 -67
- package/dist/cjs/providers/solana/rateLimitedRpcFactory.js.map +1 -1
- package/dist/cjs/providers/solana/retryRpcFactory.js +79 -52
- package/dist/cjs/providers/solana/retryRpcFactory.js.map +1 -1
- package/dist/cjs/providers/solana/utils.js +2 -2
- package/dist/cjs/providers/solana/utils.js.map +1 -1
- package/dist/cjs/providers/speedProvider.js +53 -31
- package/dist/cjs/providers/speedProvider.js.map +1 -1
- package/dist/cjs/providers/types.js +1 -1
- package/dist/cjs/providers/types.js.map +1 -1
- package/dist/cjs/providers/utils.js +28 -26
- package/dist/cjs/providers/utils.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js +162 -108
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/customGasToken.js +26 -14
- package/dist/cjs/relayFeeCalculator/chain-queries/customGasToken.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/factory.js +29 -20
- package/dist/cjs/relayFeeCalculator/chain-queries/factory.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/index.js +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js +137 -88
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/index.js +1 -1
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js +297 -199
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
- package/dist/cjs/typeguards/error.js +7 -5
- package/dist/cjs/typeguards/error.js.map +1 -1
- package/dist/cjs/typeguards/index.js +1 -1
- package/dist/cjs/utils/AddressUtils.js +144 -117
- package/dist/cjs/utils/AddressUtils.js.map +1 -1
- package/dist/cjs/utils/ArrayUtils.js +78 -21
- package/dist/cjs/utils/ArrayUtils.js.map +1 -1
- package/dist/cjs/utils/BigNumberUtils.js +10 -9
- package/dist/cjs/utils/BigNumberUtils.js.map +1 -1
- package/dist/cjs/utils/BlockExplorerUtils.js +30 -26
- package/dist/cjs/utils/BlockExplorerUtils.js.map +1 -1
- package/dist/cjs/utils/BlockFinder.js +5 -2
- package/dist/cjs/utils/BlockFinder.js.map +1 -1
- package/dist/cjs/utils/BlockUtils.js +41 -24
- package/dist/cjs/utils/BlockUtils.js.map +1 -1
- package/dist/cjs/utils/BundleUtils.js +24 -21
- package/dist/cjs/utils/BundleUtils.js.map +1 -1
- package/dist/cjs/utils/CCTPUtils.js +126 -62
- package/dist/cjs/utils/CCTPUtils.js.map +1 -1
- package/dist/cjs/utils/CachingUtils.js +42 -20
- package/dist/cjs/utils/CachingUtils.js.map +1 -1
- package/dist/cjs/utils/ContractUtils.js +5 -5
- package/dist/cjs/utils/ContractUtils.js.map +1 -1
- package/dist/cjs/utils/DepositUtils.js +99 -122
- package/dist/cjs/utils/DepositUtils.js.map +1 -1
- package/dist/cjs/utils/EventUtils.js +70 -49
- package/dist/cjs/utils/EventUtils.js.map +1 -1
- package/dist/cjs/utils/FormattingUtils.js +32 -26
- package/dist/cjs/utils/FormattingUtils.js.map +1 -1
- package/dist/cjs/utils/HyperLiquidUtils.js +23 -10
- package/dist/cjs/utils/HyperLiquidUtils.js.map +1 -1
- package/dist/cjs/utils/IPFSUtils.js +34 -16
- package/dist/cjs/utils/IPFSUtils.js.map +1 -1
- package/dist/cjs/utils/JSONUtils.js +6 -6
- package/dist/cjs/utils/JSONUtils.js.map +1 -1
- package/dist/cjs/utils/LogUtils.js +12 -10
- package/dist/cjs/utils/LogUtils.js.map +1 -1
- package/dist/cjs/utils/Multicall.js +115 -56
- package/dist/cjs/utils/Multicall.js.map +1 -1
- package/dist/cjs/utils/NetworkUtils.js +28 -12
- package/dist/cjs/utils/NetworkUtils.js.map +1 -1
- package/dist/cjs/utils/NumberUtils.js +3 -1
- package/dist/cjs/utils/NumberUtils.js.map +1 -1
- package/dist/cjs/utils/ObjectUtils.js +41 -27
- package/dist/cjs/utils/ObjectUtils.js.map +1 -1
- package/dist/cjs/utils/Profiler.js +83 -80
- package/dist/cjs/utils/Profiler.js.map +1 -1
- package/dist/cjs/utils/ReviverUtils.js +9 -5
- package/dist/cjs/utils/ReviverUtils.js.map +1 -1
- package/dist/cjs/utils/SpokeUtils.js +84 -84
- package/dist/cjs/utils/SpokeUtils.js.map +1 -1
- package/dist/cjs/utils/TokenUtils.js +64 -41
- package/dist/cjs/utils/TokenUtils.js.map +1 -1
- package/dist/cjs/utils/TypeGuards.js +1 -1
- package/dist/cjs/utils/TypeGuards.js.map +1 -1
- package/dist/cjs/utils/ValidatorUtils.js +7 -7
- package/dist/cjs/utils/ValidatorUtils.js.map +1 -1
- package/dist/cjs/utils/abi/contracts/index.js +1 -1
- package/dist/cjs/utils/abi/index.js +22 -12
- package/dist/cjs/utils/abi/index.js.map +1 -1
- package/dist/cjs/utils/abi/typechain/factories/Multicall3__factory.js +12 -9
- package/dist/cjs/utils/abi/typechain/factories/Multicall3__factory.js.map +1 -1
- package/dist/cjs/utils/abi/typechain/index.js +1 -1
- package/dist/cjs/utils/common.js +53 -40
- package/dist/cjs/utils/common.js.map +1 -1
- package/dist/cjs/utils/index.js +1 -1
- package/dist/esm/addressAggregator/adapters/abstract.js +64 -48
- package/dist/esm/addressAggregator/adapters/abstract.js.map +1 -1
- package/dist/esm/addressAggregator/adapters/bybit.js +29 -15
- package/dist/esm/addressAggregator/adapters/bybit.js.map +1 -1
- package/dist/esm/addressAggregator/adapters/env.js +14 -9
- package/dist/esm/addressAggregator/adapters/env.js.map +1 -1
- package/dist/esm/addressAggregator/adapters/file.js +43 -29
- package/dist/esm/addressAggregator/adapters/file.js.map +1 -1
- package/dist/esm/addressAggregator/adapters/risklabs.js +35 -20
- package/dist/esm/addressAggregator/adapters/risklabs.js.map +1 -1
- package/dist/esm/addressAggregator/index.js +83 -52
- package/dist/esm/addressAggregator/index.js.map +1 -1
- package/dist/esm/addressAggregator/types.js +1 -1
- package/dist/esm/addressAggregator/types.js.map +1 -1
- package/dist/esm/apiClient/abstractClient.js +9 -15
- package/dist/esm/apiClient/abstractClient.js.map +1 -1
- package/dist/esm/apiClient/mockedClient.js +26 -21
- package/dist/esm/apiClient/mockedClient.js.map +1 -1
- package/dist/esm/apiClient/productionClient.js +101 -61
- package/dist/esm/apiClient/productionClient.js.map +1 -1
- package/dist/esm/arch/evm/BlockUtils.js +217 -139
- package/dist/esm/arch/evm/BlockUtils.js.map +1 -1
- package/dist/esm/arch/evm/SpokeUtils.js +289 -146
- package/dist/esm/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/evm/utils/wait.js +46 -34
- package/dist/esm/arch/evm/utils/wait.js.map +1 -1
- package/dist/esm/arch/svm/BlockUtils.js +166 -118
- package/dist/esm/arch/svm/BlockUtils.js.map +1 -1
- package/dist/esm/arch/svm/SpokeUtils.js +1150 -738
- package/dist/esm/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/constants.js +1 -1
- package/dist/esm/arch/svm/constants.js.map +1 -1
- package/dist/esm/arch/svm/eventsClient.js +232 -172
- package/dist/esm/arch/svm/eventsClient.js.map +1 -1
- package/dist/esm/arch/svm/provider.js +1 -1
- package/dist/esm/arch/svm/provider.js.map +1 -1
- package/dist/esm/arch/svm/utils.js +345 -155
- package/dist/esm/arch/svm/utils.js.map +1 -1
- package/dist/esm/caching/Arweave/ArweaveClient.js +256 -182
- package/dist/esm/caching/Arweave/ArweaveClient.js.map +1 -1
- package/dist/esm/caching/IPFS/PinataIPFSClient.js +48 -47
- package/dist/esm/caching/IPFS/PinataIPFSClient.js.map +1 -1
- package/dist/esm/caching/Memory/MemoryCacheClient.js +19 -13
- package/dist/esm/caching/Memory/MemoryCacheClient.js.map +1 -1
- package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js +408 -333
- package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map +1 -1
- package/dist/esm/clients/BaseAbstractClient.js +92 -66
- package/dist/esm/clients/BaseAbstractClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js +1054 -927
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js +131 -102
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js +59 -57
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js +5 -7
- package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js +94 -75
- package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js +23 -45
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/esm/clients/HubPoolClient.js +740 -581
- package/dist/esm/clients/HubPoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js +178 -133
- package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SVMSpokePoolClient.js +183 -126
- package/dist/esm/clients/SpokePoolClient/SVMSpokePoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js +399 -372
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SpokePoolClientManager.js +9 -9
- package/dist/esm/clients/SpokePoolClient/SpokePoolClientManager.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/index.js +2 -2
- package/dist/esm/clients/SpokePoolClient/index.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/types.js +2 -2
- package/dist/esm/clients/SpokePoolClient/types.js.map +1 -1
- package/dist/esm/clients/mocks/MockConfigStoreClient.js +64 -53
- package/dist/esm/clients/mocks/MockConfigStoreClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockEvents.js +49 -42
- package/dist/esm/clients/mocks/MockEvents.js.map +1 -1
- package/dist/esm/clients/mocks/MockHubPoolClient.js +182 -138
- package/dist/esm/clients/mocks/MockHubPoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSpokePoolClient.js +188 -202
- package/dist/esm/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.js +132 -127
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js +69 -53
- package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
- package/dist/esm/coingecko/Coingecko.js +443 -298
- package/dist/esm/coingecko/Coingecko.js.map +1 -1
- package/dist/esm/constants.js +47 -40
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/contracts/acrossConfigStore.js +46 -24
- package/dist/esm/contracts/acrossConfigStore.js.map +1 -1
- package/dist/esm/contracts/hubPool.js +18 -34
- package/dist/esm/contracts/hubPool.js.map +1 -1
- package/dist/esm/contracts/utils.js +5 -3
- package/dist/esm/contracts/utils.js.map +1 -1
- package/dist/esm/gasPriceOracle/adapters/arbitrum.js +14 -6
- package/dist/esm/gasPriceOracle/adapters/arbitrum.js.map +1 -1
- package/dist/esm/gasPriceOracle/adapters/ethereum.js +42 -22
- package/dist/esm/gasPriceOracle/adapters/ethereum.js.map +1 -1
- package/dist/esm/gasPriceOracle/adapters/linea-viem.js +25 -13
- package/dist/esm/gasPriceOracle/adapters/linea-viem.js.map +1 -1
- package/dist/esm/gasPriceOracle/adapters/polygon.js +108 -72
- package/dist/esm/gasPriceOracle/adapters/polygon.js.map +1 -1
- package/dist/esm/gasPriceOracle/adapters/solana.js +31 -22
- package/dist/esm/gasPriceOracle/adapters/solana.js.map +1 -1
- package/dist/esm/gasPriceOracle/oracle.js +96 -70
- package/dist/esm/gasPriceOracle/oracle.js.map +1 -1
- package/dist/esm/gasPriceOracle/types.js +2 -2
- package/dist/esm/gasPriceOracle/types.js.map +1 -1
- package/dist/esm/gasPriceOracle/util.js +4 -4
- package/dist/esm/gasPriceOracle/util.js.map +1 -1
- package/dist/esm/lpFeeCalculator/lpFeeCalculator.js +33 -30
- package/dist/esm/lpFeeCalculator/lpFeeCalculator.js.map +1 -1
- package/dist/esm/lpFeeCalculator/rateModel.js +9 -7
- package/dist/esm/lpFeeCalculator/rateModel.js.map +1 -1
- package/dist/esm/merkleDistributor/MerkleDistributor.js +17 -18
- package/dist/esm/merkleDistributor/MerkleDistributor.js.map +1 -1
- package/dist/esm/pool/TransactionManager.js +100 -45
- package/dist/esm/pool/TransactionManager.js.map +1 -1
- package/dist/esm/pool/poolClient.js +740 -479
- package/dist/esm/pool/poolClient.js.map +1 -1
- package/dist/esm/pool/uma/across/constants.js +2 -2
- package/dist/esm/pool/uma/across/constants.js.map +1 -1
- package/dist/esm/pool/uma/across/transactionManager.js +100 -45
- package/dist/esm/pool/uma/across/transactionManager.js.map +1 -1
- package/dist/esm/pool/uma/clients/erc20/client.js +13 -15
- package/dist/esm/pool/uma/clients/erc20/client.js.map +1 -1
- package/dist/esm/pool/uma/oracle/utils.js +3 -2
- package/dist/esm/pool/uma/oracle/utils.js.map +1 -1
- package/dist/esm/pool/uma/utils.js +28 -9
- package/dist/esm/pool/uma/utils.js.map +1 -1
- package/dist/esm/priceClient/adapters/acrossApi.js +40 -21
- package/dist/esm/priceClient/adapters/acrossApi.js.map +1 -1
- package/dist/esm/priceClient/adapters/baseAdapter.js +72 -46
- package/dist/esm/priceClient/adapters/baseAdapter.js.map +1 -1
- package/dist/esm/priceClient/adapters/coingecko.js +61 -33
- package/dist/esm/priceClient/adapters/coingecko.js.map +1 -1
- package/dist/esm/priceClient/adapters/default.js +31 -15
- package/dist/esm/priceClient/adapters/default.js.map +1 -1
- package/dist/esm/priceClient/adapters/defiLlama.js +73 -38
- package/dist/esm/priceClient/adapters/defiLlama.js.map +1 -1
- package/dist/esm/priceClient/priceClient.js +158 -109
- package/dist/esm/priceClient/priceClient.js.map +1 -1
- package/dist/esm/providers/alchemy.js +18 -16
- package/dist/esm/providers/alchemy.js.map +1 -1
- package/dist/esm/providers/cachedProvider.js +134 -99
- package/dist/esm/providers/cachedProvider.js.map +1 -1
- package/dist/esm/providers/constants.js +3 -3
- package/dist/esm/providers/constants.js.map +1 -1
- package/dist/esm/providers/drpc.js +10 -8
- package/dist/esm/providers/drpc.js.map +1 -1
- package/dist/esm/providers/infura.js +11 -9
- package/dist/esm/providers/infura.js.map +1 -1
- package/dist/esm/providers/mocks/MockCachedSolanaRpcFactory.js +15 -6
- package/dist/esm/providers/mocks/MockCachedSolanaRpcFactory.js.map +1 -1
- package/dist/esm/providers/mocks/MockRateLimitedSolanaRpcFactory.js +14 -5
- package/dist/esm/providers/mocks/MockRateLimitedSolanaRpcFactory.js.map +1 -1
- package/dist/esm/providers/mocks/MockRetrySolanaRpcFactory.js +15 -6
- package/dist/esm/providers/mocks/MockRetrySolanaRpcFactory.js.map +1 -1
- package/dist/esm/providers/mocks/MockSolanaRpcFactory.js +66 -41
- package/dist/esm/providers/mocks/MockSolanaRpcFactory.js.map +1 -1
- package/dist/esm/providers/mocks/mockEthersProvider.js +30 -27
- package/dist/esm/providers/mocks/mockEthersProvider.js.map +1 -1
- package/dist/esm/providers/quicknode.js +20 -18
- package/dist/esm/providers/quicknode.js.map +1 -1
- package/dist/esm/providers/rateLimitedProvider.js +80 -68
- package/dist/esm/providers/rateLimitedProvider.js.map +1 -1
- package/dist/esm/providers/retryProvider.js +259 -186
- package/dist/esm/providers/retryProvider.js.map +1 -1
- package/dist/esm/providers/solana/baseRpcFactories.js +19 -13
- package/dist/esm/providers/solana/baseRpcFactories.js.map +1 -1
- package/dist/esm/providers/solana/cachedRpcFactory.js +112 -75
- package/dist/esm/providers/solana/cachedRpcFactory.js.map +1 -1
- package/dist/esm/providers/solana/defaultRpcFactory.js +14 -6
- package/dist/esm/providers/solana/defaultRpcFactory.js.map +1 -1
- package/dist/esm/providers/solana/quorumFallbackRpcFactory.js +202 -149
- package/dist/esm/providers/solana/quorumFallbackRpcFactory.js.map +1 -1
- package/dist/esm/providers/solana/rateLimitedRpcFactory.js +90 -70
- package/dist/esm/providers/solana/rateLimitedRpcFactory.js.map +1 -1
- package/dist/esm/providers/solana/retryRpcFactory.js +74 -50
- package/dist/esm/providers/solana/retryRpcFactory.js.map +1 -1
- package/dist/esm/providers/solana/utils.js +1 -1
- package/dist/esm/providers/solana/utils.js.map +1 -1
- package/dist/esm/providers/speedProvider.js +51 -28
- package/dist/esm/providers/speedProvider.js.map +1 -1
- package/dist/esm/providers/types.js +2 -2
- package/dist/esm/providers/types.js.map +1 -1
- package/dist/esm/providers/utils.js +20 -17
- package/dist/esm/providers/utils.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js +152 -98
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/customGasToken.js +26 -13
- package/dist/esm/relayFeeCalculator/chain-queries/customGasToken.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/factory.js +19 -9
- package/dist/esm/relayFeeCalculator/chain-queries/factory.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js +128 -83
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.js +299 -211
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
- package/dist/esm/typeguards/error.js +5 -3
- package/dist/esm/typeguards/error.js.map +1 -1
- package/dist/esm/utils/AddressUtils.js +147 -115
- package/dist/esm/utils/AddressUtils.js.map +1 -1
- package/dist/esm/utils/ArrayUtils.js +78 -21
- package/dist/esm/utils/ArrayUtils.js.map +1 -1
- package/dist/esm/utils/BigNumberUtils.js +12 -11
- package/dist/esm/utils/BigNumberUtils.js.map +1 -1
- package/dist/esm/utils/BlockExplorerUtils.js +23 -19
- package/dist/esm/utils/BlockExplorerUtils.js.map +1 -1
- package/dist/esm/utils/BlockFinder.js +6 -2
- package/dist/esm/utils/BlockFinder.js.map +1 -1
- package/dist/esm/utils/BlockUtils.js +40 -31
- package/dist/esm/utils/BlockUtils.js.map +1 -1
- package/dist/esm/utils/BundleUtils.js +24 -21
- package/dist/esm/utils/BundleUtils.js.map +1 -1
- package/dist/esm/utils/CCTPUtils.js +123 -62
- package/dist/esm/utils/CCTPUtils.js.map +1 -1
- package/dist/esm/utils/CachingUtils.js +38 -17
- package/dist/esm/utils/CachingUtils.js.map +1 -1
- package/dist/esm/utils/ContractUtils.js +3 -3
- package/dist/esm/utils/ContractUtils.js.map +1 -1
- package/dist/esm/utils/DepositUtils.js +98 -121
- package/dist/esm/utils/DepositUtils.js.map +1 -1
- package/dist/esm/utils/EventUtils.js +69 -52
- package/dist/esm/utils/EventUtils.js.map +1 -1
- package/dist/esm/utils/FormattingUtils.js +26 -20
- package/dist/esm/utils/FormattingUtils.js.map +1 -1
- package/dist/esm/utils/HyperLiquidUtils.js +22 -8
- package/dist/esm/utils/HyperLiquidUtils.js.map +1 -1
- package/dist/esm/utils/IPFSUtils.js +35 -16
- package/dist/esm/utils/IPFSUtils.js.map +1 -1
- package/dist/esm/utils/JSONUtils.js +4 -4
- package/dist/esm/utils/JSONUtils.js.map +1 -1
- package/dist/esm/utils/LogUtils.js +12 -8
- package/dist/esm/utils/LogUtils.js.map +1 -1
- package/dist/esm/utils/Multicall.js +110 -50
- package/dist/esm/utils/Multicall.js.map +1 -1
- package/dist/esm/utils/NetworkUtils.js +28 -12
- package/dist/esm/utils/NetworkUtils.js.map +1 -1
- package/dist/esm/utils/NumberUtils.js +3 -1
- package/dist/esm/utils/NumberUtils.js.map +1 -1
- package/dist/esm/utils/ObjectUtils.js +41 -27
- package/dist/esm/utils/ObjectUtils.js.map +1 -1
- package/dist/esm/utils/Profiler.js +82 -77
- package/dist/esm/utils/Profiler.js.map +1 -1
- package/dist/esm/utils/ReviverUtils.js +7 -3
- package/dist/esm/utils/ReviverUtils.js.map +1 -1
- package/dist/esm/utils/SpokeUtils.js +78 -83
- package/dist/esm/utils/SpokeUtils.js.map +1 -1
- package/dist/esm/utils/TokenUtils.js +57 -33
- package/dist/esm/utils/TokenUtils.js.map +1 -1
- package/dist/esm/utils/ValidatorUtils.js +4 -4
- package/dist/esm/utils/ValidatorUtils.js.map +1 -1
- package/dist/esm/utils/abi/index.js +20 -10
- package/dist/esm/utils/abi/index.js.map +1 -1
- package/dist/esm/utils/abi/typechain/factories/Multicall3__factory.js +12 -8
- package/dist/esm/utils/abi/typechain/factories/Multicall3__factory.js.map +1 -1
- package/dist/esm/utils/common.js +52 -38
- package/dist/esm/utils/common.js.map +1 -1
- package/dist/types/constants.d.ts.map +1 -1
- package/dist/types/gasPriceOracle/oracle.d.ts.map +1 -1
- package/dist/types/utils/Multicall.d.ts.map +1 -1
- package/dist/types/utils/NetworkUtils.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/constants.ts +1 -0
- package/src/gasPriceOracle/oracle.ts +1 -0
- package/src/utils/Multicall.ts +1 -0
- package/src/utils/NetworkUtils.ts +8 -1
|
@@ -18,18 +18,20 @@ exports.chainIsCCTPEnabled = chainIsCCTPEnabled;
|
|
|
18
18
|
exports.chainIsOFTEnabled = chainIsOFTEnabled;
|
|
19
19
|
exports.chainRequiresL1ToL2Finalization = chainRequiresL1ToL2Finalization;
|
|
20
20
|
exports.getOriginFromURL = getOriginFromURL;
|
|
21
|
-
|
|
21
|
+
var constants_1 = require("../constants");
|
|
22
22
|
exports.hreNetworks = {
|
|
23
23
|
666: "Hardhat1",
|
|
24
24
|
1342: "Hardhat2",
|
|
25
25
|
31337: "HardhatNetwork",
|
|
26
26
|
};
|
|
27
27
|
function getNetworkName(networkId) {
|
|
28
|
+
var _a, _b, _c;
|
|
28
29
|
networkId = Number(networkId);
|
|
29
|
-
return constants_1.PUBLIC_NETWORKS[networkId]
|
|
30
|
+
return (_c = (_b = (_a = constants_1.PUBLIC_NETWORKS[networkId]) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : exports.hreNetworks[networkId]) !== null && _c !== void 0 ? _c : "unknown (".concat(networkId, ")");
|
|
30
31
|
}
|
|
31
32
|
function getNativeTokenSymbol(chainId) {
|
|
32
|
-
|
|
33
|
+
var _a, _b;
|
|
34
|
+
return (_b = (_a = constants_1.PUBLIC_NETWORKS[Number(chainId)]) === null || _a === void 0 ? void 0 : _a.nativeToken) !== null && _b !== void 0 ? _b : "ETH";
|
|
33
35
|
}
|
|
34
36
|
function chainIsProd(chainId) {
|
|
35
37
|
return Object.values(constants_1.MAINNET_CHAIN_IDs).includes(chainId);
|
|
@@ -41,13 +43,16 @@ function chainIsMatic(chainId) {
|
|
|
41
43
|
return [constants_1.CHAIN_IDs.POLYGON, constants_1.CHAIN_IDs.POLYGON_AMOY].includes(chainId);
|
|
42
44
|
}
|
|
43
45
|
function chainIsOPStack(chainId) {
|
|
44
|
-
|
|
46
|
+
var _a;
|
|
47
|
+
return ((_a = constants_1.PUBLIC_NETWORKS[chainId]) === null || _a === void 0 ? void 0 : _a.family) === constants_1.ChainFamily.OP_STACK;
|
|
45
48
|
}
|
|
46
49
|
function chainIsZkStack(chainId) {
|
|
47
|
-
|
|
50
|
+
var _a;
|
|
51
|
+
return ((_a = constants_1.PUBLIC_NETWORKS[chainId]) === null || _a === void 0 ? void 0 : _a.family) === constants_1.ChainFamily.ZK_STACK;
|
|
48
52
|
}
|
|
49
53
|
function chainIsOrbit(chainId) {
|
|
50
|
-
|
|
54
|
+
var _a;
|
|
55
|
+
return ((_a = constants_1.PUBLIC_NETWORKS[chainId]) === null || _a === void 0 ? void 0 : _a.family) === constants_1.ChainFamily.ORBIT;
|
|
51
56
|
}
|
|
52
57
|
function chainIsArbitrum(chainId) {
|
|
53
58
|
return [constants_1.CHAIN_IDs.ARBITRUM, constants_1.CHAIN_IDs.ARBITRUM_SEPOLIA].includes(chainId);
|
|
@@ -59,18 +64,29 @@ function chainIsL1(chainId) {
|
|
|
59
64
|
return [constants_1.CHAIN_IDs.MAINNET, constants_1.CHAIN_IDs.SEPOLIA].includes(chainId);
|
|
60
65
|
}
|
|
61
66
|
function chainIsEvm(chainId) {
|
|
62
|
-
|
|
67
|
+
var _a;
|
|
68
|
+
return ((_a = constants_1.PUBLIC_NETWORKS[chainId]) === null || _a === void 0 ? void 0 : _a.family) !== constants_1.ChainFamily.SVM;
|
|
63
69
|
}
|
|
64
70
|
function chainIsSvm(chainId) {
|
|
65
|
-
|
|
71
|
+
var _a;
|
|
72
|
+
return ((_a = constants_1.PUBLIC_NETWORKS[chainId]) === null || _a === void 0 ? void 0 : _a.family) === constants_1.ChainFamily.SVM;
|
|
66
73
|
}
|
|
67
74
|
function chainIsCCTPEnabled(chainId) {
|
|
68
|
-
|
|
69
|
-
|
|
75
|
+
var _a;
|
|
76
|
+
var cctpExceptions = [];
|
|
77
|
+
return ((_a = constants_1.PRODUCTION_NETWORKS[chainId]) === null || _a === void 0 ? void 0 : _a.cctpDomain) !== constants_1.CCTP_NO_DOMAIN && !cctpExceptions.includes(chainId);
|
|
70
78
|
}
|
|
71
79
|
function chainIsOFTEnabled(chainId) {
|
|
72
|
-
|
|
73
|
-
|
|
80
|
+
var _a;
|
|
81
|
+
var oftEnabled = [
|
|
82
|
+
constants_1.CHAIN_IDs.ARBITRUM,
|
|
83
|
+
constants_1.CHAIN_IDs.POLYGON,
|
|
84
|
+
constants_1.CHAIN_IDs.HYPEREVM,
|
|
85
|
+
constants_1.CHAIN_IDs.MONAD,
|
|
86
|
+
constants_1.CHAIN_IDs.PLASMA,
|
|
87
|
+
constants_1.CHAIN_IDs.MEGAETH,
|
|
88
|
+
];
|
|
89
|
+
return oftEnabled.includes(chainId) && ((_a = constants_1.PRODUCTION_NETWORKS[chainId]) === null || _a === void 0 ? void 0 : _a.oftEid) !== constants_1.OFT_NO_EID;
|
|
74
90
|
}
|
|
75
91
|
function chainRequiresL1ToL2Finalization(chainId) {
|
|
76
92
|
return chainIsCCTPEnabled(chainId) || chainIsLinea(chainId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkUtils.js","sourceRoot":"","sources":["../../../src/utils/NetworkUtils.ts"],"names":[],"mappings":";;;AAsBA,wCAGC;AAOD,oDAEC;AAOD,kCAEC;AAOD,wCAEC;AAOD,oCAEC;AAOD,wCAEC;AAOD,wCAEC;AAOD,oCAEC;AAOD,0CAEC;AAOD,oCAEC;AAOD,8BAEC;AAOD,gCAGC;AAOD,gCAEC;AAOD,gDAKC;AAQD,
|
|
1
|
+
{"version":3,"file":"NetworkUtils.js","sourceRoot":"","sources":["../../../src/utils/NetworkUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,9 @@ function isInteger(value) {
|
|
|
9
9
|
function isPositiveInteger(value) {
|
|
10
10
|
return isInteger(value) && value > 0;
|
|
11
11
|
}
|
|
12
|
-
function getRandomInt(min
|
|
12
|
+
function getRandomInt(min, max) {
|
|
13
|
+
if (min === void 0) { min = 0; }
|
|
14
|
+
if (max === void 0) { max = 1000000; }
|
|
13
15
|
return Math.floor(Math.random() * (max - min + 1)) + min;
|
|
14
16
|
}
|
|
15
17
|
//# sourceMappingURL=NumberUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NumberUtils.js","sourceRoot":"","sources":["../../../src/utils/NumberUtils.ts"],"names":[],"mappings":";;AAKA,8BAEC;AAOD,8CAEC;AAQD,oCAEC;AArBD,SAAgB,SAAS,CAAC,KAAc;IACtC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACjE,CAAC;AAOD,SAAgB,iBAAiB,CAAC,KAAc;IAC9C,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;AACvC,CAAC;AAQD,SAAgB,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"NumberUtils.js","sourceRoot":"","sources":["../../../src/utils/NumberUtils.ts"],"names":[],"mappings":";;AAKA,8BAEC;AAOD,8CAEC;AAQD,oCAEC;AArBD,SAAgB,SAAS,CAAC,KAAc;IACtC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACjE,CAAC;AAOD,SAAgB,iBAAiB,CAAC,KAAc;IAC9C,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;AACvC,CAAC;AAQD,SAAgB,YAAY,CAAC,GAAe,EAAE,GAAqB;IAAtC,oBAAA,EAAA,OAAe;IAAE,oBAAA,EAAA,aAAqB;IACjE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;AAC3D,CAAC"}
|
|
@@ -8,10 +8,11 @@ exports.groupObjectCountsByProp = groupObjectCountsByProp;
|
|
|
8
8
|
exports.filterFalsyKeys = filterFalsyKeys;
|
|
9
9
|
exports.count2DDictionaryValues = count2DDictionaryValues;
|
|
10
10
|
exports.count3DDictionaryValues = count3DDictionaryValues;
|
|
11
|
+
var tslib_1 = require("tslib");
|
|
11
12
|
function assign(obj, keyPath, value) {
|
|
12
|
-
|
|
13
|
-
for (
|
|
14
|
-
|
|
13
|
+
var lastKeyIndex = keyPath.length - 1;
|
|
14
|
+
for (var i = 0; i < lastKeyIndex; ++i) {
|
|
15
|
+
var key = keyPath[i];
|
|
15
16
|
if (!(key in obj)) {
|
|
16
17
|
obj[key] = {};
|
|
17
18
|
}
|
|
@@ -21,20 +22,20 @@ function assign(obj, keyPath, value) {
|
|
|
21
22
|
obj[keyPath[lastKeyIndex]] = value;
|
|
22
23
|
}
|
|
23
24
|
else if (Array.isArray(value)) {
|
|
24
|
-
obj[keyPath[lastKeyIndex]] = [
|
|
25
|
+
obj[keyPath[lastKeyIndex]] = tslib_1.__spreadArray(tslib_1.__spreadArray([], obj[keyPath[lastKeyIndex]], true), value, true);
|
|
25
26
|
}
|
|
26
27
|
else if (value === false) {
|
|
27
28
|
obj[keyPath[lastKeyIndex]] = false;
|
|
28
29
|
}
|
|
29
30
|
else {
|
|
30
|
-
obj[keyPath[lastKeyIndex]] = {
|
|
31
|
+
obj[keyPath[lastKeyIndex]] = tslib_1.__assign(tslib_1.__assign({}, obj[keyPath[lastKeyIndex]]), value);
|
|
31
32
|
}
|
|
32
33
|
}
|
|
33
34
|
function deleteFromJson(obj, keyPath) {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
for (
|
|
37
|
-
|
|
35
|
+
var lastKeyIndex = keyPath.length - 1;
|
|
36
|
+
var _obj = obj;
|
|
37
|
+
for (var i = 0; i < lastKeyIndex; ++i) {
|
|
38
|
+
var key = keyPath[i];
|
|
38
39
|
_obj = obj[key];
|
|
39
40
|
}
|
|
40
41
|
delete _obj[keyPath[lastKeyIndex]];
|
|
@@ -43,47 +44,60 @@ function deleteFromJson(obj, keyPath) {
|
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
46
|
function groupObjectCountsByThreeProps(objects, primaryProp, secondaryProp, tertiaryProp) {
|
|
46
|
-
return objects.reduce((result, obj)
|
|
47
|
-
|
|
48
|
-
result[obj[primaryProp]]
|
|
49
|
-
|
|
47
|
+
return objects.reduce(function (result, obj) {
|
|
48
|
+
var _a, _b;
|
|
49
|
+
result[obj[primaryProp]] = (_a = result[obj[primaryProp]]) !== null && _a !== void 0 ? _a : {};
|
|
50
|
+
result[obj[primaryProp]][obj[secondaryProp]] = (_b = result[obj[primaryProp]][obj[secondaryProp]]) !== null && _b !== void 0 ? _b : {};
|
|
51
|
+
var existingCount = result[obj[primaryProp]][obj[secondaryProp]][obj[tertiaryProp]];
|
|
50
52
|
result[obj[primaryProp]][obj[secondaryProp]][obj[tertiaryProp]] =
|
|
51
53
|
existingCount === undefined ? 1 : existingCount + 1;
|
|
52
54
|
return result;
|
|
53
55
|
}, {});
|
|
54
56
|
}
|
|
55
57
|
function groupObjectCountsByTwoProps(objects, primaryProp, getSecondaryProp) {
|
|
56
|
-
return objects.reduce((result, obj)
|
|
57
|
-
|
|
58
|
-
|
|
58
|
+
return objects.reduce(function (result, obj) {
|
|
59
|
+
var _a;
|
|
60
|
+
result[obj[primaryProp]] = (_a = result[obj[primaryProp]]) !== null && _a !== void 0 ? _a : {};
|
|
61
|
+
var existingCount = result[obj[primaryProp]][getSecondaryProp(obj)];
|
|
59
62
|
result[obj[primaryProp]][getSecondaryProp(obj)] = existingCount === undefined ? 1 : existingCount + 1;
|
|
60
63
|
return result;
|
|
61
64
|
}, {});
|
|
62
65
|
}
|
|
63
66
|
function groupObjectCountsByProp(objects, getProp) {
|
|
64
|
-
return objects.reduce((result, obj)
|
|
65
|
-
|
|
67
|
+
return objects.reduce(function (result, obj) {
|
|
68
|
+
var existingCount = result[getProp(obj)];
|
|
66
69
|
result[getProp(obj)] = existingCount === undefined ? 1 : existingCount + 1;
|
|
67
70
|
return result;
|
|
68
71
|
}, {});
|
|
69
72
|
}
|
|
70
73
|
function filterFalsyKeys(obj) {
|
|
71
|
-
return Object.fromEntries(Object.entries(obj).filter((
|
|
74
|
+
return Object.fromEntries(Object.entries(obj).filter(function (_a) {
|
|
75
|
+
var v = _a[1];
|
|
76
|
+
return v;
|
|
77
|
+
}));
|
|
72
78
|
}
|
|
73
79
|
function count2DDictionaryValues(dictionary) {
|
|
74
|
-
return Object.entries(dictionary).reduce((output,
|
|
75
|
-
|
|
76
|
-
|
|
80
|
+
return Object.entries(dictionary).reduce(function (output, _a) {
|
|
81
|
+
var _b;
|
|
82
|
+
var key = _a[0], innerDict = _a[1];
|
|
83
|
+
var innerDictOutput = Object.entries(innerDict).reduce(function (innerOutput, _a) {
|
|
84
|
+
var _b;
|
|
85
|
+
var key2 = _a[0], vals = _a[1];
|
|
86
|
+
return tslib_1.__assign(tslib_1.__assign({}, innerOutput), (_b = {}, _b[key2] = vals.length, _b));
|
|
77
87
|
}, {});
|
|
78
|
-
return {
|
|
88
|
+
return tslib_1.__assign(tslib_1.__assign({}, output), (_b = {}, _b[key] = innerDictOutput, _b));
|
|
79
89
|
}, {});
|
|
80
90
|
}
|
|
81
91
|
function count3DDictionaryValues(dictionary, innerPropName) {
|
|
82
|
-
return Object.entries(dictionary).reduce((output,
|
|
83
|
-
|
|
84
|
-
|
|
92
|
+
return Object.entries(dictionary).reduce(function (output, _a) {
|
|
93
|
+
var _b;
|
|
94
|
+
var key = _a[0], innerDict = _a[1];
|
|
95
|
+
var innerDictOutput = Object.entries(innerDict).reduce(function (innerOutput, _a) {
|
|
96
|
+
var _b;
|
|
97
|
+
var key2 = _a[0], vals = _a[1];
|
|
98
|
+
return tslib_1.__assign(tslib_1.__assign({}, innerOutput), (_b = {}, _b[key2] = vals[innerPropName].length, _b));
|
|
85
99
|
}, {});
|
|
86
|
-
return {
|
|
100
|
+
return tslib_1.__assign(tslib_1.__assign({}, output), (_b = {}, _b[key] = innerDictOutput, _b));
|
|
87
101
|
}, {});
|
|
88
102
|
}
|
|
89
103
|
//# sourceMappingURL=ObjectUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectUtils.js","sourceRoot":"","sources":["../../../src/utils/ObjectUtils.ts"],"names":[],"mappings":";;AAuBA,wBAyBC;AAGD,wCAWC;AAGD,sEAcC;AACD,kEAWC;AAED,0DAMC;AAOD,0CAEC;AAED,0DASC;AAED,0DAUC
|
|
1
|
+
{"version":3,"file":"ObjectUtils.js","sourceRoot":"","sources":["../../../src/utils/ObjectUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,109 +1,112 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Profiler = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
detail;
|
|
12
|
-
logger;
|
|
13
|
-
constructor({ logger, at, logLevel, ...detail }) {
|
|
4
|
+
var tslib_1 = require("tslib");
|
|
5
|
+
var node_perf_hooks_1 = require("node:perf_hooks");
|
|
6
|
+
var crypto_1 = tslib_1.__importDefault(require("crypto"));
|
|
7
|
+
var defaultMeta = { datadog: true };
|
|
8
|
+
var Profiler = (function () {
|
|
9
|
+
function Profiler(_a) {
|
|
10
|
+
var logger = _a.logger, at = _a.at, logLevel = _a.logLevel, detail = tslib_1.__rest(_a, ["logger", "at", "logLevel"]);
|
|
14
11
|
this.marks = new Map();
|
|
15
12
|
this.logger = logger;
|
|
16
13
|
this.at = at;
|
|
17
14
|
this.detail = detail;
|
|
18
15
|
}
|
|
19
|
-
warn(data) {
|
|
20
|
-
this.logger.warn({
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
});
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
this
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
...data,
|
|
30
|
-
});
|
|
31
|
-
}
|
|
32
|
-
start(task, detail) {
|
|
33
|
-
const start = crypto_1.default.randomUUID();
|
|
34
|
-
const startTime = this.mark(start, detail);
|
|
16
|
+
Profiler.prototype.warn = function (data) {
|
|
17
|
+
this.logger.warn(tslib_1.__assign({ at: this.at }, data));
|
|
18
|
+
};
|
|
19
|
+
Profiler.prototype.logMeasure = function (data) {
|
|
20
|
+
this.logger.debug(tslib_1.__assign(tslib_1.__assign({ at: this.at }, defaultMeta), data));
|
|
21
|
+
};
|
|
22
|
+
Profiler.prototype.start = function (task, detail) {
|
|
23
|
+
var _this = this;
|
|
24
|
+
var start = crypto_1.default.randomUUID();
|
|
25
|
+
var startTime = this.mark(start, detail);
|
|
35
26
|
return {
|
|
36
|
-
startTime,
|
|
37
|
-
stop: (_detail)
|
|
27
|
+
startTime: startTime,
|
|
28
|
+
stop: function (_detail) { return _this.measure(task, tslib_1.__assign(tslib_1.__assign({ from: start }, (detail !== null && detail !== void 0 ? detail : {})), (_detail !== null && _detail !== void 0 ? _detail : {}))); },
|
|
38
29
|
};
|
|
39
|
-
}
|
|
40
|
-
mark(label, detail) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
this.
|
|
30
|
+
};
|
|
31
|
+
Profiler.prototype.mark = function (label, detail) {
|
|
32
|
+
var _a;
|
|
33
|
+
var currentTime = node_perf_hooks_1.performance.now();
|
|
34
|
+
this.detail = tslib_1.__assign(tslib_1.__assign({}, ((_a = this.detail) !== null && _a !== void 0 ? _a : {})), (detail !== null && detail !== void 0 ? detail : {}));
|
|
35
|
+
this.marks.set(label, { time: currentTime, detail: detail });
|
|
44
36
|
return currentTime;
|
|
45
|
-
}
|
|
46
|
-
measure(task, params) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
37
|
+
};
|
|
38
|
+
Profiler.prototype.measure = function (task, params) {
|
|
39
|
+
var _a, _b;
|
|
40
|
+
var from = params.from, to = params.to, detail = tslib_1.__rest(params, ["from", "to"]);
|
|
41
|
+
var startMark = this.marks.get(from);
|
|
42
|
+
var endMark = to ? this.marks.get(to) : undefined;
|
|
50
43
|
if (!startMark) {
|
|
51
|
-
this.warn({
|
|
52
|
-
message: `Cannot find start mark for label "${from}".`,
|
|
53
|
-
...this.detail,
|
|
54
|
-
});
|
|
44
|
+
this.warn(tslib_1.__assign({ message: "Cannot find start mark for label \"".concat(from, "\".") }, this.detail));
|
|
55
45
|
return;
|
|
56
46
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
47
|
+
var endTime = (_a = endMark === null || endMark === void 0 ? void 0 : endMark.time) !== null && _a !== void 0 ? _a : node_perf_hooks_1.performance.now();
|
|
48
|
+
var duration = endTime - startMark.time;
|
|
49
|
+
var _c = tslib_1.__assign(tslib_1.__assign({}, ((_b = this.detail) !== null && _b !== void 0 ? _b : {})), (detail !== null && detail !== void 0 ? detail : {})), message = _c.message, combinedDetail = tslib_1.__rest(_c, ["message"]);
|
|
50
|
+
var defaultMessage = "Profiler Log: ".concat(task);
|
|
61
51
|
this.logMeasure({
|
|
62
|
-
task,
|
|
63
|
-
duration,
|
|
64
|
-
message: message
|
|
52
|
+
task: task,
|
|
53
|
+
duration: duration,
|
|
54
|
+
message: message !== null && message !== void 0 ? message : defaultMessage,
|
|
65
55
|
data: combinedDetail,
|
|
66
56
|
});
|
|
67
57
|
return duration;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
58
|
+
};
|
|
59
|
+
Profiler.prototype.measureAsync = function (pr, task, detail) {
|
|
60
|
+
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
61
|
+
var startTime, result, endTime, duration, _a, message, combinedDetail, defaultMessage;
|
|
62
|
+
return tslib_1.__generator(this, function (_b) {
|
|
63
|
+
switch (_b.label) {
|
|
64
|
+
case 0:
|
|
65
|
+
startTime = node_perf_hooks_1.performance.now();
|
|
66
|
+
_b.label = 1;
|
|
67
|
+
case 1:
|
|
68
|
+
_b.trys.push([1, , 3, 4]);
|
|
69
|
+
return [4, pr];
|
|
70
|
+
case 2:
|
|
71
|
+
result = _b.sent();
|
|
72
|
+
return [2, result];
|
|
73
|
+
case 3:
|
|
74
|
+
endTime = node_perf_hooks_1.performance.now();
|
|
75
|
+
duration = endTime - startTime;
|
|
76
|
+
_a = tslib_1.__assign({}, detail), message = _a.message, combinedDetail = tslib_1.__rest(_a, ["message"]);
|
|
77
|
+
defaultMessage = "Profiler Log: ".concat(task);
|
|
78
|
+
this.logMeasure({
|
|
79
|
+
task: task,
|
|
80
|
+
duration: duration,
|
|
81
|
+
message: message !== null && message !== void 0 ? message : defaultMessage,
|
|
82
|
+
data: combinedDetail,
|
|
83
|
+
});
|
|
84
|
+
return [7];
|
|
85
|
+
case 4: return [2];
|
|
86
|
+
}
|
|
85
87
|
});
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
measureSync(fn, task, detail) {
|
|
89
|
-
|
|
88
|
+
});
|
|
89
|
+
};
|
|
90
|
+
Profiler.prototype.measureSync = function (fn, task, detail) {
|
|
91
|
+
var startTime = node_perf_hooks_1.performance.now();
|
|
90
92
|
try {
|
|
91
|
-
|
|
93
|
+
var result = fn();
|
|
92
94
|
return result;
|
|
93
95
|
}
|
|
94
96
|
finally {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
97
|
+
var endTime = node_perf_hooks_1.performance.now();
|
|
98
|
+
var duration = endTime - startTime;
|
|
99
|
+
var _a = tslib_1.__assign({}, detail), message = _a.message, combinedDetail = tslib_1.__rest(_a, ["message"]);
|
|
100
|
+
var defaultMessage = "Profiler Log: ".concat(task);
|
|
99
101
|
this.logMeasure({
|
|
100
|
-
task,
|
|
101
|
-
duration,
|
|
102
|
-
message: message
|
|
102
|
+
task: task,
|
|
103
|
+
duration: duration,
|
|
104
|
+
message: message !== null && message !== void 0 ? message : defaultMessage,
|
|
103
105
|
data: combinedDetail,
|
|
104
106
|
});
|
|
105
107
|
}
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
+
};
|
|
109
|
+
return Profiler;
|
|
110
|
+
}());
|
|
108
111
|
exports.Profiler = Profiler;
|
|
109
112
|
//# sourceMappingURL=Profiler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Profiler.js","sourceRoot":"","sources":["../../../src/utils/Profiler.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"Profiler.js","sourceRoot":"","sources":["../../../src/utils/Profiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,17 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.composeRevivers = composeRevivers;
|
|
4
4
|
exports.objectWithBigNumberReviver = objectWithBigNumberReviver;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
function composeRevivers(
|
|
5
|
+
var BigNumberUtils_1 = require("./BigNumberUtils");
|
|
6
|
+
var TypeGuards_1 = require("./TypeGuards");
|
|
7
|
+
function composeRevivers() {
|
|
8
|
+
var revivers = [];
|
|
9
|
+
for (var _i = 0; _i < arguments.length; _i++) {
|
|
10
|
+
revivers[_i] = arguments[_i];
|
|
11
|
+
}
|
|
8
12
|
revivers = revivers.filter(TypeGuards_1.isDefined);
|
|
9
|
-
return (key, value)
|
|
13
|
+
return function (key, value) { return revivers.reduce(function (acc, reviver) { return reviver(key, acc); }, value); };
|
|
10
14
|
}
|
|
11
15
|
function objectWithBigNumberReviver(_, value) {
|
|
12
16
|
if (value === null || typeof value !== "object") {
|
|
13
17
|
return value;
|
|
14
18
|
}
|
|
15
|
-
|
|
19
|
+
var resolvedValue = value;
|
|
16
20
|
return resolvedValue.type === "BigNumber" ? (0, BigNumberUtils_1.toBN)(resolvedValue.hex) : resolvedValue;
|
|
17
21
|
}
|
|
18
22
|
//# sourceMappingURL=ReviverUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReviverUtils.js","sourceRoot":"","sources":["../../../src/utils/ReviverUtils.ts"],"names":[],"mappings":";;AAUA,0CAMC;AAQD,gEAMC;AA9BD,
|
|
1
|
+
{"version":3,"file":"ReviverUtils.js","sourceRoot":"","sources":["../../../src/utils/ReviverUtils.ts"],"names":[],"mappings":";;AAUA,0CAMC;AAQD,gEAMC;AA9BD,mDAAwC;AACxC,2CAAyC;AASzC,SAAgB,eAAe;IAAC,kBAAsB;SAAtB,UAAsB,EAAtB,qBAAsB,EAAtB,IAAsB;QAAtB,6BAAsB;;IAEpD,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,sBAAS,CAAC,CAAC;IAGtC,OAAO,UAAC,GAAW,EAAE,KAAc,IAAK,OAAA,QAAQ,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,OAAO,IAAK,OAAA,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAjB,CAAiB,EAAE,KAAK,CAAC,EAA3D,CAA2D,CAAC;AACtG,CAAC;AAQD,SAAgB,0BAA0B,CAAC,CAAU,EAAE,KAAc;IACnE,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAM,aAAa,GAAG,KAAsC,CAAC;IAC7D,OAAO,aAAa,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,qBAAI,EAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;AACtF,CAAC"}
|