@paraswap/dex-lib 4.3.8 → 4.3.9-ethers-v6.0
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/build/abi/BProtocol.json +1155 -0
- package/build/abi/Jarvis.json +1172 -0
- package/build/abi/MStableAsset.json +1545 -0
- package/build/abi/OneInchLp.json +1304 -0
- package/build/abi/Onebit.json +736 -0
- package/build/abi/Shell.json +1294 -0
- package/build/abi/TraderJoeV2Router.json +50 -0
- package/build/abi/wUSDM.json +757 -0
- package/build/abi/zrx.v2.json +1967 -0
- package/build/abi/zrx.v3.json +3454 -0
- package/build/abi/zrx.v4.json +2193 -0
- package/build/constants.d.ts +7 -8
- package/build/constants.js +7 -8
- package/build/constants.js.map +1 -1
- package/build/dex/OneInchLp.d.ts +24 -0
- package/build/dex/OneInchLp.js +43 -0
- package/build/dex/OneInchLp.js.map +1 -0
- package/build/dex/aave-gsm/aave-gsm.js +4 -4
- package/build/dex/aave-gsm/aave-gsm.js.map +1 -1
- package/build/dex/aave-v3/aave-v3.js +3 -3
- package/build/dex/aave-v3/aave-v3.js.map +1 -1
- package/build/dex/aave-v3/utils.d.ts +1 -2
- package/build/dex/aave-v3/utils.js +2 -2
- package/build/dex/aave-v3/utils.js.map +1 -1
- package/build/dex/aave-v3-stata/aave-v3-stata.d.ts +1 -1
- package/build/dex/aave-v3-stata/aave-v3-stata.js +2 -2
- package/build/dex/aave-v3-stata/aave-v3-stata.js.map +1 -1
- package/build/dex/aave-v3-stata-v2/aave-v3-stata-v2.d.ts +1 -1
- package/build/dex/aave-v3-stata-v2/aave-v3-stata-v2.js +3 -3
- package/build/dex/aave-v3-stata-v2/aave-v3-stata-v2.js.map +1 -1
- package/build/dex/algebra/algebra-factory.d.ts +1 -2
- package/build/dex/algebra/algebra-factory.js +2 -2
- package/build/dex/algebra/algebra-factory.js.map +1 -1
- package/build/dex/algebra/algebra-pool-v1_1.d.ts +3 -3
- package/build/dex/algebra/algebra-pool-v1_1.js +8 -8
- package/build/dex/algebra/algebra-pool-v1_1.js.map +1 -1
- package/build/dex/algebra/algebra-pool-v1_9.d.ts +2 -2
- package/build/dex/algebra/algebra-pool-v1_9.js +3 -4
- package/build/dex/algebra/algebra-pool-v1_9.js.map +1 -1
- package/build/dex/algebra/algebra-pool-v1_9_bidirectional_fee.d.ts +1 -1
- package/build/dex/algebra/algebra-pool-v1_9_bidirectional_fee.js.map +1 -1
- package/build/dex/algebra/algebra.d.ts +1 -1
- package/build/dex/algebra/algebra.js +7 -9
- package/build/dex/algebra/algebra.js.map +1 -1
- package/build/dex/algebra/scripts/validate-state.js +3 -6
- package/build/dex/algebra/scripts/validate-state.js.map +1 -1
- package/build/dex/algebra/types.d.ts +1 -1
- package/build/dex/algebra/utils.js +10 -9
- package/build/dex/algebra/utils.js.map +1 -1
- package/build/dex/algebra-integral/algebra-integral.d.ts +2 -2
- package/build/dex/algebra-integral/algebra-integral.js +79 -58
- package/build/dex/algebra-integral/algebra-integral.js.map +1 -1
- package/build/dex/algebra-integral/config.js +1 -1
- package/build/dex/algebra-integral/config.js.map +1 -1
- package/build/dex/algebra-integral/types.d.ts +0 -2
- package/build/dex/algebra-integral/types.js.map +1 -1
- package/build/dex/angle-transmuter/angle-transmuter-pool.d.ts +1 -1
- package/build/dex/angle-transmuter/angle-transmuter-pool.js +23 -25
- package/build/dex/angle-transmuter/angle-transmuter-pool.js.map +1 -1
- package/build/dex/angle-transmuter/angle-transmuter.d.ts +1 -1
- package/build/dex/angle-transmuter/angle-transmuter.js +6 -6
- package/build/dex/angle-transmuter/angle-transmuter.js.map +1 -1
- package/build/dex/angle-transmuter/constants.js +4 -4
- package/build/dex/angle-transmuter/constants.js.map +1 -1
- package/build/dex/angle-transmuter/morphoVault.d.ts +5 -6
- package/build/dex/angle-transmuter/morphoVault.js +4 -2
- package/build/dex/angle-transmuter/morphoVault.js.map +1 -1
- package/build/dex/angle-transmuter/pyth.d.ts +2 -3
- package/build/dex/angle-transmuter/pyth.js +5 -6
- package/build/dex/angle-transmuter/pyth.js.map +1 -1
- package/build/dex/angle-transmuter/transmuter.d.ts +13 -14
- package/build/dex/angle-transmuter/transmuter.js +33 -32
- package/build/dex/angle-transmuter/transmuter.js.map +1 -1
- package/build/dex/angle-transmuter/types.d.ts +4 -5
- package/build/dex/angle-transmuter/types.js.map +1 -1
- package/build/dex/augustus-approvals.js +1 -1
- package/build/dex/augustus-approvals.js.map +1 -1
- package/build/dex/bProtocol/bProtocol.d.ts +15 -0
- package/build/dex/bProtocol/bProtocol.js +56 -0
- package/build/dex/bProtocol/bProtocol.js.map +1 -0
- package/build/dex/bProtocol/types.d.ts +11 -0
- package/build/dex/bProtocol/types.js +8 -0
- package/build/dex/bProtocol/types.js.map +1 -0
- package/build/dex/balancer-v1/balancer-v1.d.ts +2 -2
- package/build/dex/balancer-v1/balancer-v1.js +6 -8
- package/build/dex/balancer-v1/balancer-v1.js.map +1 -1
- package/build/dex/balancer-v2/balancer-v2.d.ts +1 -1
- package/build/dex/balancer-v2/balancer-v2.js +12 -18
- package/build/dex/balancer-v2/balancer-v2.js.map +1 -1
- package/build/dex/balancer-v2/pools/gyro/Gyro3Pool.d.ts +1 -1
- package/build/dex/balancer-v2/pools/gyro/Gyro3Pool.js +2 -2
- package/build/dex/balancer-v2/pools/gyro/Gyro3Pool.js.map +1 -1
- package/build/dex/balancer-v2/pools/gyro/GyroEPool.d.ts +1 -1
- package/build/dex/balancer-v2/pools/gyro/GyroEPool.js +2 -2
- package/build/dex/balancer-v2/pools/gyro/GyroEPool.js.map +1 -1
- package/build/dex/balancer-v2/pools/linear/LinearPool.d.ts +2 -3
- package/build/dex/balancer-v2/pools/linear/LinearPool.js +5 -6
- package/build/dex/balancer-v2/pools/linear/LinearPool.js.map +1 -1
- package/build/dex/balancer-v2/pools/phantom-stable/PhantomStablePool.d.ts +2 -3
- package/build/dex/balancer-v2/pools/phantom-stable/PhantomStablePool.js +6 -7
- package/build/dex/balancer-v2/pools/phantom-stable/PhantomStablePool.js.map +1 -1
- package/build/dex/balancer-v2/pools/stable/StablePool.d.ts +1 -1
- package/build/dex/balancer-v2/pools/stable/StablePool.js +3 -3
- package/build/dex/balancer-v2/pools/stable/StablePool.js.map +1 -1
- package/build/dex/balancer-v2/pools/weighted/WeightedPool.d.ts +1 -1
- package/build/dex/balancer-v2/pools/weighted/WeightedPool.js +2 -2
- package/build/dex/balancer-v2/pools/weighted/WeightedPool.js.map +1 -1
- package/build/dex/balancer-v2/queryOnChain.js +4 -5
- package/build/dex/balancer-v2/queryOnChain.js.map +1 -1
- package/build/dex/balancer-v2/utils.d.ts +1 -1
- package/build/dex/balancer-v2/utils.js +2 -2
- package/build/dex/balancer-v2/utils.js.map +1 -1
- package/build/dex/balancer-v3/balancer-test-helpers.js +4 -2
- package/build/dex/balancer-v3/balancer-test-helpers.js.map +1 -1
- package/build/dex/balancer-v3/balancer-v3-pool.d.ts +1 -1
- package/build/dex/balancer-v3/balancer-v3-pool.js +7 -4
- package/build/dex/balancer-v3/balancer-v3-pool.js.map +1 -1
- package/build/dex/balancer-v3/balancer-v3.d.ts +1 -2
- package/build/dex/balancer-v3/balancer-v3.js +6 -3
- package/build/dex/balancer-v3/balancer-v3.js.map +1 -1
- package/build/dex/balancer-v3/getOnChainState.d.ts +1 -1
- package/build/dex/balancer-v3/getPoolsApi.js +4 -4
- package/build/dex/balancer-v3/getPoolsApi.js.map +1 -1
- package/build/dex/balancer-v3/hooks/balancer-hook-event-subscriber.d.ts +1 -1
- package/build/dex/balancer-v3/hooks/balancer-hook-event-subscriber.js +6 -6
- package/build/dex/balancer-v3/hooks/balancer-hook-event-subscriber.js.map +1 -1
- package/build/dex/balancer-v3/hooks/stableSurgeHook.d.ts +1 -1
- package/build/dex/balancer-v3/hooks/stableSurgeHook.js +1 -1
- package/build/dex/balancer-v3/hooks/stableSurgeHook.js.map +1 -1
- package/build/dex/bancor/bancor.d.ts +1 -1
- package/build/dex/bancor/bancor.js +2 -2
- package/build/dex/bancor/bancor.js.map +1 -1
- package/build/dex/bebop/bebop.d.ts +3 -3
- package/build/dex/bebop/bebop.js +9 -10
- package/build/dex/bebop/bebop.js.map +1 -1
- package/build/dex/bebop/rate-fetcher.js +2 -2
- package/build/dex/bebop/rate-fetcher.js.map +1 -1
- package/build/dex/cables/cables.d.ts +1 -1
- package/build/dex/cables/cables.js +6 -6
- package/build/dex/cables/cables.js.map +1 -1
- package/build/dex/camelot/camelot.d.ts +2 -2
- package/build/dex/camelot/camelot.js +13 -17
- package/build/dex/camelot/camelot.js.map +1 -1
- package/build/dex/concentrator-arusd/concentrator-arusd-event.d.ts +2 -2
- package/build/dex/concentrator-arusd/concentrator-arusd-event.js +2 -0
- package/build/dex/concentrator-arusd/concentrator-arusd-event.js.map +1 -1
- package/build/dex/concentrator-arusd/concentrator-arusd.d.ts +1 -1
- package/build/dex/concentrator-arusd/concentrator-arusd.js +3 -3
- package/build/dex/concentrator-arusd/concentrator-arusd.js.map +1 -1
- package/build/dex/concentrator-arusd/utils.d.ts +1 -1
- package/build/dex/concentrator-arusd/utils.js +0 -2
- package/build/dex/concentrator-arusd/utils.js.map +1 -1
- package/build/dex/curve-v1/curve-v1.js +4 -4
- package/build/dex/curve-v1/curve-v1.js.map +1 -1
- package/build/dex/curve-v1/packer.d.ts +1 -2
- package/build/dex/curve-v1/packer.js +4 -5
- package/build/dex/curve-v1/packer.js.map +1 -1
- package/build/dex/curve-v1-factory/curve-v1-factory.d.ts +1 -1
- package/build/dex/curve-v1-factory/curve-v1-factory.js +10 -14
- package/build/dex/curve-v1-factory/curve-v1-factory.js.map +1 -1
- package/build/dex/curve-v1-factory/state-polling-pools/factory-pool-polling.js +4 -4
- package/build/dex/curve-v1-factory/state-polling-pools/factory-pool-polling.js.map +1 -1
- package/build/dex/curve-v1-factory/types.d.ts +1 -1
- package/build/dex/curve-v2/curve-v2.d.ts +1 -1
- package/build/dex/curve-v2/curve-v2.js +5 -9
- package/build/dex/curve-v2/curve-v2.js.map +1 -1
- package/build/dex/dexalot/dexalot.d.ts +1 -1
- package/build/dex/dexalot/dexalot.js +12 -22
- package/build/dex/dexalot/dexalot.js.map +1 -1
- package/build/dex/dodo-v1/dodo-v1.d.ts +1 -1
- package/build/dex/dodo-v1/dodo-v1.js +2 -2
- package/build/dex/dodo-v1/dodo-v1.js.map +1 -1
- package/build/dex/dodo-v2.d.ts +1 -1
- package/build/dex/dodo-v2.js +2 -2
- package/build/dex/dodo-v2.js.map +1 -1
- package/build/dex/ekubo/ekubo.js +5 -6
- package/build/dex/ekubo/ekubo.js.map +1 -1
- package/build/dex/ekubo/pools/base-pool.d.ts +1 -1
- package/build/dex/ekubo/pools/base-pool.js +2 -2
- package/build/dex/ekubo/pools/base-pool.js.map +1 -1
- package/build/dex/ekubo/pools/math/price.d.ts +2 -3
- package/build/dex/ekubo/pools/math/price.js +2 -3
- package/build/dex/ekubo/pools/math/price.js.map +1 -1
- package/build/dex/ekubo/pools/oracle-pool.d.ts +1 -1
- package/build/dex/ekubo/pools/oracle-pool.js +2 -2
- package/build/dex/ekubo/pools/oracle-pool.js.map +1 -1
- package/build/dex/ekubo/pools/pool-utils.js +12 -12
- package/build/dex/ekubo/pools/pool-utils.js.map +1 -1
- package/build/dex/ekubo/types.d.ts +3 -4
- package/build/dex/ekubo/utils.js +5 -5
- package/build/dex/ekubo/utils.js.map +1 -1
- package/build/dex/erc4626/erc-4626-pool.d.ts +1 -1
- package/build/dex/erc4626/erc4626.d.ts +1 -1
- package/build/dex/erc4626/erc4626.js +2 -2
- package/build/dex/erc4626/erc4626.js.map +1 -1
- package/build/dex/etherfi.d.ts +1 -1
- package/build/dex/etherfi.js +3 -3
- package/build/dex/etherfi.js.map +1 -1
- package/build/dex/fluid-dex/fluid-dex-factory.d.ts +1 -2
- package/build/dex/fluid-dex/fluid-dex-factory.js +6 -6
- package/build/dex/fluid-dex/fluid-dex-factory.js.map +1 -1
- package/build/dex/fluid-dex/fluid-dex-liquidity-proxy.d.ts +1 -2
- package/build/dex/fluid-dex/fluid-dex-liquidity-proxy.js +3 -4
- package/build/dex/fluid-dex/fluid-dex-liquidity-proxy.js.map +1 -1
- package/build/dex/fluid-dex/fluid-dex-pool.js +1 -2
- package/build/dex/fluid-dex/fluid-dex-pool.js.map +1 -1
- package/build/dex/fluid-dex/fluid-dex.d.ts +1 -2
- package/build/dex/fluid-dex/fluid-dex.js +6 -7
- package/build/dex/fluid-dex/fluid-dex.js.map +1 -1
- package/build/dex/fluid-dex/types.d.ts +4 -5
- package/build/dex/fluid-dex/utils.d.ts +1 -2
- package/build/dex/fluid-dex/utils.js +3 -6
- package/build/dex/fluid-dex/utils.js.map +1 -1
- package/build/dex/fx-protocol-rusd/fx-protocol-rusd-event.d.ts +1 -1
- package/build/dex/fx-protocol-rusd/fx-protocol-rusd-event.js +2 -2
- package/build/dex/fx-protocol-rusd/fx-protocol-rusd-event.js.map +1 -1
- package/build/dex/fx-protocol-rusd/fx-protocol-rusd.d.ts +1 -1
- package/build/dex/fx-protocol-rusd/fx-protocol-rusd.js +4 -4
- package/build/dex/fx-protocol-rusd/fx-protocol-rusd.js.map +1 -1
- package/build/dex/fx-protocol-rusd/utils.d.ts +1 -1
- package/build/dex/generic-rfq/generic-rfq.js +3 -7
- package/build/dex/generic-rfq/generic-rfq.js.map +1 -1
- package/build/dex/generic-rfq/utils.js +1 -1
- package/build/dex/generic-rfq/utils.js.map +1 -1
- package/build/dex/generic-rfq/validators.js +1 -1
- package/build/dex/generic-rfq/validators.js.map +1 -1
- package/build/dex/gmx/gmx.d.ts +1 -1
- package/build/dex/gmx/gmx.js +2 -2
- package/build/dex/gmx/gmx.js.map +1 -1
- package/build/dex/gmx/vault.d.ts +1 -1
- package/build/dex/gmx/vault.js +4 -2
- package/build/dex/gmx/vault.js.map +1 -1
- package/build/dex/hashflow/hashflow.d.ts +3 -3
- package/build/dex/hashflow/hashflow.js +9 -9
- package/build/dex/hashflow/hashflow.js.map +1 -1
- package/build/dex/idle-dao/idle-dao.js +3 -3
- package/build/dex/idle-dao/idle-dao.js.map +1 -1
- package/build/dex/idle-dao/utils.d.ts +1 -3
- package/build/dex/idle-dao/utils.js +1 -4
- package/build/dex/idle-dao/utils.js.map +1 -1
- package/build/dex/infusion/infusion.d.ts +2 -1
- package/build/dex/infusion/infusion.js +6 -6
- package/build/dex/infusion/infusion.js.map +1 -1
- package/build/dex/jarvis-v6/jarvis-v6-events.d.ts +1 -1
- package/build/dex/jarvis-v6/jarvis-v6.d.ts +1 -1
- package/build/dex/jarvis-v6/jarvis-v6.js +2 -2
- package/build/dex/jarvis-v6/jarvis-v6.js.map +1 -1
- package/build/dex/jarvis-v6/syntheteumPool-event.d.ts +1 -1
- package/build/dex/jarvis-v6/syntheteumPool-event.js +2 -0
- package/build/dex/jarvis-v6/syntheteumPool-event.js.map +1 -1
- package/build/dex/jarvis-v6/utils.d.ts +1 -1
- package/build/dex/jarvis-v6/utils.js +1 -1
- package/build/dex/jarvis-v6/utils.js.map +1 -1
- package/build/dex/jarvis.d.ts +56 -0
- package/build/dex/jarvis.js +163 -0
- package/build/dex/jarvis.js.map +1 -0
- package/build/dex/kyberdmm/kyberdmm.d.ts +1 -1
- package/build/dex/kyberdmm/kyberdmm.js +8 -7
- package/build/dex/kyberdmm/kyberdmm.js.map +1 -1
- package/build/dex/lite-psm/lite-psm.js +6 -15
- package/build/dex/lite-psm/lite-psm.js.map +1 -1
- package/build/dex/mStable.d.ts +44 -0
- package/build/dex/mStable.js +75 -0
- package/build/dex/mStable.js.map +1 -0
- package/build/dex/maker-psm/maker-psm.js +7 -15
- package/build/dex/maker-psm/maker-psm.js.map +1 -1
- package/build/dex/maverick-v1/maverick-v1.d.ts +1 -1
- package/build/dex/maverick-v1/maverick-v1.js +2 -2
- package/build/dex/maverick-v1/maverick-v1.js.map +1 -1
- package/build/dex/maverick-v2/maverick-v2.d.ts +1 -1
- package/build/dex/maverick-v2/maverick-v2.js +3 -3
- package/build/dex/maverick-v2/maverick-v2.js.map +1 -1
- package/build/dex/miro-migrator/miro-migrator-pool.d.ts +4 -5
- package/build/dex/miro-migrator/miro-migrator-pool.js +21 -13
- package/build/dex/miro-migrator/miro-migrator-pool.js.map +1 -1
- package/build/dex/miro-migrator/miro-migrator.js +1 -4
- package/build/dex/miro-migrator/miro-migrator.js.map +1 -1
- package/build/dex/nerve/nerve.d.ts +1 -1
- package/build/dex/nerve/nerve.js +2 -2
- package/build/dex/nerve/nerve.js.map +1 -1
- package/build/dex/onebit/onebit.d.ts +16 -0
- package/build/dex/onebit/onebit.js +61 -0
- package/build/dex/onebit/onebit.js.map +1 -0
- package/build/dex/onebit/types.d.ts +14 -0
- package/build/dex/onebit/types.js +8 -0
- package/build/dex/onebit/types.js.map +1 -0
- package/build/dex/oswap/oswap.d.ts +1 -1
- package/build/dex/oswap/oswap.js +2 -2
- package/build/dex/oswap/oswap.js.map +1 -1
- package/build/dex/pancakeswap-v3/pancakeswap-v3-factory.d.ts +1 -1
- package/build/dex/pancakeswap-v3/pancakeswap-v3-pool.d.ts +2 -2
- package/build/dex/pancakeswap-v3/pancakeswap-v3-pool.js +3 -4
- package/build/dex/pancakeswap-v3/pancakeswap-v3-pool.js.map +1 -1
- package/build/dex/pancakeswap-v3/pancakeswap-v3.d.ts +1 -1
- package/build/dex/pancakeswap-v3/pancakeswap-v3.js +5 -6
- package/build/dex/pancakeswap-v3/pancakeswap-v3.js.map +1 -1
- package/build/dex/pancakeswap-v3/utils.js +1 -1
- package/build/dex/pancakeswap-v3/utils.js.map +1 -1
- package/build/dex/paraswap-limit-orders/paraswap-limit-orders.d.ts +2 -2
- package/build/dex/paraswap-limit-orders/paraswap-limit-orders.js +3 -4
- package/build/dex/paraswap-limit-orders/paraswap-limit-orders.js.map +1 -1
- package/build/dex/paraswap-limit-orders/utils.js +4 -4
- package/build/dex/paraswap-limit-orders/utils.js.map +1 -1
- package/build/dex/polygon-migrator/polygon-migrator.d.ts +1 -1
- package/build/dex/polygon-migrator/polygon-migrator.js +2 -2
- package/build/dex/polygon-migrator/polygon-migrator.js.map +1 -1
- package/build/dex/quick-perps/quick-perps.d.ts +1 -1
- package/build/dex/quick-perps/quick-perps.js +2 -2
- package/build/dex/quick-perps/quick-perps.js.map +1 -1
- package/build/dex/quick-perps/vault.d.ts +1 -1
- package/build/dex/quick-perps/vault.js +4 -2
- package/build/dex/quick-perps/vault.js.map +1 -1
- package/build/dex/quickswap/quickswap-v3.js +3 -3
- package/build/dex/quickswap/quickswap-v3.js.map +1 -1
- package/build/dex/shell.d.ts +25 -0
- package/build/dex/shell.js +41 -0
- package/build/dex/shell.js.map +1 -0
- package/build/dex/simple-exchange.d.ts +1 -1
- package/build/dex/simple-exchange.js +5 -5
- package/build/dex/simple-exchange.js.map +1 -1
- package/build/dex/smoothy/smoothy.js.map +1 -1
- package/build/dex/solidly/forks-override/chronos.d.ts +2 -1
- package/build/dex/solidly/forks-override/chronos.js.map +1 -1
- package/build/dex/solidly/forks-override/equalizer.d.ts +2 -1
- package/build/dex/solidly/forks-override/equalizer.js.map +1 -1
- package/build/dex/solidly/forks-override/ramses.d.ts +2 -1
- package/build/dex/solidly/forks-override/ramses.js.map +1 -1
- package/build/dex/solidly/forks-override/spiritSwapV2.d.ts +2 -1
- package/build/dex/solidly/forks-override/spiritSwapV2.js.map +1 -1
- package/build/dex/solidly/forks-override/thena.d.ts +2 -1
- package/build/dex/solidly/forks-override/thena.js +2 -2
- package/build/dex/solidly/forks-override/thena.js.map +1 -1
- package/build/dex/solidly/forks-override/velocimeter.d.ts +2 -1
- package/build/dex/solidly/forks-override/velocimeter.js +2 -2
- package/build/dex/solidly/forks-override/velocimeter.js.map +1 -1
- package/build/dex/solidly/forks-override/velodrome.d.ts +2 -1
- package/build/dex/solidly/forks-override/velodrome.js +2 -2
- package/build/dex/solidly/forks-override/velodrome.js.map +1 -1
- package/build/dex/solidly/forks-override/velodromeV2.d.ts +2 -1
- package/build/dex/solidly/forks-override/velodromeV2.js +2 -2
- package/build/dex/solidly/forks-override/velodromeV2.js.map +1 -1
- package/build/dex/solidly/solidly-ethereum.d.ts +2 -1
- package/build/dex/solidly/solidly-ethereum.js +2 -2
- package/build/dex/solidly/solidly-ethereum.js.map +1 -1
- package/build/dex/solidly/solidly.js +8 -13
- package/build/dex/solidly/solidly.js.map +1 -1
- package/build/dex/solidly-v3/contract-math/utils.d.ts +3 -3
- package/build/dex/solidly-v3/contract-math/utils.js +4 -4
- package/build/dex/solidly-v3/contract-math/utils.js.map +1 -1
- package/build/dex/solidly-v3/solidly-v3-factory.d.ts +1 -2
- package/build/dex/solidly-v3/solidly-v3-factory.js +2 -2
- package/build/dex/solidly-v3/solidly-v3-factory.js.map +1 -1
- package/build/dex/solidly-v3/solidly-v3-pool.d.ts +2 -2
- package/build/dex/solidly-v3/solidly-v3-pool.js +3 -4
- package/build/dex/solidly-v3/solidly-v3-pool.js.map +1 -1
- package/build/dex/solidly-v3/solidly-v3.d.ts +1 -1
- package/build/dex/solidly-v3/solidly-v3.js +5 -6
- package/build/dex/solidly-v3/solidly-v3.js.map +1 -1
- package/build/dex/solidly-v3/types.d.ts +7 -20
- package/build/dex/solidly-v3/utils.js +1 -1
- package/build/dex/solidly-v3/utils.js.map +1 -1
- package/build/dex/spark/config.js +5 -5
- package/build/dex/spark/config.js.map +1 -1
- package/build/dex/spark/scripts/validate-state.js +2 -5
- package/build/dex/spark/scripts/validate-state.js.map +1 -1
- package/build/dex/spark/spark-psm.d.ts +1 -1
- package/build/dex/spark/spark-psm.js +5 -5
- package/build/dex/spark/spark-psm.js.map +1 -1
- package/build/dex/spark/spark-sdai-pool.d.ts +1 -1
- package/build/dex/spark/spark.d.ts +1 -1
- package/build/dex/spark/types.d.ts +1 -1
- package/build/dex/spark/utils.d.ts +1 -1
- package/build/dex/spark/utils.js +3 -4
- package/build/dex/spark/utils.js.map +1 -1
- package/build/dex/stable-pool/stable-pool.d.ts +1 -1
- package/build/dex/stable-pool/stable-pool.js +2 -2
- package/build/dex/stable-pool/stable-pool.js.map +1 -1
- package/build/dex/stader/stader-pool.d.ts +2 -2
- package/build/dex/stader/stader-pool.js +2 -0
- package/build/dex/stader/stader-pool.js.map +1 -1
- package/build/dex/stader/stader.d.ts +1 -1
- package/build/dex/stader/stader.js +4 -4
- package/build/dex/stader/stader.js.map +1 -1
- package/build/dex/stader/utils.d.ts +1 -1
- package/build/dex/stader/utils.js +2 -2
- package/build/dex/stader/utils.js.map +1 -1
- package/build/dex/swaap-v2/swaap-v2.d.ts +1 -1
- package/build/dex/swaap-v2/swaap-v2.js +21 -21
- package/build/dex/swaap-v2/swaap-v2.js.map +1 -1
- package/build/dex/swaap-v2/validators.js +1 -1
- package/build/dex/swaap-v2/validators.js.map +1 -1
- package/build/dex/swell/rsweth-pool.d.ts +2 -2
- package/build/dex/swell/rsweth-pool.js +2 -0
- package/build/dex/swell/rsweth-pool.js.map +1 -1
- package/build/dex/swell/swell.d.ts +1 -1
- package/build/dex/swell/swell.js +3 -4
- package/build/dex/swell/swell.js.map +1 -1
- package/build/dex/swell/sweth-pool.d.ts +2 -2
- package/build/dex/swell/sweth-pool.js +2 -0
- package/build/dex/swell/sweth-pool.js.map +1 -1
- package/build/dex/swell/utils.d.ts +1 -1
- package/build/dex/swell/utils.js +2 -2
- package/build/dex/swell/utils.js.map +1 -1
- package/build/dex/synthetix/contract-math/DexPriceAggregatorUniswapV3.js +4 -4
- package/build/dex/synthetix/contract-math/DexPriceAggregatorUniswapV3.js.map +1 -1
- package/build/dex/synthetix/synthetix-state.d.ts +2 -3
- package/build/dex/synthetix/synthetix-state.js +4 -4
- package/build/dex/synthetix/synthetix-state.js.map +1 -1
- package/build/dex/synthetix/synthetix.d.ts +1 -1
- package/build/dex/synthetix/synthetix.js +2 -2
- package/build/dex/synthetix/synthetix.js.map +1 -1
- package/build/dex/synthetix/utils.js +1 -1
- package/build/dex/synthetix/utils.js.map +1 -1
- package/build/dex/trader-joe-v2.1/base.d.ts +1 -1
- package/build/dex/trader-joe-v2.1/base.js +2 -2
- package/build/dex/trader-joe-v2.1/base.js.map +1 -1
- package/build/dex/trader-joe-v2.1/trader-joe-v2.1.js +2 -2
- package/build/dex/trader-joe-v2.1/trader-joe-v2.1.js.map +1 -1
- package/build/dex/trader-joe-v2.1/trader-joe-v2.2.js +2 -2
- package/build/dex/trader-joe-v2.1/trader-joe-v2.2.js.map +1 -1
- package/build/dex/trader-joe-v2.d.ts +40 -0
- package/build/dex/trader-joe-v2.js +74 -0
- package/build/dex/trader-joe-v2.js.map +1 -0
- package/build/dex/uniswap-v2/biswap.d.ts +2 -1
- package/build/dex/uniswap-v2/biswap.js.map +1 -1
- package/build/dex/uniswap-v2/excalibur.d.ts +2 -1
- package/build/dex/uniswap-v2/excalibur.js.map +1 -1
- package/build/dex/uniswap-v2/mdex.d.ts +2 -1
- package/build/dex/uniswap-v2/mdex.js.map +1 -1
- package/build/dex/uniswap-v2/nomiswap-v2.d.ts +2 -1
- package/build/dex/uniswap-v2/nomiswap-v2.js.map +1 -1
- package/build/dex/uniswap-v2/ring-v2.d.ts +1 -1
- package/build/dex/uniswap-v2/ring-v2.js +6 -8
- package/build/dex/uniswap-v2/ring-v2.js.map +1 -1
- package/build/dex/uniswap-v2/uniswap-v2-factory.d.ts +1 -1
- package/build/dex/uniswap-v2/uniswap-v2.d.ts +4 -4
- package/build/dex/uniswap-v2/uniswap-v2.js +17 -20
- package/build/dex/uniswap-v2/uniswap-v2.js.map +1 -1
- package/build/dex/uniswap-v3/forks/ramses-v2/ramses-v2-pool.d.ts +1 -1
- package/build/dex/uniswap-v3/forks/ramses-v2/ramses-v2-pool.js +2 -2
- package/build/dex/uniswap-v3/forks/ramses-v2/ramses-v2-pool.js.map +1 -1
- package/build/dex/uniswap-v3/forks/ramses-v2/utils.js +1 -1
- package/build/dex/uniswap-v3/forks/ramses-v2/utils.js.map +1 -1
- package/build/dex/uniswap-v3/forks/velodrome-slipstream/utils.js +1 -1
- package/build/dex/uniswap-v3/forks/velodrome-slipstream/utils.js.map +1 -1
- package/build/dex/uniswap-v3/forks/velodrome-slipstream/velodrome-slipstream-factory.d.ts +1 -1
- package/build/dex/uniswap-v3/forks/velodrome-slipstream/velodrome-slipstream-pool.d.ts +1 -1
- package/build/dex/uniswap-v3/forks/velodrome-slipstream/velodrome-slipstream-pool.js +21 -21
- package/build/dex/uniswap-v3/forks/velodrome-slipstream/velodrome-slipstream-pool.js.map +1 -1
- package/build/dex/uniswap-v3/forks/velodrome-slipstream/velodrome-slipstream.d.ts +1 -1
- package/build/dex/uniswap-v3/forks/velodrome-slipstream/velodrome-slipstream.js +4 -5
- package/build/dex/uniswap-v3/forks/velodrome-slipstream/velodrome-slipstream.js.map +1 -1
- package/build/dex/uniswap-v3/types.d.ts +2 -1
- package/build/dex/uniswap-v3/types.js.map +1 -1
- package/build/dex/uniswap-v3/uniswap-v3-factory.d.ts +1 -1
- package/build/dex/uniswap-v3/uniswap-v3-new.d.ts +94 -0
- package/build/dex/uniswap-v3/uniswap-v3-new.js +923 -0
- package/build/dex/uniswap-v3/uniswap-v3-new.js.map +1 -0
- package/build/dex/uniswap-v3/uniswap-v3-pool.d.ts +2 -2
- package/build/dex/uniswap-v3/uniswap-v3-pool.js +3 -4
- package/build/dex/uniswap-v3/uniswap-v3-pool.js.map +1 -1
- package/build/dex/uniswap-v3/uniswap-v3.d.ts +1 -1
- package/build/dex/uniswap-v3/uniswap-v3.js +11 -16
- package/build/dex/uniswap-v3/uniswap-v3.js.map +1 -1
- package/build/dex/uniswap-v3/utils.js +1 -1
- package/build/dex/uniswap-v3/utils.js.map +1 -1
- package/build/dex/uniswap-v3.d.ts +1 -1
- package/build/dex/uniswap-v3.js +4 -5
- package/build/dex/uniswap-v3.js.map +1 -1
- package/build/dex/uniswap-v4/encoder.js +9 -9
- package/build/dex/uniswap-v4/encoder.js.map +1 -1
- package/build/dex/uniswap-v4/uniswap-v4-pool-manager.d.ts +1 -1
- package/build/dex/uniswap-v4/uniswap-v4-pool-manager.js +6 -6
- package/build/dex/uniswap-v4/uniswap-v4-pool-manager.js.map +1 -1
- package/build/dex/uniswap-v4/uniswap-v4-pool.d.ts +1 -1
- package/build/dex/uniswap-v4/uniswap-v4-pool.js +5 -5
- package/build/dex/uniswap-v4/uniswap-v4-pool.js.map +1 -1
- package/build/dex/usual-bond/config.d.ts +3 -0
- package/build/dex/usual-bond/config.js +13 -0
- package/build/dex/usual-bond/config.js.map +1 -0
- package/build/dex/usual-bond/types.d.ts +7 -0
- package/build/dex/usual-bond/types.js +3 -0
- package/build/dex/usual-bond/types.js.map +1 -0
- package/build/dex/usual-bond/usual-bond.d.ts +35 -0
- package/build/dex/usual-bond/usual-bond.js +176 -0
- package/build/dex/usual-bond/usual-bond.js.map +1 -0
- package/build/dex/wombat/utils.d.ts +1 -1
- package/build/dex/wombat/wombat-bmw.d.ts +1 -1
- package/build/dex/wombat/wombat.d.ts +1 -1
- package/build/dex/wombat/wombat.js +4 -4
- package/build/dex/wombat/wombat.js.map +1 -1
- package/build/dex/woo-fi-v2/types.d.ts +1 -1
- package/build/dex/woo-fi-v2/utils.js +6 -6
- package/build/dex/woo-fi-v2/utils.js.map +1 -1
- package/build/dex/woo-fi-v2/woo-fi-v2.js +1 -1
- package/build/dex/woo-fi-v2/woo-fi-v2.js.map +1 -1
- package/build/dex/wsteth/wsteth.d.ts +1 -1
- package/build/dex/wsteth/wsteth.js +3 -3
- package/build/dex/wsteth/wsteth.js.map +1 -1
- package/build/dex/wusdm/config.d.ts +3 -0
- package/build/dex/wusdm/config.js +43 -0
- package/build/dex/wusdm/config.js.map +1 -0
- package/build/dex/wusdm/constants.d.ts +2 -0
- package/build/dex/wusdm/constants.js +6 -0
- package/build/dex/wusdm/constants.js.map +1 -0
- package/build/dex/wusdm/types.d.ts +18 -0
- package/build/dex/wusdm/types.js +11 -0
- package/build/dex/wusdm/types.js.map +1 -0
- package/build/dex/wusdm/wusdm-pool.d.ts +21 -0
- package/build/dex/wusdm/wusdm-pool.js +74 -0
- package/build/dex/wusdm/wusdm-pool.js.map +1 -0
- package/build/dex/wusdm/wusdm.d.ts +46 -0
- package/build/dex/wusdm/wusdm.js +243 -0
- package/build/dex/wusdm/wusdm.js.map +1 -0
- package/build/dex/zerox/config.d.ts +2 -0
- package/build/dex/zerox/config.js +33 -0
- package/build/dex/zerox/config.js.map +1 -0
- package/build/dex/zerox/index.d.ts +22 -0
- package/build/dex/zerox/index.js +225 -0
- package/build/dex/zerox/index.js.map +1 -0
- package/build/dex/zerox/order.d.ts +88 -0
- package/build/dex/zerox/order.js +53 -0
- package/build/dex/zerox/order.js.map +1 -0
- package/build/dex/zerox/types.d.ts +73 -0
- package/build/dex/zerox/types.js +21 -0
- package/build/dex/zerox/types.js.map +1 -0
- package/build/dex-helper/dummy-dex-helper.d.ts +1 -1
- package/build/dex-helper/dummy-dex-helper.js +3 -4
- package/build/dex-helper/dummy-dex-helper.js.map +1 -1
- package/build/dex-helper/idex-helper.d.ts +1 -1
- package/build/executor/Executor01BytecodeBuilder.js +13 -14
- package/build/executor/Executor01BytecodeBuilder.js.map +1 -1
- package/build/executor/Executor02BytecodeBuilder.js +40 -53
- package/build/executor/Executor02BytecodeBuilder.js.map +1 -1
- package/build/executor/Executor03BytecodeBuilder.js +18 -19
- package/build/executor/Executor03BytecodeBuilder.js.map +1 -1
- package/build/executor/ExecutorBytecodeBuilder.js +22 -23
- package/build/executor/ExecutorBytecodeBuilder.js.map +1 -1
- package/build/executor/constants.js +5 -6
- package/build/executor/constants.js.map +1 -1
- package/build/executor/utils.d.ts +1 -1
- package/build/executor/utils.js +3 -0
- package/build/executor/utils.js.map +1 -1
- package/build/generic-swap-transaction-builder.d.ts +1 -1
- package/build/generic-swap-transaction-builder.js +18 -23
- package/build/generic-swap-transaction-builder.js.map +1 -1
- package/build/lib/api3-feed.d.ts +1 -1
- package/build/lib/api3-feed.js +5 -5
- package/build/lib/api3-feed.js.map +1 -1
- package/build/lib/curve/encoder.d.ts +1 -2
- package/build/lib/curve/encoder.js +4 -5
- package/build/lib/curve/encoder.js.map +1 -1
- package/build/lib/decoders.d.ts +2 -3
- package/build/lib/decoders.js +9 -9
- package/build/lib/decoders.js.map +1 -1
- package/build/lib/tokens/utils.d.ts +1 -1
- package/build/lib/tokens/utils.js +10 -8
- package/build/lib/tokens/utils.js.map +1 -1
- package/build/utils.d.ts +1 -0
- package/build/utils.js +10 -3
- package/build/utils.js.map +1 -1
- package/package.json +2 -3
- package/build/abi/algebra-integral/AlgebraFactory.abi.json +0 -947
- package/build/abi/ekubo/twamm-data-fetcher.json +0 -216
- package/build/abi/ekubo/twamm.json +0 -720
- package/build/abi/ring-v2/few-wrapped-token.json +0 -587
- package/build/abi/ring-v2/ring-v2-factory.json +0 -125
- package/build/abi/ring-v2/ring-v2-pool.json +0 -461
- package/build/abi/ring-v2/ring-v2-router.json +0 -332
- package/build/dex/algebra-integral/algebra-integral-factory.d.ts +0 -29
- package/build/dex/algebra-integral/algebra-integral-factory.js +0 -159
- package/build/dex/algebra-integral/algebra-integral-factory.js.map +0 -1
- package/build/dex/ekubo/pools/base.d.ts +0 -36
- package/build/dex/ekubo/pools/base.js +0 -289
- package/build/dex/ekubo/pools/base.js.map +0 -1
- package/build/dex/ekubo/pools/full-range.d.ts +0 -23
- package/build/dex/ekubo/pools/full-range.js +0 -99
- package/build/dex/ekubo/pools/full-range.js.map +0 -1
- package/build/dex/ekubo/pools/iface.d.ts +0 -46
- package/build/dex/ekubo/pools/iface.js +0 -75
- package/build/dex/ekubo/pools/iface.js.map +0 -1
- package/build/dex/ekubo/pools/math/twamm/exp2.d.ts +0 -1
- package/build/dex/ekubo/pools/math/twamm/exp2.js +0 -86
- package/build/dex/ekubo/pools/math/twamm/exp2.js.map +0 -1
- package/build/dex/ekubo/pools/math/twamm/sqrt-ratio.d.ts +0 -1
- package/build/dex/ekubo/pools/math/twamm/sqrt-ratio.js +0 -56
- package/build/dex/ekubo/pools/math/twamm/sqrt-ratio.js.map +0 -1
- package/build/dex/ekubo/pools/oracle.d.ts +0 -8
- package/build/dex/ekubo/pools/oracle.js +0 -19
- package/build/dex/ekubo/pools/oracle.js.map +0 -1
- package/build/dex/ekubo/pools/twamm.d.ts +0 -38
- package/build/dex/ekubo/pools/twamm.js +0 -253
- package/build/dex/ekubo/pools/twamm.js.map +0 -1
- package/build/dex/ekubo/pools/utils.d.ts +0 -28
- package/build/dex/ekubo/pools/utils.js +0 -80
- package/build/dex/ekubo/pools/utils.js.map +0 -1
- package/build/dex/miro-migrator/miro-migrator-state.d.ts +0 -27
- package/build/dex/miro-migrator/miro-migrator-state.js +0 -89
- package/build/dex/miro-migrator/miro-migrator-state.js.map +0 -1
|
@@ -13,7 +13,6 @@ const constants_1 = require("./constants");
|
|
|
13
13
|
const types_1 = require("./types");
|
|
14
14
|
const constants_2 = require("../constants");
|
|
15
15
|
const bigint_constants_1 = require("../bigint-constants");
|
|
16
|
-
const { utils: { hexlify, hexDataLength, hexConcat, hexZeroPad, solidityPack }, } = ethers_1.ethers;
|
|
17
16
|
const MAX_UINT48 = bigint_constants_1.BI_MAX_UINT48.toString();
|
|
18
17
|
const MAX_UINT160 = bigint_constants_1.BI_MAX_UINT160.toString();
|
|
19
18
|
class ExecutorBytecodeBuilder {
|
|
@@ -55,13 +54,13 @@ class ExecutorBytecodeBuilder {
|
|
|
55
54
|
// as approval given only for MAX_UNIT or 0, no need to use insertFromAmount flag
|
|
56
55
|
const checkSrcTokenBalance = flag % 3 === 2;
|
|
57
56
|
if (checkSrcTokenBalance) {
|
|
58
|
-
approveCalldata =
|
|
57
|
+
approveCalldata = (0, ethers_1.concat)([approveCalldata, constants_1.ZEROS_12_BYTES, tokenAddr]);
|
|
59
58
|
}
|
|
60
59
|
let approvalCalldata = this.buildCallData(tokenAddr, approveCalldata, 0, constants_1.APPROVE_CALLDATA_DEST_TOKEN_POS, types_1.SpecialDex.DEFAULT, flag);
|
|
61
60
|
// add additional approval 0 for special cases
|
|
62
61
|
if (amount !== '0' &&
|
|
63
62
|
constants_1.DISABLED_MAX_UNIT_APPROVAL_TOKENS?.[this.dexHelper.config.data.network]?.includes(tokenAddr)) {
|
|
64
|
-
approvalCalldata =
|
|
63
|
+
approvalCalldata = (0, ethers_1.concat)([
|
|
65
64
|
this.buildApproveCallData(spender, tokenAddr, types_1.Flag.DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP, false, '0'),
|
|
66
65
|
approvalCalldata,
|
|
67
66
|
]);
|
|
@@ -82,7 +81,7 @@ class ExecutorBytecodeBuilder {
|
|
|
82
81
|
constants_2.PERMIT2_ADDRESS,
|
|
83
82
|
0,
|
|
84
83
|
]);
|
|
85
|
-
approvalCalldata =
|
|
84
|
+
approvalCalldata = (0, ethers_1.concat)([
|
|
86
85
|
this.buildCallData(tokenAddr, resetApprove, 0, constants_1.APPROVE_CALLDATA_DEST_TOKEN_POS, types_1.SpecialDex.DEFAULT, types_1.Flag.DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP),
|
|
87
86
|
approvalCalldata,
|
|
88
87
|
]);
|
|
@@ -99,9 +98,9 @@ class ExecutorBytecodeBuilder {
|
|
|
99
98
|
// as approval given only for MAX_UNIT or 0, no need to use insertFromAmount flag
|
|
100
99
|
const checkSrcTokenBalance = flag % 3 === 2;
|
|
101
100
|
if (checkSrcTokenBalance) {
|
|
102
|
-
permit2Calldata =
|
|
101
|
+
permit2Calldata = (0, ethers_1.concat)([permit2Calldata, constants_1.ZEROS_12_BYTES, tokenAddr]);
|
|
103
102
|
}
|
|
104
|
-
return
|
|
103
|
+
return (0, ethers_1.concat)([approvalCalldata, permit2Calldata]);
|
|
105
104
|
}
|
|
106
105
|
buildWrapEthCallData(wethAddress, depositCallData, flag, destTokenPos = 0) {
|
|
107
106
|
return this.buildCallData(wethAddress, depositCallData, constants_1.WRAP_UNWRAP_FROM_AMOUNT_POS, destTokenPos, types_1.SpecialDex.DEFAULT, flag);
|
|
@@ -109,11 +108,11 @@ class ExecutorBytecodeBuilder {
|
|
|
109
108
|
buildUnwrapEthCallData(wethAddress, withdrawCallData) {
|
|
110
109
|
return this.buildCallData(wethAddress, // weth address
|
|
111
110
|
withdrawCallData, constants_1.WRAP_UNWRAP_FROM_AMOUNT_POS, 0, types_1.SpecialDex.DEFAULT, types_1.Flag.INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP, // 7
|
|
112
|
-
|
|
111
|
+
(0, ethers_1.dataLength)(withdrawCallData));
|
|
113
112
|
}
|
|
114
113
|
buildTransferCallData(transferCallData, tokenAddr) {
|
|
115
114
|
return this.buildCallData(tokenAddr, transferCallData, 36, 0, types_1.SpecialDex.DEFAULT, types_1.Flag.INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP, // 3
|
|
116
|
-
|
|
115
|
+
(0, ethers_1.dataLength)(transferCallData));
|
|
117
116
|
}
|
|
118
117
|
buildFinalSpecialFlagCalldata() {
|
|
119
118
|
return this.buildCallData(this.dexHelper.config.data.augustusV6Address, // augustus v6 address
|
|
@@ -127,27 +126,27 @@ class ExecutorBytecodeBuilder {
|
|
|
127
126
|
}
|
|
128
127
|
buildExecutor0102CallData(tokenAddress, calldata, fromAmountPos, destTokenPos, specialDexFlag, flag, toAmountPos = 0, // not used for Executor01 and Executor02, just to follow the same interface
|
|
129
128
|
returnAmountPos = constants_1.DEFAULT_RETURN_AMOUNT_POS) {
|
|
130
|
-
return
|
|
129
|
+
return (0, ethers_1.solidityPacked)(constants_1.EXECUTOR_01_02_FUNCTION_CALL_DATA_TYPES, [
|
|
131
130
|
tokenAddress, // token address
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
131
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)((0, ethers_1.dataLength)(calldata) + constants_1.BYTES_28_LENGTH), 4), // calldata length + bytes28(0)
|
|
132
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(fromAmountPos), 2), // fromAmountPos
|
|
133
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(destTokenPos), 2), // destTokenPos
|
|
134
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(returnAmountPos), 1), // returnAmountPos
|
|
135
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(specialDexFlag), 1), // special
|
|
136
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(flag), 2), // flag
|
|
138
137
|
constants_1.ZEROS_28_BYTES, // bytes28(0)
|
|
139
138
|
calldata, // calldata
|
|
140
139
|
]);
|
|
141
140
|
}
|
|
142
141
|
buildExecutor03CallData(tokenAddress, calldata, fromAmountPos, destTokenPos, specialDexFlag, flag, toAmountPos = 0) {
|
|
143
|
-
return
|
|
142
|
+
return (0, ethers_1.solidityPacked)(constants_1.EXECUTOR_03_FUNCTION_CALL_DATA_TYPES, [
|
|
144
143
|
tokenAddress, // token address
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
144
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)((0, ethers_1.dataLength)(calldata) + constants_1.BYTES_28_LENGTH), 2), // calldata length + bytes28(0)
|
|
145
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(toAmountPos), 2), // toAmountPos
|
|
146
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(fromAmountPos), 2), // fromAmountPos
|
|
147
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(destTokenPos), 2), // destTokenPos
|
|
148
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(specialDexFlag), 2), // special
|
|
149
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(flag), 2), // flag
|
|
151
150
|
constants_1.ZEROS_28_BYTES, // bytes28(0)
|
|
152
151
|
calldata, // calldata
|
|
153
152
|
]);
|
|
@@ -185,7 +184,7 @@ class ExecutorBytecodeBuilder {
|
|
|
185
184
|
.replace('0x', '')
|
|
186
185
|
.indexOf(tokenAddr.replace('0x', ''));
|
|
187
186
|
if (isTokenInCallData === -1) {
|
|
188
|
-
callData =
|
|
187
|
+
callData = (0, ethers_1.concat)([callData, constants_1.ZEROS_12_BYTES, tokenAddr]);
|
|
189
188
|
}
|
|
190
189
|
return callData;
|
|
191
190
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExecutorBytecodeBuilder.js","sourceRoot":"","sources":["../../src/executor/ExecutorBytecodeBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA+C;AAE/C,mEAAyC;AACzC,uEAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"ExecutorBytecodeBuilder.js","sourceRoot":"","sources":["../../src/executor/ExecutorBytecodeBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DISABLED_MAX_UNIT_APPROVAL_TOKENS = exports.RETURN_AMOUNT_POS_32 = exports.RETURN_AMOUNT_POS_0 = exports.DEFAULT_RETURN_AMOUNT_POS = exports.WRAP_UNWRAP_FROM_AMOUNT_POS = exports.APPROVE_CALLDATA_DEST_TOKEN_POS = exports.EXECUTOR_03_FUNCTION_CALL_DATA_TYPES = exports.EXECUTOR_01_02_FUNCTION_CALL_DATA_TYPES = exports.ETH_SRC_TOKEN_POS_FOR_MULTISWAP_METADATA = exports.NOT_EXISTING_EXCHANGE_PARAM_INDEX = exports.SWAP_EXCHANGE_100_PERCENTAGE = exports.ZEROS_32_BYTES = exports.ZEROS_28_BYTES = exports.ZEROS_20_BYTES = exports.ZEROS_12_BYTES = exports.ZEROS_4_BYTES = exports.BYTES_96_LENGTH = exports.BYTES_64_LENGTH = exports.BYTES_28_LENGTH = void 0;
|
|
4
4
|
const ethers_1 = require("ethers");
|
|
5
5
|
const constants_1 = require("../constants");
|
|
6
|
-
const { utils: { hexlify, hexZeroPad }, } = ethers_1.ethers;
|
|
7
6
|
exports.BYTES_28_LENGTH = 28;
|
|
8
7
|
exports.BYTES_64_LENGTH = 64;
|
|
9
8
|
exports.BYTES_96_LENGTH = 96;
|
|
10
|
-
exports.ZEROS_4_BYTES =
|
|
11
|
-
exports.ZEROS_12_BYTES =
|
|
12
|
-
exports.ZEROS_20_BYTES =
|
|
13
|
-
exports.ZEROS_28_BYTES =
|
|
14
|
-
exports.ZEROS_32_BYTES =
|
|
9
|
+
exports.ZEROS_4_BYTES = (0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(0), 4);
|
|
10
|
+
exports.ZEROS_12_BYTES = (0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(0), 12);
|
|
11
|
+
exports.ZEROS_20_BYTES = (0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(0), 20);
|
|
12
|
+
exports.ZEROS_28_BYTES = (0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(0), 28);
|
|
13
|
+
exports.ZEROS_32_BYTES = (0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(0), 32);
|
|
15
14
|
exports.SWAP_EXCHANGE_100_PERCENTAGE = 100;
|
|
16
15
|
exports.NOT_EXISTING_EXCHANGE_PARAM_INDEX = -1;
|
|
17
16
|
exports.ETH_SRC_TOKEN_POS_FOR_MULTISWAP_METADATA = '0xEEEEEEEEEEEEEEEE';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/executor/constants.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/executor/constants.ts"],"names":[],"mappings":";;;AAAA,mCAA+C;AAC/C,4CAAuC;AAE1B,QAAA,eAAe,GAAG,EAAE,CAAC;AACrB,QAAA,eAAe,GAAG,EAAE,CAAC;AACrB,QAAA,eAAe,GAAG,EAAE,CAAC;AAErB,QAAA,aAAa,GAAG,IAAA,qBAAY,EAAC,IAAA,gBAAO,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,QAAA,cAAc,GAAG,IAAA,qBAAY,EAAC,IAAA,gBAAO,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9C,QAAA,cAAc,GAAG,IAAA,qBAAY,EAAC,IAAA,gBAAO,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9C,QAAA,cAAc,GAAG,IAAA,qBAAY,EAAC,IAAA,gBAAO,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9C,QAAA,cAAc,GAAG,IAAA,qBAAY,EAAC,IAAA,gBAAO,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAE9C,QAAA,4BAA4B,GAAG,GAAG,CAAC;AAEnC,QAAA,iCAAiC,GAAG,CAAC,CAAC,CAAC;AAEvC,QAAA,wCAAwC,GAAG,oBAAoB,CAAC;AAEhE,QAAA,uCAAuC,GAAa;IAC/D,SAAS,EAAE,UAAU;IACrB,QAAQ,EAAE,gBAAgB;IAC1B,QAAQ,EAAE,iBAAiB;IAC3B,QAAQ,EAAE,cAAc;IACxB,QAAQ,EAAE,mBAAmB;IAC7B,QAAQ,EAAE,kBAAkB;IAC5B,QAAQ,EAAE,OAAO;IACjB,SAAS,EAAE,eAAe;IAC1B,OAAO,EAAE,eAAe;CACzB,CAAC;AAEW,QAAA,oCAAoC,GAAa;IAC5D,SAAS,EAAE,mBAAmB;IAC9B,QAAQ,EAAE,yBAAyB;IACnC,QAAQ,EAAE,uBAAuB;IACjC,QAAQ,EAAE,yBAAyB;IACnC,QAAQ,EAAE,sBAAsB;IAChC,QAAQ,EAAE,2BAA2B;IACrC,QAAQ,EAAE,eAAe;IACzB,SAAS,EAAE,yBAAyB;IACpC,OAAO,EAAE,uBAAuB;CACjC,CAAC;AAEW,QAAA,+BAA+B,GAAG,EAAE,CAAC;AACrC,QAAA,2BAA2B,GAAG,CAAC,CAAC;AAChC,QAAA,yBAAyB,GAAG,GAAG,CAAC;AAEhC,QAAA,mBAAmB,GAAG,CAAC,CAAC;AACxB,QAAA,oBAAoB,GAAG,EAAE,CAAC;AAEvC,4GAA4G;AAC5G,sDAAsD;AACzC,QAAA,iCAAiC,GAE1C;IACF,qEAAqE;IACrE,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;QACjB,4CAA4C;QAC5C,4CAA4C;QAC5C,4CAA4C;KAC7C;CACF,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { FunctionFragment, Interface } from '
|
|
1
|
+
import { FunctionFragment, Interface } from 'ethers';
|
|
2
2
|
export declare const extractReturnAmountPosition: (iface: Interface, functionName: string | FunctionFragment, outputName?: string, outputIndex?: number) => number;
|
package/build/executor/utils.js
CHANGED
|
@@ -6,6 +6,9 @@ const extractReturnAmountPosition = (iface, functionName, outputName = '', outpu
|
|
|
6
6
|
const func = typeof functionName === 'string'
|
|
7
7
|
? iface.getFunction(functionName)
|
|
8
8
|
: functionName;
|
|
9
|
+
if (!func) {
|
|
10
|
+
throw new Error(`Function ${functionName} was not found in the provided abi`);
|
|
11
|
+
}
|
|
9
12
|
const outputs = func.outputs || [];
|
|
10
13
|
const index = outputs.findIndex(({ name }) => name === outputName || (outputName === '' && name === null));
|
|
11
14
|
if (index < 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/executor/utils.ts"],"names":[],"mappings":";;;AACA,2CAAwE;AAEjE,MAAM,2BAA2B,GAAG,CACzC,KAAgB,EAChB,YAAuC,EACvC,UAAU,GAAG,EAAE,EACf,WAAW,GAAG,CAAC,EACP,EAAE;IACV,MAAM,IAAI,GACR,OAAO,YAAY,KAAK,QAAQ;QAC9B,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,YAAY,CAAC;QACjC,CAAC,CAAC,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/executor/utils.ts"],"names":[],"mappings":";;;AACA,2CAAwE;AAEjE,MAAM,2BAA2B,GAAG,CACzC,KAAgB,EAChB,YAAuC,EACvC,UAAU,GAAG,EAAE,EACf,WAAW,GAAG,CAAC,EACP,EAAE;IACV,MAAM,IAAI,GACR,OAAO,YAAY,KAAK,QAAQ;QAC9B,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,YAAY,CAAC;QACjC,CAAC,CAAC,YAAY,CAAC;IAEnB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CACb,YAAY,YAAY,oCAAoC,CAC7D,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAC7B,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,UAAU,KAAK,EAAE,IAAI,IAAI,KAAK,IAAI,CAAC,CAC1E,CAAC;IAEF,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CACb,YAAY,YAAY,oCAAoC,CAC7D,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,IACE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO;YAC/B,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,aAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,2BAA2B;YACjF,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,8BAA8B;UACnD,CAAC;YACD,OAAO,CACL,gCAAoB;gBACpB,gCAAoB;gBACpB,WAAW,GAAG,gCAAoB,CACnC,CAAC,CAAC,4EAA4E;QACjF,CAAC;QACD,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACxE,MAAM,IAAI,KAAK,CACb,kGAAkG,CACnG,CAAC;QACJ,CAAC;QAED,OAAO,+BAAmB,CAAC;IAC7B,CAAC;IAED,IAAI,QAAQ,GAAG,+BAAmB,CAAC;IACnC,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,OAAO,QAAQ,GAAG,KAAK,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEjC,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,MAAM,IAAI,KAAK,CACb,oIAAoI,CACrI,CAAC;QACJ,CAAC;QAED,QAAQ,IAAI,gCAAoB,CAAC;QACjC,QAAQ,EAAE,CAAC;IACb,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAjEW,QAAA,2BAA2B,+BAiEtC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Address, DexExchangeParamWithBooleanNeedWrapNative, OptimalRate, OptimalSwap, OptimalSwapExchange, TxObject } from './types';
|
|
2
|
-
import { AbiCoder, Interface } from '
|
|
2
|
+
import { AbiCoder, Interface } from 'ethers';
|
|
3
3
|
import { DepositWithdrawReturn } from './dex/weth/types';
|
|
4
4
|
import { DexAdapterService } from './dex';
|
|
5
5
|
import { ExecutorDetector } from './executor/ExecutorDetector';
|
|
@@ -6,14 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.GenericSwapTransactionBuilder = void 0;
|
|
7
7
|
const ethers_1 = require("ethers");
|
|
8
8
|
const constants_1 = require("./constants");
|
|
9
|
-
const abi_1 = require("@ethersproject/abi");
|
|
10
9
|
const ABI_json_1 = __importDefault(require("./abi/augustus-v6/ABI.json"));
|
|
11
10
|
const utils_1 = require("./utils");
|
|
12
11
|
const weth_1 = require("./dex/weth/weth");
|
|
13
12
|
const erc20_json_1 = __importDefault(require("./abi/erc20.json"));
|
|
14
13
|
const ExecutorDetector_1 = require("./executor/ExecutorDetector");
|
|
15
14
|
const core_1 = require("@paraswap/core");
|
|
16
|
-
const { utils: { hexlify, hexConcat, hexZeroPad }, } = ethers_1.ethers;
|
|
17
15
|
class GenericSwapTransactionBuilder {
|
|
18
16
|
dexAdapterService;
|
|
19
17
|
wExchangeNetworkToKey;
|
|
@@ -30,9 +28,9 @@ class GenericSwapTransactionBuilder {
|
|
|
30
28
|
}, {})) {
|
|
31
29
|
this.dexAdapterService = dexAdapterService;
|
|
32
30
|
this.wExchangeNetworkToKey = wExchangeNetworkToKey;
|
|
33
|
-
this.abiCoder = new
|
|
34
|
-
this.erc20Interface = new
|
|
35
|
-
this.augustusV6Interface = new
|
|
31
|
+
this.abiCoder = new ethers_1.AbiCoder();
|
|
32
|
+
this.erc20Interface = new ethers_1.Interface(erc20_json_1.default);
|
|
33
|
+
this.augustusV6Interface = new ethers_1.Interface(ABI_json_1.default);
|
|
36
34
|
this.augustusV6Address =
|
|
37
35
|
this.dexAdapterService.dexHelper.config.data.augustusV6Address;
|
|
38
36
|
this.executorDetector = new ExecutorDetector_1.ExecutorDetector(this.dexAdapterService.dexHelper);
|
|
@@ -105,9 +103,9 @@ class GenericSwapTransactionBuilder {
|
|
|
105
103
|
isSell ? priceRoute.srcAmount : minMaxAmount,
|
|
106
104
|
isSell ? minMaxAmount : priceRoute.destAmount,
|
|
107
105
|
quotedAmount,
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
106
|
+
(0, ethers_1.concat)([
|
|
107
|
+
(0, ethers_1.zeroPadValue)((0, utils_1.uuidToBytes16)(uuid), 16),
|
|
108
|
+
(0, ethers_1.zeroPadValue)((0, ethers_1.toBeHex)(priceRoute.blockNumber), 16),
|
|
111
109
|
]),
|
|
112
110
|
beneficiary,
|
|
113
111
|
],
|
|
@@ -220,40 +218,37 @@ class GenericSwapTransactionBuilder {
|
|
|
220
218
|
? constants_1.NULL_ADDRESS
|
|
221
219
|
: partner;
|
|
222
220
|
// Partner address shifted left to make room for flags and fee percent
|
|
223
|
-
const partialFeeCodeWithPartnerAddress =
|
|
224
|
-
let partialFeeCodeWithBitFlags =
|
|
225
|
-
const isFixedFees =
|
|
221
|
+
const partialFeeCodeWithPartnerAddress = BigInt(partnerAddress) << 96n;
|
|
222
|
+
let partialFeeCodeWithBitFlags = 0n; // default 0 is safe if none the conditions pass
|
|
223
|
+
const isFixedFees = feePercent !== '0';
|
|
226
224
|
if (isFixedFees) {
|
|
227
225
|
// Ensure feePercent fits within the FEE_PERCENT_IN_BASIS_POINTS_MASK range
|
|
228
|
-
partialFeeCodeWithBitFlags =
|
|
226
|
+
partialFeeCodeWithBitFlags =
|
|
227
|
+
BigInt(feePercent) & constants_1.FEE_PERCENT_IN_BASIS_POINTS_MASK;
|
|
229
228
|
// Apply flags using bitwise OR with the appropriate masks
|
|
230
229
|
}
|
|
231
230
|
else {
|
|
232
231
|
if (isTakeSurplus) {
|
|
233
|
-
partialFeeCodeWithBitFlags
|
|
234
|
-
partialFeeCodeWithBitFlags.or(constants_1.IS_TAKE_SURPLUS_MASK);
|
|
232
|
+
partialFeeCodeWithBitFlags |= constants_1.IS_TAKE_SURPLUS_MASK;
|
|
235
233
|
}
|
|
236
234
|
else if (isReferral) {
|
|
237
|
-
partialFeeCodeWithBitFlags
|
|
238
|
-
partialFeeCodeWithBitFlags.or(constants_1.IS_REFERRAL_MASK);
|
|
235
|
+
partialFeeCodeWithBitFlags |= constants_1.IS_REFERRAL_MASK;
|
|
239
236
|
}
|
|
240
237
|
}
|
|
241
238
|
if (isSkipBlacklist) {
|
|
242
|
-
partialFeeCodeWithBitFlags
|
|
239
|
+
partialFeeCodeWithBitFlags |= constants_1.IS_SKIP_BLACKLIST_MASK;
|
|
243
240
|
}
|
|
244
241
|
if (isCapSurplus) {
|
|
245
|
-
partialFeeCodeWithBitFlags
|
|
246
|
-
partialFeeCodeWithBitFlags.or(constants_1.IS_CAP_SURPLUS_MASK);
|
|
242
|
+
partialFeeCodeWithBitFlags |= constants_1.IS_CAP_SURPLUS_MASK;
|
|
247
243
|
}
|
|
248
244
|
if (isSurplusToUser) {
|
|
249
|
-
partialFeeCodeWithBitFlags
|
|
250
|
-
partialFeeCodeWithBitFlags.or(constants_1.IS_USER_SURPLUS_MASK);
|
|
245
|
+
partialFeeCodeWithBitFlags |= constants_1.IS_USER_SURPLUS_MASK;
|
|
251
246
|
}
|
|
252
247
|
if (isDirectFeeTransfer) {
|
|
253
|
-
partialFeeCodeWithBitFlags
|
|
248
|
+
partialFeeCodeWithBitFlags |= constants_1.IS_DIRECT_TRANSFER_MASK;
|
|
254
249
|
}
|
|
255
250
|
// Combine partnerBigInt and feePercentBigInt
|
|
256
|
-
const feeCode = partialFeeCodeWithPartnerAddress
|
|
251
|
+
const feeCode = partialFeeCodeWithPartnerAddress | partialFeeCodeWithBitFlags;
|
|
257
252
|
return feeCode.toString();
|
|
258
253
|
}
|
|
259
254
|
getExecutionContractAddress(priceRoute) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generic-swap-transaction-builder.js","sourceRoot":"","sources":["../src/generic-swap-transaction-builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generic-swap-transaction-builder.js","sourceRoot":"","sources":["../src/generic-swap-transaction-builder.ts"],"names":[],"mappings":";;;;;;AASA,mCAA4E;AAC5E,2CAUqB;AACrB,0EAAuD;AACvD,mCAAsD;AAMtD,0CAAuC;AACvC,kEAAwC;AACxC,kEAA+D;AAG/D,yCAA2D;AAa3D,MAAa,6BAA6B;IAW5B;IACA;IAXZ,mBAAmB,CAAY;IAC/B,iBAAiB,CAAU;IAE3B,cAAc,CAAY;IAE1B,QAAQ,CAAW;IAEnB,gBAAgB,CAAmB;IAEnC,YACY,iBAAoC,EACpC,wBAAwB,WAAI,CAAC,kBAAkB,CAAC,MAAM,CAE9D,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAClB,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;QAC9B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAE,CAAC;QARI,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,0BAAqB,GAArB,qBAAqB,CAOzB;QAEN,IAAI,CAAC,QAAQ,GAAG,IAAI,iBAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG,IAAI,kBAAS,CAAC,oBAAQ,CAAC,CAAC;QAC9C,IAAI,CAAC,mBAAmB,GAAG,IAAI,kBAAS,CAAC,kBAAa,CAAC,CAAC;QACxD,IAAI,CAAC,iBAAiB;YACpB,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAkB,CAAC;QAClE,IAAI,CAAC,gBAAgB,GAAG,IAAI,mCAAgB,CAC1C,IAAI,CAAC,iBAAiB,CAAC,SAAS,CACjC,CAAC;IACJ,CAAC;IAES,8BAA8B,CACtC,aAAqB,EACrB,cAAsB,EACtB,IAAc,EACd,UAAuB,EACvB,cAA2D;QAE3D,IAAI,aAAa,KAAK,EAAE,IAAI,cAAc,KAAK,EAAE;YAAE,OAAO;QAE1D,IACE,aAAa,KAAK,cAAc;YAChC,CAAC,IAAI,CAAC,4CAA4C,CAChD,UAAU,EACV,cAAc,CACf;YAED,OAAO;QAET,OACE,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CACzC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAE7D,CAAC,uBAAuB,CACvB,aAAa,CAAC,QAAQ,EAAE,EACxB,cAAc,CAAC,QAAQ,EAAE,EACzB,IAAI,EACJ,sBAAe,CAAC,EAAE,CACnB,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,UAAuB,EACvB,YAAoB,EACpB,eAAwC,EACxC,WAAmB;QAEnB,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CACpC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CACjD,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CACtC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAChC,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CACrD,EAAE,CAAC,QAAQ,CACZ,CAAC;YAEF,MAAM,eAAe,GAAG,eAAe,CAAC,UAAU,EAAE,CAAC;YACrD,MAAM,EACJ,QAAQ,EACR,SAAS,EACT,SAAS,EACT,UAAU,EACV,SAAS,EACT,WAAW,EACX,YAAY,GACb,GAAG,IAAI,CAAC,iBAAiB,CACxB,UAAU,EACV,UAAU,EACV,IAAI,EACJ,SAAS,EACT,EAAE,EACF,YAAY,EACZ,GAAG,EACH,eAAe,CAChB,CAAC;YAEF,IAAI,SAAS,GAAG,MAAM,GAAG,CAAC,WAAY,CACpC,QAAQ,EACR,SAAS,EACT,IAAI,KAAK,eAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,uEAAuE;YACzH,UAAU,EACV,SAAS,EACT,EAAE,CAAC,IAAI,EACP,IAAI,EACJ;gBACE,gBAAgB,EACd,UAAU,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE;gBAC9D,iBAAiB,EACf,UAAU,CAAC,SAAS,CAAC,WAAW,EAAE;oBAClC,SAAS,CAAC,WAAW,EAAE;aAC1B,EACD,eAAe,CAChB,CAAC;YAEF,IAAI,OAAO,SAAS,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;gBACnD,SAAS,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CACjD,UAAU,EACV,IAAI,EACJ,EAAE,CACH,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,SAAS,EAA6C,SAAS;gBAC/D,WAAW;gBACX,YAAY;aACb,CAAC;QACJ,CAAC,CAAC,CACH,CACF,CACF,CAAC;QAEF,MAAM,EAAE,cAAc,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,GACxE,MAAM,YAAY,CAAC,MAAM,CAKvB,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;YACV,GAAG,CAAC,sBAAsB,IAAI,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;YACrD,GAAG,CAAC,wBAAwB,IAAI,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;YACxD,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;YACtC,OAAO,GAAG,CAAC;QACb,CAAC,EACD;YACE,cAAc,EAAE,EAAE;YAClB,sBAAsB,EAAE,EAAE;YAC1B,wBAAwB,EAAE,EAAE;SAC7B,CACF,CAAC;QAEJ,MAAM,iBAAiB,GAAG,IAAI,CAAC,8BAA8B,CAC3D,sBAAsB,EACtB,wBAAwB,EACxB,IAAI,EACJ,UAAU,EACV,cAAc,CACf,CAAC;QAEF,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAChE,eAAe,EACf,UAAU,EACV,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,OAAO,eAAe,CAAC,aAAa,CAClC,UAAU,EACV,mBAAmB,EACnB,WAAW,EACX,iBAAiB,CAClB,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,MAAM,CACpB,UAAuB,EACvB,YAAoB,EACpB,YAAoB,EACpB,WAAoB,EACpB,eAAoC,EACpC,cAAuB,EACvB,iBAAyB,EACzB,WAAoB,EACpB,YAAqB,EACrB,eAAwB,EACxB,mBAA4B,EAC5B,WAAoB,EACpB,MAAc,EACd,QAAgB,EAChB,IAAY;QAEZ,MAAM,YAAY,GAChB,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAC5D,MAAM,wBAAwB,GAC5B,IAAI,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC;QAE/C,MAAM,eAAe,GACnB,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CACpC,UAAU,EACV,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;QAEF,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,KAAK,eAAQ,CAAC,IAAI,CAAC;QAEtC,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC;YACrC,eAAe;YACf,cAAc;YACd,iBAAiB;YACjB,WAAW;YACX,YAAY;YACZ,eAAe;YACf,mBAAmB;YACnB,UAAU;SACX,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG;YACjB,wBAAwB;YACxB;gBACE,UAAU,CAAC,QAAQ;gBACnB,UAAU,CAAC,SAAS;gBACpB,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY;gBAC5C,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU;gBAC7C,YAAY;gBACZ,IAAA,eAAM,EAAC;oBACL,IAAA,qBAAY,EAAC,IAAA,qBAAa,EAAC,IAAI,CAAC,EAAE,EAAE,CAAC;oBACrC,IAAA,qBAAY,EAAC,IAAA,gBAAO,EAAC,UAAU,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;iBAClD,CAAC;gBACF,WAAW;aACZ;YACD,aAAa;YACb,MAAM;YACN,QAAQ;SACT,CAAC;QAEF,MAAM,OAAO,GAAG,CAAC,GAAG,MAAa,EAAE,EAAE,CACnC,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CACzC,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,oBAAoB,EACnD,MAAM,CACP,CAAC;QAEJ,OAAO;YACL,OAAO;YACP,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC;IAED,gBAAgB;IACN,KAAK,CAAC,YAAY,CAC1B,UAAuB,EACvB,YAAoB,EACpB,YAAoB,EACpB,eAAoC,EACpC,cAAuB,EACvB,iBAAyB,EACzB,WAAoB,EACpB,YAAqB,EACrB,eAAwB,EACxB,mBAA4B,EAC5B,MAAc,EACd,IAAY,EACZ,WAAoB;QAEpB,IACE,UAAU,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YACjC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,GAAG;YACvC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;YAC1C,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC;YAC3D,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,GAAG;YAEjE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAElD,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC3E,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAElD,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACjE,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;QAE7D,IAAI,CAAC,GAAG,CAAC,gBAAgB;YACvB,MAAM,IAAI,KAAK,CACb,kDAAkD,OAAO,EAAE,CAC5D,CAAC;QAEJ,MAAM,YAAY,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAEvE,MAAM,SAAS,GACb,UAAU,CAAC,IAAI,KAAK,eAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC;QAC5E,MAAM,UAAU,GACd,UAAU,CAAC,IAAI,KAAK,eAAQ,CAAC,IAAI;YAC/B,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC;QAE9B,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC;YACrC,eAAe;YACf,cAAc;YACd,iBAAiB;YACjB,WAAW;YACX,YAAY;YACZ,eAAe;YACf,mBAAmB;YACnB,UAAU;SACX,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC,gBAAiB,CAC1B,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,SAAS,EACpB,SAAS,EACT,UAAU,EACV,YAAY,EACZ,YAAY,CAAC,IAAI,EACjB,UAAU,CAAC,IAAI,EACf,MAAM,EACN,IAAI,EACJ,aAAa,EACb,WAAW,EACX,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,cAAc,CAC1B,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,EAClB,eAAe,EACf,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,aAAa,GAAG,KAAK,GAWtB;QACC,MAAM,aAAa,GAAG,eAAe;YACnC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC;gBACzB,OAAO,EAAE,eAAe;gBACxB,UAAU,EAAE,GAAG;gBACf,aAAa,EAAE,WAAW;gBAC1B,YAAY;gBACZ,eAAe;gBACf,mBAAmB;gBACnB,UAAU,EAAE,IAAI;gBAChB,eAAe,EAAE,aAAa;aAC/B,CAAC;YACJ,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC;gBACzB,OAAO,EAAE,cAAc;gBACvB,UAAU,EAAE,iBAAiB;gBAC7B,aAAa,EAAE,WAAW;gBAC1B,YAAY;gBACZ,eAAe;gBACf,mBAAmB;gBACnB,eAAe,EAAE,aAAa;gBAC9B,UAAU,EAAE,KAAK;aAClB,CAAC,CAAC;QAEP,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,EACjB,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,QAAQ,EACR,YAAY,EACZ,oBAAoB,EACpB,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,WAAW,GAAG,wBAAY,EAC1B,UAAU,GAAG,KAAK,GAqBnB;QACC,+DAA+D;QAC/D,MAAM,aAAa,GAAG,YAAY;YAChC,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,eAAQ,CAAC,IAAI;gBACnC,CAAC,CAAC,UAAU,CAAC,UAAU;gBACvB,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC;QAEzB,0FAA0F;QAC1F,MAAM,YAAY,GAChB,WAAW,KAAK,wBAAY;YAC5B,WAAW,CAAC,WAAW,EAAE,KAAK,WAAW,CAAC,WAAW,EAAE;YACrD,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,wBAAY,CAAC;QAEnB,IAAI,OAAqC,CAAC;QAC1C,IAAI,MAA6B,CAAC;QAElC,IACE,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,UAAU,CAAC,cAAc,CAAC,EACxE,CAAC;YACD,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAC5C,UAAU,EACV,YAAY,EACZ,aAAa,EACb,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,WAAW,IAAI,KAAK,EACpB,YAAY,IAAI,IAAI,EACpB,eAAe,IAAI,KAAK,EACxB,mBAAmB,IAAI,KAAK,EAC5B,MAAM,IAAI,IAAI,EACd,IAAI,EACJ,YAAY,CACb,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CACtC,UAAU,EACV,YAAY,EACZ,aAAa,EACb,WAAW,EACX,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,WAAW,IAAI,KAAK,EACpB,YAAY,IAAI,IAAI,EACpB,eAAe,IAAI,KAAK,EACxB,mBAAmB,IAAI,KAAK,EAC5B,YAAY,EACZ,MAAM,IAAI,IAAI,EACd,QAAQ,EACR,IAAI,CACL,CAAC,CAAC;QACL,CAAC;QAED,IAAI,UAAU;YAAE,OAAO,MAAM,CAAC;QAE9B,MAAM,KAAK,GAAG,CACZ,UAAU,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,yBAAa,CAAC,WAAW,EAAE;YAC/D,CAAC,CAAC,MAAM,CACJ,UAAU,CAAC,IAAI,KAAK,eAAQ,CAAC,IAAI;gBAC/B,CAAC,CAAC,UAAU,CAAC,SAAS;gBACtB,CAAC,CAAC,YAAY,CACjB;YACH,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CACd,CAAC,QAAQ,EAAE,CAAC;QAEb,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,EAAE,EAAE,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB;YAClE,KAAK;YACL,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC;YACjC,QAAQ;YACR,YAAY;YACZ,oBAAoB;SACrB,CAAC;IACJ,CAAC;IAEO,qBAAqB,CAAC,EAC5B,OAAO,EACP,UAAU,EACV,aAAa,EACb,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,UAAU,EACV,eAAe,GACL;QACV,MAAM,cAAc,GAClB,UAAU,KAAK,GAAG,IAAI,CAAC,aAAa,IAAI,CAAC,UAAU;YACjD,CAAC,CAAC,wBAAY;YACd,CAAC,CAAC,OAAO,CAAC;QAEd,sEAAsE;QACtE,MAAM,gCAAgC,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC;QACvE,IAAI,0BAA0B,GAAG,EAAE,CAAC,CAAC,gDAAgD;QAErF,MAAM,WAAW,GAAG,UAAU,KAAK,GAAG,CAAC;QAEvC,IAAI,WAAW,EAAE,CAAC;YAChB,2EAA2E;YAC3E,0BAA0B;gBACxB,MAAM,CAAC,UAAU,CAAC,GAAG,4CAAgC,CAAC;YAExD,0DAA0D;QAC5D,CAAC;aAAM,CAAC;YACN,IAAI,aAAa,EAAE,CAAC;gBAClB,0BAA0B,IAAI,gCAAoB,CAAC;YACrD,CAAC;iBAAM,IAAI,UAAU,EAAE,CAAC;gBACtB,0BAA0B,IAAI,4BAAgB,CAAC;YACjD,CAAC;QACH,CAAC;QAED,IAAI,eAAe,EAAE,CAAC;YACpB,0BAA0B,IAAI,kCAAsB,CAAC;QACvD,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,0BAA0B,IAAI,+BAAmB,CAAC;QACpD,CAAC;QAED,IAAI,eAAe,EAAE,CAAC;YACpB,0BAA0B,IAAI,gCAAoB,CAAC;QACrD,CAAC;QAED,IAAI,mBAAmB,EAAE,CAAC;YACxB,0BAA0B,IAAI,mCAAuB,CAAC;QACxD,CAAC;QACD,6CAA6C;QAC7C,MAAM,OAAO,GACX,gCAAgC,GAAG,0BAA0B,CAAC;QAEhE,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAEM,2BAA2B,CAAC,UAAuB;QACxD,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAClE,UAAU,CAAC,cAAc,CAC1B,CAAC;QACF,IAAI,cAAc;YAAE,OAAO,IAAI,CAAC,iBAAiB,CAAC;QAElD,MAAM,YAAY,GAChB,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAC5D,MAAM,eAAe,GACnB,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAEzD,OAAO,eAAe,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;IAEM,iBAAiB,CACtB,UAAuB,EACvB,UAAkB,EAClB,IAAiB,EACjB,SAAiB,EACjB,EAA4B,EAC5B,YAAoB,EACpB,GAA4B,EAC5B,wBAAgC;QAUhC,MAAM,WAAW,GACf,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC;QAEzE,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAE7B,MAAM,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG,CAAC,UAAU,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QAE5E,MAAM,UAAU,GACd,SAAS,KAAK,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QAElE,IAAI,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC;QACzB,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;QAE3B,IAAI,YAAY,GAAG,EAAE,CAAC;QAEtB,kGAAkG;QAClG,qFAAqF;QACrF,iCAAiC;QACjC,MAAM,UAAU,GACd,SAAS,GAAG,CAAC,IAAI,IAAI,KAAK,eAAQ,CAAC,IAAI;YACrC,CAAC,CAAC,EAAE,CAAC,SAAS;YACd,CAAC,CAAC,CACE,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC7C,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAC7B,CAAC,QAAQ,EAAE,CAAC;QAEnB,0DAA0D;QAC1D,0DAA0D;QAC1D,kDAAkD;QAClD,MAAM,WAAW,GAAG,IAAI,KAAK,eAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC;QAEjE,MAAM,iBAAiB,GACrB,OAAO,GAAG,CAAC,cAAc,KAAK,UAAU;YACtC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;YAC1C,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC;QAEzB,IAAI,IAAA,oBAAY,EAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,iBAAiB,EAAE,CAAC;YACrD,IAAI,GAAG,WAAW,CAAC;YACnB,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,WAAW,GACf,IAAA,oBAAY,EAAC,IAAI,CAAC,SAAS,CAAC;YAC5B,CAAC,WAAW,IAAI,UAAU,CAAC;YAC3B,CAAC,iBAAiB;YAClB,CAAC,UAAU,CAAC;QAEd,IAAI,CAAC,IAAA,oBAAY,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,iBAAiB,CAAC,IAAI,WAAW,EAAE,CAAC;YACvE,KAAK,GAAG,WAAW,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC;YAChE,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QACvC,CAAC;QAED,MAAM,uBAAuB,GAAG,KAAK,KAAK,WAAW,IAAI,YAAY,CAAC;QAEtE,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,KAAK;YAChB,SAAS,EACP,uBAAuB,IAAI,CAAC,UAAU;gBACpC,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAkB;YACrE,SAAS,EAAE,UAAU;YACrB,UAAU,EAAE,WAAW;YACvB,WAAW;YACX,YAAY;SACb,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACvC,eAAwC,EACxC,UAAuB,EACvB,iBAA8D,EAC9D,iBAAyC;QAEzC,MAAM,OAAO,GAAG,eAAe,CAAC,UAAU,EAAE,CAAC;QAC7C,MAAM,kBAAkB,GAGlB,EAAE,CAAC;QAET,IAAI,yBAAyB,GAAG,CAAC,CAAC;QAElC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CACnC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CACzB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAChC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;YACtE,MAAM,aAAa,GAAG,eAAe,CAAC,yBAAyB,CAC7D,IAAI,EACJ,gBAAgB,CACjB,CAAC;YAEF,IAAI,aAAa,EAAE,CAAC;gBAClB,kBAAkB,CAAC,IAAI,CAAC;oBACtB,MAAM,EAAE;wBACN,aAAa,CAAC,KAAK;wBACnB,aAAa,CAAC,MAAM;wBACpB,CAAC,CAAC,gBAAgB,CAAC,eAAe;qBACnC;oBACD,kBAAkB,EAAE,yBAAyB;iBAC9C,CAAC,CAAC;YACL,CAAC;YAED,yBAAyB,EAAE,CAAC;QAC9B,CAAC,CAAC,CACH,CACF,CAAC;QAEF,MAAM,SAAS,GACb,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,iBAAiB,CAAC,YAAY,CACnE,OAAO,EACP,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CACtC,CAAC;QAEJ,MAAM,sBAAsB,GAA4B;YACtD,GAAG,iBAAiB;SACrB,CAAC;QAEF,SAAS,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,KAAK,EAAE,EAAE;YAC3C,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;gBACzD,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,kBAAkB,CAAC;gBACxE,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;gBAC/D,sBAAsB,CAAC,kBAAkB,CAAC,GAAG;oBAC3C,GAAG,gBAAgB;oBACnB,WAAW,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;iBAC/B,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAEO,4CAA4C,CAClD,UAAuB,EACvB,cAA2D;QAE3D,MAAM,GAAG,GAAG,yBAAa,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,IAAI,GACR,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,WAAW,EAAE,CAAC;QAEvF,IAAI,yBAAyB,GAAG,CAAC,CAAC;QAElC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACzC,MAAM,kBAAkB,GACtB,EAAE,CAAC;YAEL,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACzB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBAC9B,MAAM,gBAAgB,GAAG,cAAc,CAAC,yBAAyB,CAAC,CAAC;oBACnE,yBAAyB,EAAE,CAAC;oBAC5B,IACE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,IAAI;wBACrC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,GAAG;wBACpC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,IAAI;wBACpC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,GAAG,EACnC,CAAC;wBACD,kBAAkB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;oBAC5C,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,CACL,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,IAAI,CAAC;gBACxD,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,KAAK,CAAC,CAC1D,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA1uBD,sEA0uBC"}
|
package/build/lib/api3-feed.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { DeepReadonly } from 'ts-essentials';
|
|
|
2
2
|
import { PartialEventSubscriber } from '../composed-event-subscriber';
|
|
3
3
|
import { Address, BlockHeader, Log, Logger, MultiCallInput, MultiCallOutput } from '../types';
|
|
4
4
|
import { Lens } from '../lens';
|
|
5
|
-
import { Interface } from '
|
|
5
|
+
import { Interface } from 'ethers';
|
|
6
6
|
export type Api3FeedSubscriberState = {
|
|
7
7
|
value: bigint;
|
|
8
8
|
timestamp: bigint;
|
package/build/lib/api3-feed.js
CHANGED
|
@@ -5,16 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Api3FeedSubscriber = void 0;
|
|
7
7
|
const composed_event_subscriber_1 = require("../composed-event-subscriber");
|
|
8
|
-
const
|
|
8
|
+
const ethers_1 = require("ethers");
|
|
9
9
|
const api3_proxy_json_1 = __importDefault(require("../abi/api3-proxy.json"));
|
|
10
10
|
const api3_server_v1_json_1 = __importDefault(require("../abi/api3-server-v1.json"));
|
|
11
11
|
class Api3FeedSubscriber extends composed_event_subscriber_1.PartialEventSubscriber {
|
|
12
12
|
proxy;
|
|
13
13
|
dataFeedId;
|
|
14
|
-
static proxyInterface = new
|
|
15
|
-
static api3ServerV1Iface = new
|
|
16
|
-
static ANSWER_UPDATED_SIGNED_DATA = Api3FeedSubscriber.api3ServerV1Iface.
|
|
17
|
-
static ANSWER_UPDATED_BEACON_SET_DATA = Api3FeedSubscriber.api3ServerV1Iface.
|
|
14
|
+
static proxyInterface = new ethers_1.Interface(api3_proxy_json_1.default);
|
|
15
|
+
static api3ServerV1Iface = new ethers_1.Interface(api3_server_v1_json_1.default);
|
|
16
|
+
static ANSWER_UPDATED_SIGNED_DATA = Api3FeedSubscriber.api3ServerV1Iface.getEvent('UpdatedBeaconWithSignedData').topicHash;
|
|
17
|
+
static ANSWER_UPDATED_BEACON_SET_DATA = Api3FeedSubscriber.api3ServerV1Iface.getEvent('UpdatedBeaconSetWithBeacons').topicHash;
|
|
18
18
|
constructor(proxy, api3Server, dataFeedId, lens, logger) {
|
|
19
19
|
super([api3Server], lens, logger);
|
|
20
20
|
this.proxy = proxy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api3-feed.js","sourceRoot":"","sources":["../../src/lib/api3-feed.ts"],"names":[],"mappings":";;;;;;AACA,4EAAsE;AAUtE,
|
|
1
|
+
{"version":3,"file":"api3-feed.js","sourceRoot":"","sources":["../../src/lib/api3-feed.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Address } from '@paraswap/core';
|
|
2
|
-
import { BigNumber } from 'ethers';
|
|
3
2
|
import { CurveV1SwapType } from '../../dex/curve-v1/types';
|
|
4
3
|
import { CurveV2SwapType } from '../../dex/curve-v2/types';
|
|
5
|
-
export declare const packCurveData: (address: Address, approve: boolean, wrapFlag: number, swapType: CurveV2SwapType | CurveV1SwapType) =>
|
|
4
|
+
export declare const packCurveData: (address: Address, approve: boolean, wrapFlag: number, swapType: CurveV2SwapType | CurveV1SwapType) => bigint;
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.packCurveData = void 0;
|
|
4
|
-
const ethers_1 = require("ethers");
|
|
5
4
|
const packCurveData = (address, approve, wrapFlag, swapType) => {
|
|
6
|
-
let packedData =
|
|
7
|
-
packedData
|
|
8
|
-
packedData
|
|
9
|
-
packedData
|
|
5
|
+
let packedData = BigInt(address);
|
|
6
|
+
packedData |= BigInt(approve ? 1 : 0) << 160n;
|
|
7
|
+
packedData |= BigInt(wrapFlag) << 161n;
|
|
8
|
+
packedData |= BigInt(swapType) << 162n;
|
|
10
9
|
return packedData;
|
|
11
10
|
};
|
|
12
11
|
exports.packCurveData = packCurveData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encoder.js","sourceRoot":"","sources":["../../../src/lib/curve/encoder.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"encoder.js","sourceRoot":"","sources":["../../../src/lib/curve/encoder.ts"],"names":[],"mappings":";;;AAIO,MAAM,aAAa,GAAG,CAC3B,OAAgB,EAChB,OAAgB,EAChB,QAAgB,EAChB,QAA2C,EACnC,EAAE;IACV,IAAI,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAEjC,UAAU,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAC9C,UAAU,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;IACvC,UAAU,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;IAEvC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAbW,QAAA,aAAa,iBAaxB"}
|
package/build/lib/decoders.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { Result } from '@ethersproject/abi';
|
|
2
1
|
import BigNumber from 'bignumber.js';
|
|
3
|
-
import { BigNumber as EthersBigNumber } from '
|
|
4
|
-
import { BytesLike } from 'ethers
|
|
2
|
+
import { BigNumber as EthersBigNumber } from '@ethersproject/bignumber';
|
|
3
|
+
import { BytesLike, Result } from 'ethers';
|
|
5
4
|
import { MultiResult } from './multi-wrapper';
|
|
6
5
|
export declare const extractSuccessAndValue: (result: MultiResult<BytesLike> | BytesLike) => [boolean, BytesLike];
|
|
7
6
|
export declare function generalDecoder<T>(result: MultiResult<BytesLike> | BytesLike, types: string[], defaultValue: T | undefined, parser?: (v: Result) => T): T;
|
package/build/lib/decoders.js
CHANGED
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.uint24ToBigInt = exports.uint24ToNumber = exports.uint8ToNumber = exports.bytes32ToString = exports.stringDecode = exports.addressArrayDecode = exports.addressDecode = exports.booleanDecode = exports.uin128DecodeToInt = exports.uin128DecodeToFloat = exports.uin256DecodeToFloat = exports.uint256DecodeToNumber = exports.uin256DecodeToBigNumber = exports.uint256ArrayDecode = exports.int24ToNumber = exports.uint128ToBigNumber = exports.uint256ToBigInt = exports.extractSuccessAndValue = void 0;
|
|
7
7
|
exports.generalDecoder = generalDecoder;
|
|
8
8
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
9
|
-
const
|
|
9
|
+
const ethers_1 = require("ethers");
|
|
10
10
|
const lodash_1 = require("lodash");
|
|
11
11
|
const bignumber_constants_1 = require("../bignumber-constants");
|
|
12
12
|
const constants_1 = require("../constants");
|
|
@@ -30,7 +30,7 @@ function generalDecoder(result, types, defaultValue, parser) {
|
|
|
30
30
|
}
|
|
31
31
|
return defaultValue;
|
|
32
32
|
}
|
|
33
|
-
const decoded =
|
|
33
|
+
const decoded = ethers_1.AbiCoder.defaultAbiCoder().decode(types, toDecode);
|
|
34
34
|
return parser ? parser(decoded) : decoded[0];
|
|
35
35
|
}
|
|
36
36
|
const uint256ToBigInt = (result) => {
|
|
@@ -50,7 +50,7 @@ const uint256ArrayDecode = (result) => {
|
|
|
50
50
|
if (!isSuccess || toDecode === '0x') {
|
|
51
51
|
return 0n;
|
|
52
52
|
}
|
|
53
|
-
return
|
|
53
|
+
return ethers_1.AbiCoder.defaultAbiCoder()
|
|
54
54
|
.decode(['uint256[]'], toDecode)[0]
|
|
55
55
|
.map((r) => r.toBigInt());
|
|
56
56
|
};
|
|
@@ -60,7 +60,7 @@ const uin256DecodeToBigNumber = (result) => {
|
|
|
60
60
|
if (!isSuccess || toDecode === '0x') {
|
|
61
61
|
return bignumber_constants_1.BN_0;
|
|
62
62
|
}
|
|
63
|
-
return new bignumber_js_1.default(
|
|
63
|
+
return new bignumber_js_1.default(ethers_1.AbiCoder.defaultAbiCoder().decode(['uint256'], toDecode)[0].toString());
|
|
64
64
|
};
|
|
65
65
|
exports.uin256DecodeToBigNumber = uin256DecodeToBigNumber;
|
|
66
66
|
const uint256DecodeToNumber = (result) => {
|
|
@@ -68,7 +68,7 @@ const uint256DecodeToNumber = (result) => {
|
|
|
68
68
|
if (!isSuccess || toDecode === '0x') {
|
|
69
69
|
return 0;
|
|
70
70
|
}
|
|
71
|
-
return (0, lodash_1.parseInt)(
|
|
71
|
+
return (0, lodash_1.parseInt)(ethers_1.AbiCoder.defaultAbiCoder().decode(['uint256'], toDecode)[0], 10);
|
|
72
72
|
};
|
|
73
73
|
exports.uint256DecodeToNumber = uint256DecodeToNumber;
|
|
74
74
|
const uin256DecodeToFloat = (result) => {
|
|
@@ -76,7 +76,7 @@ const uin256DecodeToFloat = (result) => {
|
|
|
76
76
|
if (!isSuccess || toDecode === '0x') {
|
|
77
77
|
return 0;
|
|
78
78
|
}
|
|
79
|
-
return parseFloat(
|
|
79
|
+
return parseFloat(ethers_1.AbiCoder.defaultAbiCoder().decode(['uint256'], toDecode)[0]);
|
|
80
80
|
};
|
|
81
81
|
exports.uin256DecodeToFloat = uin256DecodeToFloat;
|
|
82
82
|
const uin128DecodeToFloat = (result) => {
|
|
@@ -84,7 +84,7 @@ const uin128DecodeToFloat = (result) => {
|
|
|
84
84
|
if (!isSuccess || toDecode === '0x') {
|
|
85
85
|
return 0;
|
|
86
86
|
}
|
|
87
|
-
return parseFloat(
|
|
87
|
+
return parseFloat(ethers_1.AbiCoder.defaultAbiCoder().decode(['uint128'], toDecode)[0]);
|
|
88
88
|
};
|
|
89
89
|
exports.uin128DecodeToFloat = uin128DecodeToFloat;
|
|
90
90
|
const uin128DecodeToInt = (result) => {
|
|
@@ -92,7 +92,7 @@ const uin128DecodeToInt = (result) => {
|
|
|
92
92
|
if (!isSuccess || toDecode === '0x') {
|
|
93
93
|
return 0;
|
|
94
94
|
}
|
|
95
|
-
return (0, lodash_1.parseInt)(
|
|
95
|
+
return (0, lodash_1.parseInt)(ethers_1.AbiCoder.defaultAbiCoder().decode(['uint128'], toDecode)[0], 10);
|
|
96
96
|
};
|
|
97
97
|
exports.uin128DecodeToInt = uin128DecodeToInt;
|
|
98
98
|
const booleanDecode = (result) => {
|
|
@@ -100,7 +100,7 @@ const booleanDecode = (result) => {
|
|
|
100
100
|
if (!isSuccess || toDecode === '0x') {
|
|
101
101
|
return false;
|
|
102
102
|
}
|
|
103
|
-
return
|
|
103
|
+
return ethers_1.AbiCoder.defaultAbiCoder().decode(['bool'], toDecode)[0];
|
|
104
104
|
};
|
|
105
105
|
exports.booleanDecode = booleanDecode;
|
|
106
106
|
const addressDecode = (result) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decoders.js","sourceRoot":"","sources":["../../src/lib/decoders.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"decoders.js","sourceRoot":"","sources":["../../src/lib/decoders.ts"],"names":[],"mappings":";;;;;;AA2BA,wCAiBC;AA5CD,gEAAqC;AAErC,mCAAqD;AACrD,mCAAqC;AACrC,gEAA8C;AAC9C,4CAA4C;AAG5C,MAAM,aAAa,GAAG,CACpB,MAA0C,EACR,EAAE;IACpC,OAAO,CACL,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,KAAK,IAAI;QACf,SAAS,IAAI,MAAM;QACnB,YAAY,IAAI,MAAM,CACvB,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,sBAAsB,GAAG,CACpC,MAA0C,EACpB,EAAE;IACxB,OAAO,aAAa,CAAC,MAAM,CAAC;QAC1B,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC;QACrC,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACrB,CAAC,CAAC;AANW,QAAA,sBAAsB,0BAMjC;AAEF,SAAgB,cAAc,CAC5B,MAA0C,EAC1C,KAAe,EACf,YAA2B,EAC3B,MAAyB;IAEzB,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,8BAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAI,CAAC,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpC,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,EAAE,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,OAAO,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnE,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAC/C,CAAC;AAEM,MAAM,eAAe,GAAG,CAC7B,MAA0C,EAClC,EAAE;IACV,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC/E,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAEK,MAAM,kBAAkB,GAAG,CAChC,MAA0C,EACzB,EAAE;IACnB,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B;AAEK,MAAM,aAAa,GAAG,CAC3B,MAA0C,EAClC,EAAE;IACV,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAClE,CAAC,CAAC;AAJW,QAAA,aAAa,iBAIxB;AAEK,MAAM,kBAAkB,GAAG,CAChC,MAA0C,EAClC,EAAE;IACV,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,8BAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAI,CAAC,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,iBAAQ,CAAC,eAAe,EAAE;SAC9B,MAAM,CAAC,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;SAClC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AACnC,CAAC,CAAC;AAXW,QAAA,kBAAkB,sBAW7B;AAEK,MAAM,uBAAuB,GAAG,CACrC,MAA0C,EAC/B,EAAE;IACb,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,8BAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAI,CAAC,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpC,OAAO,0BAAI,CAAC;IACd,CAAC;IACD,OAAO,IAAI,sBAAS,CAClB,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CACvE,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,uBAAuB,2BAWlC;AAEK,MAAM,qBAAqB,GAAG,CACnC,MAA0C,EAClC,EAAE;IACV,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,8BAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAI,CAAC,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpC,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,IAAA,iBAAQ,EACb,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC3D,EAAE,CACH,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,qBAAqB,yBAYhC;AAEK,MAAM,mBAAmB,GAAG,CACjC,MAA0C,EAClC,EAAE;IACV,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,8BAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAI,CAAC,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpC,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,UAAU,CACf,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAC5D,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,mBAAmB,uBAW9B;AAEK,MAAM,mBAAmB,GAAG,CACjC,MAA0C,EAClC,EAAE;IACV,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,8BAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAI,CAAC,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpC,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,UAAU,CACf,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAC5D,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,mBAAmB,uBAW9B;AAEK,MAAM,iBAAiB,GAAG,CAC/B,MAA0C,EAClC,EAAE;IACV,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,8BAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAI,CAAC,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpC,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,IAAA,iBAAQ,EACb,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC3D,EAAE,CACH,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,iBAAiB,qBAY5B;AAEK,MAAM,aAAa,GAAG,CAC3B,MAA0C,EACjC,EAAE;IACX,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAA,8BAAsB,EAAC,MAAM,CAAC,CAAC;IAE7D,IAAI,CAAC,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAClE,CAAC,CAAC;AATW,QAAA,aAAa,iBASxB;AAEK,MAAM,aAAa,GAAG,CAC3B,MAA0C,EAClC,EAAE;IACV,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,wBAAY,EAAE,CAAC,CAAC,EAAE,CAC3D,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CACnB,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB;AAEK,MAAM,kBAAkB,GAAG,CAChC,MAA0C,EAClC,EAAE;IACV,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CACnD,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CACzC,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,kBAAkB,sBAM7B;AAEK,MAAM,YAAY,GAAG,CAC1B,MAA0C,EAClC,EAAE;IACV,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;AAChD,CAAC,CAAC;AAJW,QAAA,YAAY,gBAIvB;AAEK,MAAM,eAAe,GAAG,CAC7B,MAA0C,EAClC,EAAE;IACV,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,CACrD,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CACvB,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,eAAe,mBAM1B;AAEK,MAAM,aAAa,GAAG,CAC3B,MAA0C,EAClC,EAAE;IACV,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAClD,IAAA,iBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAClC,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB;AAEK,MAAM,cAAc,GAAG,CAC5B,MAA0C,EAClC,EAAE;IACV,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CACnD,IAAA,iBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAClC,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,cAAc,kBAMzB;AAEK,MAAM,cAAc,GAAG,CAC5B,MAA0C,EAClC,EAAE;IACV,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,CACpD,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC5B,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,cAAc,kBAMzB"}
|