@pendle/core-v2 0.13.1-testnet → 0.14.0-testnet
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/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgReceiveEndpointUpg.sol/PendleMsgReceiveEndpointUpg.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgReceiveEndpointUpg.sol/PendleMsgReceiveEndpointUpg.json +2 -2
- package/build/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgReceiverAppUpg.sol/PendleMsgReceiverAppUpg.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgSendEndpointUpg.sol/PendleMsgSendEndpointUpg.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgSendEndpointUpg.sol/PendleMsgSendEndpointUpg.json +2 -2
- package/build/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgSenderAppUpg.sol/PendleMsgSenderAppUpg.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/FeeDistributor/EpochResultManager.sol/EpochResultManager.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/FeeDistributor/PendleFeeDistributor.sol/PendleFeeDistributor.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/FeeDistributor/PendleFeeDistributor.sol/PendleFeeDistributor.json +2 -2
- package/build/artifacts/contracts/LiquidityMining/FeeDistributor/PendleFeeDistributorFactory.sol/PendleFeeDistributorFactory.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/FeeDistributor/PendleFeeDistributorFactory.sol/PendleFeeDistributorFactory.json +2 -2
- package/build/artifacts/contracts/LiquidityMining/GaugeController/PendleGaugeControllerBaseUpg.sol/PendleGaugeControllerBaseUpg.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/GaugeController/PendleGaugeControllerBaseUpg.sol/PendleGaugeControllerBaseUpg.json +89 -0
- package/build/artifacts/contracts/LiquidityMining/GaugeController/PendleGaugeControllerMainchainUpg.sol/PendleGaugeControllerMainchainUpg.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/GaugeController/PendleGaugeControllerMainchainUpg.sol/PendleGaugeControllerMainchainUpg.json +91 -2
- package/build/artifacts/contracts/LiquidityMining/GaugeController/PendleGaugeControllerSidechainUpg.sol/PendleGaugeControllerSidechainUpg.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/GaugeController/PendleGaugeControllerSidechainUpg.sol/PendleGaugeControllerSidechainUpg.json +91 -2
- package/build/artifacts/contracts/LiquidityMining/VotingController/PendleVotingControllerUpg.sol/PendleVotingControllerUpg.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/VotingController/PendleVotingControllerUpg.sol/PendleVotingControllerUpg.json +2 -2
- package/build/artifacts/contracts/LiquidityMining/VotingController/VotingControllerStorageUpg.sol/VotingControllerStorageUpg.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleMainchain.sol/VotingEscrowPendleMainchain.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleMainchain.sol/VotingEscrowPendleMainchain.json +2 -2
- package/build/artifacts/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleSidechain.sol/VotingEscrowPendleSidechain.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleSidechain.sol/VotingEscrowPendleSidechain.json +2 -2
- package/build/artifacts/contracts/LiquidityMining/VotingEscrow/VotingEscrowTokenBase.sol/VotingEscrowTokenBase.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/libraries/VeBalanceLib.sol/VeBalanceLib.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/libraries/VeBalanceLib.sol/VeBalanceLib.json +2 -2
- package/build/artifacts/contracts/LiquidityMining/libraries/VeHistoryLib.sol/CheckpointHelper.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/libraries/VeHistoryLib.sol/CheckpointHelper.json +2 -2
- package/build/artifacts/contracts/LiquidityMining/libraries/VeHistoryLib.sol/Checkpoints.dbg.json +1 -1
- package/build/artifacts/contracts/LiquidityMining/libraries/VeHistoryLib.sol/Checkpoints.json +2 -2
- package/build/artifacts/contracts/core/Market/MarketMathCore.sol/MarketMathCore.dbg.json +1 -1
- package/build/artifacts/contracts/core/Market/MarketMathCore.sol/MarketMathCore.json +2 -2
- package/build/artifacts/contracts/core/Market/OracleLib.sol/OracleLib.dbg.json +1 -1
- package/build/artifacts/contracts/core/Market/OracleLib.sol/OracleLib.json +2 -2
- package/build/artifacts/contracts/core/Market/PendleGauge.sol/PendleGauge.dbg.json +1 -1
- package/build/artifacts/contracts/core/Market/PendleMarket.sol/PendleMarket.dbg.json +1 -1
- package/build/artifacts/contracts/core/Market/PendleMarket.sol/PendleMarket.json +26 -26
- package/build/artifacts/contracts/core/Market/PendleMarketFactory.sol/PendleMarketFactory.dbg.json +1 -1
- package/build/artifacts/contracts/core/Market/PendleMarketFactory.sol/PendleMarketFactory.json +2 -2
- package/build/artifacts/contracts/core/RewardManager/RewardManager.sol/RewardManager.dbg.json +1 -1
- package/build/artifacts/contracts/core/StandardizedYield/PYIndex.sol/PYIndexLib.dbg.json +4 -0
- package/build/artifacts/contracts/core/{SuperComposableYield → StandardizedYield}/PYIndex.sol/PYIndexLib.json +3 -3
- package/build/artifacts/contracts/core/StandardizedYield/SYBase.sol/SYBase.dbg.json +4 -0
- package/build/artifacts/contracts/core/{SuperComposableYield/SCYBase.sol/SCYBase.json → StandardizedYield/SYBase.sol/SYBase.json} +11 -11
- package/build/artifacts/contracts/core/StandardizedYield/SYBaseWithRewards.sol/SYBaseWithRewards.dbg.json +4 -0
- package/build/artifacts/contracts/core/{SuperComposableYield/SCYBaseWithRewards.sol/SCYBaseWithRewards.json → StandardizedYield/SYBaseWithRewards.sol/SYBaseWithRewards.json} +11 -11
- package/build/artifacts/contracts/core/StandardizedYield/SYUtils.sol/SYUtils.dbg.json +4 -0
- package/build/artifacts/contracts/core/{SuperComposableYield/SCYUtils.sol/SCYUtils.json → StandardizedYield/SYUtils.sol/SYUtils.json} +4 -4
- package/build/artifacts/contracts/core/StandardizedYield/implementations/BenQi/PendleQiTokenHelper.sol/PendleQiTokenHelper.dbg.json +4 -0
- package/build/artifacts/contracts/core/{SuperComposableYield → StandardizedYield}/implementations/BenQi/PendleQiTokenHelper.sol/PendleQiTokenHelper.json +3 -3
- package/build/artifacts/contracts/core/StandardizedYield/implementations/BenQi/PendleQiTokenSY.sol/PendleQiTokenSY.dbg.json +4 -0
- package/build/artifacts/contracts/core/{SuperComposableYield/implementations/BenQi/PendleQiTokenSCY.sol/PendleQiTokenSCY.json → StandardizedYield/implementations/BenQi/PendleQiTokenSY.sol/PendleQiTokenSY.json} +17 -17
- package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/ConvexCurveLP/Pendle3CrvAndTokenSY.sol/Pendle3CrvAndTokenSY.dbg.json +4 -0
- package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/ConvexCurveLP/Pendle3CrvAndTokenSY.sol/Pendle3CrvAndTokenSY.json +1028 -0
- package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/ConvexCurveLP/PendleConvexLPSY.sol/PendleConvexLPSY.dbg.json +4 -0
- package/build/artifacts/contracts/core/{SuperComposableYield/implementations/Convex/ConvexCurveLP/PendleConvexCurveLPSCY.sol/PendleConvexCurveLPSCY.json → StandardizedYield/implementations/Convex/ConvexCurveLP/PendleConvexLPSY.sol/PendleConvexLPSY.json} +47 -47
- package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/Pendle3CrvHelper.sol/Pendle3CrvHelper.dbg.json +4 -0
- package/build/artifacts/contracts/core/{SuperComposableYield → StandardizedYield}/implementations/Convex/Pendle3CrvHelper.sol/Pendle3CrvHelper.json +5 -5
- package/build/artifacts/contracts/core/StandardizedYield/implementations/PendleWstEthSY.sol/PendleWstEthSY.dbg.json +4 -0
- package/build/artifacts/contracts/core/{SuperComposableYield/implementations/PendleWstEthSCY.sol/PendleWstEthSCY.json → StandardizedYield/implementations/PendleWstEthSY.sol/PendleWstEthSY.json} +13 -13
- package/build/artifacts/contracts/core/YieldContracts/InterestManagerYT.sol/InterestManagerYT.dbg.json +1 -1
- package/build/artifacts/contracts/core/YieldContracts/PendlePrincipalToken.sol/PendlePrincipalToken.dbg.json +1 -1
- package/build/artifacts/contracts/core/YieldContracts/PendlePrincipalToken.sol/PendlePrincipalToken.json +4 -4
- package/build/artifacts/contracts/core/YieldContracts/PendleYieldContractFactory.sol/PendleYieldContractFactory.dbg.json +1 -1
- package/build/artifacts/contracts/core/YieldContracts/PendleYieldContractFactory.sol/PendleYieldContractFactory.json +4 -4
- package/build/artifacts/contracts/core/YieldContracts/PendleYieldToken.sol/PendleYieldToken.dbg.json +1 -1
- package/build/artifacts/contracts/core/YieldContracts/PendleYieldToken.sol/PendleYieldToken.json +24 -24
- package/build/artifacts/contracts/core/libraries/Errors.sol/Errors.dbg.json +1 -1
- package/build/artifacts/contracts/core/libraries/Errors.sol/Errors.json +28 -28
- package/build/artifacts/contracts/interfaces/IPActionAddRemoveLiq.sol/IPActionAddRemoveLiq.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPActionAddRemoveLiq.sol/IPActionAddRemoveLiq.json +30 -30
- package/build/artifacts/contracts/interfaces/IPActionMintRedeem.sol/IPActionMintRedeem.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPActionMintRedeem.sol/IPActionMintRedeem.json +34 -34
- package/build/artifacts/contracts/interfaces/IPActionSwapPT.sol/IPActionSwapPT.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPActionSwapPT.sol/IPActionSwapPT.json +20 -20
- package/build/artifacts/contracts/interfaces/IPActionSwapPTYT.sol/IPActionSwapPTYT.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPActionSwapPTYT.sol/IPActionSwapPTYT.json +2 -2
- package/build/artifacts/contracts/interfaces/IPActionSwapYT.sol/IPActionSwapYT.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPActionSwapYT.sol/IPActionSwapYT.json +20 -20
- package/build/artifacts/contracts/interfaces/IPAllAction.sol/IPAllAction.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPAllAction.sol/IPAllAction.json +106 -106
- package/build/artifacts/contracts/interfaces/IPMarket.sol/IPMarket.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPMarket.sol/IPMarket.json +18 -18
- package/build/artifacts/contracts/interfaces/IPMarketSwapCallback.sol/IPMarketSwapCallback.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPMarketSwapCallback.sol/IPMarketSwapCallback.json +1 -1
- package/build/artifacts/contracts/interfaces/IPPrincipalToken.sol/IPPrincipalToken.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPPrincipalToken.sol/IPPrincipalToken.json +1 -1
- package/build/artifacts/contracts/interfaces/IPVotingController.sol/IPVotingController.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPVotingEscrowMainchain.sol/IPVotingEscrowMainchain.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPYieldContractFactory.sol/IPYieldContractFactory.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPYieldContractFactory.sol/IPYieldContractFactory.json +3 -3
- package/build/artifacts/contracts/interfaces/IPYieldToken.sol/IPYieldToken.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPYieldToken.sol/IPYieldToken.json +6 -6
- package/build/artifacts/contracts/interfaces/IStandardizedYield.sol/IStandardizedYield.dbg.json +4 -0
- package/build/artifacts/contracts/interfaces/{ISuperComposableYield.sol/ISuperComposableYield.json → IStandardizedYield.sol/IStandardizedYield.json} +5 -5
- package/build/artifacts/contracts/offchain-helpers/MarketMathStatic.sol/MarketMathStatic.dbg.json +1 -1
- package/build/artifacts/contracts/offchain-helpers/MarketMathStatic.sol/MarketMathStatic.json +7 -7
- package/build/artifacts/contracts/offchain-helpers/RouterStatic.sol/RouterStatic.dbg.json +1 -1
- package/build/artifacts/contracts/offchain-helpers/RouterStatic.sol/RouterStatic.json +116 -116
- package/build/artifacts/contracts/router/ActionAddRemoveLiq.sol/ActionAddRemoveLiq.dbg.json +1 -1
- package/build/artifacts/contracts/router/ActionAddRemoveLiq.sol/ActionAddRemoveLiq.json +35 -35
- package/build/artifacts/contracts/router/ActionCallback.sol/ActionCallback.dbg.json +1 -1
- package/build/artifacts/contracts/router/ActionCallback.sol/ActionCallback.json +12 -12
- package/build/artifacts/contracts/router/ActionMintRedeem.sol/ActionMintRedeem.dbg.json +1 -1
- package/build/artifacts/contracts/router/ActionMintRedeem.sol/ActionMintRedeem.json +41 -41
- package/build/artifacts/contracts/router/ActionMisc.sol/ActionMisc.dbg.json +1 -1
- package/build/artifacts/contracts/router/ActionMisc.sol/ActionMisc.json +2 -2
- package/build/artifacts/contracts/router/ActionSwapPT.sol/ActionSwapPT.dbg.json +1 -1
- package/build/artifacts/contracts/router/ActionSwapPT.sol/ActionSwapPT.json +28 -28
- package/build/artifacts/contracts/router/ActionSwapPTYT.sol/ActionSwapPTYT.dbg.json +1 -1
- package/build/artifacts/contracts/router/ActionSwapPTYT.sol/ActionSwapPTYT.json +4 -4
- package/build/artifacts/contracts/router/ActionSwapYT.sol/ActionSwapYT.dbg.json +1 -1
- package/build/artifacts/contracts/router/ActionSwapYT.sol/ActionSwapYT.json +22 -22
- package/build/artifacts/contracts/router/PendleRouter.sol/PendleRouter.dbg.json +1 -1
- package/build/artifacts/contracts/router/PendleRouter.sol/PendleRouter.json +2 -2
- package/build/artifacts/contracts/router/base/ActionBaseMintRedeem.sol/ActionBaseMintRedeem.dbg.json +1 -1
- package/build/artifacts/contracts/router/base/CallbackHelper.sol/CallbackHelper.dbg.json +1 -1
- package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtInLib.dbg.json +1 -1
- package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtInLib.json +2 -2
- package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtOutLib.dbg.json +1 -1
- package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtOutLib.json +2 -2
- package/build/artifacts/contracts/router/kyberswap/KyberSwapHelper.sol/KyberSwapHelper.dbg.json +1 -1
- package/contracts/LiquidityMining/CrossChainMsg/PendleMsgReceiveEndpointUpg.sol +96 -27
- package/contracts/LiquidityMining/CrossChainMsg/PendleMsgSendEndpointUpg.sol +40 -12
- package/contracts/LiquidityMining/CrossChainMsg/PendleMsgSenderAppUpg.sol +24 -5
- package/contracts/LiquidityMining/CrossChainMsg/libraries/ExcessivelySafeCall.sol +133 -0
- package/contracts/LiquidityMining/CrossChainMsg/libraries/LayerZeroHelper.sol +33 -0
- package/contracts/LiquidityMining/GaugeController/PendleGaugeControllerBaseUpg.sol +8 -1
- package/contracts/LiquidityMining/VotingController/PendleVotingControllerUpg.sol +3 -3
- package/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleMainchain.sol +2 -7
- package/contracts/core/Market/MarketMathCore.sol +50 -53
- package/contracts/core/Market/PendleGauge.sol +8 -8
- package/contracts/core/Market/PendleMarket.sol +49 -49
- package/contracts/core/Market/PendleMarketFactory.sol +1 -1
- package/contracts/core/RewardManager/RewardManager.sol +1 -1
- package/contracts/core/{SuperComposableYield → StandardizedYield}/PYIndex.sol +16 -16
- package/contracts/core/{SuperComposableYield/SCYBase.sol → StandardizedYield/SYBase.sol} +17 -17
- package/contracts/core/{SuperComposableYield/SCYBaseWithRewards.sol → StandardizedYield/SYBaseWithRewards.sol} +9 -9
- package/contracts/core/StandardizedYield/SYUtils.sol +26 -0
- package/contracts/core/{SuperComposableYield → StandardizedYield}/implementations/BenQi/PendleQiTokenHelper.sol +1 -1
- package/contracts/core/{SuperComposableYield/implementations/BenQi/PendleQiTokenSCY.sol → StandardizedYield/implementations/BenQi/PendleQiTokenSY.sol} +10 -10
- package/contracts/core/StandardizedYield/implementations/Convex/ConvexCurveLP/Pendle3CrvAndTokenSY.sol +167 -0
- package/contracts/core/{SuperComposableYield/implementations/Convex/ConvexCurveLP/PendleConvexCurveLPSCY.sol → StandardizedYield/implementations/Convex/ConvexCurveLP/PendleConvexLPSY.sol} +51 -70
- package/contracts/core/{SuperComposableYield → StandardizedYield}/implementations/Convex/Pendle3CrvHelper.sol +7 -7
- package/contracts/core/{SuperComposableYield/implementations/PendleWstEthSCY.sol → StandardizedYield/implementations/PendleWstEthSY.sol} +5 -5
- package/contracts/core/YieldContracts/InterestManagerYT.sol +7 -7
- package/contracts/core/YieldContracts/PendlePrincipalToken.sol +3 -3
- package/contracts/core/YieldContracts/PendleYieldContractFactory.sol +15 -15
- package/contracts/core/YieldContracts/PendleYieldToken.sol +71 -71
- package/contracts/core/libraries/Errors.sol +23 -21
- package/contracts/core/libraries/TokenHelper.sol +0 -33
- package/contracts/interfaces/Curve/ICrvPool.sol +2 -0
- package/contracts/interfaces/ILayerZeroEndpoint.sol +39 -0
- package/contracts/interfaces/ILayerZeroReceiver.sol +12 -0
- package/contracts/interfaces/IPActionAddRemoveLiq.sol +27 -27
- package/contracts/interfaces/IPActionMintRedeem.sol +30 -30
- package/contracts/interfaces/IPActionSwapPT.sol +16 -16
- package/contracts/interfaces/IPActionSwapPTYT.sol +2 -2
- package/contracts/interfaces/IPActionSwapYT.sol +16 -16
- package/contracts/interfaces/IPMarket.sol +14 -19
- package/contracts/interfaces/IPMarketSwapCallback.sol +1 -1
- package/contracts/interfaces/IPMsgSendEndpoint.sol +4 -2
- package/contracts/interfaces/IPPrincipalToken.sol +1 -1
- package/contracts/interfaces/IPYieldContractFactory.sol +3 -3
- package/contracts/interfaces/IPYieldToken.sol +7 -9
- package/contracts/interfaces/{ISuperComposableYield.sol → IStandardizedYield.sol} +6 -6
- package/contracts/offchain-helpers/MarketMathStatic.sol +116 -131
- package/contracts/offchain-helpers/RouterStatic.sol +80 -93
- package/contracts/router/ActionAddRemoveLiq.sol +99 -111
- package/contracts/router/ActionCallback.sol +46 -46
- package/contracts/router/ActionMintRedeem.sol +58 -58
- package/contracts/router/ActionSwapPT.sol +61 -69
- package/contracts/router/ActionSwapPTYT.sol +7 -7
- package/contracts/router/ActionSwapYT.sol +72 -79
- package/contracts/router/PendleRouter.sol +16 -16
- package/contracts/router/base/ActionBaseMintRedeem.sol +43 -43
- package/contracts/router/base/CallbackHelper.sol +20 -20
- package/contracts/router/base/MarketApproxLib.sol +166 -143
- package/contracts/router/kyberswap/KyberSwapHelper.sol +2 -2
- package/deployments/43113-core.json +16 -0
- package/{contracts/deployments → deployments}/43113-helper.json +0 -0
- package/deployments/43113-markets/benqi-market-QI-USDC-FEB-2ND.json +8 -0
- package/deployments/43113-markets/benqi-market-QI-WETH-DEC-1ST.json +8 -0
- package/{contracts/deployments → deployments}/43113-testenv.json +0 -0
- package/deployments/80001-core.json +15 -0
- package/{contracts/deployments → deployments}/80001-testenv.json +0 -0
- package/package.json +2 -2
- package/typechain-types/ActionAddRemoveLiq.ts +127 -129
- package/typechain-types/ActionCallback.ts +5 -5
- package/typechain-types/ActionMintRedeem.ts +139 -141
- package/typechain-types/ActionSwapPT.ts +73 -73
- package/typechain-types/ActionSwapPTYT.ts +2 -2
- package/typechain-types/ActionSwapYT.ts +73 -73
- package/typechain-types/IPActionAddRemoveLiq.ts +127 -129
- package/typechain-types/IPActionMintRedeem.ts +139 -141
- package/typechain-types/IPActionSwapPT.ts +73 -73
- package/typechain-types/IPActionSwapPTYT.ts +2 -2
- package/typechain-types/IPActionSwapYT.ts +73 -73
- package/typechain-types/IPAllAction.ts +402 -406
- package/typechain-types/IPMarket.ts +51 -54
- package/typechain-types/IPMarketSwapCallback.ts +5 -5
- package/typechain-types/IPPrincipalToken.ts +8 -8
- package/typechain-types/IPYieldContractFactory.ts +13 -13
- package/typechain-types/IPYieldToken.ts +17 -17
- package/typechain-types/IStandardizedYield.ts +895 -0
- package/typechain-types/MarketMathStatic.ts +27 -27
- package/typechain-types/Pendle3CrvAndTokenSY.ts +1243 -0
- package/typechain-types/Pendle3CrvHelper.ts +13 -13
- package/typechain-types/PendleConvexLPSY.ts +1189 -0
- package/typechain-types/PendleGaugeControllerBaseUpg.ts +125 -0
- package/typechain-types/PendleGaugeControllerMainchainUpg.ts +125 -0
- package/typechain-types/PendleGaugeControllerSidechainUpg.ts +124 -0
- package/typechain-types/PendleMarket.ts +54 -57
- package/typechain-types/PendlePrincipalToken.ts +8 -8
- package/typechain-types/PendleQiTokenSY.ts +1166 -0
- package/typechain-types/PendleWstEthSY.ts +1040 -0
- package/typechain-types/PendleYieldContractFactory.ts +8 -8
- package/typechain-types/PendleYieldToken.ts +41 -44
- package/typechain-types/RouterStatic.ts +196 -196
- package/typechain-types/SYBase.ts +1001 -0
- package/typechain-types/SYBaseWithRewards.ts +1094 -0
- package/typechain-types/factories/ActionAddRemoveLiq__factory.ts +34 -34
- package/typechain-types/factories/ActionCallback__factory.ts +11 -11
- package/typechain-types/factories/ActionMintRedeem__factory.ts +38 -38
- package/typechain-types/factories/ActionMisc__factory.ts +1 -1
- package/typechain-types/factories/ActionSwapPTYT__factory.ts +3 -3
- package/typechain-types/factories/ActionSwapPT__factory.ts +27 -27
- package/typechain-types/factories/ActionSwapYT__factory.ts +21 -21
- package/typechain-types/factories/Errors__factory.ts +27 -27
- package/typechain-types/factories/IPActionAddRemoveLiq__factory.ts +30 -30
- package/typechain-types/factories/IPActionMintRedeem__factory.ts +34 -34
- package/typechain-types/factories/IPActionSwapPTYT__factory.ts +2 -2
- package/typechain-types/factories/IPActionSwapPT__factory.ts +20 -20
- package/typechain-types/factories/IPActionSwapYT__factory.ts +20 -20
- package/typechain-types/factories/IPAllAction__factory.ts +106 -106
- package/typechain-types/factories/IPMarketSwapCallback__factory.ts +1 -1
- package/typechain-types/factories/IPMarket__factory.ts +18 -18
- package/typechain-types/factories/IPPrincipalToken__factory.ts +1 -1
- package/typechain-types/factories/IPYieldContractFactory__factory.ts +3 -3
- package/typechain-types/factories/IPYieldToken__factory.ts +6 -6
- package/typechain-types/factories/IStandardizedYield__factory.ts +658 -0
- package/typechain-types/factories/MarketMathStatic__factory.ts +6 -6
- package/typechain-types/factories/OracleLib__factory.ts +1 -1
- package/typechain-types/factories/Pendle3CrvAndTokenSY__factory.ts +1124 -0
- package/typechain-types/factories/Pendle3CrvHelper__factory.ts +3 -3
- package/typechain-types/factories/PendleConvexLPSY__factory.ts +963 -0
- package/typechain-types/factories/PendleFeeDistributorFactory__factory.ts +1 -1
- package/typechain-types/factories/PendleFeeDistributor__factory.ts +1 -1
- package/typechain-types/factories/PendleGaugeControllerBaseUpg__factory.ts +89 -0
- package/typechain-types/factories/PendleGaugeControllerMainchainUpg__factory.ts +90 -1
- package/typechain-types/factories/PendleGaugeControllerSidechainUpg__factory.ts +90 -1
- package/typechain-types/factories/PendleMarketFactory__factory.ts +1 -1
- package/typechain-types/factories/PendleMarket__factory.ts +21 -21
- package/typechain-types/factories/PendleMsgReceiveEndpointUpg__factory.ts +1 -1
- package/typechain-types/factories/PendleMsgSendEndpointUpg__factory.ts +1 -1
- package/typechain-types/factories/PendlePrincipalToken__factory.ts +7 -7
- package/typechain-types/factories/PendleQiTokenHelper__factory.ts +1 -1
- package/typechain-types/factories/PendleQiTokenSY__factory.ts +1095 -0
- package/typechain-types/factories/PendleRouter__factory.ts +1 -1
- package/typechain-types/factories/PendleVotingControllerUpg__factory.ts +1 -1
- package/typechain-types/factories/PendleWstEthSY__factory.ts +924 -0
- package/typechain-types/factories/PendleYieldContractFactory__factory.ts +3 -3
- package/typechain-types/factories/PendleYieldToken__factory.ts +27 -27
- package/typechain-types/factories/RouterStatic__factory.ts +57 -57
- package/typechain-types/factories/SYBaseWithRewards__factory.ts +867 -0
- package/typechain-types/factories/SYBase__factory.ts +795 -0
- package/typechain-types/factories/VotingEscrowPendleMainchain__factory.ts +1 -1
- package/typechain-types/factories/VotingEscrowPendleSidechain__factory.ts +1 -1
- package/typechain-types/hardhat.d.ts +33 -51
- package/typechain-types/index.ts +14 -18
- package/build/artifacts/contracts/core/SuperComposableYield/PYIndex.sol/PYIndexLib.dbg.json +0 -4
- package/build/artifacts/contracts/core/SuperComposableYield/SCYBase.sol/SCYBase.dbg.json +0 -4
- package/build/artifacts/contracts/core/SuperComposableYield/SCYBaseWithRewards.sol/SCYBaseWithRewards.dbg.json +0 -4
- package/build/artifacts/contracts/core/SuperComposableYield/SCYUtils.sol/SCYUtils.dbg.json +0 -4
- package/build/artifacts/contracts/core/SuperComposableYield/implementations/BenQi/PendleQiTokenHelper.sol/PendleQiTokenHelper.dbg.json +0 -4
- package/build/artifacts/contracts/core/SuperComposableYield/implementations/BenQi/PendleQiTokenSCY.sol/PendleQiTokenSCY.dbg.json +0 -4
- package/build/artifacts/contracts/core/SuperComposableYield/implementations/Convex/ConvexCurveLP/Pendle3CrvAndTokenSCY.sol/Pendle3CrvAndTokenSCY.dbg.json +0 -4
- package/build/artifacts/contracts/core/SuperComposableYield/implementations/Convex/ConvexCurveLP/Pendle3CrvAndTokenSCY.sol/Pendle3CrvAndTokenSCY.json +0 -1030
- package/build/artifacts/contracts/core/SuperComposableYield/implementations/Convex/ConvexCurveLP/PendleConvexCurveLP2PoolSCY.sol/PendleConvexCurveLP2PoolSCY.dbg.json +0 -4
- package/build/artifacts/contracts/core/SuperComposableYield/implementations/Convex/ConvexCurveLP/PendleConvexCurveLP2PoolSCY.sol/PendleConvexCurveLP2PoolSCY.json +0 -1025
- package/build/artifacts/contracts/core/SuperComposableYield/implementations/Convex/ConvexCurveLP/PendleConvexCurveLPSCY.sol/PendleConvexCurveLPSCY.dbg.json +0 -4
- package/build/artifacts/contracts/core/SuperComposableYield/implementations/Convex/Pendle3CrvHelper.sol/Pendle3CrvHelper.dbg.json +0 -4
- package/build/artifacts/contracts/core/SuperComposableYield/implementations/PendleWstEthSCY.sol/PendleWstEthSCY.dbg.json +0 -4
- package/build/artifacts/contracts/interfaces/ISuperComposableYield.sol/ISuperComposableYield.dbg.json +0 -4
- package/build/artifacts/contracts/offchain-helpers/ImplicitSwapfeeContract.sol/ImplicitSwapfeeContract.dbg.json +0 -4
- package/build/artifacts/contracts/offchain-helpers/ImplicitSwapfeeContract.sol/ImplicitSwapfeeContract.json +0 -190
- package/contracts/core/SuperComposableYield/SCYUtils.sol +0 -34
- package/contracts/core/SuperComposableYield/implementations/Convex/ConvexCurveLP/Pendle3CrvAndTokenSCY.sol +0 -135
- package/contracts/core/SuperComposableYield/implementations/Convex/ConvexCurveLP/PendleConvexCurveLP2PoolSCY.sol +0 -96
- package/contracts/deployments/43113-core.json +0 -16
- package/contracts/deployments/43113-markets/benqi-market-QI-USDC-FEB-2ND.json +0 -8
- package/contracts/deployments/43113-markets/benqi-market-QI-WETH-DEC-1ST.json +0 -8
- package/contracts/deployments/80001-core.json +0 -15
- package/contracts/deployments/80001-markets/benqi-market-QI-USDC-FEB-2ND.json +0 -8
- package/contracts/deployments/80001-markets/benqi-market-QI-WETH-DEC-1ST.json +0 -8
- package/contracts/interfaces/ICelerMessageBus.sol +0 -28
- package/contracts/interfaces/ICelerMessageReceiverApp.sol +0 -25
- package/contracts/offchain-helpers/ImplicitSwapfeeContract.sol +0 -26
|
@@ -359,8 +359,8 @@
|
|
|
359
359
|
"type": "function"
|
|
360
360
|
}
|
|
361
361
|
],
|
|
362
|
-
"bytecode": "
|
|
363
|
-
"deployedBytecode": "
|
|
362
|
+
"bytecode": "0x60a06040523480156200001157600080fd5b50604051620010b8380380620010b8833981016040819052620000349162000247565b806200004a6200016160201b6200065b1760201c565b600180546001600160801b0319166001600160801b03929092169190911790556001600160a01b0316608052606854600160a81b900460ff166200009c57606854600160a01b900460ff1615620000a6565b620000a662000173565b6200010f5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b606854600160a81b900460ff161580156200013a576068805461ffff60a01b191661010160a01b1790555b6200014462000191565b801562000159576068805460ff60a81b191690555b5050620002e8565b60006200016e4262000214565b905090565b60006200018b306200023860201b620006661760201c565b15905090565b606854600160a81b900460ff16620002005760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b606482015260840162000106565b606780546001600160a01b03191633179055565b600062093a8062000226818462000279565b620002329190620002ae565b92915050565b6001600160a01b03163b151590565b6000602082840312156200025a57600080fd5b81516001600160a01b03811681146200027257600080fd5b9392505050565b60006001600160801b0383811680620002a257634e487b7160e01b600052601260045260246000fd5b92169190910492915050565b6001600160801b03818116838216028082169190828114620002e057634e487b7160e01b600052601160045260246000fd5b505092915050565b608051610dad6200030b600039600081816101e701526105880152610dad6000f3fe6080604052600436106100c35760003560e01c8063078dfbe7146100c857806330d981af146100ea5780633ff032071461011c5780634e71e0c81461013357806370a0823114610148578063769b1ebc14610168578063814b2cac146101885780638da5cb5b146101a8578063af5a8f7b146101d5578063cb6b4f3c14610209578063e0299bf51461026a578063e268b3a41461027d578063e30c39781461029d578063ef1c243a146102bd578063f4359ce51461011c578063fa78668f146102d2575b600080fd5b3480156100d457600080fd5b506100e86100e336600461096e565b6102ea565b005b3480156100f657600080fd5b506100ff6103f1565b6040516001600160801b0390911681526020015b60405180910390f35b34801561012857600080fd5b506100ff62093a8081565b34801561013f57600080fd5b506100e8610400565b34801561015457600080fd5b506100ff6101633660046109b3565b6104ac565b34801561017457600080fd5b506100e86101833660046109d0565b6104e7565b34801561019457600080fd5b506001546100ff906001600160801b031681565b3480156101b457600080fd5b506067546101c8906001600160a01b031681565b6040516101139190610a09565b3480156101e157600080fd5b506101c87f000000000000000000000000000000000000000000000000000000000000000081565b34801561021557600080fd5b5061024a6102243660046109b3565b6002602052600090815260409020546001600160801b0380821691600160801b90041682565b604080516001600160801b03938416815292909116602083015201610113565b6100e8610278366004610a1d565b61057d565b34801561028957600080fd5b5061024a6102983660046109b3565b61060b565b3480156102a957600080fd5b506068546101c8906001600160a01b031681565b3480156102c957600080fd5b506100ff610628565b3480156102de57600080fd5b506100ff6303bfc40081565b6067546001600160a01b0316331461031d5760405162461bcd60e51b815260040161031490610a8e565b60405180910390fd5b81156103cf576001600160a01b0383161515806103375750805b61037b5760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b6044820152606401610314565b6067546040516001600160a01b03808616921690600080516020610d5883398151915290600090a3606780546001600160a01b0385166001600160a01b031991821617909155606880549091169055505050565b606880546001600160a01b0385166001600160a01b0319909116179055505050565b60006103fb610628565b905090565b6068546001600160a01b031633811461045b5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e65726044820152606401610314565b6067546040516001600160a01b03808416921690600080516020610d5883398151915290600090a3606780546001600160a01b039092166001600160a01b0319928316179055606880549091169055565b6001600160a01b03808216600090815260996020526040812054909116806104de576104d783610675565b9392505050565b6104d781610675565b6067546001600160a01b031633146105115760405162461bcd60e51b815260040161031490610a8e565b6001600160a01b0382811660008181526099602090815260409182902080546001600160a01b031916948616948517905581519384528301919091527f8d268954369e04c7941c3a7876f40c618eb97919add31202c9a235e75e84cf1b91015b60405180910390a15050565b336001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105c85733604051632b5c157560e11b81526004016103149190610a09565b61060782828080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506106ce92505050565b5050565b6000806106166103f1565b61061f846104ac565b91509150915091565b60408051808201909152600080546001600160801b038082168452600160801b909104166020830152906103fb9061070d565b60006103fb4261072f565b6001600160a01b03163b151590565b6001600160a01b03811660009081526002602090815260408083208151808301909252546001600160801b038082168352600160801b90910416918101919091526106c8906106c390610749565b61070d565b92915050565b6000806000838060200190518101906106e79190610b7d565b9250925092506106f7838361079b565b805115610707576107078161082b565b50505050565b6000610718826108bd565b1561072557506000919050565b6106c882426108ee565b600062093a8061073f8184610c61565b6106c89190610c95565b6040805180820190915260008082526020820152815161076e906303bfc40090610c61565b6001600160801b0316602080830182905283015161078b91610c95565b6001600160801b03168152919050565b6107a48261072f565b6001600160801b0316826001600160801b0316146107c4576107c4610cc0565b600180546001600160801b038085166001600160801b031990921691909117909155815160208301518216600160801b029116176000556040517f460b96294ff8de4eea3be3fb4fac9f978cffe83c7cc3140a4bfe0bedba26b92f90610571908390610cd6565b600080828060200190518101906108429190610cfa565b6001600160a01b0382166000908152600260209081526040918290208351918401516001600160801b03908116600160801b0292169190911790555191935091507f776960a80ccfa09c52229b183bf0ef49b26a5d15f9ae2c1c0f780a450d3b2a9f906108b0908390610cd6565b60405180910390a1505050565b600081600001516001600160801b03164283602001516108dd9190610c95565b6001600160801b0316101592915050565b600082600001516001600160801b031682846020015161090e9190610c95565b6001600160801b03161115610925575060006106c8565b8183602001516109359190610c95565b83516104d79190610d30565b6001600160a01b038116811461095657600080fd5b50565b8035801515811461096957600080fd5b919050565b60008060006060848603121561098357600080fd5b833561098e81610941565b925061099c60208501610959565b91506109aa60408501610959565b90509250925092565b6000602082840312156109c557600080fd5b81356104d781610941565b600080604083850312156109e357600080fd5b82356109ee81610941565b915060208301356109fe81610941565b809150509250929050565b6001600160a01b0391909116815260200190565b60008060208385031215610a3057600080fd5b82356001600160401b0380821115610a4757600080fd5b818501915085601f830112610a5b57600080fd5b813581811115610a6a57600080fd5b866020828501011115610a7c57600080fd5b60209290920196919550909350505050565b6020808252818101527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604082015260600190565b80516001600160801b038116811461096957600080fd5b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715610b1857610b18610ada565b604052919050565b600060408284031215610b3257600080fd5b604080519081016001600160401b0381118282101715610b5457610b54610ada565b604052905080610b6383610ac3565b8152610b7160208401610ac3565b60208201525092915050565b600080600060808486031215610b9257600080fd5b610b9b84610ac3565b92506020610bab86828701610b20565b60608601519093506001600160401b0380821115610bc857600080fd5b818701915087601f830112610bdc57600080fd5b815181811115610bee57610bee610ada565b610c00601f8201601f19168501610af0565b91508082528884828501011115610c1657600080fd5b60005b81811015610c34578381018501518382018601528401610c19565b506000848284010152508093505050509250925092565b634e487b7160e01b600052601160045260246000fd5b60006001600160801b0383811680610c8957634e487b7160e01b600052601260045260246000fd5b92169190910492915050565b6001600160801b03818116838216028082169190828114610cb857610cb8610c4b565b505092915050565b634e487b7160e01b600052600160045260246000fd5b604081016106c8828480516001600160801b03908116835260209182015116910152565b60008060608385031215610d0d57600080fd5b8251610d1881610941565b9150610d278460208501610b20565b90509250929050565b6001600160801b03828116828216039080821115610d5057610d50610c4b565b509291505056fe8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0a264697066735822122050fe5bbfaf47e948737b0e6f2d215036dc8dee9d0cfe740a5138a437c72ce3b064736f6c63430008110033",
|
|
363
|
+
"deployedBytecode": "0x6080604052600436106100c35760003560e01c8063078dfbe7146100c857806330d981af146100ea5780633ff032071461011c5780634e71e0c81461013357806370a0823114610148578063769b1ebc14610168578063814b2cac146101885780638da5cb5b146101a8578063af5a8f7b146101d5578063cb6b4f3c14610209578063e0299bf51461026a578063e268b3a41461027d578063e30c39781461029d578063ef1c243a146102bd578063f4359ce51461011c578063fa78668f146102d2575b600080fd5b3480156100d457600080fd5b506100e86100e336600461096e565b6102ea565b005b3480156100f657600080fd5b506100ff6103f1565b6040516001600160801b0390911681526020015b60405180910390f35b34801561012857600080fd5b506100ff62093a8081565b34801561013f57600080fd5b506100e8610400565b34801561015457600080fd5b506100ff6101633660046109b3565b6104ac565b34801561017457600080fd5b506100e86101833660046109d0565b6104e7565b34801561019457600080fd5b506001546100ff906001600160801b031681565b3480156101b457600080fd5b506067546101c8906001600160a01b031681565b6040516101139190610a09565b3480156101e157600080fd5b506101c87f000000000000000000000000000000000000000000000000000000000000000081565b34801561021557600080fd5b5061024a6102243660046109b3565b6002602052600090815260409020546001600160801b0380821691600160801b90041682565b604080516001600160801b03938416815292909116602083015201610113565b6100e8610278366004610a1d565b61057d565b34801561028957600080fd5b5061024a6102983660046109b3565b61060b565b3480156102a957600080fd5b506068546101c8906001600160a01b031681565b3480156102c957600080fd5b506100ff610628565b3480156102de57600080fd5b506100ff6303bfc40081565b6067546001600160a01b0316331461031d5760405162461bcd60e51b815260040161031490610a8e565b60405180910390fd5b81156103cf576001600160a01b0383161515806103375750805b61037b5760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b6044820152606401610314565b6067546040516001600160a01b03808616921690600080516020610d5883398151915290600090a3606780546001600160a01b0385166001600160a01b031991821617909155606880549091169055505050565b606880546001600160a01b0385166001600160a01b0319909116179055505050565b60006103fb610628565b905090565b6068546001600160a01b031633811461045b5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e65726044820152606401610314565b6067546040516001600160a01b03808416921690600080516020610d5883398151915290600090a3606780546001600160a01b039092166001600160a01b0319928316179055606880549091169055565b6001600160a01b03808216600090815260996020526040812054909116806104de576104d783610675565b9392505050565b6104d781610675565b6067546001600160a01b031633146105115760405162461bcd60e51b815260040161031490610a8e565b6001600160a01b0382811660008181526099602090815260409182902080546001600160a01b031916948616948517905581519384528301919091527f8d268954369e04c7941c3a7876f40c618eb97919add31202c9a235e75e84cf1b91015b60405180910390a15050565b336001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105c85733604051632b5c157560e11b81526004016103149190610a09565b61060782828080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506106ce92505050565b5050565b6000806106166103f1565b61061f846104ac565b91509150915091565b60408051808201909152600080546001600160801b038082168452600160801b909104166020830152906103fb9061070d565b60006103fb4261072f565b6001600160a01b03163b151590565b6001600160a01b03811660009081526002602090815260408083208151808301909252546001600160801b038082168352600160801b90910416918101919091526106c8906106c390610749565b61070d565b92915050565b6000806000838060200190518101906106e79190610b7d565b9250925092506106f7838361079b565b805115610707576107078161082b565b50505050565b6000610718826108bd565b1561072557506000919050565b6106c882426108ee565b600062093a8061073f8184610c61565b6106c89190610c95565b6040805180820190915260008082526020820152815161076e906303bfc40090610c61565b6001600160801b0316602080830182905283015161078b91610c95565b6001600160801b03168152919050565b6107a48261072f565b6001600160801b0316826001600160801b0316146107c4576107c4610cc0565b600180546001600160801b038085166001600160801b031990921691909117909155815160208301518216600160801b029116176000556040517f460b96294ff8de4eea3be3fb4fac9f978cffe83c7cc3140a4bfe0bedba26b92f90610571908390610cd6565b600080828060200190518101906108429190610cfa565b6001600160a01b0382166000908152600260209081526040918290208351918401516001600160801b03908116600160801b0292169190911790555191935091507f776960a80ccfa09c52229b183bf0ef49b26a5d15f9ae2c1c0f780a450d3b2a9f906108b0908390610cd6565b60405180910390a1505050565b600081600001516001600160801b03164283602001516108dd9190610c95565b6001600160801b0316101592915050565b600082600001516001600160801b031682846020015161090e9190610c95565b6001600160801b03161115610925575060006106c8565b8183602001516109359190610c95565b83516104d79190610d30565b6001600160a01b038116811461095657600080fd5b50565b8035801515811461096957600080fd5b919050565b60008060006060848603121561098357600080fd5b833561098e81610941565b925061099c60208501610959565b91506109aa60408501610959565b90509250925092565b6000602082840312156109c557600080fd5b81356104d781610941565b600080604083850312156109e357600080fd5b82356109ee81610941565b915060208301356109fe81610941565b809150509250929050565b6001600160a01b0391909116815260200190565b60008060208385031215610a3057600080fd5b82356001600160401b0380821115610a4757600080fd5b818501915085601f830112610a5b57600080fd5b813581811115610a6a57600080fd5b866020828501011115610a7c57600080fd5b60209290920196919550909350505050565b6020808252818101527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604082015260600190565b80516001600160801b038116811461096957600080fd5b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715610b1857610b18610ada565b604052919050565b600060408284031215610b3257600080fd5b604080519081016001600160401b0381118282101715610b5457610b54610ada565b604052905080610b6383610ac3565b8152610b7160208401610ac3565b60208201525092915050565b600080600060808486031215610b9257600080fd5b610b9b84610ac3565b92506020610bab86828701610b20565b60608601519093506001600160401b0380821115610bc857600080fd5b818701915087601f830112610bdc57600080fd5b815181811115610bee57610bee610ada565b610c00601f8201601f19168501610af0565b91508082528884828501011115610c1657600080fd5b60005b81811015610c34578381018501518382018601528401610c19565b506000848284010152508093505050509250925092565b634e487b7160e01b600052601160045260246000fd5b60006001600160801b0383811680610c8957634e487b7160e01b600052601260045260246000fd5b92169190910492915050565b6001600160801b03818116838216028082169190828114610cb857610cb8610c4b565b505092915050565b634e487b7160e01b600052600160045260246000fd5b604081016106c8828480516001600160801b03908116835260209182015116910152565b60008060608385031215610d0d57600080fd5b8251610d1881610941565b9150610d278460208501610b20565b90509250929050565b6001600160801b03828116828216039080821115610d5057610d50610c4b565b509291505056fe8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0a264697066735822122050fe5bbfaf47e948737b0e6f2d215036dc8dee9d0cfe740a5138a437c72ce3b064736f6c63430008110033",
|
|
364
364
|
"linkReferences": {},
|
|
365
365
|
"deployedLinkReferences": {}
|
|
366
366
|
}
|
package/build/artifacts/contracts/LiquidityMining/libraries/VeBalanceLib.sol/VeBalanceLib.json
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
"contractName": "VeBalanceLib",
|
|
4
4
|
"sourceName": "contracts/LiquidityMining/libraries/VeBalanceLib.sol",
|
|
5
5
|
"abi": [],
|
|
6
|
-
"bytecode": "
|
|
7
|
-
"deployedBytecode": "
|
|
6
|
+
"bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212207a6fd44e672ac35e1f9e052915db42bfd067efac91fd06aa9eeccf5ebb81fb5c64736f6c63430008110033",
|
|
7
|
+
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212207a6fd44e672ac35e1f9e052915db42bfd067efac91fd06aa9eeccf5ebb81fb5c64736f6c63430008110033",
|
|
8
8
|
"linkReferences": {},
|
|
9
9
|
"deployedLinkReferences": {}
|
|
10
10
|
}
|
package/build/artifacts/contracts/LiquidityMining/libraries/VeHistoryLib.sol/CheckpointHelper.json
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
"contractName": "CheckpointHelper",
|
|
4
4
|
"sourceName": "contracts/LiquidityMining/libraries/VeHistoryLib.sol",
|
|
5
5
|
"abi": [],
|
|
6
|
-
"bytecode": "
|
|
7
|
-
"deployedBytecode": "
|
|
6
|
+
"bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212203ca49f4cda110c06a27bad87c622f6782c14abf8175b2fd45d10096d30b0ba4764736f6c63430008110033",
|
|
7
|
+
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212203ca49f4cda110c06a27bad87c622f6782c14abf8175b2fd45d10096d30b0ba4764736f6c63430008110033",
|
|
8
8
|
"linkReferences": {},
|
|
9
9
|
"deployedLinkReferences": {}
|
|
10
10
|
}
|
package/build/artifacts/contracts/LiquidityMining/libraries/VeHistoryLib.sol/Checkpoints.json
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
"contractName": "Checkpoints",
|
|
4
4
|
"sourceName": "contracts/LiquidityMining/libraries/VeHistoryLib.sol",
|
|
5
5
|
"abi": [],
|
|
6
|
-
"bytecode": "
|
|
7
|
-
"deployedBytecode": "
|
|
6
|
+
"bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220d1d86cf13bceefa15727b049649f79a7a879a1f71d641afc65ffcb160f0ebd1d64736f6c63430008110033",
|
|
7
|
+
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220d1d86cf13bceefa15727b049649f79a7a879a1f71d641afc65ffcb160f0ebd1d64736f6c63430008110033",
|
|
8
8
|
"linkReferences": {},
|
|
9
9
|
"deployedLinkReferences": {}
|
|
10
10
|
}
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
"contractName": "MarketMathCore",
|
|
4
4
|
"sourceName": "contracts/core/Market/MarketMathCore.sol",
|
|
5
5
|
"abi": [],
|
|
6
|
-
"bytecode": "
|
|
7
|
-
"deployedBytecode": "
|
|
6
|
+
"bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220cef292ec4c9086d65827431e214eab0b5c09251c89c2bdcf8b2887237183bf1f64736f6c63430008110033",
|
|
7
|
+
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220cef292ec4c9086d65827431e214eab0b5c09251c89c2bdcf8b2887237183bf1f64736f6c63430008110033",
|
|
8
8
|
"linkReferences": {},
|
|
9
9
|
"deployedLinkReferences": {}
|
|
10
10
|
}
|
|
@@ -93,8 +93,8 @@
|
|
|
93
93
|
"type": "function"
|
|
94
94
|
}
|
|
95
95
|
],
|
|
96
|
-
"bytecode": "
|
|
97
|
-
"deployedBytecode": "
|
|
96
|
+
"bytecode": "0x61105a61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100825760003560e01c80631dd421ce14610087578063335129ad146100b05780634af74b68146100db578063587cdc06146101165780635d27625914610149578063b8d236ac1461016a578063ca7dab2c1461017d578063f8500bcc146101cc575b600080fd5b61009a610095366004610aaf565b6101ec565b6040516100a79190610ba8565b60405180910390f35b6100c36100be366004610bf5565b6102d0565b6040516001600160d81b0390911681526020016100a7565b8180156100e757600080fd5b506100fb6100f6366004610c3a565b61044f565b6040805161ffff9384168152929091166020830152016100a7565b81801561012257600080fd5b50610136610131366004610c63565b610598565b60405161ffff90911681526020016100a7565b61015c610157366004610c9f565b61062c565b6040516100a7929190610d16565b61015c610178366004610d31565b6107e6565b81801561018957600080fd5b506100fb610198366004610d8f565b6040805160608101825263ffffffff9290921680835260006020840152600192909101829052600160f81b17909155908190565b6101df6101da366004610dbb565b610995565b6040516100a79190610e63565b60608161ffff1660000361021357604051636a86842160e01b815260040160405180910390fd5b84516001600160401b0381111561022c5761022c610a40565b604051908082528060200260200182016040528015610255578160200160208202803683370190505b50905060005b81518110156102c55761028b888888848151811061027b5761027b610e77565b60200260200101518888886102d0565b82828151811061029d5761029d610e77565b6001600160d81b03909216602092830291909101909101526102be81610ea3565b905061025b565b509695505050505050565b60008463ffffffff16600003610369576000878461ffff1661ffff81106102f9576102f9610e77565b60408051606081018252919092015463ffffffff808216808452600160201b83046001600160d81b03166020850152600160f81b90920460ff161515938301939093529092509088161461035e57610352818887610995565b60200151915050610445565b602001519050610445565b60006103758688610ebc565b90506000806103878a848989896107e6565b91509150816000015163ffffffff168363ffffffff16036103b057506020015191506104459050565b806000015163ffffffff168363ffffffff16036103d557602001519250610445915050565b815181516103e39190610ebc565b63ffffffff168260000151846103f99190610ebc565b63ffffffff16836020015183602001516104139190610ee0565b6001600160d81b03166104269190610f00565b6104309190610f2d565b826020015161043f9190610f41565b93505050505b9695505050505050565b6000806000888861ffff1661ffff811061046b5761046b610e77565b60408051606081018252919092015463ffffffff808216808452600160201b83046001600160d81b03166020850152600160f81b90920460ff1615159383019390935290925090881690036104c6578785925092505061058d565b8461ffff168461ffff161180156104ee57506104e3600186610f61565b61ffff168861ffff16145b156104fb578391506104ff565b8491505b8161050b896001610f7c565b6105159190610f97565b9250610522818888610995565b898461ffff1661ffff811061053957610539610e77565b82519101805460208401516040909401511515600160f81b026001600160f81b036001600160d81b03909516600160201b026001600160f81b031990921663ffffffff909416939093171792909216179055505b965096945050505050565b60008261ffff166000036105bf5760405163dc14e8a160e01b815260040160405180910390fd5b8261ffff168261ffff16116105d5575081610625565b825b8261ffff168161ffff1614610620576001858261ffff1661ffff81106105ff576105ff610e77565b01805463ffffffff191663ffffffff929092169190911790556001016105d7565b508190505b9392505050565b610634610a07565b61063c610a07565b60008361064a866001610f7c565b6106549190610f97565b61ffff169050600060018561ffff168361066e9190610fb8565b6106789190610fcb565b905060005b60026106898385610fb8565b6106939190610f2d565b9050886106a461ffff881683610fde565b61ffff81106106b5576106b5610e77565b60408051606081018252919092015463ffffffff81168252600160201b81046001600160d81b03166020830152600160f81b900460ff161515918101829052955061070c57610705816001610fb8565b925061067d565b8861ffff871661071d836001610fb8565b6107279190610fde565b61ffff811061073857610738610e77565b60408051606081018252919092015463ffffffff8082168352600160201b82046001600160d81b03166020840152600160f81b90910460ff16151592820192909252865190955089821691161180159081906107a45750846000015163ffffffff168963ffffffff1611155b156107af57506107da565b806107c6576107bf600183610fcb565b92506107d4565b6107d1826001610fb8565b93505b5061067d565b50505094509492505050565b6107ee610a07565b6107f6610a07565b868461ffff1661ffff811061080d5761080d610e77565b60408051606081018252919092015463ffffffff808216808452600160201b83046001600160d81b03166020850152600160f81b90920460ff161515938301939093529093509087161061088157815163ffffffff87811691161461098b5781610878838888610995565b9150915061098b565b868361088e866001610f7c565b6108989190610f97565b61ffff1661ffff81106108ad576108ad610e77565b60408051606081018252919092015463ffffffff81168252600160201b81046001600160d81b03166020830152600160f81b900460ff16151591810182905292506109325760408051606081018252885463ffffffff81168252600160201b81046001600160d81b03166020830152600160f81b900460ff1615159181019190915291505b816000015163ffffffff168663ffffffff16101561097a578151604051632728d09b60e21b815263ffffffff8089166004830152909116602482015260440160405180910390fd5b6109868787868661062c565b915091505b9550959350505050565b61099d610a07565b60405180606001604052808463ffffffff1681526020018560000151856109c49190610ebc565b6109dd9063ffffffff166001600160601b038616610ff2565b86602001516109ec9190610f41565b6001600160d81b031681526001602090910152949350505050565b604080516060810182526000808252602082018190529181019190915290565b803563ffffffff81168114610a3b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715610a7e57610a7e610a40565b604052919050565b80356001600160601b0381168114610a3b57600080fd5b803561ffff81168114610a3b57600080fd5b60008060008060008060c08789031215610ac857600080fd5b863595506020610ad9818901610a27565b955060408801356001600160401b0380821115610af557600080fd5b818a0191508a601f830112610b0957600080fd5b813581811115610b1b57610b1b610a40565b8060051b9150610b2c848301610a56565b818152918301840191848101908d841115610b4657600080fd5b938501935b83851015610b6b57610b5c85610a27565b82529385019390850190610b4b565b809950505050505050610b8060608801610a86565b9250610b8e60808801610a9d565b9150610b9c60a08801610a9d565b90509295509295509295565b6020808252825182820181905260009190848201906040850190845b81811015610be95783516001600160d81b031683529284019291840191600101610bc4565b50909695505050505050565b60008060008060008060c08789031215610c0e57600080fd5b86359550610c1e60208801610a27565b9450610c2c60408801610a27565b9350610b8060608801610a86565b60008060008060008060c08789031215610c5357600080fd5b86359550610c1e60208801610a9d565b600080600060608486031215610c7857600080fd5b83359250610c8860208501610a9d565b9150610c9660408501610a9d565b90509250925092565b60008060008060808587031215610cb557600080fd5b84359350610cc560208601610a27565b9250610cd360408601610a9d565b9150610ce160608601610a9d565b905092959194509250565b805163ffffffff1682526020808201516001600160d81b0316908301526040908101511515910152565b60c08101610d248285610cec565b6106256060830184610cec565b600080600080600060a08688031215610d4957600080fd5b85359450610d5960208701610a27565b9350610d6760408701610a86565b9250610d7560608701610a9d565b9150610d8360808701610a9d565b90509295509295909350565b60008060408385031215610da257600080fd5b82359150610db260208401610a27565b90509250929050565b600080600083850360a0811215610dd157600080fd5b6060811215610ddf57600080fd5b50604051606081016001600160401b0381118282101715610e0257610e02610a40565b604052610e0e85610a27565b815260208501356001600160d81b0381168114610e2a57600080fd5b602082015260408501358015158114610e4257600080fd5b60408201529250610e5560608501610a27565b9150610c9660808501610a86565b60608101610e718284610cec565b92915050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b600060018201610eb557610eb5610e8d565b5060010190565b63ffffffff828116828216039080821115610ed957610ed9610e8d565b5092915050565b6001600160d81b03828116828216039080821115610ed957610ed9610e8d565b8082028115828204841417610e7157610e71610e8d565b634e487b7160e01b600052601260045260246000fd5b600082610f3c57610f3c610f17565b500490565b6001600160d81b03818116838216019080821115610ed957610ed9610e8d565b61ffff828116828216039080821115610ed957610ed9610e8d565b61ffff818116838216019080821115610ed957610ed9610e8d565b600061ffff80841680610fac57610fac610f17565b92169190910692915050565b80820180821115610e7157610e71610e8d565b81810381811115610e7157610e71610e8d565b600082610fed57610fed610f17565b500690565b6001600160d81b0382811682821681810283169291811582850482141761101b5761101b610e8d565b5050509291505056fea26469706673582212203ac07d5e8c4bf589e09e186b60f9e0835809a674380c5d775df6c71e543466dd64736f6c63430008110033",
|
|
97
|
+
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100825760003560e01c80631dd421ce14610087578063335129ad146100b05780634af74b68146100db578063587cdc06146101165780635d27625914610149578063b8d236ac1461016a578063ca7dab2c1461017d578063f8500bcc146101cc575b600080fd5b61009a610095366004610aaf565b6101ec565b6040516100a79190610ba8565b60405180910390f35b6100c36100be366004610bf5565b6102d0565b6040516001600160d81b0390911681526020016100a7565b8180156100e757600080fd5b506100fb6100f6366004610c3a565b61044f565b6040805161ffff9384168152929091166020830152016100a7565b81801561012257600080fd5b50610136610131366004610c63565b610598565b60405161ffff90911681526020016100a7565b61015c610157366004610c9f565b61062c565b6040516100a7929190610d16565b61015c610178366004610d31565b6107e6565b81801561018957600080fd5b506100fb610198366004610d8f565b6040805160608101825263ffffffff9290921680835260006020840152600192909101829052600160f81b17909155908190565b6101df6101da366004610dbb565b610995565b6040516100a79190610e63565b60608161ffff1660000361021357604051636a86842160e01b815260040160405180910390fd5b84516001600160401b0381111561022c5761022c610a40565b604051908082528060200260200182016040528015610255578160200160208202803683370190505b50905060005b81518110156102c55761028b888888848151811061027b5761027b610e77565b60200260200101518888886102d0565b82828151811061029d5761029d610e77565b6001600160d81b03909216602092830291909101909101526102be81610ea3565b905061025b565b509695505050505050565b60008463ffffffff16600003610369576000878461ffff1661ffff81106102f9576102f9610e77565b60408051606081018252919092015463ffffffff808216808452600160201b83046001600160d81b03166020850152600160f81b90920460ff161515938301939093529092509088161461035e57610352818887610995565b60200151915050610445565b602001519050610445565b60006103758688610ebc565b90506000806103878a848989896107e6565b91509150816000015163ffffffff168363ffffffff16036103b057506020015191506104459050565b806000015163ffffffff168363ffffffff16036103d557602001519250610445915050565b815181516103e39190610ebc565b63ffffffff168260000151846103f99190610ebc565b63ffffffff16836020015183602001516104139190610ee0565b6001600160d81b03166104269190610f00565b6104309190610f2d565b826020015161043f9190610f41565b93505050505b9695505050505050565b6000806000888861ffff1661ffff811061046b5761046b610e77565b60408051606081018252919092015463ffffffff808216808452600160201b83046001600160d81b03166020850152600160f81b90920460ff1615159383019390935290925090881690036104c6578785925092505061058d565b8461ffff168461ffff161180156104ee57506104e3600186610f61565b61ffff168861ffff16145b156104fb578391506104ff565b8491505b8161050b896001610f7c565b6105159190610f97565b9250610522818888610995565b898461ffff1661ffff811061053957610539610e77565b82519101805460208401516040909401511515600160f81b026001600160f81b036001600160d81b03909516600160201b026001600160f81b031990921663ffffffff909416939093171792909216179055505b965096945050505050565b60008261ffff166000036105bf5760405163dc14e8a160e01b815260040160405180910390fd5b8261ffff168261ffff16116105d5575081610625565b825b8261ffff168161ffff1614610620576001858261ffff1661ffff81106105ff576105ff610e77565b01805463ffffffff191663ffffffff929092169190911790556001016105d7565b508190505b9392505050565b610634610a07565b61063c610a07565b60008361064a866001610f7c565b6106549190610f97565b61ffff169050600060018561ffff168361066e9190610fb8565b6106789190610fcb565b905060005b60026106898385610fb8565b6106939190610f2d565b9050886106a461ffff881683610fde565b61ffff81106106b5576106b5610e77565b60408051606081018252919092015463ffffffff81168252600160201b81046001600160d81b03166020830152600160f81b900460ff161515918101829052955061070c57610705816001610fb8565b925061067d565b8861ffff871661071d836001610fb8565b6107279190610fde565b61ffff811061073857610738610e77565b60408051606081018252919092015463ffffffff8082168352600160201b82046001600160d81b03166020840152600160f81b90910460ff16151592820192909252865190955089821691161180159081906107a45750846000015163ffffffff168963ffffffff1611155b156107af57506107da565b806107c6576107bf600183610fcb565b92506107d4565b6107d1826001610fb8565b93505b5061067d565b50505094509492505050565b6107ee610a07565b6107f6610a07565b868461ffff1661ffff811061080d5761080d610e77565b60408051606081018252919092015463ffffffff808216808452600160201b83046001600160d81b03166020850152600160f81b90920460ff161515938301939093529093509087161061088157815163ffffffff87811691161461098b5781610878838888610995565b9150915061098b565b868361088e866001610f7c565b6108989190610f97565b61ffff1661ffff81106108ad576108ad610e77565b60408051606081018252919092015463ffffffff81168252600160201b81046001600160d81b03166020830152600160f81b900460ff16151591810182905292506109325760408051606081018252885463ffffffff81168252600160201b81046001600160d81b03166020830152600160f81b900460ff1615159181019190915291505b816000015163ffffffff168663ffffffff16101561097a578151604051632728d09b60e21b815263ffffffff8089166004830152909116602482015260440160405180910390fd5b6109868787868661062c565b915091505b9550959350505050565b61099d610a07565b60405180606001604052808463ffffffff1681526020018560000151856109c49190610ebc565b6109dd9063ffffffff166001600160601b038616610ff2565b86602001516109ec9190610f41565b6001600160d81b031681526001602090910152949350505050565b604080516060810182526000808252602082018190529181019190915290565b803563ffffffff81168114610a3b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715610a7e57610a7e610a40565b604052919050565b80356001600160601b0381168114610a3b57600080fd5b803561ffff81168114610a3b57600080fd5b60008060008060008060c08789031215610ac857600080fd5b863595506020610ad9818901610a27565b955060408801356001600160401b0380821115610af557600080fd5b818a0191508a601f830112610b0957600080fd5b813581811115610b1b57610b1b610a40565b8060051b9150610b2c848301610a56565b818152918301840191848101908d841115610b4657600080fd5b938501935b83851015610b6b57610b5c85610a27565b82529385019390850190610b4b565b809950505050505050610b8060608801610a86565b9250610b8e60808801610a9d565b9150610b9c60a08801610a9d565b90509295509295509295565b6020808252825182820181905260009190848201906040850190845b81811015610be95783516001600160d81b031683529284019291840191600101610bc4565b50909695505050505050565b60008060008060008060c08789031215610c0e57600080fd5b86359550610c1e60208801610a27565b9450610c2c60408801610a27565b9350610b8060608801610a86565b60008060008060008060c08789031215610c5357600080fd5b86359550610c1e60208801610a9d565b600080600060608486031215610c7857600080fd5b83359250610c8860208501610a9d565b9150610c9660408501610a9d565b90509250925092565b60008060008060808587031215610cb557600080fd5b84359350610cc560208601610a27565b9250610cd360408601610a9d565b9150610ce160608601610a9d565b905092959194509250565b805163ffffffff1682526020808201516001600160d81b0316908301526040908101511515910152565b60c08101610d248285610cec565b6106256060830184610cec565b600080600080600060a08688031215610d4957600080fd5b85359450610d5960208701610a27565b9350610d6760408701610a86565b9250610d7560608701610a9d565b9150610d8360808701610a9d565b90509295509295909350565b60008060408385031215610da257600080fd5b82359150610db260208401610a27565b90509250929050565b600080600083850360a0811215610dd157600080fd5b6060811215610ddf57600080fd5b50604051606081016001600160401b0381118282101715610e0257610e02610a40565b604052610e0e85610a27565b815260208501356001600160d81b0381168114610e2a57600080fd5b602082015260408501358015158114610e4257600080fd5b60408201529250610e5560608501610a27565b9150610c9660808501610a86565b60608101610e718284610cec565b92915050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b600060018201610eb557610eb5610e8d565b5060010190565b63ffffffff828116828216039080821115610ed957610ed9610e8d565b5092915050565b6001600160d81b03828116828216039080821115610ed957610ed9610e8d565b8082028115828204841417610e7157610e71610e8d565b634e487b7160e01b600052601260045260246000fd5b600082610f3c57610f3c610f17565b500490565b6001600160d81b03818116838216019080821115610ed957610ed9610e8d565b61ffff828116828216039080821115610ed957610ed9610e8d565b61ffff818116838216019080821115610ed957610ed9610e8d565b600061ffff80841680610fac57610fac610f17565b92169190910692915050565b80820180821115610e7157610e71610e8d565b81810381811115610e7157610e71610e8d565b600082610fed57610fed610f17565b500690565b6001600160d81b0382811682821681810283169291811582850482141761101b5761101b610e8d565b5050509291505056fea26469706673582212203ac07d5e8c4bf589e09e186b60f9e0835809a674380c5d775df6c71e543466dd64736f6c63430008110033",
|
|
98
98
|
"linkReferences": {},
|
|
99
99
|
"deployedLinkReferences": {}
|
|
100
100
|
}
|