@pendle/core-v2 0.7.0 → 0.7.1-beta
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/SuperComposableYield/SCY-implementations/AaveV3/PendleAaveV3SCY.sol/PendleAaveV3SCY.dbg.json +1 -1
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/AaveV3/PendleAaveV3SCY.sol/PendleAaveV3SCY.json +2 -39
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/AaveV3/WadRayMath.sol/WadRayMath.dbg.json +1 -1
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/AaveV3/WadRayMath.sol/WadRayMath.json +2 -2
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/BenQi/PendleQiTokenHelper.sol/PendleQiTokenHelper.dbg.json +1 -1
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/BenQi/PendleQiTokenHelper.sol/PendleQiTokenHelper.json +2 -2
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/BenQi/PendleQiTokenSCY.sol/PendleQiTokenSCY.dbg.json +1 -1
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/BenQi/PendleQiTokenSCY.sol/PendleQiTokenSCY.json +2 -26
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/PendleBtrflySCY.sol/PendleBtrflyScy.dbg.json +1 -1
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/PendleBtrflySCY.sol/PendleBtrflyScy.json +2 -2
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/PendleERC4626SCY.sol/PendleERC4626SCY.dbg.json +1 -1
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/PendleERC4626SCY.sol/PendleERC4626SCY.json +2 -2
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/PendleJoeLpSCY.sol/PendleJoeLpSCY.dbg.json +1 -1
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/PendleJoeLpSCY.sol/PendleJoeLpSCY.json +2 -2
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/PendleWstEthSCY.sol/PendleWstEthSCY.dbg.json +1 -1
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/PendleWstEthSCY.sol/PendleWstEthSCY.json +2 -2
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/PendleYearnVaultScy.sol/PendleYearnVaultSCY.dbg.json +1 -1
- package/build/artifacts/contracts/SuperComposableYield/SCY-implementations/PendleYearnVaultScy.sol/PendleYearnVaultSCY.json +2 -2
- package/build/artifacts/contracts/SuperComposableYield/base-implementations/SCYBase.sol/SCYBase.dbg.json +1 -1
- package/build/artifacts/contracts/SuperComposableYield/base-implementations/SCYBaseWithRewards.sol/SCYBaseWithRewards.dbg.json +1 -1
- package/build/artifacts/contracts/SuperComposableYield/base-implementations/SCYBaseWithRewards.sol/SCYBaseWithRewards.json +0 -24
- package/build/artifacts/contracts/core/LiquidityMining/CelerAbstracts/CelerReceiverUpg.sol/CelerReceiverUpg.dbg.json +4 -0
- package/build/artifacts/contracts/core/LiquidityMining/CelerAbstracts/{CelerReceiver.sol/CelerReceiver.json → CelerReceiverUpg.sol/CelerReceiverUpg.json} +2 -2
- package/build/artifacts/contracts/core/LiquidityMining/CelerAbstracts/CelerSenderUpg.sol/CelerSenderUpg.dbg.json +4 -0
- package/build/artifacts/contracts/core/LiquidityMining/CelerAbstracts/{CelerSender.sol/CelerSender.json → CelerSenderUpg.sol/CelerSenderUpg.json} +15 -2
- package/build/artifacts/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerBaseUpg.sol/PendleGaugeControllerBaseUpg.dbg.json +4 -0
- package/build/artifacts/contracts/core/LiquidityMining/GaugeController/{PendleGaugeController.sol/PendleGaugeController.json → PendleGaugeControllerBaseUpg.sol/PendleGaugeControllerBaseUpg.json} +2 -2
- package/build/artifacts/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerMainchain.sol/PendleGaugeControllerMainchainUpg.dbg.json +4 -0
- package/build/artifacts/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerMainchain.sol/PendleGaugeControllerMainchainUpg.json +255 -0
- package/build/artifacts/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerSidechain.sol/PendleGaugeControllerSidechainUpg.dbg.json +4 -0
- package/build/artifacts/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerSidechain.sol/PendleGaugeControllerSidechainUpg.json +318 -0
- package/build/artifacts/contracts/core/LiquidityMining/PendleGauge.sol/PendleGauge.dbg.json +1 -1
- package/build/artifacts/contracts/core/LiquidityMining/PendleGauge.sol/PendleGauge.json +0 -24
- package/build/artifacts/contracts/core/LiquidityMining/VotingController/PendleVotingControllerUpg.sol/PendleVotingControllerUpg.dbg.json +4 -0
- package/build/artifacts/contracts/core/LiquidityMining/VotingController/PendleVotingControllerUpg.sol/PendleVotingControllerUpg.json +776 -0
- package/build/artifacts/contracts/core/LiquidityMining/VotingController/VotingControllerStorageUpg.sol/VotingControllerStorageUpg.dbg.json +4 -0
- package/build/artifacts/contracts/core/LiquidityMining/VotingController/{VotingControllerStorage.sol/VotingControllerStorage.json → VotingControllerStorageUpg.sol/VotingControllerStorageUpg.json} +16 -49
- package/build/artifacts/contracts/core/LiquidityMining/VotingEscrow/VotingEscrowPendleMainchain.sol/VotingEscrowPendleMainchain.dbg.json +1 -1
- package/build/artifacts/contracts/core/LiquidityMining/VotingEscrow/VotingEscrowPendleMainchain.sol/VotingEscrowPendleMainchain.json +15 -43
- package/build/artifacts/contracts/core/LiquidityMining/VotingEscrow/VotingEscrowPendleSidechain.sol/VotingEscrowPendleSidechain.dbg.json +1 -1
- package/build/artifacts/contracts/core/LiquidityMining/VotingEscrow/VotingEscrowPendleSidechain.sol/VotingEscrowPendleSidechain.json +2 -2
- package/build/artifacts/contracts/core/LiquidityMining/VotingEscrow/VotingEscrowTokenBase.sol/VotingEscrowTokenBase.dbg.json +4 -0
- package/build/artifacts/contracts/core/LiquidityMining/VotingEscrow/{VotingEscrowToken.sol/VotingEscrowToken.json → VotingEscrowTokenBase.sol/VotingEscrowTokenBase.json} +2 -2
- package/build/artifacts/contracts/core/Market/PendleMarket.sol/PendleMarket.dbg.json +1 -1
- package/build/artifacts/contracts/core/Market/PendleMarket.sol/PendleMarket.json +2 -26
- package/build/artifacts/contracts/core/Market/PendleMarketFactory.sol/PendleMarketFactory.dbg.json +1 -1
- package/build/artifacts/contracts/core/Market/PendleMarketFactory.sol/PendleMarketFactory.json +13 -7
- package/build/artifacts/contracts/core/PendleERC20.sol/PendleERC20.dbg.json +1 -1
- package/build/artifacts/contracts/core/PendleERC20.sol/PendleERC20.json +2 -2
- package/build/artifacts/contracts/core/PendleERC20Permit.sol/PendleERC20Permit.dbg.json +1 -1
- package/build/artifacts/contracts/core/PendleERC20Permit.sol/PendleERC20Permit.json +2 -2
- package/build/artifacts/contracts/core/PendleRouter.sol/PendleRouter.dbg.json +1 -1
- package/build/artifacts/contracts/core/PendleRouter.sol/PendleRouter.json +2 -2
- package/build/artifacts/contracts/core/YieldContracts/InterestManagerYT.sol/InterestManagerYT.dbg.json +4 -0
- package/build/artifacts/contracts/core/YieldContracts/InterestManagerYT.sol/InterestManagerYT.json +35 -0
- package/build/artifacts/contracts/core/YieldContracts/PendlePrincipalToken.sol/PendlePrincipalToken.dbg.json +1 -1
- package/build/artifacts/contracts/core/YieldContracts/PendlePrincipalToken.sol/PendlePrincipalToken.json +15 -82
- package/build/artifacts/contracts/core/YieldContracts/PendleYieldContractFactory.sol/PendleYieldContractFactory.dbg.json +1 -1
- package/build/artifacts/contracts/core/YieldContracts/PendleYieldContractFactory.sol/PendleYieldContractFactory.json +15 -7
- package/build/artifacts/contracts/core/YieldContracts/PendleYieldToken.sol/PendleYieldToken.dbg.json +1 -1
- package/build/artifacts/contracts/core/YieldContracts/PendleYieldToken.sol/PendleYieldToken.json +77 -95
- package/build/artifacts/contracts/core/actions/ActionCallback.sol/ActionCallback.dbg.json +1 -1
- package/build/artifacts/contracts/core/actions/ActionCallback.sol/ActionCallback.json +2 -2
- package/build/artifacts/contracts/core/actions/ActionCore.sol/ActionCore.dbg.json +1 -1
- package/build/artifacts/contracts/core/actions/ActionCore.sol/ActionCore.json +2 -2
- package/build/artifacts/contracts/core/actions/ActionYT.sol/ActionYT.dbg.json +1 -1
- package/build/artifacts/contracts/core/actions/ActionYT.sol/ActionYT.json +2 -2
- package/build/artifacts/contracts/core/actions/base/ActionSCYAndPTBase.sol/ActionSCYAndPTBase.dbg.json +1 -1
- package/build/artifacts/contracts/core/actions/base/ActionSCYAndPYBase.sol/ActionSCYAndPYBase.dbg.json +1 -1
- package/build/artifacts/contracts/core/actions/base/ActionSCYAndYTBase.sol/ActionSCYAndYTBase.dbg.json +1 -1
- package/build/artifacts/contracts/core/actions/base/CallbackHelper.sol/CallbackHelper.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IAToken.sol/IAToken.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IAavePool.sol/IAavePool.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IAaveRewardsController.sol/IAaveRewardsController.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IBenQiComptroller.sol/IBenQiComptroller.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IBenQiInterestRateModel.sol/IBenQiInterestRateModel.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/ICelerMessageBus.sol/ICelerMessageBus.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/ICelerMessageReceiverApp.sol/ICelerMessageReceiverApp.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IERC4626.sol/IERC4626.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IJoePair.sol/IJoePair.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IJoeRouter01.sol/IJoeRouter01.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IJoeRouter02.sol/IJoeRouter02.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPActionCore.sol/IPActionCore.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPActionYT.sol/IPActionYT.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPAllAction.sol/IPAllAction.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPGaugeController.sol/IPGaugeController.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPGaugeController.sol/IPGaugeController.json +26 -0
- package/build/artifacts/contracts/interfaces/IPGaugeControllerMainchain.sol/IPGaugeControllerMainchain.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPGaugeControllerMainchain.sol/IPGaugeControllerMainchain.json +26 -0
- package/build/artifacts/contracts/interfaces/IPGovernanceManager.sol/IPGovernanceManager.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPInterestManagerYT.sol/IPInterestManagerYT.dbg.json +4 -0
- package/build/artifacts/contracts/interfaces/IPInterestManagerYT.sol/IPInterestManagerYT.json +35 -0
- package/build/artifacts/contracts/interfaces/IPMarket.sol/IPMarket.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPMarketAddRemoveCallback.sol/IPMarketAddRemoveCallback.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPMarketAddRemoveCallback.sol/IPMarketAddRemoveCallback.json +2 -2
- package/build/artifacts/contracts/interfaces/IPMarketFactory.sol/IPMarketFactory.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPMarketFactory.sol/IPMarketFactory.json +6 -0
- package/build/artifacts/contracts/interfaces/IPMarketSwapCallback.sol/IPMarketSwapCallback.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPPermissionsV2Upg.sol/IPermissionsV2Upg.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPPrincipalToken.sol/IPPrincipalToken.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPPrincipalToken.sol/IPPrincipalToken.json +13 -0
- package/build/artifacts/contracts/interfaces/IPRouterStatic.sol/IPRouterStatic.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPVeToken.sol/IPVeToken.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPVotingController.sol/IPVotingController.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPVotingEscrow.sol/IPVotingEscrow.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPYieldContractFactory.sol/IPYieldContractFactory.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPYieldToken.sol/IPYieldToken.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IPYieldToken.sol/IPYieldToken.json +91 -43
- package/build/artifacts/contracts/interfaces/IQiAvax.sol/IQiAvax.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IQiErc20.sol/IQiErc20.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IQiToken.sol/IQiToken.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IREDACTEDStaking.sol/IREDACTEDStaking.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IRewardManager.sol/IRewardManager.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IRewardManager.sol/IRewardManager.json +7 -2
- package/build/artifacts/contracts/interfaces/ISuperComposableYield.sol/ISuperComposableYield.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IWETH.sol/IWETH.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IWXBTRFLY.sol/IWXBTRFLY.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IWstETH.sol/IWstETH.dbg.json +1 -1
- package/build/artifacts/contracts/interfaces/IYearnVault.sol/IYearnVault.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/RewardManager.sol/RewardManager.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/RewardManager.sol/RewardManager.json +0 -24
- package/build/artifacts/contracts/libraries/RewardManagerAbstract.sol/RewardManagerAbstract.dbg.json +4 -0
- package/build/artifacts/contracts/libraries/RewardManagerAbstract.sol/RewardManagerAbstract.json +40 -0
- package/build/artifacts/contracts/libraries/SCY/SCYIndex.sol/SCYIndexLib.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/SCY/SCYIndex.sol/SCYIndexLib.json +2 -2
- package/build/artifacts/contracts/libraries/SCY/SCYUtils.sol/SCYUtils.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/SCY/SCYUtils.sol/SCYUtils.json +2 -2
- package/build/artifacts/contracts/libraries/VeBalanceLib.sol/VeBalanceLib.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/VeBalanceLib.sol/VeBalanceLib.json +2 -2
- package/build/artifacts/contracts/libraries/VeHistoryLib.sol/Checkpoints.dbg.json +4 -0
- package/build/artifacts/contracts/libraries/{solmate/LibRLP.sol/LibRLP.json → VeHistoryLib.sol/Checkpoints.json} +4 -4
- package/build/artifacts/contracts/libraries/helpers/ArrayLib.sol/ArrayLib.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/helpers/ArrayLib.sol/ArrayLib.json +2 -2
- package/build/artifacts/contracts/libraries/helpers/ExpiryUtilsLib.sol/ExpiryUtils.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/helpers/ExpiryUtilsLib.sol/ExpiryUtils.json +2 -2
- package/build/artifacts/contracts/libraries/helpers/MiniHelpers.sol/MiniHelpers.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/helpers/MiniHelpers.sol/MiniHelpers.json +2 -2
- package/build/artifacts/contracts/libraries/helpers/SSTORE2Deployer.sol/SSTORE2Deployer.dbg.json +4 -0
- package/build/artifacts/contracts/libraries/helpers/SSTORE2Deployer.sol/SSTORE2Deployer.json +10 -0
- package/build/artifacts/contracts/libraries/helpers/TokenHelper.sol/TokenHelper.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/math/LogExpMath.sol/LogExpMath.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/math/LogExpMath.sol/LogExpMath.json +2 -2
- package/build/artifacts/contracts/libraries/math/MarketApproxLib.sol/MarketApproxLib.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/math/MarketApproxLib.sol/MarketApproxLib.json +2 -2
- package/build/artifacts/contracts/libraries/math/MarketMathCore.sol/MarketMathCore.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/math/MarketMathCore.sol/MarketMathCore.json +2 -2
- package/build/artifacts/contracts/libraries/math/Math.sol/Math.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/math/Math.sol/Math.json +2 -2
- package/build/artifacts/contracts/libraries/math/WeekMath.sol/WeekMath.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/math/WeekMath.sol/WeekMath.json +2 -2
- package/build/artifacts/contracts/libraries/solmate/Bytes32AddressLib.sol/Bytes32AddressLib.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/solmate/Bytes32AddressLib.sol/Bytes32AddressLib.json +2 -2
- package/build/artifacts/contracts/libraries/solmate/SSTORE2.sol/SSTORE2.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/solmate/SSTORE2.sol/SSTORE2.json +2 -2
- package/build/artifacts/contracts/libraries/traderjoe/JoeLibrary.sol/JoeLibrary.dbg.json +1 -1
- package/build/artifacts/contracts/libraries/traderjoe/JoeLibrary.sol/JoeLibrary.json +2 -2
- package/build/artifacts/contracts/libraries/traderjoe/PendleJoeSwapHelperUpg.sol/PendleJoeSwapHelperUpg.dbg.json +1 -1
- package/build/artifacts/contracts/offchain-helpers/RouterStatic.sol/RouterStatic.dbg.json +1 -1
- package/build/artifacts/contracts/offchain-helpers/RouterStatic.sol/RouterStatic.json +3 -3
- package/build/artifacts/contracts/periphery/PendleGovernanceManager.sol/PendleGovernanceManager.dbg.json +1 -1
- package/build/artifacts/contracts/periphery/PendleGovernanceManager.sol/PendleGovernanceManager.json +2 -2
- package/build/artifacts/contracts/periphery/PermissionsV2Upg.sol/PermissionsV2Upg.dbg.json +1 -1
- package/contracts/SuperComposableYield/SCY-implementations/AaveV3/PendleAaveV3SCY.sol +1 -1
- package/contracts/SuperComposableYield/SCY-implementations/AaveV3/WadRayMath.sol +1 -1
- package/contracts/SuperComposableYield/SCY-implementations/BenQi/PendleQiTokenHelper.sol +1 -1
- package/contracts/SuperComposableYield/SCY-implementations/BenQi/PendleQiTokenSCY.sol +1 -1
- package/contracts/SuperComposableYield/SCY-implementations/PendleBtrflySCY.sol +1 -1
- package/contracts/SuperComposableYield/SCY-implementations/PendleERC4626SCY.sol +1 -1
- package/contracts/SuperComposableYield/SCY-implementations/PendleJoeLpSCY.sol +1 -1
- package/contracts/SuperComposableYield/SCY-implementations/PendleWstEthSCY.sol +1 -1
- package/contracts/SuperComposableYield/SCY-implementations/PendleYearnVaultScy.sol +1 -1
- package/contracts/SuperComposableYield/base-implementations/SCYBase.sol +1 -1
- package/contracts/SuperComposableYield/base-implementations/SCYBaseWithRewards.sol +1 -1
- package/contracts/core/LiquidityMining/CelerAbstracts/{CelerReceiver.sol → CelerReceiverUpg.sol} +8 -2
- package/contracts/core/LiquidityMining/CelerAbstracts/{CelerSender.sol → CelerSenderUpg.sol} +10 -3
- package/contracts/core/LiquidityMining/GaugeController/{PendleGaugeController.sol → PendleGaugeControllerBaseUpg.sol} +9 -4
- package/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerMainchain.sol +7 -4
- package/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerSidechain.sol +9 -5
- package/contracts/core/LiquidityMining/PendleGauge.sol +1 -1
- package/contracts/core/LiquidityMining/VotingController/{PendleVotingController.sol → PendleVotingControllerUpg.sol} +19 -6
- package/contracts/core/LiquidityMining/VotingController/{VotingControllerStorage.sol → VotingControllerStorageUpg.sol} +14 -10
- package/contracts/core/LiquidityMining/VotingEscrow/VotingEscrowPendleMainchain.sol +12 -8
- package/contracts/core/LiquidityMining/VotingEscrow/VotingEscrowPendleSidechain.sol +5 -5
- package/contracts/core/LiquidityMining/VotingEscrow/{VotingEscrowToken.sol → VotingEscrowTokenBase.sol} +2 -3
- package/contracts/core/Market/PendleMarket.sol +4 -5
- package/contracts/core/Market/PendleMarketFactory.sol +17 -20
- package/contracts/core/PendleRouter.sol +1 -1
- package/contracts/core/YieldContracts/InterestManagerYT.sol +1 -1
- package/contracts/core/YieldContracts/PendlePrincipalToken.sol +15 -7
- package/contracts/core/YieldContracts/PendleYieldContractFactory.sol +18 -19
- package/contracts/core/YieldContracts/PendleYieldToken.sol +37 -28
- package/contracts/core/actions/ActionCallback.sol +1 -1
- package/contracts/core/actions/ActionCore.sol +1 -1
- package/contracts/core/actions/ActionYT.sol +1 -1
- package/contracts/core/actions/base/ActionSCYAndPTBase.sol +1 -1
- package/contracts/core/actions/base/ActionSCYAndPYBase.sol +1 -1
- package/contracts/core/actions/base/ActionSCYAndYTBase.sol +1 -1
- package/contracts/core/actions/base/CallbackHelper.sol +1 -1
- package/contracts/interfaces/IAToken.sol +1 -1
- package/contracts/interfaces/IAavePool.sol +1 -1
- package/contracts/interfaces/IAaveRewardsController.sol +1 -1
- package/contracts/interfaces/IBenQiComptroller.sol +1 -1
- package/contracts/interfaces/IBenQiInterestRateModel.sol +1 -1
- package/contracts/interfaces/IERC4626.sol +1 -1
- package/contracts/interfaces/IJoeRouter01.sol +1 -1
- package/contracts/interfaces/IJoeRouter02.sol +1 -1
- package/contracts/interfaces/IPActionCore.sol +1 -1
- package/contracts/interfaces/IPActionYT.sol +1 -1
- package/contracts/interfaces/IPAllAction.sol +1 -1
- package/contracts/interfaces/IPGaugeController.sol +7 -1
- package/contracts/interfaces/IPGaugeControllerMainchain.sol +1 -1
- package/contracts/interfaces/IPGovernanceManager.sol +1 -1
- package/contracts/interfaces/IPInterestManagerYT.sol +1 -1
- package/contracts/interfaces/IPMarket.sol +1 -1
- package/contracts/interfaces/IPMarketAddRemoveCallback.sol +1 -1
- package/contracts/interfaces/IPMarketFactory.sol +7 -2
- package/contracts/interfaces/IPMarketSwapCallback.sol +1 -1
- package/contracts/interfaces/IPPermissionsV2Upg.sol +1 -1
- package/contracts/interfaces/IPPrincipalToken.sol +3 -1
- package/contracts/interfaces/IPRouterStatic.sol +1 -1
- package/contracts/interfaces/IPVeToken.sol +1 -1
- package/contracts/interfaces/IPVotingController.sol +1 -1
- package/contracts/interfaces/IPVotingEscrow.sol +1 -1
- package/contracts/interfaces/IPYieldContractFactory.sol +1 -1
- package/contracts/interfaces/IPYieldToken.sol +14 -4
- package/contracts/interfaces/IQiAvax.sol +1 -1
- package/contracts/interfaces/IQiErc20.sol +1 -1
- package/contracts/interfaces/IQiToken.sol +1 -1
- package/contracts/interfaces/IREDACTEDStaking.sol +1 -1
- package/contracts/interfaces/IRewardManager.sol +1 -1
- package/contracts/interfaces/ISuperComposableYield.sol +1 -1
- package/contracts/interfaces/IWETH.sol +1 -1
- package/contracts/interfaces/IWXBTRFLY.sol +1 -1
- package/contracts/interfaces/IWstETH.sol +1 -1
- package/contracts/interfaces/IYearnVault.sol +1 -1
- package/contracts/libraries/RewardManager.sol +1 -1
- package/contracts/libraries/RewardManagerAbstract.sol +6 -2
- package/contracts/libraries/SCY/SCYIndex.sol +1 -1
- package/contracts/libraries/SCY/SCYUtils.sol +1 -1
- package/contracts/libraries/VeBalanceLib.sol +1 -35
- package/contracts/libraries/VeHistoryLib.sol +60 -0
- package/contracts/libraries/helpers/ExpiryUtilsLib.sol +1 -1
- package/contracts/libraries/helpers/MiniHelpers.sol +1 -1
- package/contracts/libraries/helpers/SSTORE2Deployer.sol +30 -0
- package/contracts/libraries/helpers/TokenHelper.sol +1 -1
- package/contracts/libraries/math/LogExpMath.sol +1 -1
- package/contracts/libraries/math/MarketApproxLib.sol +1 -1
- package/contracts/libraries/math/MarketMathCore.sol +1 -1
- package/contracts/libraries/math/Math.sol +1 -1
- package/contracts/libraries/math/WeekMath.sol +1 -1
- package/contracts/libraries/traderjoe/JoeLibrary.sol +1 -1
- package/contracts/libraries/traderjoe/PendleJoeSwapHelperUpg.sol +1 -1
- package/contracts/offchain-helpers/RouterStatic.sol +3 -3
- package/contracts/periphery/PendleGovernanceManager.sol +1 -1
- package/contracts/periphery/PermissionsV2Upg.sol +7 -1
- package/deployments/43113-benqi.json +6 -0
- package/deployments/43113-core.json +14 -0
- package/deployments/43113-markets/benqi-market.json +7 -0
- package/deployments/80001-benqi.json +6 -0
- package/deployments/80001-core.json +13 -0
- package/deployments/80001-markets/benqi-market.json +7 -0
- package/package.json +2 -2
- package/typechain-types/{CelerReceiver.ts → CelerReceiverUpg.ts} +5 -5
- package/typechain-types/{CelerSender.ts → CelerSenderUpg.ts} +24 -5
- package/typechain-types/IPGaugeController.ts +63 -0
- package/typechain-types/IPGaugeControllerMainchain.ts +62 -0
- package/typechain-types/{IVePToken.ts → IPInterestManagerYT.ts} +38 -27
- package/typechain-types/IPMarketAddRemoveCallback.ts +10 -10
- package/typechain-types/IPMarketFactory.ts +11 -4
- package/typechain-types/IPPrincipalToken.ts +25 -0
- package/typechain-types/IPYieldToken.ts +106 -106
- package/typechain-types/IRewardManager.ts +15 -14
- package/typechain-types/{IPGauge.ts → InterestManagerYT.ts} +27 -28
- package/typechain-types/PendleAaveV3SCY.ts +0 -70
- package/typechain-types/PendleGauge.ts +0 -39
- package/typechain-types/{PendleGaugeController.ts → PendleGaugeControllerBaseUpg.ts} +5 -5
- package/typechain-types/{PendleGaugeControllerMainchain.ts → PendleGaugeControllerMainchainUpg.ts} +5 -5
- package/typechain-types/{PendleGaugeControllerSidechain.ts → PendleGaugeControllerSidechainUpg.ts} +5 -5
- package/typechain-types/PendleMarket.ts +0 -39
- package/typechain-types/PendleMarketFactory.ts +18 -6
- package/typechain-types/PendlePrincipalToken.ts +25 -104
- package/typechain-types/PendleQiTokenSCY.ts +0 -39
- package/typechain-types/{PendleVotingController.ts → PendleVotingControllerUpg.ts} +165 -62
- package/typechain-types/{PendleYearnVaultScy.ts → PendleYearnVaultSCY.ts} +0 -0
- package/typechain-types/PendleYieldContractFactory.ts +31 -0
- package/typechain-types/PendleYieldToken.ts +84 -177
- package/typechain-types/RewardManager.ts +0 -39
- package/typechain-types/{IBeacon.ts → RewardManagerAbstract.ts} +38 -17
- package/typechain-types/RouterStatic.ts +5 -11
- package/typechain-types/SCYBaseWithRewards.ts +0 -39
- package/typechain-types/{VotingControllerStorage.ts → VotingControllerStorageUpg.ts} +28 -68
- package/typechain-types/VotingEscrowPendleMainchain.ts +19 -54
- package/typechain-types/{VotingEscrowToken.ts → VotingEscrowTokenBase.ts} +5 -5
- package/typechain-types/factories/ActionCallback__factory.ts +1 -1
- package/typechain-types/factories/ActionCore__factory.ts +1 -1
- package/typechain-types/factories/ActionYT__factory.ts +1 -1
- package/typechain-types/factories/{CelerReceiver__factory.ts → CelerReceiverUpg__factory.ts} +9 -6
- package/typechain-types/factories/{CelerSender__factory.ts → CelerSenderUpg__factory.ts} +22 -6
- package/typechain-types/factories/ERC20__factory.ts +1 -1
- package/typechain-types/factories/IPGaugeControllerMainchain__factory.ts +26 -0
- package/typechain-types/factories/IPGaugeController__factory.ts +26 -0
- package/typechain-types/factories/IPInterestManagerYT__factory.ts +50 -0
- package/typechain-types/factories/IPMarketAddRemoveCallback__factory.ts +2 -2
- package/typechain-types/factories/IPMarketFactory__factory.ts +6 -0
- package/typechain-types/factories/IPPrincipalToken__factory.ts +13 -0
- package/typechain-types/factories/IPYieldToken__factory.ts +91 -43
- package/typechain-types/factories/IRewardManager__factory.ts +7 -2
- package/typechain-types/factories/InterestManagerYT__factory.ts +50 -0
- package/typechain-types/factories/PendleAaveV3SCY__factory.ts +1 -38
- package/typechain-types/factories/PendleBtrflyScy__factory.ts +1 -1
- package/typechain-types/factories/PendleERC20Permit__factory.ts +1 -1
- package/typechain-types/factories/PendleERC20__factory.ts +1 -1
- package/typechain-types/factories/PendleERC4626SCY__factory.ts +1 -1
- package/typechain-types/factories/{PendleGaugeController__factory.ts → PendleGaugeControllerBaseUpg__factory.ts} +8 -8
- package/typechain-types/factories/PendleGaugeControllerMainchainUpg__factory.ts +334 -0
- package/typechain-types/factories/PendleGaugeControllerSidechainUpg__factory.ts +393 -0
- package/typechain-types/factories/PendleGauge__factory.ts +0 -24
- package/typechain-types/factories/PendleGovernanceManager__factory.ts +1 -1
- package/typechain-types/factories/PendleJoeLpSCY__factory.ts +1 -1
- package/typechain-types/factories/PendleMarketFactory__factory.ts +12 -11
- package/typechain-types/factories/PendleMarket__factory.ts +1 -25
- package/typechain-types/factories/PendlePrincipalToken__factory.ts +14 -85
- package/typechain-types/factories/PendleQiTokenHelper__factory.ts +1 -1
- package/typechain-types/factories/PendleQiTokenSCY__factory.ts +1 -25
- package/typechain-types/factories/PendleRouter__factory.ts +1 -1
- package/typechain-types/factories/PendleVotingControllerUpg__factory.ts +845 -0
- package/typechain-types/factories/PendleWstEthSCY__factory.ts +1 -1
- package/typechain-types/factories/PendleYearnVaultSCY__factory.ts +691 -0
- package/typechain-types/factories/PendleYieldContractFactory__factory.ts +14 -11
- package/typechain-types/factories/PendleYieldToken__factory.ts +76 -94
- package/typechain-types/factories/RewardManagerAbstract__factory.ts +59 -0
- package/typechain-types/factories/RewardManager__factory.ts +0 -24
- package/typechain-types/factories/RouterStatic__factory.ts +2 -2
- package/typechain-types/factories/SCYBaseWithRewards__factory.ts +0 -24
- package/typechain-types/factories/{VotingControllerStorage__factory.ts → VotingControllerStorageUpg__factory.ts} +22 -55
- package/typechain-types/factories/VotingEscrowPendleMainchain__factory.ts +14 -42
- package/typechain-types/factories/VotingEscrowPendleSidechain__factory.ts +1 -1
- package/typechain-types/factories/{VotingEscrowToken__factory.ts → VotingEscrowTokenBase__factory.ts} +12 -8
- package/typechain-types/hardhat.d.ts +54 -72
- package/typechain-types/index.ts +22 -26
- package/build/artifacts/contracts/core/LiquidityMining/CelerAbstracts/CelerReceiver.sol/CelerReceiver.dbg.json +0 -4
- package/build/artifacts/contracts/core/LiquidityMining/CelerAbstracts/CelerSender.sol/CelerSender.dbg.json +0 -4
- package/build/artifacts/contracts/core/LiquidityMining/GaugeController/PendleGaugeController.sol/PendleGaugeController.dbg.json +0 -4
- package/build/artifacts/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerMainchain.sol/PendleGaugeControllerMainchain.dbg.json +0 -4
- package/build/artifacts/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerMainchain.sol/PendleGaugeControllerMainchain.json +0 -255
- package/build/artifacts/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerSidechain.sol/PendleGaugeControllerSidechain.dbg.json +0 -4
- package/build/artifacts/contracts/core/LiquidityMining/GaugeController/PendleGaugeControllerSidechain.sol/PendleGaugeControllerSidechain.json +0 -318
- package/build/artifacts/contracts/core/LiquidityMining/VotingController/PendleVotingController.sol/PendleVotingController.dbg.json +0 -4
- package/build/artifacts/contracts/core/LiquidityMining/VotingController/PendleVotingController.sol/PendleVotingController.json +0 -707
- package/build/artifacts/contracts/core/LiquidityMining/VotingController/VotingControllerStorage.sol/VotingControllerStorage.dbg.json +0 -4
- package/build/artifacts/contracts/core/LiquidityMining/VotingEscrow/VotingEscrowToken.sol/VotingEscrowToken.dbg.json +0 -4
- package/build/artifacts/contracts/libraries/RewardManagerMini.sol/RewardManagerMini.dbg.json +0 -4
- package/build/artifacts/contracts/libraries/RewardManagerMini.sol/RewardManagerMini.json +0 -101
- package/build/artifacts/contracts/libraries/helpers/MiniDeployer.sol/MiniDeployer.dbg.json +0 -4
- package/build/artifacts/contracts/libraries/helpers/MiniDeployer.sol/MiniDeployer.json +0 -10
- package/build/artifacts/contracts/libraries/solmate/LibRLP.sol/LibRLP.dbg.json +0 -4
- package/contracts/libraries/helpers/MiniDeployer.sol +0 -23
- package/contracts/libraries/solmate/LibRLP.sol +0 -30
- package/deployments/kovan.json +0 -31
- package/typechain-types/ActionRedeem.ts +0 -125
- package/typechain-types/BeaconProxy.ts +0 -97
- package/typechain-types/ERC1967Upgrade.ts +0 -97
- package/typechain-types/IERC1822Proxiable.ts +0 -87
- package/typechain-types/IPActionRedeem.ts +0 -125
- package/typechain-types/IPBaseToken.ts +0 -365
- package/typechain-types/IPVotingEscrowController.ts +0 -154
- package/typechain-types/IPendleGauge.ts +0 -241
- package/typechain-types/IVotingEscrowPendle.ts +0 -297
- package/typechain-types/PendleBaseToken.ts +0 -475
- package/typechain-types/PendleBenQiErc20SCY.ts +0 -1050
- package/typechain-types/PendleMarketRewards.ts +0 -1317
- package/typechain-types/PendleStEthSCY.ts +0 -872
- package/typechain-types/RewardManagerMini.ts +0 -200
- package/typechain-types/VotingEscrowController.ts +0 -154
- package/typechain-types/factories/ActionRedeem__factory.ts +0 -105
- package/typechain-types/factories/BeaconProxy__factory.ts +0 -141
- package/typechain-types/factories/ERC1967Upgrade__factory.ts +0 -71
- package/typechain-types/factories/IBeacon__factory.ts +0 -36
- package/typechain-types/factories/IERC1822Proxiable__factory.ts +0 -39
- package/typechain-types/factories/IPActionRedeem__factory.ts +0 -70
- package/typechain-types/factories/IPBaseToken__factory.ts +0 -271
- package/typechain-types/factories/IPGauge__factory.ts +0 -42
- package/typechain-types/factories/IPVotingEscrowController__factory.ts +0 -80
- package/typechain-types/factories/IPendleGauge__factory.ts +0 -125
- package/typechain-types/factories/IVePToken__factory.ts +0 -55
- package/typechain-types/factories/IVotingEscrowPendle__factory.ts +0 -182
- package/typechain-types/factories/PendleBaseToken__factory.ts +0 -348
- package/typechain-types/factories/PendleBenQiErc20SCY__factory.ts +0 -871
- package/typechain-types/factories/PendleGaugeControllerMainchain__factory.ts +0 -332
- package/typechain-types/factories/PendleGaugeControllerSidechain__factory.ts +0 -391
- package/typechain-types/factories/PendleMarketRewards__factory.ts +0 -1140
- package/typechain-types/factories/PendleStEthSCY__factory.ts +0 -716
- package/typechain-types/factories/PendleVotingController__factory.ts +0 -776
- package/typechain-types/factories/PendleYearnVaultScy__factory.ts +0 -691
- package/typechain-types/factories/RewardManagerMini__factory.ts +0 -116
- package/typechain-types/factories/VotingEscrowController__factory.ts +0 -80
|
@@ -73,30 +73,6 @@ const _abi = [
|
|
|
73
73
|
stateMutability: "view",
|
|
74
74
|
type: "function",
|
|
75
75
|
},
|
|
76
|
-
{
|
|
77
|
-
inputs: [
|
|
78
|
-
{
|
|
79
|
-
internalType: "address",
|
|
80
|
-
name: "token",
|
|
81
|
-
type: "address",
|
|
82
|
-
},
|
|
83
|
-
{
|
|
84
|
-
internalType: "address",
|
|
85
|
-
name: "user",
|
|
86
|
-
type: "address",
|
|
87
|
-
},
|
|
88
|
-
],
|
|
89
|
-
name: "userRewardAccrued",
|
|
90
|
-
outputs: [
|
|
91
|
-
{
|
|
92
|
-
internalType: "uint128",
|
|
93
|
-
name: "",
|
|
94
|
-
type: "uint128",
|
|
95
|
-
},
|
|
96
|
-
],
|
|
97
|
-
stateMutability: "view",
|
|
98
|
-
type: "function",
|
|
99
|
-
},
|
|
100
76
|
];
|
|
101
77
|
|
|
102
78
|
export class RewardManager__factory {
|
|
@@ -783,7 +783,7 @@ const _abi = [
|
|
|
783
783
|
type: "uint256",
|
|
784
784
|
},
|
|
785
785
|
],
|
|
786
|
-
stateMutability: "
|
|
786
|
+
stateMutability: "view",
|
|
787
787
|
type: "function",
|
|
788
788
|
},
|
|
789
789
|
{
|
|
@@ -860,7 +860,7 @@ const _abi = [
|
|
|
860
860
|
];
|
|
861
861
|
|
|
862
862
|
const _bytecode =
|
|
863
|
-
"0x60c06040523480156200001157600080fd5b5060405162003ba138038062003ba1833981016040819052620000349162000065565b6001600160a01b039182166080521660a052620000a4565b6001600160a01b03811681146200006257600080fd5b50565b600080604083850312156200007957600080fd5b825162000086816200004c565b602084015190925062000099816200004c565b809150509250929050565b60805160a051613abc620000e56000396000818160f001526114c9015260008181610260015281816104d20152818161137e015261142e0152613abc6000f3fe608060405234801561001057600080fd5b50600436106100e65760003560e01c806306ae7095146100eb5780630cf85bcc14610128578063227501f51461014c57806332e12d791461016d578063372cfb931461019b5780633857a07b146101bb57806355a7bae2146101dd57806355b4fff51461020557806355bbcd73146102255780635805908c1461024857806387a409a21461025b5780639225afd614610282578063a71f7895146102a2578063a749840a146102b5578063c74141f1146102d5578063d52eacb2146102f6578063e4a4442614610328578063e83316041461033b575b600080fd5b6101127f000000000000000000000000000000000000000000000000000000000000000081565b60405161011f9190612e82565b60405180910390f35b61013b610136366004612eae565b61035c565b60405161011f959493929190612ecb565b61015f61015a366004612eae565b6104cd565b60405161011f929190612f9a565b61018061017b366004612fb4565b610637565b6040805193845260208401929092529082015260600161011f565b6101ae6101a9366004612fe9565b6106d4565b60405161011f919061308f565b6101ce6101c9366004612eae565b61081d565b60405161011f9392919061309e565b6101f06101eb3660046130fc565b610ae2565b6040805192835260208301919091520161011f565b610218610213366004613128565b610b6d565b60405161011f91906131af565b61023861023336600461337e565b610c34565b604051901515815260200161011f565b6101f06102563660046130fc565b610c75565b6101127f000000000000000000000000000000000000000000000000000000000000000081565b610295610290366004612fe9565b610cfd565b60405161011f91906134d9565b6101f06102b03660046130fc565b61119c565b6102c86102c3366004613128565b611224565b60405161011f91906134ec565b6102e86102e3366004612eae565b6112e3565b60405190815260200161011f565b610309610304366004612eae565b611377565b604080519315158452911515602084015215159082015260600161011f565b6102e8610336366004612eae565b61154f565b61034e610349366004612fe9565b6115c8565b60405161011f92919061354e565b6000806103cc6040518061018001604052806000815260200160008152602001600081526020016000815260200160006001600160a01b03168152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081525090565b6000806000869050600080886001600160a01b0316632c8ce6bc6040518163ffffffff1660e01b8152600401606060405180830381865afa158015610415573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104399190613567565b50604051631cf38c7b60e11b8152600160048201529099509097508792508891506001600160a01b038416906339e718f69060240161018060405180830381865afa15801561048c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104b091906135bf565b95506104bb896112e3565b94506000935050505091939590929450565b6000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166371846aa8846040518263ffffffff1660e01b815260040161051c9190612e82565b602060405180830381865afa158015610539573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061055d9190613660565b156105ce57829050826001600160a01b031663d94073d46040518163ffffffff1660e01b8152600401602060405180830381865afa1580156105a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105c79190613682565b9150915091565b826001600160a01b031663781c18db6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561060c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106309190613682565b9293915050565b604051631cf38c7b60e11b8152600060048201819052908190819081906001600160a01b038816906339e718f69060240161018060405180830381865afa158015610686573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106aa91906135bf565b90506106c36106b88861154f565b8290888860006117ff565b919a90995090975095505050505050565b6106dc612ddf565b6001600160a01b0383168082526040516370a0823160e01b81528491906370a082319061070d908690600401612e82565b602060405180830381865afa15801561072a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061074e919061369f565b826020018181525050600080856001600160a01b0316632c8ce6bc6040518163ffffffff1660e01b8152600401606060405180830381865afa158015610798573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107bc9190613567565b506040805180820182526001600160a01b039283168152600060208083018290528984019290925282518084018452949093168452838101839052606088019390935280518082019091528181529182015260808501525091949350505050565b6000806060600061082d856104cd565b5090506000819050806001600160a01b031663b9d9a4536040518163ffffffff1660e01b8152600401602060405180830381865afa158015610873573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610897919061369f565b9450806001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108d7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108fb919061369f565b93506000816001600160a01b031663c4f59f9b6040518163ffffffff1660e01b8152600401600060405180830381865afa15801561093d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261096591908101906136b8565b905080516001600160401b03811115610980576109806131fe565b6040519080825280602002602001820160405280156109c557816020015b604080518082019091526000808252602082015281526020019060019003908161099e5790505b5093506000826001600160a01b031663f8b2f9916040518163ffffffff1660e01b81526004016000604051808303816000875af1158015610a0a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610a329190810190613751565b905060005b8251811015610ad6576000838281518110610a5457610a546137d6565b6020026020010151905080878381518110610a7157610a716137d6565b60209081029190910101516001600160a01b0390911690528251839083908110610a9d57610a9d6137d6565b6020026020010151878381518110610ab757610ab76137d6565b602090810291909101810151015250610acf81613802565b9050610a37565b50505050509193909250565b604051631cf38c7b60e11b815260006004820181905290819081906001600160a01b038616906339e718f69060240161018060405180830381865afa158015610b2f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b5391906135bf565b9050610b618185600061186c565b90969095509350505050565b6060816001600160401b03811115610b8757610b876131fe565b604051908082528060200260200182016040528015610bc057816020015b610bad612ddf565b815260200190600190039081610ba55790505b50905060005b82811015610c2c57610bfe848483818110610be357610be36137d6565b9050602002016020810190610bf89190612eae565b866106d4565b828281518110610c1057610c106137d6565b602002602001018190525080610c2590613802565b9050610bc6565b509392505050565b60008082604001511180610c4c575060008260600151115b80610c5f57506000826080015160200151115b80610c6f575060008260a0015151115b92915050565b604051631cf38c7b60e11b815260006004820181905290819081906001600160a01b038616906339e718f69060240161018060405180830381865afa158015610cc2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ce691906135bf565b9050610b61610cf48661154f565b829086426118a9565b610d05612e1d565b610d0e836104cd565b6001600160a01b039081166020840152168082526040516370a0823160e01b815281906370a0823190610d45908690600401612e82565b602060405180830381865afa158015610d62573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d86919061369f565b82604001818152505081602001516001600160a01b03166370a08231846040518263ffffffff1660e01b8152600401610dbf9190612e82565b602060405180830381865afa158015610ddc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e00919061369f565b826060018181525050806001600160a01b03166347bfac626040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e47573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e6b9190613682565b60808301516001600160a01b03918216905260405163d68076c360e01b81529082169063d68076c390610ea2908690600401612e82565b6040805180830381865afa158015610ebe573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ee29190613832565b9050806001600160801b03169050826080015160200181815250506000816001600160a01b031663c4f59f9b6040518163ffffffff1660e01b8152600401600060405180830381865afa158015610f3d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610f6591908101906136b8565b9050600081516001600160401b03811115610f8257610f826131fe565b604051908082528060200260200182016040528015610fbb57816020015b610fa8612e6b565b815260200190600190039081610fa05790505b5090506000805b83518110156110e2576000848281518110610fdf57610fdf6137d6565b602002602001015190506000866001600160a01b0316636b8ae5f3838b6040518363ffffffff1660e01b8152600401611019929190612f9a565b602060405180830381865afa158015611036573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061105a9190613865565b6001600160801b0316905080156110cf578185858151811061107e5761107e6137d6565b6020026020010151600001906001600160a01b031690816001600160a01b031681525050808585815181106110b5576110b56137d6565b60209081029190910181015101526110cc84613802565b93505b5050806110db90613802565b9050610fc2565b50806001600160401b038111156110fb576110fb6131fe565b60405190808252806020026020018201604052801561113457816020015b611121612e6b565b8152602001906001900390816111195790505b5060a086015260005b8181101561119157828181518110611157576111576137d6565b60200260200101518660a001518281518110611175576111756137d6565b60200260200101819052508061118a90613802565b905061113d565b505050505092915050565b604051631cf38c7b60e11b815260006004820181905290819081906001600160a01b038616906339e718f69060240161018060405180830381865afa1580156111e9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061120d91906135bf565b9050610b6161121b8661154f565b829086426118f0565b6060816001600160401b0381111561123e5761123e6131fe565b60405190808252806020026020018201604052801561127757816020015b611264612e1d565b81526020019060019003908161125c5790505b50905060005b82811015610c2c576112b584848381811061129a5761129a6137d6565b90506020020160208101906112af9190612eae565b86610cfd565b8282815181106112c7576112c76137d6565b6020026020010181905250806112dc90613802565b905061127d565b604051631cf38c7b60e11b81526000600482018190529081906001600160a01b038416906339e718f69060240161018060405180830381865afa15801561132e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061135291906135bf565b90506000611364826101400151611911565b905061136f8161192b565b949350505050565b60008060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166318b7373d856040518263ffffffff1660e01b81526004016113c89190612e82565b602060405180830381865afa1580156113e5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114099190613660565b156114175760019250611548565b604051630e308d5560e31b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906371846aa890611463908790600401612e82565b602060405180830381865afa158015611480573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114a49190613660565b156114b25760019150611548565b6040516358e6309f60e01b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906358e6309f906114fe908790600401612e82565b602060405180830381865afa15801561151b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061153f9190613660565b15611548575060015b9193909250565b600080826001600160a01b0316632c8ce6bc6040518163ffffffff1660e01b8152600401606060405180830381865afa158015611590573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115b49190613567565b505090506115c181611d45565b9392505050565b6040516370a0823160e01b815260009060609084906001600160a01b038216906370a08231906115fc908490600401612e82565b602060405180830381865afa158015611619573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061163d919061369f565b92506000816001600160a01b031663c4f59f9b6040518163ffffffff1660e01b8152600401600060405180830381865afa15801561167f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526116a791908101906136b8565b905080516001600160401b038111156116c2576116c26131fe565b6040519080825280602002602001820160405280156116fb57816020015b6116e8612e6b565b8152602001906001900390816116e05790505b50925060005b81518110156117f557600082828151811061171e5761171e6137d6565b602002602001015190508085838151811061173b5761173b6137d6565b60209081029190910101516001600160a01b039182169052604051636b8ae5f360e01b815290891690636b8ae5f39061177a9084908b90600401612f9a565b602060405180830381865afa158015611797573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117bb9190613865565b6001600160801b03168583815181106117d6576117d66137d6565b6020908102919091018101510152506117ee81613802565b9050611701565b5050509250929050565b6000806000806000806000806118288d8d6118198e611911565b6118228e611911565b8d611da9565b935093509350935061183984611f7b565b975061184483611f7b565b965061184f82611f7b565b955061185a81611f7b565b94505050505095509550955095915050565b6000806000806118858761187f88611911565b87611f8a565b9150915061189282611f7b565b935061189d81611f7b565b92505050935093915050565b6000806000806118c388886118bd89611911565b886120a3565b915091506118d86118d38361216f565b611f7b565b93506118e381611f7b565b9250505094509492505050565b60008060008061190488886118bd8961217d565b915091506118d882611f7b565b60006001600160ff1b0382111561192757600080fd5b5090565b6000680238fd42c5cf03ffff198212158015611950575068070c1cc73b00c800008213155b6119945760405162461bcd60e51b815260206004820152601060248201526f125b9d985b1a5908195e1c1bdb995b9d60821b60448201526064015b60405180910390fd5b60008212156119cc576119a98260000361192b565b6a0c097ce7bc90715b34b9f160241b816119c5576119c5613880565b0592915050565b60006806f05b59d3b20000008312611a0a57506806f05b59d3b1ffffff199091019072195e54c5dd42177f53a27172fa9ec63026282760241b611a40565b6803782dace9d90000008312611a3c57506803782dace9d8ffffff19909101906b1425982cf597cd205cef7380611a40565b5060015b6064929092029168056bc75e2d6310000068ad78ebc5ac620000008412611a905768ad78ebc5ac61ffffff199093019268056bc75e2d631000006e01855144814a7ff805980ff008400082020590505b6856bc75e2d6310000008412611acc576856bc75e2d630ffffff199093019268056bc75e2d631000006b02df0ab5a80a22c61ab5a70082020590505b682b5e3af16b188000008412611b0657682b5e3af16b187fffff199093019268056bc75e2d63100000693f1fce3da636ea5cf85082020590505b6815af1d78b58c4000008412611b40576815af1d78b58c3fffff199093019268056bc75e2d63100000690127fa27722cc06cc5e282020590505b680ad78ebc5ac62000008412611b7957680ad78ebc5ac61fffff199093019268056bc75e2d6310000068280e60114edb805d0382020590505b68056bc75e2d631000008412611bb25768056bc75e2d630fffff199093019268056bc75e2d63100000680ebc5fb4174612111082020590505b6802b5e3af16b18800008412611beb576802b5e3af16b187ffff199093019268056bc75e2d631000006808f00f760a4b2db55d82020590505b68015af1d78b58c400008412611c245768015af1d78b58c3ffff199093019268056bc75e2d631000006806f5f177578893793782020590505b68056bc75e2d631000008481019085906002908280020505918201919050600368056bc75e2d631000008783020505918201919050600468056bc75e2d631000008783020505918201919050600568056bc75e2d631000008783020505918201919050600668056bc75e2d631000008783020505918201919050600768056bc75e2d631000008783020505918201919050600868056bc75e2d631000008783020505918201919050600968056bc75e2d631000008783020505918201919050600a68056bc75e2d631000008783020505918201919050600b68056bc75e2d631000008783020505918201919050600c68056bc75e2d631000008783020505918201919050606468056bc75e2d63100000848402058502059695505050505050565b6000816001600160a01b0316633ba0b9a96040518163ffffffff1660e01b8152600401602060405180830381865afa158015611d85573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c6f919061369f565b600080600080600087138015611dbf5750600086135b611dfa5760405162461bcd60e51b815260206004820152600c60248201526b5a45524f5f414d4f554e545360a01b604482015260640161198b565b8860400151600003611e2e57611e1c6103e8611e168a8a612194565b906121d0565b92506103e89350869150859050611ed1565b885160408a015160009190611e439089613896565b611e4d919061391b565b905060008a602001518b604001518a611e669190613896565b611e70919061391b565b905080821215611ea6578194508792508a60400151858c60200151611e959190613896565b611e9f919061391b565b9350611ece565b8094508893508a60400151858c60000151611ec19190613896565b611ecb919061391b565b92505b50505b60008313611f215760405162461bcd60e51b815260206004820152601d60248201527f494e53554646494349454e545f4c49515549444954595f4d494e544544000000604482015260640161198b565b8415611f6f578189602001818151611f399190613949565b905250885181908a90611f4d908390613949565b905250611f5a8484613949565b89604001818151611f6b9190613949565b9052505b95509550955095915050565b60008082121561192757600080fd5b60008060008413611fd15760405162461bcd60e51b81526020600482015260116024820152701a5b9d985b1a59081b1c08185b5bdd5b9d607a1b604482015260640161198b565b60408501516020860151611fe59086613896565b611fef919061391b565b60408601518651919350906120049086613896565b61200e919061391b565b9050600082138061201f5750600081135b61205e5760405162461bcd60e51b815260206004820152601060248201526f1e995c9bc8185b5bdd5b9d1cc81bdd5d60821b604482015260640161198b565b821561209b57604085015161207390856121d0565b6040860152845161208490826121d0565b8552602085015161209590836121d0565b60208601525b935093915050565b6000806120b586610100015184101590565b156120d25760405162461bcd60e51b815260040161198b9061398a565b8551841261211b5760405162461bcd60e51b8152602060048201526016602482015275696e73756666696369656e74206c697175696469747960501b604482015260640161198b565b6000612128878786612217565b9050600080612138898489612331565b9092509050612147888361243e565b9450612153888261243e565b935061216389848a8a898b61246b565b50505094509492505050565b6000610c6f82600019613896565b600061218882611911565b610c6f90600019613896565b600080600083126121a65760016121aa565b6000195b90506121c66121c1856121bc86612520565b612537565b611911565b61136f9082613896565b60008183121561220d5760405162461bcd60e51b81526020600482015260086024820152676e6567617469766560c01b604482015260640161198b565b6115c182846139b2565b6122426040518060800160405280600081526020016000815260200160008152602001600081525090565b61010084015182106122665760405162461bcd60e51b815260040161198b9061398a565b60008285610100015161227991906139f1565b90506122858582612556565b82526020850151612297908590612194565b60208301528451158015906122af5750602082015115155b6122f25760405162461bcd60e51b8152602060048201526014602482015273696e76616c6964206d61726b657420737461746560601b604482015260640161198b565b612310856000015186610140015184602001518560000151856125d5565b604083015260c08501516123249082612652565b6060830152509392505050565b600080600061235386600001518660200151876000015188604001518861268b565b90506000612369612364868461275c565b61216f565b606087015190915060008613156123d4576000612386848361275c565b9050670de0b6b3a76400008112156123b05760405162461bcd60e51b815260040161198b90613a08565b6123cc6123c583670de0b6b3a76400006139b2565b849061278b565b915050612401565b6123fe816123ea81670de0b6b3a76400006139b2565b6123f49085613896565b612364919061391b565b90505b6064612411896101200151611911565b61241b9083613896565b612425919061391b565b935061243181836139b2565b9450505050935093915050565b60008060008312612450576001612454565b6000195b90506121c66121c18561246686612520565b6127a9565b60008187610100015161247e91906139f1565b6101608801839052875190915061249590856121d0565b875260208701516124a690846121d0565b6020880181905287516124cb916124be908890612194565b885160408a0151856127be565b61014088018190526000036125175760405162461bcd60e51b81526020600482015260126024820152717a65726f206c6e496d706c6965645261746560701b604482015260640161198b565b50505050505050565b60008082136119275761253282613a37565b610c6f565b6000670de0b6b3a764000061254c8484613a53565b6115c19190613a72565b600061256182611911565b6125736121c16201518061016d613a53565b8460a001516125829190613896565b61258c919061391b565b905060008113610c6f5760405162461bcd60e51b8152602060048201526014602482015273726174655363616c617220756e646572666c6f7760601b604482015260640161198b565b6000806125e28684612652565b9050670de0b6b3a764000081121561260c5760405162461bcd60e51b815260040161198b90613a08565b600061262261261b878a613949565b899061275c565b9050600061262f82612811565b905061263b818761275c565b61264590846139b2565b9998505050505050505050565b6000806126646201518061016d613a53565b61266e8486613a53565b6126789190613a72565b905061136f61268682611911565b61192b565b60008061269887846121d0565b905060006126b06126a9888a613949565b839061275c565b9050670d529ae9e86000008113156127045760405162461bcd60e51b81526020600482015260176024820152761b585e081c1c9bdc1bdc9d1a5bdb88195e18d959591959604a1b604482015260640161198b565b600061270f82612811565b90508561271c828961275c565b6127269190613949565b9350670de0b6b3a76400008412156127505760405162461bcd60e51b815260040161198b90613a08565b50505095945050505050565b600080612771670de0b6b3a764000085613896565b905082818161278257612782613880565b05949350505050565b6000806127988385613896565b9050670de0b6b3a764000081612782565b60008261254c670de0b6b3a764000084613a53565b6000806127cf87878787600061268b565b905060006127df6118d38361288c565b9050836127f16201518061016d613a53565b6127fb9083613a53565b6128059190613a72565b98975050505050505050565b6000670de0b6b3a764000082036128675760405162461bcd60e51b815260206004820152601a60248201527970726f706f7274696f6e206d757374206e6f74206265206f6e6560301b604482015260640161198b565b600061288561287e84670de0b6b3a76400006139b2565b849061275c565b90506115c1815b60008082136128cd5760405162461bcd60e51b815260206004820152600d60248201526c6f7574206f6620626f756e647360981b604482015260640161198b565b670c7d713b49da0000821380156128eb5750670f43fc2c04ee000082125b1561290f57670de0b6b3a76400006129028361291d565b816119c5576119c5613880565b610c6f82612a3c565b919050565b670de0b6b3a7640000026000806a0c097ce7bc90715b34b9f160241b808401906ec097ce7bc90715b34b9f0fffffffff198501028161295e5761295e613880565b05905060006a0c097ce7bc90715b34b9f160241b82800205905081806a0c097ce7bc90715b34b9f160241b81840205915060038205016a0c097ce7bc90715b34b9f160241b82840205915060058205016a0c097ce7bc90715b34b9f160241b82840205915060078205016a0c097ce7bc90715b34b9f160241b82840205915060098205016a0c097ce7bc90715b34b9f160241b828402059150600b8205016a0c097ce7bc90715b34b9f160241b828402059150600d8205016a0c097ce7bc90715b34b9f160241b828402059150600f82050160020295945050505050565b6000670de0b6b3a7640000821215612a7d57612a74826a0c097ce7bc90715b34b9f160241b81612a6e57612a6e613880565b05612a3c565b60000392915050565b6000775803bcc5cb9634ba4cfb2213f784019318ed4dcb6017880f60361b8312612ac85772195e54c5dd42177f53a27172fa9ec63026282760241b830592506806f05b59d3b2000000015b6f8bcc0026baae9e45e470190267a230cf60191b8312612aff576b1425982cf597cd205cef7380830592506803782dace9d9000000015b606492830292026e01855144814a7ff805980ff00840008312612b47576e01855144814a7ff805980ff008400068056bc75e2d63100000840205925068ad78ebc5ac62000000015b6b02df0ab5a80a22c61ab5a7008312612b82576b02df0ab5a80a22c61ab5a70068056bc75e2d6310000084020592506856bc75e2d631000000015b693f1fce3da636ea5cf8508312612bb957693f1fce3da636ea5cf85068056bc75e2d631000008402059250682b5e3af16b18800000015b690127fa27722cc06cc5e28312612bf057690127fa27722cc06cc5e268056bc75e2d6310000084020592506815af1d78b58c400000015b68280e60114edb805d038312612c255768280e60114edb805d0368056bc75e2d631000008402059250680ad78ebc5ac6200000015b680ebc5fb417461211108312612c5057680ebc5fb4174612111068056bc75e2d631000009384020592015b6808f00f760a4b2db55d8312612c85576808f00f760a4b2db55d68056bc75e2d6310000084020592506802b5e3af16b1880000015b6806f5f17757889379378312612cba576806f5f177578893793768056bc75e2d63100000840205925068015af1d78b58c40000015b6806248f33704b2866038312612cee576806248f33704b28660368056bc75e2d63100000840205925067ad78ebc5ac620000015b6805c548670b9510e7ac8312612d22576805c548670b9510e7ac68056bc75e2d6310000084020592506756bc75e2d6310000015b600068056bc75e2d63100000840168056bc75e2d631000008086030281612d4b57612d4b613880565b059050600068056bc75e2d63100000828002059050818068056bc75e2d63100000818402059150600382050168056bc75e2d63100000828402059150600582050168056bc75e2d63100000828402059150600782050168056bc75e2d63100000828402059150600982050168056bc75e2d63100000828402059150600b820501600202606485820105979650505050505050565b6040805160a08101825260008082526020820152908101612dfe612e6b565b8152602001612e0b612e6b565b8152602001612e18612e6b565b905290565b6040518060c0016040528060006001600160a01b0316815260200160006001600160a01b031681526020016000815260200160008152602001612e5e612e6b565b8152602001606081525090565b604080518082019091526000808252602082015290565b6001600160a01b0391909116815260200190565b6001600160a01b0381168114612eab57600080fd5b50565b600060208284031215612ec057600080fd5b81356115c181612e96565b60006102008201905060018060a01b038088168352808716602084015250845160408301526020850151606083015260408501516080830152606085015160a08301526080850151612f2860c08401826001600160a01b03169052565b5060a085015160e08381019190915260c08601516101008085019190915290860151610120808501919091529086015161014080850191909152908601516101608085019190915290860151610180840152909401516101a08201526101c08101929092526101e09091015292915050565b6001600160a01b0392831681529116602082015260400190565b600080600060608486031215612fc957600080fd5b8335612fd481612e96565b95602085013595506040909401359392505050565b60008060408385031215612ffc57600080fd5b823561300781612e96565b9150602083013561301781612e96565b809150509250929050565b80516001600160a01b03168252602090810151910152565b80516001600160a01b03168252602080820151908301526040808201519061306490840182613022565b5060608101516130776080840182613022565b50608081015161308a60c0840182613022565b505050565b6101008101610c6f828461303a565b600060608201858352602085818501526040606081860152828651808552608087019150838801945060005b818110156130ed576130dd838751613022565b94840194918301916001016130ca565b50909998505050505050505050565b6000806040838503121561310f57600080fd5b823561311a81612e96565b946020939093013593505050565b60008060006040848603121561313d57600080fd5b833561314881612e96565b925060208401356001600160401b038082111561316457600080fd5b818601915086601f83011261317857600080fd5b81358181111561318757600080fd5b8760208260051b850101111561319c57600080fd5b6020830194508093505050509250925092565b6020808252825182820181905260009190848201906040850190845b818110156131f2576131de83855161303a565b9284019261010092909201916001016131cb565b50909695505050505050565b634e487b7160e01b600052604160045260246000fd5b60405160c081016001600160401b0381118282101715613236576132366131fe565b60405290565b60405161018081016001600160401b0381118282101715613236576132366131fe565b604051601f8201601f191681016001600160401b0381118282101715613287576132876131fe565b604052919050565b6000604082840312156132a157600080fd5b604080519081016001600160401b03811182821017156132c3576132c36131fe565b60405290508082356132d481612e96565b8152602092830135920191909152919050565b60006001600160401b03821115613300576133006131fe565b5060051b60200190565b600082601f83011261331b57600080fd5b8135602061333061332b836132e7565b61325f565b82815260069290921b8401810191818101908684111561334f57600080fd5b8286015b8481101561337357613365888261328f565b835291830191604001613353565b509695505050505050565b60006020828403121561339057600080fd5b81356001600160401b03808211156133a757600080fd5b9083019060e082860312156133bb57600080fd5b6133c3613214565b82356133ce81612e96565b815260208301356133de81612e96565b806020830152506040830135604082015260608301356060820152613406866080850161328f565b608082015260c08301358281111561341d57600080fd5b6134298782860161330a565b60a08301525095945050505050565b600081518084526020808501945080840160005b838110156134725761345f878351613022565b604096909601959082019060010161344c565b509495945050505050565b600060018060a01b0380835116845280602084015116602085015250604082015160408401526060820151606084015260808201516134bf6080850182613022565b5060a082015160e060c085015261136f60e0850182613438565b6020815260006115c1602083018461347d565b6000602080830181845280855180835260408601915060408160051b870101925083870160005b8281101561354157603f1988860301845261352f85835161347d565b94509285019290850190600101613513565b5092979650505050505050565b82815260406020820152600061136f6040830184613438565b60008060006060848603121561357c57600080fd5b835161358781612e96565b602085015190935061359881612e96565b60408501519092506135a981612e96565b809150509250925092565b805161291881612e96565b600061018082840312156135d257600080fd5b6135da61323c565b82518152602083015160208201526040830151604082015260608301516060820152613608608084016135b4565b608082015260a0838101519082015260c0808401519082015260e08084015190820152610100808401519082015261012080840151908201526101408084015190820152610160928301519281019290925250919050565b60006020828403121561367257600080fd5b815180151581146115c157600080fd5b60006020828403121561369457600080fd5b81516115c181612e96565b6000602082840312156136b157600080fd5b5051919050565b600060208083850312156136cb57600080fd5b82516001600160401b038111156136e157600080fd5b8301601f810185136136f257600080fd5b805161370061332b826132e7565b81815260059190911b8201830190838101908783111561371f57600080fd5b928401925b8284101561374657835161373781612e96565b82529284019290840190613724565b979650505050505050565b6000602080838503121561376457600080fd5b82516001600160401b0381111561377a57600080fd5b8301601f8101851361378b57600080fd5b805161379961332b826132e7565b81815260059190911b820183019083810190878311156137b857600080fd5b928401925b82841015613746578351825292840192908401906137bd565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b600060018201613814576138146137ec565b5060010190565b80516001600160801b038116811461291857600080fd5b6000806040838503121561384557600080fd5b61384e8361381b565b915061385c6020840161381b565b90509250929050565b60006020828403121561387757600080fd5b6115c18261381b565b634e487b7160e01b600052601260045260246000fd5b60006001600160ff1b03818413828413808216868404861116156138bc576138bc6137ec565b600160ff1b60008712828116878305891216156138db576138db6137ec565b600087129250878205871284841616156138f7576138f76137ec565b8785058712818416161561390d5761390d6137ec565b505050929093029392505050565b60008261392a5761392a613880565b600160ff1b821460001984141615613944576139446137ec565b500590565b600080821280156001600160ff1b038490038513161561396b5761396b6137ec565b600160ff1b8390038412811615613984576139846137ec565b50500190565b6020808252600e908201526d1b585c9ad95d08195e1c1a5c995960921b604082015260600190565b60008083128015600160ff1b8501841216156139d0576139d06137ec565b6001600160ff1b03840183138116156139eb576139eb6137ec565b50500390565b600082821015613a0357613a036137ec565b500390565b60208082526015908201527465786368616e676520726174652062656c6f77203160581b604082015260600190565b6000600160ff1b8201613a4c57613a4c6137ec565b5060000390565b6000816000190483118215151615613a6d57613a6d6137ec565b500290565b600082613a8157613a81613880565b50049056fea26469706673582212209246b770c1a8628e7b0698db40c3528a61ae62845c4ec70993b721f7354e3a2964736f6c634300080d0033";
|
|
863
|
+
"0x60c06040523480156200001157600080fd5b5060405162003b8c38038062003b8c833981016040819052620000349162000065565b6001600160a01b039182166080521660a052620000a4565b6001600160a01b03811681146200006257600080fd5b50565b600080604083850312156200007957600080fd5b825162000086816200004c565b602084015190925062000099816200004c565b809150509250929050565b60805160a051613aa7620000e56000396000818160f001526114cb015260008181610260015281816104d20152818161138001526114300152613aa76000f3fe608060405234801561001057600080fd5b50600436106100e65760003560e01c806306ae7095146100eb5780630cf85bcc14610128578063227501f51461014c57806332e12d791461016d578063372cfb931461019b5780633857a07b146101bb57806355a7bae2146101dd57806355b4fff51461020557806355bbcd73146102255780635805908c1461024857806387a409a21461025b5780639225afd614610282578063a71f7895146102a2578063a749840a146102b5578063c74141f1146102d5578063d52eacb2146102f6578063e4a4442614610328578063e83316041461033b575b600080fd5b6101127f000000000000000000000000000000000000000000000000000000000000000081565b60405161011f9190612e88565b60405180910390f35b61013b610136366004612eb4565b61035c565b60405161011f959493929190612ed1565b61015f61015a366004612eb4565b6104cd565b60405161011f929190612fa0565b61018061017b366004612fba565b610637565b6040805193845260208401929092529082015260600161011f565b6101ae6101a9366004612fef565b6106d4565b60405161011f9190613095565b6101ce6101c9366004612eb4565b61081d565b60405161011f939291906130a4565b6101f06101eb366004613102565b610ae4565b6040805192835260208301919091520161011f565b61021861021336600461312e565b610b6f565b60405161011f91906131b5565b610238610233366004613384565b610c36565b604051901515815260200161011f565b6101f0610256366004613102565b610c77565b6101127f000000000000000000000000000000000000000000000000000000000000000081565b610295610290366004612fef565b610cff565b60405161011f91906134df565b6101f06102b0366004613102565b61119e565b6102c86102c336600461312e565b611226565b60405161011f91906134f2565b6102e86102e3366004612eb4565b6112e5565b60405190815260200161011f565b610309610304366004612eb4565b611379565b604080519315158452911515602084015215159082015260600161011f565b6102e8610336366004612eb4565b611551565b61034e610349366004612fef565b6115ca565b60405161011f929190613554565b6000806103cc6040518061018001604052806000815260200160008152602001600081526020016000815260200160006001600160a01b03168152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081525090565b6000806000869050600080886001600160a01b0316632c8ce6bc6040518163ffffffff1660e01b8152600401606060405180830381865afa158015610415573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610439919061356d565b50604051631cf38c7b60e11b8152600160048201529099509097508792508891506001600160a01b038416906339e718f69060240161018060405180830381865afa15801561048c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104b091906135c5565b95506104bb896112e5565b94506000935050505091939590929450565b6000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166371846aa8846040518263ffffffff1660e01b815260040161051c9190612e88565b602060405180830381865afa158015610539573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061055d9190613666565b156105ce57829050826001600160a01b031663d94073d46040518163ffffffff1660e01b8152600401602060405180830381865afa1580156105a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105c79190613688565b9150915091565b826001600160a01b031663781c18db6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561060c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106309190613688565b9293915050565b604051631cf38c7b60e11b8152600060048201819052908190819081906001600160a01b038816906339e718f69060240161018060405180830381865afa158015610686573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106aa91906135c5565b90506106c36106b888611551565b829088886000611805565b919a90995090975095505050505050565b6106dc612de5565b6001600160a01b0383168082526040516370a0823160e01b81528491906370a082319061070d908690600401612e88565b602060405180830381865afa15801561072a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061074e91906136a5565b826020018181525050600080856001600160a01b0316632c8ce6bc6040518163ffffffff1660e01b8152600401606060405180830381865afa158015610798573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107bc919061356d565b506040805180820182526001600160a01b039283168152600060208083018290528984019290925282518084018452949093168452838101839052606088019390935280518082019091528181529182015260808501525091949350505050565b6000806060600061082d856104cd565b5090506000819050806001600160a01b031663f65d6fc86040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610875573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061089991906136a5565b9450806001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108d9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108fd91906136a5565b93506000816001600160a01b031663c4f59f9b6040518163ffffffff1660e01b8152600401600060405180830381865afa15801561093f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261096791908101906136be565b905080516001600160401b0381111561098257610982613204565b6040519080825280602002602001820160405280156109c757816020015b60408051808201909152600080825260208201528152602001906001900390816109a05790505b5093506000826001600160a01b031663f8b2f9916040518163ffffffff1660e01b81526004016000604051808303816000875af1158015610a0c573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610a349190810190613757565b905060005b8251811015610ad8576000838281518110610a5657610a566137dc565b6020026020010151905080878381518110610a7357610a736137dc565b60209081029190910101516001600160a01b0390911690528251839083908110610a9f57610a9f6137dc565b6020026020010151878381518110610ab957610ab96137dc565b602090810291909101810151015250610ad181613808565b9050610a39565b50505050509193909250565b604051631cf38c7b60e11b815260006004820181905290819081906001600160a01b038616906339e718f69060240161018060405180830381865afa158015610b31573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b5591906135c5565b9050610b6381856000611872565b90969095509350505050565b6060816001600160401b03811115610b8957610b89613204565b604051908082528060200260200182016040528015610bc257816020015b610baf612de5565b815260200190600190039081610ba75790505b50905060005b82811015610c2e57610c00848483818110610be557610be56137dc565b9050602002016020810190610bfa9190612eb4565b866106d4565b828281518110610c1257610c126137dc565b602002602001018190525080610c2790613808565b9050610bc8565b509392505050565b60008082604001511180610c4e575060008260600151115b80610c6157506000826080015160200151115b80610c71575060008260a0015151115b92915050565b604051631cf38c7b60e11b815260006004820181905290819081906001600160a01b038616906339e718f69060240161018060405180830381865afa158015610cc4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ce891906135c5565b9050610b63610cf686611551565b829086426118af565b610d07612e23565b610d10836104cd565b6001600160a01b039081166020840152168082526040516370a0823160e01b815281906370a0823190610d47908690600401612e88565b602060405180830381865afa158015610d64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d8891906136a5565b82604001818152505081602001516001600160a01b03166370a08231846040518263ffffffff1660e01b8152600401610dc19190612e88565b602060405180830381865afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906136a5565b826060018181525050806001600160a01b03166347bfac626040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e49573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e6d9190613688565b60808301516001600160a01b03918216905260405163d68076c360e01b81529082169063d68076c390610ea4908690600401612e88565b6040805180830381865afa158015610ec0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ee49190613838565b9050806001600160801b03169050826080015160200181815250506000816001600160a01b031663c4f59f9b6040518163ffffffff1660e01b8152600401600060405180830381865afa158015610f3f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610f6791908101906136be565b9050600081516001600160401b03811115610f8457610f84613204565b604051908082528060200260200182016040528015610fbd57816020015b610faa612e71565b815260200190600190039081610fa25790505b5090506000805b83518110156110e4576000848281518110610fe157610fe16137dc565b602002602001015190506000866001600160a01b0316635cbadbe4838b6040518363ffffffff1660e01b815260040161101b929190612fa0565b6040805180830381865afa158015611037573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061105b9190613838565b6001600160801b031691505080156110d15781858581518110611080576110806137dc565b6020026020010151600001906001600160a01b031690816001600160a01b031681525050808585815181106110b7576110b76137dc565b60209081029190910181015101526110ce84613808565b93505b5050806110dd90613808565b9050610fc4565b50806001600160401b038111156110fd576110fd613204565b60405190808252806020026020018201604052801561113657816020015b611123612e71565b81526020019060019003908161111b5790505b5060a086015260005b8181101561119357828181518110611159576111596137dc565b60200260200101518660a001518281518110611177576111776137dc565b60200260200101819052508061118c90613808565b905061113f565b505050505092915050565b604051631cf38c7b60e11b815260006004820181905290819081906001600160a01b038616906339e718f69060240161018060405180830381865afa1580156111eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061120f91906135c5565b9050610b6361121d86611551565b829086426118f6565b6060816001600160401b0381111561124057611240613204565b60405190808252806020026020018201604052801561127957816020015b611266612e23565b81526020019060019003908161125e5790505b50905060005b82811015610c2e576112b784848381811061129c5761129c6137dc565b90506020020160208101906112b19190612eb4565b86610cff565b8282815181106112c9576112c96137dc565b6020026020010181905250806112de90613808565b905061127f565b604051631cf38c7b60e11b81526000600482018190529081906001600160a01b038416906339e718f69060240161018060405180830381865afa158015611330573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061135491906135c5565b90506000611366826101400151611917565b905061137181611931565b949350505050565b60008060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166318b7373d856040518263ffffffff1660e01b81526004016113ca9190612e88565b602060405180830381865afa1580156113e7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061140b9190613666565b15611419576001925061154a565b604051630e308d5560e31b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906371846aa890611465908790600401612e88565b602060405180830381865afa158015611482573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114a69190613666565b156114b4576001915061154a565b6040516358e6309f60e01b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906358e6309f90611500908790600401612e88565b602060405180830381865afa15801561151d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115419190613666565b1561154a575060015b9193909250565b600080826001600160a01b0316632c8ce6bc6040518163ffffffff1660e01b8152600401606060405180830381865afa158015611592573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115b6919061356d565b505090506115c381611d4b565b9392505050565b6040516370a0823160e01b815260009060609084906001600160a01b038216906370a08231906115fe908490600401612e88565b602060405180830381865afa15801561161b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061163f91906136a5565b92506000816001600160a01b031663c4f59f9b6040518163ffffffff1660e01b8152600401600060405180830381865afa158015611681573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526116a991908101906136be565b905080516001600160401b038111156116c4576116c4613204565b6040519080825280602002602001820160405280156116fd57816020015b6116ea612e71565b8152602001906001900390816116e25790505b50925060005b81518110156117fb576000828281518110611720576117206137dc565b602002602001015190508085838151811061173d5761173d6137dc565b60209081029190910101516001600160a01b03918216905260405163172eb6f960e21b815290891690635cbadbe49061177c9084908b90600401612fa0565b6040805180830381865afa158015611798573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117bc9190613838565b9050806001600160801b031690508583815181106117dc576117dc6137dc565b6020908102919091018101510152506117f481613808565b9050611703565b5050509250929050565b60008060008060008060008061182e8d8d61181f8e611917565b6118288e611917565b8d611daf565b935093509350935061183f84611f81565b975061184a83611f81565b965061185582611f81565b955061186081611f81565b94505050505095509550955095915050565b60008060008061188b8761188588611917565b87611f90565b9150915061189882611f81565b93506118a381611f81565b92505050935093915050565b6000806000806118c988886118c389611917565b886120a9565b915091506118de6118d983612175565b611f81565b93506118e981611f81565b9250505094509492505050565b60008060008061190a88886118c389612183565b915091506118de82611f81565b60006001600160ff1b0382111561192d57600080fd5b5090565b6000680238fd42c5cf03ffff198212158015611956575068070c1cc73b00c800008213155b61199a5760405162461bcd60e51b815260206004820152601060248201526f125b9d985b1a5908195e1c1bdb995b9d60821b60448201526064015b60405180910390fd5b60008212156119d2576119af82600003611931565b6a0c097ce7bc90715b34b9f160241b816119cb576119cb61386b565b0592915050565b60006806f05b59d3b20000008312611a1057506806f05b59d3b1ffffff199091019072195e54c5dd42177f53a27172fa9ec63026282760241b611a46565b6803782dace9d90000008312611a4257506803782dace9d8ffffff19909101906b1425982cf597cd205cef7380611a46565b5060015b6064929092029168056bc75e2d6310000068ad78ebc5ac620000008412611a965768ad78ebc5ac61ffffff199093019268056bc75e2d631000006e01855144814a7ff805980ff008400082020590505b6856bc75e2d6310000008412611ad2576856bc75e2d630ffffff199093019268056bc75e2d631000006b02df0ab5a80a22c61ab5a70082020590505b682b5e3af16b188000008412611b0c57682b5e3af16b187fffff199093019268056bc75e2d63100000693f1fce3da636ea5cf85082020590505b6815af1d78b58c4000008412611b46576815af1d78b58c3fffff199093019268056bc75e2d63100000690127fa27722cc06cc5e282020590505b680ad78ebc5ac62000008412611b7f57680ad78ebc5ac61fffff199093019268056bc75e2d6310000068280e60114edb805d0382020590505b68056bc75e2d631000008412611bb85768056bc75e2d630fffff199093019268056bc75e2d63100000680ebc5fb4174612111082020590505b6802b5e3af16b18800008412611bf1576802b5e3af16b187ffff199093019268056bc75e2d631000006808f00f760a4b2db55d82020590505b68015af1d78b58c400008412611c2a5768015af1d78b58c3ffff199093019268056bc75e2d631000006806f5f177578893793782020590505b68056bc75e2d631000008481019085906002908280020505918201919050600368056bc75e2d631000008783020505918201919050600468056bc75e2d631000008783020505918201919050600568056bc75e2d631000008783020505918201919050600668056bc75e2d631000008783020505918201919050600768056bc75e2d631000008783020505918201919050600868056bc75e2d631000008783020505918201919050600968056bc75e2d631000008783020505918201919050600a68056bc75e2d631000008783020505918201919050600b68056bc75e2d631000008783020505918201919050600c68056bc75e2d631000008783020505918201919050606468056bc75e2d63100000848402058502059695505050505050565b6000816001600160a01b0316633ba0b9a96040518163ffffffff1660e01b8152600401602060405180830381865afa158015611d8b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7191906136a5565b600080600080600087138015611dc55750600086135b611e005760405162461bcd60e51b815260206004820152600c60248201526b5a45524f5f414d4f554e545360a01b6044820152606401611991565b8860400151600003611e3457611e226103e8611e1c8a8a61219a565b906121d6565b92506103e89350869150859050611ed7565b885160408a015160009190611e499089613881565b611e539190613906565b905060008a602001518b604001518a611e6c9190613881565b611e769190613906565b905080821215611eac578194508792508a60400151858c60200151611e9b9190613881565b611ea59190613906565b9350611ed4565b8094508893508a60400151858c60000151611ec79190613881565b611ed19190613906565b92505b50505b60008313611f275760405162461bcd60e51b815260206004820152601d60248201527f494e53554646494349454e545f4c49515549444954595f4d494e5445440000006044820152606401611991565b8415611f75578189602001818151611f3f9190613934565b905250885181908a90611f53908390613934565b905250611f608484613934565b89604001818151611f719190613934565b9052505b95509550955095915050565b60008082121561192d57600080fd5b60008060008413611fd75760405162461bcd60e51b81526020600482015260116024820152701a5b9d985b1a59081b1c08185b5bdd5b9d607a1b6044820152606401611991565b60408501516020860151611feb9086613881565b611ff59190613906565b604086015186519193509061200a9086613881565b6120149190613906565b905060008213806120255750600081135b6120645760405162461bcd60e51b815260206004820152601060248201526f1e995c9bc8185b5bdd5b9d1cc81bdd5d60821b6044820152606401611991565b82156120a157604085015161207990856121d6565b6040860152845161208a90826121d6565b8552602085015161209b90836121d6565b60208601525b935093915050565b6000806120bb86610100015184101590565b156120d85760405162461bcd60e51b815260040161199190613975565b855184126121215760405162461bcd60e51b8152602060048201526016602482015275696e73756666696369656e74206c697175696469747960501b6044820152606401611991565b600061212e87878661221d565b905060008061213e898489612337565b909250905061214d8883612444565b94506121598882612444565b935061216989848a8a898b612471565b50505094509492505050565b6000610c7182600019613881565b600061218e82611917565b610c7190600019613881565b600080600083126121ac5760016121b0565b6000195b90506121cc6121c7856121c286612526565b61253d565b611917565b6113719082613881565b6000818312156122135760405162461bcd60e51b81526020600482015260086024820152676e6567617469766560c01b6044820152606401611991565b6115c3828461399d565b6122486040518060800160405280600081526020016000815260200160008152602001600081525090565b610100840151821061226c5760405162461bcd60e51b815260040161199190613975565b60008285610100015161227f91906139dc565b905061228b858261255c565b8252602085015161229d90859061219a565b60208301528451158015906122b55750602082015115155b6122f85760405162461bcd60e51b8152602060048201526014602482015273696e76616c6964206d61726b657420737461746560601b6044820152606401611991565b612316856000015186610140015184602001518560000151856125db565b604083015260c085015161232a9082612658565b6060830152509392505050565b6000806000612359866000015186602001518760000151886040015188612691565b9050600061236f61236a8684612762565b612175565b606087015190915060008613156123da57600061238c8483612762565b9050670de0b6b3a76400008112156123b65760405162461bcd60e51b8152600401611991906139f3565b6123d26123cb83670de0b6b3a764000061399d565b8490612791565b915050612407565b612404816123f081670de0b6b3a764000061399d565b6123fa9085613881565b61236a9190613906565b90505b6064612417896101200151611917565b6124219083613881565b61242b9190613906565b9350612437818361399d565b9450505050935093915050565b6000806000831261245657600161245a565b6000195b90506121cc6121c78561246c86612526565b6127af565b60008187610100015161248491906139dc565b6101608801839052875190915061249b90856121d6565b875260208701516124ac90846121d6565b6020880181905287516124d1916124c490889061219a565b885160408a0151856127c4565b610140880181905260000361251d5760405162461bcd60e51b81526020600482015260126024820152717a65726f206c6e496d706c6965645261746560701b6044820152606401611991565b50505050505050565b600080821361192d5761253882613a22565b610c71565b6000670de0b6b3a76400006125528484613a3e565b6115c39190613a5d565b600061256782611917565b6125796121c76201518061016d613a3e565b8460a001516125889190613881565b6125929190613906565b905060008113610c715760405162461bcd60e51b8152602060048201526014602482015273726174655363616c617220756e646572666c6f7760601b6044820152606401611991565b6000806125e88684612658565b9050670de0b6b3a76400008112156126125760405162461bcd60e51b8152600401611991906139f3565b6000612628612621878a613934565b8990612762565b9050600061263582612817565b90506126418187612762565b61264b908461399d565b9998505050505050505050565b60008061266a6201518061016d613a3e565b6126748486613a3e565b61267e9190613a5d565b905061137161268c82611917565b611931565b60008061269e87846121d6565b905060006126b66126af888a613934565b8390612762565b9050670d529ae9e860000081131561270a5760405162461bcd60e51b81526020600482015260176024820152761b585e081c1c9bdc1bdc9d1a5bdb88195e18d959591959604a1b6044820152606401611991565b600061271582612817565b9050856127228289612762565b61272c9190613934565b9350670de0b6b3a76400008412156127565760405162461bcd60e51b8152600401611991906139f3565b50505095945050505050565b600080612777670de0b6b3a764000085613881565b90508281816127885761278861386b565b05949350505050565b60008061279e8385613881565b9050670de0b6b3a764000081612788565b600082612552670de0b6b3a764000084613a3e565b6000806127d5878787876000612691565b905060006127e56118d983612892565b9050836127f76201518061016d613a3e565b6128019083613a3e565b61280b9190613a5d565b98975050505050505050565b6000670de0b6b3a7640000820361286d5760405162461bcd60e51b815260206004820152601a60248201527970726f706f7274696f6e206d757374206e6f74206265206f6e6560301b6044820152606401611991565b600061288b61288484670de0b6b3a764000061399d565b8490612762565b90506115c3815b60008082136128d35760405162461bcd60e51b815260206004820152600d60248201526c6f7574206f6620626f756e647360981b6044820152606401611991565b670c7d713b49da0000821380156128f15750670f43fc2c04ee000082125b1561291557670de0b6b3a764000061290883612923565b816119cb576119cb61386b565b610c7182612a42565b919050565b670de0b6b3a7640000026000806a0c097ce7bc90715b34b9f160241b808401906ec097ce7bc90715b34b9f0fffffffff19850102816129645761296461386b565b05905060006a0c097ce7bc90715b34b9f160241b82800205905081806a0c097ce7bc90715b34b9f160241b81840205915060038205016a0c097ce7bc90715b34b9f160241b82840205915060058205016a0c097ce7bc90715b34b9f160241b82840205915060078205016a0c097ce7bc90715b34b9f160241b82840205915060098205016a0c097ce7bc90715b34b9f160241b828402059150600b8205016a0c097ce7bc90715b34b9f160241b828402059150600d8205016a0c097ce7bc90715b34b9f160241b828402059150600f82050160020295945050505050565b6000670de0b6b3a7640000821215612a8357612a7a826a0c097ce7bc90715b34b9f160241b81612a7457612a7461386b565b05612a42565b60000392915050565b6000775803bcc5cb9634ba4cfb2213f784019318ed4dcb6017880f60361b8312612ace5772195e54c5dd42177f53a27172fa9ec63026282760241b830592506806f05b59d3b2000000015b6f8bcc0026baae9e45e470190267a230cf60191b8312612b05576b1425982cf597cd205cef7380830592506803782dace9d9000000015b606492830292026e01855144814a7ff805980ff00840008312612b4d576e01855144814a7ff805980ff008400068056bc75e2d63100000840205925068ad78ebc5ac62000000015b6b02df0ab5a80a22c61ab5a7008312612b88576b02df0ab5a80a22c61ab5a70068056bc75e2d6310000084020592506856bc75e2d631000000015b693f1fce3da636ea5cf8508312612bbf57693f1fce3da636ea5cf85068056bc75e2d631000008402059250682b5e3af16b18800000015b690127fa27722cc06cc5e28312612bf657690127fa27722cc06cc5e268056bc75e2d6310000084020592506815af1d78b58c400000015b68280e60114edb805d038312612c2b5768280e60114edb805d0368056bc75e2d631000008402059250680ad78ebc5ac6200000015b680ebc5fb417461211108312612c5657680ebc5fb4174612111068056bc75e2d631000009384020592015b6808f00f760a4b2db55d8312612c8b576808f00f760a4b2db55d68056bc75e2d6310000084020592506802b5e3af16b1880000015b6806f5f17757889379378312612cc0576806f5f177578893793768056bc75e2d63100000840205925068015af1d78b58c40000015b6806248f33704b2866038312612cf4576806248f33704b28660368056bc75e2d63100000840205925067ad78ebc5ac620000015b6805c548670b9510e7ac8312612d28576805c548670b9510e7ac68056bc75e2d6310000084020592506756bc75e2d6310000015b600068056bc75e2d63100000840168056bc75e2d631000008086030281612d5157612d5161386b565b059050600068056bc75e2d63100000828002059050818068056bc75e2d63100000818402059150600382050168056bc75e2d63100000828402059150600582050168056bc75e2d63100000828402059150600782050168056bc75e2d63100000828402059150600982050168056bc75e2d63100000828402059150600b820501600202606485820105979650505050505050565b6040805160a08101825260008082526020820152908101612e04612e71565b8152602001612e11612e71565b8152602001612e1e612e71565b905290565b6040518060c0016040528060006001600160a01b0316815260200160006001600160a01b031681526020016000815260200160008152602001612e64612e71565b8152602001606081525090565b604080518082019091526000808252602082015290565b6001600160a01b0391909116815260200190565b6001600160a01b0381168114612eb157600080fd5b50565b600060208284031215612ec657600080fd5b81356115c381612e9c565b60006102008201905060018060a01b038088168352808716602084015250845160408301526020850151606083015260408501516080830152606085015160a08301526080850151612f2e60c08401826001600160a01b03169052565b5060a085015160e08381019190915260c08601516101008085019190915290860151610120808501919091529086015161014080850191909152908601516101608085019190915290860151610180840152909401516101a08201526101c08101929092526101e09091015292915050565b6001600160a01b0392831681529116602082015260400190565b600080600060608486031215612fcf57600080fd5b8335612fda81612e9c565b95602085013595506040909401359392505050565b6000806040838503121561300257600080fd5b823561300d81612e9c565b9150602083013561301d81612e9c565b809150509250929050565b80516001600160a01b03168252602090810151910152565b80516001600160a01b03168252602080820151908301526040808201519061306a90840182613028565b50606081015161307d6080840182613028565b50608081015161309060c0840182613028565b505050565b6101008101610c718284613040565b600060608201858352602085818501526040606081860152828651808552608087019150838801945060005b818110156130f3576130e3838751613028565b94840194918301916001016130d0565b50909998505050505050505050565b6000806040838503121561311557600080fd5b823561312081612e9c565b946020939093013593505050565b60008060006040848603121561314357600080fd5b833561314e81612e9c565b925060208401356001600160401b038082111561316a57600080fd5b818601915086601f83011261317e57600080fd5b81358181111561318d57600080fd5b8760208260051b85010111156131a257600080fd5b6020830194508093505050509250925092565b6020808252825182820181905260009190848201906040850190845b818110156131f8576131e4838551613040565b9284019261010092909201916001016131d1565b50909695505050505050565b634e487b7160e01b600052604160045260246000fd5b60405160c081016001600160401b038111828210171561323c5761323c613204565b60405290565b60405161018081016001600160401b038111828210171561323c5761323c613204565b604051601f8201601f191681016001600160401b038111828210171561328d5761328d613204565b604052919050565b6000604082840312156132a757600080fd5b604080519081016001600160401b03811182821017156132c9576132c9613204565b60405290508082356132da81612e9c565b8152602092830135920191909152919050565b60006001600160401b0382111561330657613306613204565b5060051b60200190565b600082601f83011261332157600080fd5b81356020613336613331836132ed565b613265565b82815260069290921b8401810191818101908684111561335557600080fd5b8286015b848110156133795761336b8882613295565b835291830191604001613359565b509695505050505050565b60006020828403121561339657600080fd5b81356001600160401b03808211156133ad57600080fd5b9083019060e082860312156133c157600080fd5b6133c961321a565b82356133d481612e9c565b815260208301356133e481612e9c565b80602083015250604083013560408201526060830135606082015261340c8660808501613295565b608082015260c08301358281111561342357600080fd5b61342f87828601613310565b60a08301525095945050505050565b600081518084526020808501945080840160005b8381101561347857613465878351613028565b6040969096019590820190600101613452565b509495945050505050565b600060018060a01b0380835116845280602084015116602085015250604082015160408401526060820151606084015260808201516134c56080850182613028565b5060a082015160e060c085015261137160e085018261343e565b6020815260006115c36020830184613483565b6000602080830181845280855180835260408601915060408160051b870101925083870160005b8281101561354757603f19888603018452613535858351613483565b94509285019290850190600101613519565b5092979650505050505050565b828152604060208201526000611371604083018461343e565b60008060006060848603121561358257600080fd5b835161358d81612e9c565b602085015190935061359e81612e9c565b60408501519092506135af81612e9c565b809150509250925092565b805161291e81612e9c565b600061018082840312156135d857600080fd5b6135e0613242565b8251815260208301516020820152604083015160408201526060830151606082015261360e608084016135ba565b608082015260a0838101519082015260c0808401519082015260e08084015190820152610100808401519082015261012080840151908201526101408084015190820152610160928301519281019290925250919050565b60006020828403121561367857600080fd5b815180151581146115c357600080fd5b60006020828403121561369a57600080fd5b81516115c381612e9c565b6000602082840312156136b757600080fd5b5051919050565b600060208083850312156136d157600080fd5b82516001600160401b038111156136e757600080fd5b8301601f810185136136f857600080fd5b8051613706613331826132ed565b81815260059190911b8201830190838101908783111561372557600080fd5b928401925b8284101561374c57835161373d81612e9c565b8252928401929084019061372a565b979650505050505050565b6000602080838503121561376a57600080fd5b82516001600160401b0381111561378057600080fd5b8301601f8101851361379157600080fd5b805161379f613331826132ed565b81815260059190911b820183019083810190878311156137be57600080fd5b928401925b8284101561374c578351825292840192908401906137c3565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b60006001820161381a5761381a6137f2565b5060010190565b80516001600160801b038116811461291e57600080fd5b6000806040838503121561384b57600080fd5b61385483613821565b915061386260208401613821565b90509250929050565b634e487b7160e01b600052601260045260246000fd5b60006001600160ff1b03818413828413808216868404861116156138a7576138a76137f2565b600160ff1b60008712828116878305891216156138c6576138c66137f2565b600087129250878205871284841616156138e2576138e26137f2565b878505871281841616156138f8576138f86137f2565b505050929093029392505050565b6000826139155761391561386b565b600160ff1b82146000198414161561392f5761392f6137f2565b500590565b600080821280156001600160ff1b0384900385131615613956576139566137f2565b600160ff1b839003841281161561396f5761396f6137f2565b50500190565b6020808252600e908201526d1b585c9ad95d08195e1c1a5c995960921b604082015260600190565b60008083128015600160ff1b8501841216156139bb576139bb6137f2565b6001600160ff1b03840183138116156139d6576139d66137f2565b50500390565b6000828210156139ee576139ee6137f2565b500390565b60208082526015908201527465786368616e676520726174652062656c6f77203160581b604082015260600190565b6000600160ff1b8201613a3757613a376137f2565b5060000390565b6000816000190483118215151615613a5857613a586137f2565b500290565b600082613a6c57613a6c61386b565b50049056fea26469706673582212208c340a39d886f66b7591e587af4125ac6a86974470e9f8e34843259c410f048e64736f6c634300080f0033";
|
|
864
864
|
|
|
865
865
|
type RouterStaticConstructorParams =
|
|
866
866
|
| [signer?: Signer]
|
|
@@ -610,30 +610,6 @@ const _abi = [
|
|
|
610
610
|
stateMutability: "view",
|
|
611
611
|
type: "function",
|
|
612
612
|
},
|
|
613
|
-
{
|
|
614
|
-
inputs: [
|
|
615
|
-
{
|
|
616
|
-
internalType: "address",
|
|
617
|
-
name: "token",
|
|
618
|
-
type: "address",
|
|
619
|
-
},
|
|
620
|
-
{
|
|
621
|
-
internalType: "address",
|
|
622
|
-
name: "user",
|
|
623
|
-
type: "address",
|
|
624
|
-
},
|
|
625
|
-
],
|
|
626
|
-
name: "userRewardAccrued",
|
|
627
|
-
outputs: [
|
|
628
|
-
{
|
|
629
|
-
internalType: "uint128",
|
|
630
|
-
name: "",
|
|
631
|
-
type: "uint128",
|
|
632
|
-
},
|
|
633
|
-
],
|
|
634
|
-
stateMutability: "view",
|
|
635
|
-
type: "function",
|
|
636
|
-
},
|
|
637
613
|
{
|
|
638
614
|
inputs: [],
|
|
639
615
|
name: "yieldToken",
|
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
import { Contract, Signer, utils } from "ethers";
|
|
6
6
|
import { Provider } from "@ethersproject/providers";
|
|
7
7
|
import type {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
} from "../
|
|
8
|
+
VotingControllerStorageUpg,
|
|
9
|
+
VotingControllerStorageUpgInterface,
|
|
10
|
+
} from "../VotingControllerStorageUpg";
|
|
11
11
|
|
|
12
12
|
const _abi = [
|
|
13
13
|
{
|
|
@@ -23,6 +23,19 @@ const _abi = [
|
|
|
23
23
|
stateMutability: "view",
|
|
24
24
|
type: "function",
|
|
25
25
|
},
|
|
26
|
+
{
|
|
27
|
+
inputs: [],
|
|
28
|
+
name: "MAX_LOCK_TIME",
|
|
29
|
+
outputs: [
|
|
30
|
+
{
|
|
31
|
+
internalType: "uint128",
|
|
32
|
+
name: "",
|
|
33
|
+
type: "uint128",
|
|
34
|
+
},
|
|
35
|
+
],
|
|
36
|
+
stateMutability: "view",
|
|
37
|
+
type: "function",
|
|
38
|
+
},
|
|
26
39
|
{
|
|
27
40
|
inputs: [],
|
|
28
41
|
name: "USER_VOTE_MAX_WEIGHT",
|
|
@@ -134,7 +147,7 @@ const _abi = [
|
|
|
134
147
|
type: "tuple",
|
|
135
148
|
},
|
|
136
149
|
],
|
|
137
|
-
internalType: "struct
|
|
150
|
+
internalType: "struct VotingControllerStorageUpg.UserPoolInfo",
|
|
138
151
|
name: "",
|
|
139
152
|
type: "tuple",
|
|
140
153
|
},
|
|
@@ -263,52 +276,6 @@ const _abi = [
|
|
|
263
276
|
stateMutability: "view",
|
|
264
277
|
type: "function",
|
|
265
278
|
},
|
|
266
|
-
{
|
|
267
|
-
inputs: [
|
|
268
|
-
{
|
|
269
|
-
internalType: "address",
|
|
270
|
-
name: "",
|
|
271
|
-
type: "address",
|
|
272
|
-
},
|
|
273
|
-
{
|
|
274
|
-
internalType: "address",
|
|
275
|
-
name: "",
|
|
276
|
-
type: "address",
|
|
277
|
-
},
|
|
278
|
-
{
|
|
279
|
-
internalType: "uint256",
|
|
280
|
-
name: "",
|
|
281
|
-
type: "uint256",
|
|
282
|
-
},
|
|
283
|
-
],
|
|
284
|
-
name: "userPoolCheckpoints",
|
|
285
|
-
outputs: [
|
|
286
|
-
{
|
|
287
|
-
components: [
|
|
288
|
-
{
|
|
289
|
-
internalType: "uint128",
|
|
290
|
-
name: "bias",
|
|
291
|
-
type: "uint128",
|
|
292
|
-
},
|
|
293
|
-
{
|
|
294
|
-
internalType: "uint128",
|
|
295
|
-
name: "slope",
|
|
296
|
-
type: "uint128",
|
|
297
|
-
},
|
|
298
|
-
],
|
|
299
|
-
internalType: "struct VeBalance",
|
|
300
|
-
name: "balance",
|
|
301
|
-
type: "tuple",
|
|
302
|
-
},
|
|
303
|
-
{
|
|
304
|
-
internalType: "uint128",
|
|
305
|
-
name: "timestamp",
|
|
306
|
-
type: "uint128",
|
|
307
|
-
},
|
|
308
|
-
],
|
|
309
|
-
stateMutability: "view",
|
|
310
|
-
type: "function",
|
|
311
|
-
},
|
|
312
279
|
{
|
|
313
280
|
inputs: [],
|
|
314
281
|
name: "vePendle",
|
|
@@ -343,19 +310,19 @@ const _abi = [
|
|
|
343
310
|
},
|
|
344
311
|
];
|
|
345
312
|
|
|
346
|
-
export class
|
|
313
|
+
export class VotingControllerStorageUpg__factory {
|
|
347
314
|
static readonly abi = _abi;
|
|
348
|
-
static createInterface():
|
|
349
|
-
return new utils.Interface(_abi) as
|
|
315
|
+
static createInterface(): VotingControllerStorageUpgInterface {
|
|
316
|
+
return new utils.Interface(_abi) as VotingControllerStorageUpgInterface;
|
|
350
317
|
}
|
|
351
318
|
static connect(
|
|
352
319
|
address: string,
|
|
353
320
|
signerOrProvider: Signer | Provider
|
|
354
|
-
):
|
|
321
|
+
): VotingControllerStorageUpg {
|
|
355
322
|
return new Contract(
|
|
356
323
|
address,
|
|
357
324
|
_abi,
|
|
358
325
|
signerOrProvider
|
|
359
|
-
) as
|
|
326
|
+
) as VotingControllerStorageUpg;
|
|
360
327
|
}
|
|
361
328
|
}
|
|
@@ -231,6 +231,19 @@ const _abi = [
|
|
|
231
231
|
stateMutability: "payable",
|
|
232
232
|
type: "function",
|
|
233
233
|
},
|
|
234
|
+
{
|
|
235
|
+
inputs: [],
|
|
236
|
+
name: "celerMessageBus",
|
|
237
|
+
outputs: [
|
|
238
|
+
{
|
|
239
|
+
internalType: "contract ICelerMessageBus",
|
|
240
|
+
name: "",
|
|
241
|
+
type: "address",
|
|
242
|
+
},
|
|
243
|
+
],
|
|
244
|
+
stateMutability: "view",
|
|
245
|
+
type: "function",
|
|
246
|
+
},
|
|
234
247
|
{
|
|
235
248
|
inputs: [],
|
|
236
249
|
name: "getAllSidechainContracts",
|
|
@@ -485,47 +498,6 @@ const _abi = [
|
|
|
485
498
|
stateMutability: "view",
|
|
486
499
|
type: "function",
|
|
487
500
|
},
|
|
488
|
-
{
|
|
489
|
-
inputs: [
|
|
490
|
-
{
|
|
491
|
-
internalType: "address",
|
|
492
|
-
name: "",
|
|
493
|
-
type: "address",
|
|
494
|
-
},
|
|
495
|
-
{
|
|
496
|
-
internalType: "uint256",
|
|
497
|
-
name: "",
|
|
498
|
-
type: "uint256",
|
|
499
|
-
},
|
|
500
|
-
],
|
|
501
|
-
name: "userCheckpoints",
|
|
502
|
-
outputs: [
|
|
503
|
-
{
|
|
504
|
-
components: [
|
|
505
|
-
{
|
|
506
|
-
internalType: "uint128",
|
|
507
|
-
name: "bias",
|
|
508
|
-
type: "uint128",
|
|
509
|
-
},
|
|
510
|
-
{
|
|
511
|
-
internalType: "uint128",
|
|
512
|
-
name: "slope",
|
|
513
|
-
type: "uint128",
|
|
514
|
-
},
|
|
515
|
-
],
|
|
516
|
-
internalType: "struct VeBalance",
|
|
517
|
-
name: "balance",
|
|
518
|
-
type: "tuple",
|
|
519
|
-
},
|
|
520
|
-
{
|
|
521
|
-
internalType: "uint128",
|
|
522
|
-
name: "timestamp",
|
|
523
|
-
type: "uint128",
|
|
524
|
-
},
|
|
525
|
-
],
|
|
526
|
-
stateMutability: "view",
|
|
527
|
-
type: "function",
|
|
528
|
-
},
|
|
529
501
|
{
|
|
530
502
|
inputs: [
|
|
531
503
|
{
|
|
@@ -548,7 +520,7 @@ const _abi = [
|
|
|
548
520
|
];
|
|
549
521
|
|
|
550
522
|
const _bytecode =
|
|
551
|
-
"0x60c06040523480156200001157600080fd5b506040516200246f3803806200246f833981016040819052620000349162000122565b80806200004b620000d360201b62000da91760201c565b600180546001600160801b0319166001600160801b03929092169190911790556001600160a01b038116620000b55760405162461bcd60e51b815260206004820152600c60248201526b5a45524f5f4144445245535360a01b604482015260640160405180910390fd5b6001600160a01b039081166080529290921660a05250620001d49050565b6000620000e042620000e5565b905090565b600062093a80620000f7818462000161565b62000103919062000196565b92915050565b6001600160a01b03811681146200011f57600080fd5b50565b600080604083850312156200013657600080fd5b8251620001438162000109565b6020840151909250620001568162000109565b809150509250929050565b60006001600160801b03838116806200018a57634e487b7160e01b600052601260045260246000fd5b92169190910492915050565b60006001600160801b0382811684821681151582840482111615620001cb57634e487b7160e01b600052601160045260246000fd5b02949350505050565b60805160a0516122606200020f6000396000818161025e015281816106bc0152610a7c0152600081816103820152610db801526122606000f3fe6080604052600436106101105760003560e01c806307dfe1a714610115578063094383201461014b5780630b9efa221461017957806323342c381461018e57806330d981af146101ae5780634e91d0cb146101c357806351cff8d9146101d657806370a08231146101f6578063947975d914610216578063a2c530da1461024c578063b92e106a14610298578063bd4d66e3146102ab578063c4c30dc2146102cb578063c8121ec2146102ee578063cb6b4f3c1461030e578063cc471bb81461035d578063d2e6d1c314610370578063d4d93876146103a4578063d88e92a9146103d4578063ef1c243a1461040a578063f4359ce51461041f578063f5853a8f14610436578063fa78668f14610449575b600080fd5b34801561012157600080fd5b50600154610135906001600160801b031681565b6040516101429190611b90565b60405180910390f35b34801561015757600080fd5b5061016b610166366004611bbc565b610461565b604051610142929190611c03565b61018c610187366004611c6d565b6104c5565b005b34801561019a57600080fd5b5061018c6101a9366004611cc1565b610524565b3480156101ba57600080fd5b5061013561057e565b61018c6101d1366004611bbc565b61059b565b3480156101e257600080fd5b506101356101f1366004611cc1565b6105ee565b34801561020257600080fd5b50610135610211366004611cc1565b610732565b34801561022257600080fd5b50610135610231366004611cfa565b6008602052600090815260409020546001600160801b031681565b34801561025857600080fd5b506102807f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b039091168152602001610142565b61018c6102a6366004611d15565b6107a1565b3480156102b757600080fd5b506101356102c6366004611d56565b6107ad565b3480156102d757600080fd5b506102e06107d6565b604051610142929190611d8b565b3480156102fa57600080fd5b50610135610309366004611e0f565b6108ea565b34801561031a57600080fd5b5061034f610329366004611cc1565b6002602052600090815260409020546001600160801b0380821691600160801b90041682565b604051610142929190611e2b565b61013561036b366004611e45565b610b06565b34801561037c57600080fd5b506102807f000000000000000000000000000000000000000000000000000000000000000081565b3480156103b057600080fd5b506103c46103bf366004611cc1565b610b27565b6040519015158152602001610142565b3480156103e057600080fd5b506101356103ef366004611cfa565b6007602052600090815260409020546001600160801b031681565b34801561041657600080fd5b50610135610b58565b34801561042b57600080fd5b5061013562093a8081565b61018c610444366004611c6d565b610b90565b34801561045557600080fd5b506101356303bfc40081565b6009602052816000526040600020818154811061047d57600080fd5b60009182526020918290206040805180820190915260029092020180546001600160801b038082168452600160801b9091048116938301939093526001015490935016905082565b6001600160a01b0383166105145760405162461bcd60e51b81526020600482015260116024820152703d32b9379030b2323932b9b9903ab9b2b960791b60448201526064015b60405180910390fd5b61051f838383610b90565b505050565b61052c610db4565b6001600160a01b0316336001600160a01b03161461055c5760405162461bcd60e51b815260040161050b90611ea5565b600380546001600160a01b0319166001600160a01b0392909216919091179055565b600080610589610e38565b50905061059581610f73565b91505090565b6105a3610db4565b6001600160a01b0316336001600160a01b0316146105d35760405162461bcd60e51b815260040161050b90611ea5565b6105df60048284610f95565b506105ea8282610fab565b5050565b60006105f982610b27565b61063c5760405162461bcd60e51b81526020600482015260146024820152731c1bdcda5d1a5bdb881b9bdd08195e1c1a5c995960621b604482015260640161050b565b506001600160a01b0381166000908152600260205260409020546001600160801b03168061069c5760405162461bcd60e51b815260206004820152600d60248201526c3d32b937903837b9b4ba34b7b760991b604482015260640161050b565b6001600160a01b038083166000908152600260205260408120556106ec907f000000000000000000000000000000000000000000000000000000000000000016836001600160801b038416610fe9565b816001600160a01b03167f0e1bb0545c1ebb9fb680bde73514e572831de93b479c087ec1ef6c35c3a19fd6826040516107259190611b90565b60405180910390a2919050565b600061073d82610b27565b1561074a57506000919050565b6001600160a01b0382166000908152600260209081526040918290208251808401909352546001600160801b038082168452600160801b909104169082015261079b906107969061104c565b610f73565b92915050565b6105ea60008383610b90565b6001600160a01b03821660009081526009602052604081206107cf90836110b5565b9392505050565b60608060006107e56004611215565b9050806001600160401b038111156107ff576107ff611ece565b604051908082528060200260200182016040528015610828578160200160208202803683370190505b509250806001600160401b0381111561084357610843611ece565b60405190808252806020026020018201604052801561086c578160200160208202803683370190505b50915060005b818110156108e457610885600482611220565b85838151811061089757610897611ee4565b602002602001018584815181106108b0576108b0611ee4565b60200260200101826001600160a01b03166001600160a01b0316815250828152505050806108dd90611f10565b9050610872565b50509091565b6000336108f68361123e565b801561090a57506001600160801b03831642105b61094a5760405162461bcd60e51b8152602060048201526011602482015270696e76616c6964206e657745787069727960781b604482015260640161050b565b6109586303bfc40042611f29565b836001600160801b031611156109a95760405162461bcd60e51b81526020600482015260166024820152751b585e081b1bd8dac81d1a5b5948195e18d95959195960521b604482015260640161050b565b6001600160a01b0381166000908152600260205260408120546109d5906001600160801b031686611f41565b90506000816001600160801b031611610a2b5760405162461bcd60e51b81526020600482015260186024820152771e995c9bc81d1bdd185b08185b5bdd5b9d081b1bd8dad95960421b604482015260640161050b565b6001600160a01b038216600090815260026020526040812054610a5e90600160801b90046001600160801b031686611f6c565b90506001600160801b03861615610aad57610aad6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001684306001600160801b038a1661125d565b610ab8838288611295565b9350826001600160a01b03167fb1a3371956c54dc1d83695b4a006b051c8313ee986e533b6b964e77c9066fc2c8387604051610af5929190611e2b565b60405180910390a250505092915050565b6000610b1285856108ea565b9050610b1f3384846104c5565b949350505050565b6001600160a01b038116600090815260026020526040812054600160801b90046001600160801b031642101561079b565b60408051808201909152600080546001600160801b038082168452600160801b90910416602083015290610b8b90610f73565b905090565b6000819003610bd25760405162461bcd60e51b815260206004820152600e60248201526d656d70747920636861696e49647360901b604482015260640161050b565b600080610bdd610e38565b9092506001600160801b0316905060006001600160a01b03861615610c53576001600160a01b03861660008181526002602090815260409182902082519182019390935291546001600160801b03811691830191909152608090811c606083015201604051602081830303815290604052610c63565b6040805160008152602081019091525b905060005b84811015610d6557610c9c868683818110610c8557610c85611ee4565b9050602002013560046114e190919063ffffffff16565b610cde5760405162461bcd60e51b81526020600482015260136024820152723737ba1039bab83837b93a32b21031b430b4b760691b604482015260640161050b565b610d02868683818110610cf357610cf3611ee4565b905060200201358486856114ed565b6001600160a01b03871615610d5557866001600160a01b03167f82e92e1b0568d98f095fc0c76ccb0f2ac5b64534f69a2c706281e223b64776838787604051610d4c929190611fca565b60405180910390a25b610d5e81611f10565b9050610c68565b507f5f9e7cb1ed2eca254f75b6e350699887aa8597e3a2ec9e0aa2b3504c211facbd838686604051610d9993929190611fde565b60405180910390a1505050505050565b6000610b8b4261151a565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316635aa6e6756040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b8b9190612008565b610e40611b79565b60408051808201909152600080546001600160801b038082168452600160801b909104811660208401526001549192911682610e7a610da9565b9050806001600160801b0316826001600160801b031610610e9f575090939092509050565b806001600160801b0316826001600160801b03161015610f3057610ec662093a8083611f41565b6001600160801b03808216600090815260076020526040902054919350610ef09185911684611534565b9250610efc8383611582565b6001600160801b03838116600090815260086020526040902080546001600160801b03191692909116919091179055610e9f565b50815160208301516001600160801b03918216600160801b9183169190910217600055600180546001600160801b03191692909116918217905590939092509050565b6000610f7e826115a0565b15610f8b57506000919050565b61079b8242611582565b6000610b1f84846001600160a01b0385166115d1565b600080610fb6610e38565b6001600160801b031691509150610fe38382846040516020016040516020818303038152906040526114ed565b50505050565b6040516001600160a01b03831660248201526044810182905261051f90849063a9059cbb60e01b906064015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b0319909316929092179091526115ee565b611054611b79565b8151611065906303bfc4009061203b565b6001600160801b0316602082018190526110915760405162461bcd60e51b815260040161050b90612061565b816020015181602001516110a59190612085565b6001600160801b03168152919050565b815460009015806110fd5750816001600160801b0316836000815481106110de576110de611ee4565b60009182526020909120600160029092020101546001600160801b0316115b1561110a5750600061079b565b82546000905b8082101561118c57600060026111268385611f29565b61113091906120b4565b9050846001600160801b031686828154811061114e5761114e611ee4565b60009182526020909120600160029092020101546001600160801b03161161117857809250611186565b6111836001826120c8565b91505b50611110565b60008583815481106111a0576111a0611ee4565b600091825260209182902060408051808201909152600290920201546001600160801b038082168352600160801b909104811692820192909252915085166111e7826116c0565b6001600160801b031611611201576000935050505061079b565b61120b8186611582565b935050505061079b565b600061079b82611700565b600080808061122f868661170b565b909450925050505b9250929050565b600061124d62093a80836120df565b6001600160801b03161592915050565b6040516001600160a01b0380851660248301528316604482015260648101829052610fe39085906323b872dd60e01b90608401611015565b6001600160a01b03831660009081526002602090815260408083208151808301909252546001600160801b038082168352600160801b9091041691810191909152816112df610e38565b5090506112f982602001516001600160801b031642101590565b6113735760006113088361104c565b90506113148282611736565b602080830151858201516001600160801b0390811660009081526007909352604083208054949650919391929161134d91859116611f6c565b92506101000a8154816001600160801b0302191690836001600160801b03160217905550505b600060405180604001604052808685600001516113909190611f41565b6001600160801b031681526020018785602001516113ae9190611f41565b6001600160801b03169052905060006113c68261104c565b90506113d2838261177f565b602080830151848201516001600160801b0390811660009081526007909352604083208054949750919391929161140b91859116611f41565b82546101009290920a6001600160801b038181021990931691831602179091558451602080870151918316600160801b92841683021760009081556001600160a01b038d1681526002808352604080832089518a860151908816908816870217905560098452808320815180830190925288825242871682860190815281546001818101845592865294869020925180519601519588169588169096029490941792909102019081559151910180546001600160801b03191691909216179055506114d581610f73565b98975050505050505050565b60006107cf83836117b4565b610fe3848484846040516020016115069392919061215d565b6040516020818303038152906040526117c0565b600062093a8061152a818461203b565b61079b9190612085565b61153c611b79565b82846020015161154c9190611f6c565b6001600160801b031660208201526115648284612085565b84516115709190611f6c565b6001600160801b031681529392505050565b60008183602001516115949190612085565b83516107cf9190611f6c565b600081600001516001600160801b03164283602001516115c09190612085565b6001600160801b0316101592915050565b60008281526002840160205260408120829055610b1f84846118ca565b6000611643826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166118d69092919063ffffffff16565b80519091501561051f57808060200190518101906116619190612183565b61051f5760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b606482015260840161050b565b600081602001516001600160801b03166000036116ef5760405162461bcd60e51b815260040161050b90612061565b6020820151825161079b919061203b565b600061079b826118e5565b6000808061171985856118ef565b600081815260029690960160205260409095205494959350505050565b61173e611b79565b8151835161174c9190611f6c565b6001600160801b031681526020808301519084015161176b9190611f6c565b6001600160801b0316602082015292915050565b611787611b79565b815183516117959190611f41565b6001600160801b031681526020808301519084015161176b9190611f41565b60006107cf83836118fb565b6117cb6004836114e1565b6117d7576117d76121a5565b60006117e4600484611907565b60035460405163299aee5160e11b81529192506000916001600160a01b0390911690635335dca29061181a9086906004016121bb565b602060405180830381865afa158015611837573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061185b91906121ce565b600354604051634f9e72ad60e11b81529192506001600160a01b031690639f3ce55a908390611892908690899089906004016121e7565b6000604051808303818588803b1580156118ab57600080fd5b505af11580156118bf573d6000803e3d6000fd5b505050505050505050565b60006107cf8383611913565b6060610b1f848460008561195d565b600061079b825490565b60006107cf8383611a8e565b60006107cf8383611ab8565b60006107cf8383611ad0565b600061191f8383611ab8565b6119555750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915561079b565b50600061079b565b6060824710156119be5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b606482015260840161050b565b6001600160a01b0385163b611a155760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015260640161050b565b600080866001600160a01b03168587604051611a31919061220e565b60006040518083038185875af1925050503d8060008114611a6e576040519150601f19603f3d011682016040523d82523d6000602084013e611a73565b606091505b5091509150611a83828286611b40565b979650505050505050565b6000826000018281548110611aa557611aa5611ee4565b9060005260206000200154905092915050565b60009081526001919091016020526040902054151590565b600081815260028301602052604081205480151580611af45750611af484846117b4565b6107cf5760405162461bcd60e51b815260206004820152601e60248201527f456e756d657261626c654d61703a206e6f6e6578697374656e74206b65790000604482015260640161050b565b60608315611b4f5750816107cf565b825115611b5f5782518084602001fd5b8160405162461bcd60e51b815260040161050b91906121bb565b604080518082019091526000808252602082015290565b6001600160801b0391909116815260200190565b6001600160a01b0381168114611bb957600080fd5b50565b60008060408385031215611bcf57600080fd5b8235611bda81611ba4565b946020939093013593505050565b80516001600160801b03908116835260209182015116910152565b60608101611c118285611be8565b6001600160801b039290921660409190910152919050565b60008083601f840112611c3b57600080fd5b5081356001600160401b03811115611c5257600080fd5b6020830191508360208260051b850101111561123757600080fd5b600080600060408486031215611c8257600080fd5b8335611c8d81611ba4565b925060208401356001600160401b03811115611ca857600080fd5b611cb486828701611c29565b9497909650939450505050565b600060208284031215611cd357600080fd5b81356107cf81611ba4565b80356001600160801b0381168114611cf557600080fd5b919050565b600060208284031215611d0c57600080fd5b6107cf82611cde565b60008060208385031215611d2857600080fd5b82356001600160401b03811115611d3e57600080fd5b611d4a85828601611c29565b90969095509350505050565b60008060408385031215611d6957600080fd5b8235611d7481611ba4565b9150611d8260208401611cde565b90509250929050565b604080825283519082018190526000906020906060840190828701845b82811015611dc457815184529284019290840190600101611da8565b5050508381038285015284518082528583019183019060005b81811015611e025783516001600160a01b031683529284019291840191600101611ddd565b5090979650505050505050565b60008060408385031215611e2257600080fd5b611d7483611cde565b6001600160801b0392831681529116602082015260400190565b60008060008060608587031215611e5b57600080fd5b611e6485611cde565b9350611e7260208601611cde565b925060408501356001600160401b03811115611e8d57600080fd5b611e9987828801611c29565b95989497509550505050565b6020808252600f908201526e4f4e4c595f474f5645524e414e434560881b604082015260600190565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b600060018201611f2257611f22611efa565b5060010190565b60008219821115611f3c57611f3c611efa565b500190565b60006001600160801b03828116848216808303821115611f6357611f63611efa565b01949350505050565b60006001600160801b0383811690831681811015611f8c57611f8c611efa565b039392505050565b81835260006001600160fb1b03831115611fad57600080fd5b8260051b8083602087013760009401602001938452509192915050565b602081526000610b1f602083018486611f94565b611fe88185611be8565b606060408201526000611fff606083018486611f94565b95945050505050565b60006020828403121561201a57600080fd5b81516107cf81611ba4565b634e487b7160e01b600052601260045260246000fd5b60006001600160801b038381168061205557612055612025565b92169190910492915050565b6020808252600a90820152697a65726f20736c6f706560b01b604082015260600190565b60006001600160801b03828116848216811515828404821116156120ab576120ab611efa565b02949350505050565b6000826120c3576120c3612025565b500490565b6000828210156120da576120da611efa565b500390565b60006001600160801b03838116806120f9576120f9612025565b92169190910692915050565b60005b83811015612120578181015183820152602001612108565b83811115610fe35750506000910152565b60008151808452612149816020860160208601612105565b601f01601f19169290920160200192915050565b83815261216d6020820184611be8565b608060608201526000611fff6080830184612131565b60006020828403121561219557600080fd5b815180151581146107cf57600080fd5b634e487b7160e01b600052600160045260246000fd5b6020815260006107cf6020830184612131565b6000602082840312156121e057600080fd5b5051919050565b60018060a01b0384168152826020820152606060408201526000611fff6060830184612131565b60008251612220818460208701612105565b919091019291505056fea264697066735822122017578a41ff5524371e29a35961da966cbf139e23f97f9e1baf47e13e2422fd7664736f6c634300080d0033";
|
|
523
|
+
"0x60c06040523480156200001157600080fd5b506040516200243038038062002430833981016040819052620000349162000122565b80806200004b620000d360201b62000d401760201c565b600180546001600160801b0319166001600160801b03929092169190911790556001600160a01b038116620000b55760405162461bcd60e51b815260206004820152600c60248201526b5a45524f5f4144445245535360a01b604482015260640160405180910390fd5b6001600160a01b039081166080529290921660a05250620001d49050565b6000620000e042620000e5565b905090565b600062093a80620000f7818462000161565b62000103919062000196565b92915050565b6001600160a01b03811681146200011f57600080fd5b50565b600080604083850312156200013657600080fd5b8251620001438162000109565b6020840151909250620001568162000109565b809150509250929050565b60006001600160801b03838116806200018a57634e487b7160e01b600052601260045260246000fd5b92169190910492915050565b60006001600160801b0382811684821681151582840482111615620001cb57634e487b7160e01b600052601160045260246000fd5b02949350505050565b60805160a0516122216200020f600039600081816102680152818161064a0152610a130152600081816103740152610d4f01526122216000f3fe6080604052600436106101105760003560e01c806307dfe1a7146101155780630b9efa221461014b57806323342c381461016057806330d981af146101805780634e91d0cb1461019557806351cff8d9146101a85780635cc04968146101c857806370a0823114610200578063947975d914610220578063a2c530da14610256578063b92e106a1461028a578063bd4d66e31461029d578063c4c30dc2146102bd578063c8121ec2146102e0578063cb6b4f3c14610300578063cc471bb81461034f578063d2e6d1c314610362578063d4d9387614610396578063d88e92a9146103c6578063ef1c243a146103fc578063f4359ce514610411578063f5853a8f14610428578063fa78668f1461043b575b600080fd5b34801561012157600080fd5b50600154610135906001600160801b031681565b6040516101429190611ba4565b60405180910390f35b61015e610159366004611c14565b610453565b005b34801561016c57600080fd5b5061015e61017b366004611c68565b6104b2565b34801561018c57600080fd5b5061013561050c565b61015e6101a3366004611c85565b610529565b3480156101b457600080fd5b506101356101c3366004611c68565b61057c565b3480156101d457600080fd5b506067546101e8906001600160a01b031681565b6040516001600160a01b039091168152602001610142565b34801561020c57600080fd5b5061013561021b366004611c68565b6106c0565b34801561022c57600080fd5b5061013561023b366004611ccd565b60d0602052600090815260409020546001600160801b031681565b34801561026257600080fd5b506101e87f000000000000000000000000000000000000000000000000000000000000000081565b61015e610298366004611ce8565b61072f565b3480156102a957600080fd5b506101356102b8366004611d29565b61073b565b3480156102c957600080fd5b506102d261076d565b604051610142929190611d5e565b3480156102ec57600080fd5b506101356102fb366004611de2565b610881565b34801561030c57600080fd5b5061034161031b366004611c68565b6002602052600090815260409020546001600160801b0380821691600160801b90041682565b604051610142929190611dfe565b61013561035d366004611e18565b610a9d565b34801561036e57600080fd5b506101e87f000000000000000000000000000000000000000000000000000000000000000081565b3480156103a257600080fd5b506103b66103b1366004611c68565b610abe565b6040519015158152602001610142565b3480156103d257600080fd5b506101356103e1366004611ccd565b60cf602052600090815260409020546001600160801b031681565b34801561040857600080fd5b50610135610aef565b34801561041d57600080fd5b5061013562093a8081565b61015e610436366004611c14565b610b27565b34801561044757600080fd5b506101356303bfc40081565b6001600160a01b0383166104a25760405162461bcd60e51b81526020600482015260116024820152703d32b9379030b2323932b9b9903ab9b2b960791b60448201526064015b60405180910390fd5b6104ad838383610b27565b505050565b6104ba610d4b565b6001600160a01b0316336001600160a01b0316146104ea5760405162461bcd60e51b815260040161049990611e78565b606780546001600160a01b0319166001600160a01b0392909216919091179055565b600080610517610dcf565b50905061052381610f0a565b91505090565b610531610d4b565b6001600160a01b0316336001600160a01b0316146105615760405162461bcd60e51b815260040161049990611e78565b61056d60688284610f2c565b506105788282610f42565b5050565b600061058782610abe565b6105ca5760405162461bcd60e51b81526020600482015260146024820152731c1bdcda5d1a5bdb881b9bdd08195e1c1a5c995960621b6044820152606401610499565b506001600160a01b0381166000908152600260205260409020546001600160801b03168061062a5760405162461bcd60e51b815260206004820152600d60248201526c3d32b937903837b9b4ba34b7b760991b6044820152606401610499565b6001600160a01b0380831660009081526002602052604081205561067a907f000000000000000000000000000000000000000000000000000000000000000016836001600160801b038416610f80565b816001600160a01b03167f0e1bb0545c1ebb9fb680bde73514e572831de93b479c087ec1ef6c35c3a19fd6826040516106b39190611ba4565b60405180910390a2919050565b60006106cb82610abe565b156106d857506000919050565b6001600160a01b0382166000908152600260209081526040918290208251808401909352546001600160801b038082168452600160801b90910416908201526107299061072490610fe3565b610f0a565b92915050565b61057860008383610b27565b6001600160a01b038216600090815260d160205260408120610766906001600160801b038416611069565b9392505050565b606080600061077c60686111a9565b9050806001600160401b0381111561079657610796611ea1565b6040519080825280602002602001820160405280156107bf578160200160208202803683370190505b509250806001600160401b038111156107da576107da611ea1565b604051908082528060200260200182016040528015610803578160200160208202803683370190505b50915060005b8181101561087b5761081c6068826111b4565b85838151811061082e5761082e611eb7565b6020026020010185848151811061084757610847611eb7565b60200260200101826001600160a01b03166001600160a01b03168152508281525050508061087490611ee3565b9050610809565b50509091565b60003361088d836111d2565b80156108a157506001600160801b03831642105b6108e15760405162461bcd60e51b8152602060048201526011602482015270696e76616c6964206e657745787069727960781b6044820152606401610499565b6108ef6303bfc40042611efc565b836001600160801b031611156109405760405162461bcd60e51b81526020600482015260166024820152751b585e081b1bd8dac81d1a5b5948195e18d95959195960521b6044820152606401610499565b6001600160a01b03811660009081526002602052604081205461096c906001600160801b031686611f14565b90506000816001600160801b0316116109c25760405162461bcd60e51b81526020600482015260186024820152771e995c9bc81d1bdd185b08185b5bdd5b9d081b1bd8dad95960421b6044820152606401610499565b6001600160a01b0382166000908152600260205260408120546109f590600160801b90046001600160801b031686611f3f565b90506001600160801b03861615610a4457610a446001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001684306001600160801b038a166111f1565b610a4f838288611229565b9350826001600160a01b03167fb1a3371956c54dc1d83695b4a006b051c8313ee986e533b6b964e77c9066fc2c8387604051610a8c929190611dfe565b60405180910390a250505092915050565b6000610aa98585610881565b9050610ab6338484610453565b949350505050565b6001600160a01b038116600090815260026020526040812054600160801b90046001600160801b0316421015610729565b60408051808201909152600080546001600160801b038082168452600160801b90910416602083015290610b2290610f0a565b905090565b6000819003610b695760405162461bcd60e51b815260206004820152600e60248201526d656d70747920636861696e49647360901b6044820152606401610499565b600080610b74610dcf565b9092506001600160801b0316905060006001600160a01b03861615610bea576001600160a01b03861660008181526002602090815260409182902082519182019390935291546001600160801b03811691830191909152608090811c606083015201604051602081830303815290604052610bfa565b6040805160008152602081019091525b905060005b84811015610cfc57610c33868683818110610c1c57610c1c611eb7565b90506020020135606861142990919063ffffffff16565b610c755760405162461bcd60e51b81526020600482015260136024820152723737ba1039bab83837b93a32b21031b430b4b760691b6044820152606401610499565b610c99868683818110610c8a57610c8a611eb7565b90506020020135848685611435565b6001600160a01b03871615610cec57866001600160a01b03167f82e92e1b0568d98f095fc0c76ccb0f2ac5b64534f69a2c706281e223b64776838787604051610ce3929190611f9d565b60405180910390a25b610cf581611ee3565b9050610bff565b507f5f9e7cb1ed2eca254f75b6e350699887aa8597e3a2ec9e0aa2b3504c211facbd838686604051610d3093929190611fcc565b60405180910390a1505050505050565b6000610b2242611462565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316635aa6e6756040518163ffffffff1660e01b8152600401602060405180830381865afa158015610dab573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b229190611fed565b610dd7611b8d565b60408051808201909152600080546001600160801b038082168452600160801b909104811660208401526001549192911682610e11610d40565b9050806001600160801b0316826001600160801b031610610e36575090939092509050565b806001600160801b0316826001600160801b03161015610ec757610e5d62093a8083611f14565b6001600160801b03808216600090815260cf6020526040902054919350610e87918591168461147c565b9250610e9383836114ca565b6001600160801b03838116600090815260d06020526040902080546001600160801b03191692909116919091179055610e36565b50815160208301516001600160801b03918216600160801b9183169190910217600055600180546001600160801b03191692909116918217905590939092509050565b6000610f15826114e8565b15610f2257506000919050565b61072982426114ca565b6000610ab684846001600160a01b038516611519565b600080610f4d610dcf565b6001600160801b031691509150610f7a838284604051602001604051602081830303815290604052611435565b50505050565b6040516001600160a01b0383166024820152604481018290526104ad90849063a9059cbb60e01b906064015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611536565b610feb611b8d565b8151610ffc906303bfc40090612020565b6001600160801b0316602082018190526110455760405162461bcd60e51b815260206004820152600a6024820152697a65726f20736c6f706560b01b6044820152606401610499565b816020015181602001516110599190612046565b6001600160801b03168152919050565b60004282106110ba5760405162461bcd60e51b815260206004820181905260248201527f436865636b706f696e74733a20626c6f636b206e6f7420796574206d696e65646044820152606401610499565b825460005b8181101561113057600060026110d58484611efc565b6110df9190612075565b9050848660000182815481106110f7576110f7611eb7565b600091825260209091206002909102015463ffffffff16111561111c5780925061112a565b611127816001611efc565b91505b506110bf565b811561119d5761119885611145600185612089565b8154811061115557611155611eb7565b60009182526020918290206040805180820190915260029290920201600101546001600160801b038082168352600160801b9091041691810191909152856114ca565b6111a0565b60005b95945050505050565b600061072982611608565b60008080806111c38686611613565b909450925050505b9250929050565b60006111e162093a80836120a0565b6001600160801b03161592915050565b6040516001600160a01b0380851660248301528316604482015260648101829052610f7a9085906323b872dd60e01b90608401610fac565b6001600160a01b03831660009081526002602090815260408083208151808301909252546001600160801b038082168352600160801b909104169181019190915281611273610dcf565b50905061128d82602001516001600160801b031642101590565b61130757600061129c83610fe3565b90506112a8828261163e565b602080830151858201516001600160801b03908116600090815260cf90935260408320805494965091939192916112e191859116611f3f565b92506101000a8154816001600160801b0302191690836001600160801b03160217905550505b600060405180604001604052808685600001516113249190611f14565b6001600160801b031681526020018785602001516113429190611f14565b6001600160801b031690529050600061135a82610fe3565b90506113668382611687565b602080830151848201516001600160801b03908116600090815260cf909352604083208054949750919391929161139f91859116611f14565b82546101009290920a6001600160801b038181021990931691831602179091558451602080870151918316600160801b92841683021760009081556001600160a01b038d16815260028252604080822088518985015190871696169094029490941790925560d19052206114149150826116bc565b61141d81610f0a565b98975050505050505050565b600061076683836117c8565b610f7a8484848460405160200161144e9392919061211e565b6040516020818303038152906040526117d4565b600062093a806114728184612020565b6107299190612046565b611484611b8d565b8284602001516114949190611f3f565b6001600160801b031660208201526114ac8284612046565b84516114b89190611f3f565b6001600160801b031681529392505050565b60008183602001516114dc9190612046565b83516107669190611f3f565b600081600001516001600160801b03164283602001516115089190612046565b6001600160801b0316101592915050565b60008281526002840160205260408120829055610ab684846118de565b600061158b826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166118ea9092919063ffffffff16565b8051909150156104ad57808060200190518101906115a99190612144565b6104ad5760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610499565b6000610729826118f9565b600080806116218585611903565b600081815260029690960160205260409095205494959350505050565b611646611b8d565b815183516116549190611f3f565b6001600160801b03168152602080830151908401516116739190611f3f565b6001600160801b0316602082015292915050565b61168f611b8d565b8151835161169d9190611f14565b6001600160801b03168152602080830151908401516116739190611f14565b815480158015906116fe575042836116d5600184612089565b815481106116e5576116e5611eb7565b600091825260209091206002909102015463ffffffff16145b1561175d578183611710600184612089565b8154811061172057611720611eb7565b6000918252602091829020835193909201516001600160801b03908116600160801b02931692909217600160029093029091019190910155505050565b6040805180820190915263ffffffff4281168252602080830185815286546001818101895560008981528490209551600290920290950180549190941663ffffffff199091161783555180519101516001600160801b03908116600160801b02911617910155505050565b6000610766838361190f565b6117df606883611429565b6117eb576117eb612166565b60006117f860688461191b565b60675460405163299aee5160e11b81529192506000916001600160a01b0390911690635335dca29061182e90869060040161217c565b602060405180830381865afa15801561184b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061186f919061218f565b606754604051634f9e72ad60e11b81529192506001600160a01b031690639f3ce55a9083906118a6908690899089906004016121a8565b6000604051808303818588803b1580156118bf57600080fd5b505af11580156118d3573d6000803e3d6000fd5b505050505050505050565b60006107668383611927565b6060610ab68484600085611971565b6000610729825490565b60006107668383611aa2565b60006107668383611acc565b60006107668383611ae4565b60006119338383611acc565b61196957508154600181810184556000848152602080822090930184905584548482528286019093526040902091909155610729565b506000610729565b6060824710156119d25760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401610499565b6001600160a01b0385163b611a295760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610499565b600080866001600160a01b03168587604051611a4591906121cf565b60006040518083038185875af1925050503d8060008114611a82576040519150601f19603f3d011682016040523d82523d6000602084013e611a87565b606091505b5091509150611a97828286611b54565b979650505050505050565b6000826000018281548110611ab957611ab9611eb7565b9060005260206000200154905092915050565b60009081526001919091016020526040902054151590565b600081815260028301602052604081205480151580611b085750611b0884846117c8565b6107665760405162461bcd60e51b815260206004820152601e60248201527f456e756d657261626c654d61703a206e6f6e6578697374656e74206b657900006044820152606401610499565b60608315611b63575081610766565b825115611b735782518084602001fd5b8160405162461bcd60e51b8152600401610499919061217c565b604080518082019091526000808252602082015290565b6001600160801b0391909116815260200190565b6001600160a01b0381168114611bcd57600080fd5b50565b60008083601f840112611be257600080fd5b5081356001600160401b03811115611bf957600080fd5b6020830191508360208260051b85010111156111cb57600080fd5b600080600060408486031215611c2957600080fd5b8335611c3481611bb8565b925060208401356001600160401b03811115611c4f57600080fd5b611c5b86828701611bd0565b9497909650939450505050565b600060208284031215611c7a57600080fd5b813561076681611bb8565b60008060408385031215611c9857600080fd5b8235611ca381611bb8565b946020939093013593505050565b80356001600160801b0381168114611cc857600080fd5b919050565b600060208284031215611cdf57600080fd5b61076682611cb1565b60008060208385031215611cfb57600080fd5b82356001600160401b03811115611d1157600080fd5b611d1d85828601611bd0565b90969095509350505050565b60008060408385031215611d3c57600080fd5b8235611d4781611bb8565b9150611d5560208401611cb1565b90509250929050565b604080825283519082018190526000906020906060840190828701845b82811015611d9757815184529284019290840190600101611d7b565b5050508381038285015284518082528583019183019060005b81811015611dd55783516001600160a01b031683529284019291840191600101611db0565b5090979650505050505050565b60008060408385031215611df557600080fd5b611d4783611cb1565b6001600160801b0392831681529116602082015260400190565b60008060008060608587031215611e2e57600080fd5b611e3785611cb1565b9350611e4560208601611cb1565b925060408501356001600160401b03811115611e6057600080fd5b611e6c87828801611bd0565b95989497509550505050565b6020808252600f908201526e4f4e4c595f474f5645524e414e434560881b604082015260600190565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b600060018201611ef557611ef5611ecd565b5060010190565b60008219821115611f0f57611f0f611ecd565b500190565b60006001600160801b03828116848216808303821115611f3657611f36611ecd565b01949350505050565b60006001600160801b0383811690831681811015611f5f57611f5f611ecd565b039392505050565b81835260006001600160fb1b03831115611f8057600080fd5b8260051b8083602087013760009401602001938452509192915050565b602081526000610ab6602083018486611f67565b80516001600160801b03908116835260209182015116910152565b611fd68185611fb1565b6060604082015260006111a0606083018486611f67565b600060208284031215611fff57600080fd5b815161076681611bb8565b634e487b7160e01b600052601260045260246000fd5b60006001600160801b038381168061203a5761203a61200a565b92169190910492915050565b60006001600160801b038281168482168115158284048211161561206c5761206c611ecd565b02949350505050565b6000826120845761208461200a565b500490565b60008282101561209b5761209b611ecd565b500390565b60006001600160801b03838116806120ba576120ba61200a565b92169190910692915050565b60005b838110156120e15781810151838201526020016120c9565b83811115610f7a5750506000910152565b6000815180845261210a8160208601602086016120c6565b601f01601f19169290920160200192915050565b83815261212e6020820184611fb1565b6080606082015260006111a060808301846120f2565b60006020828403121561215657600080fd5b8151801515811461076657600080fd5b634e487b7160e01b600052600160045260246000fd5b60208152600061076660208301846120f2565b6000602082840312156121a157600080fd5b5051919050565b60018060a01b03841681528260208201526060604082015260006111a060608301846120f2565b600082516121e18184602087016120c6565b919091019291505056fea2646970667358221220218a119e3c3df4479ce2899843197889412358fe623aa7f1aa8e6ee4a67ee80b64736f6c634300080f0033";
|
|
552
524
|
|
|
553
525
|
type VotingEscrowPendleMainchainConstructorParams =
|
|
554
526
|
| [signer?: Signer]
|
|
@@ -354,7 +354,7 @@ const _abi = [
|
|
|
354
354
|
];
|
|
355
355
|
|
|
356
356
|
const _bytecode =
|
|
357
|
-
"
|
|
357
|
+
"0x60a06040523480156200001157600080fd5b506040516200103438038062001034833981016040819052620000349162000100565b80806200004b620000ca60201b620006571760201c565b600180546001600160801b0319166001600160801b03929092169190911790556001600160a01b038116620000b55760405162461bcd60e51b815260206004820152600c60248201526b5a45524f5f4144445245535360a01b604482015260640160405180910390fd5b6001600160a01b031660805250620001a59050565b6000620000d742620000dc565b905090565b600062093a80620000ee818462000132565b620000fa919062000167565b92915050565b6000602082840312156200011357600080fd5b81516001600160a01b03811681146200012b57600080fd5b9392505050565b60006001600160801b03838116806200015b57634e487b7160e01b600052601260045260246000fd5b92169190910492915050565b60006001600160801b03828116848216811515828404821116156200019c57634e487b7160e01b600052601160045260246000fd5b02949350505050565b608051610e6c620001c86000396000818161028b01526106660152610e6c6000f3fe6080604052600436106100c35760003560e01c806307dfe1a7146100c85780630ac7f5611461010557806323342c381461012957806330d981af1461014b5780634fb7015f146101605780635cc049681461018057806370a08231146101b8578063769b1ebc146101d85780639c649fdf146101f8578063cb6b4f3c14610218578063d2e6d1c314610279578063d4d93876146102ad578063e517fedd146102dd578063ef1c243a146102fd578063f4359ce514610312578063fa78668f14610329575b600080fd5b3480156100d457600080fd5b506001546100e8906001600160801b031681565b6040516001600160801b0390911681526020015b60405180910390f35b34801561011157600080fd5b5061011b60695481565b6040519081526020016100fc565b34801561013557600080fd5b506101496101443660046109f5565b610341565b005b34801561015757600080fd5b506100e86103a4565b34801561016c57600080fd5b5061014961017b366004610a12565b6103b3565b34801561018c57600080fd5b506067546101a0906001600160a01b031681565b6040516001600160a01b0390911681526020016100fc565b3480156101c457600080fd5b506100e86101d33660046109f5565b610411565b3480156101e457600080fd5b506101496101f3366004610a3e565b61044c565b61020b610206366004610a77565b6104f0565b6040516100fc9190610b26565b34801561022457600080fd5b506102596102333660046109f5565b6002602052600090815260409020546001600160801b0380821691600160801b90041682565b604080516001600160801b039384168152929091166020830152016100fc565b34801561028557600080fd5b506101a07f000000000000000000000000000000000000000000000000000000000000000081565b3480156102b957600080fd5b506102cd6102c83660046109f5565b6105f1565b60405190151581526020016100fc565b3480156102e957600080fd5b506068546101a0906001600160a01b031681565b34801561030957600080fd5b506100e8610624565b34801561031e57600080fd5b506100e862093a8081565b34801561033557600080fd5b506100e86303bfc40081565b610349610662565b6001600160a01b0316336001600160a01b0316146103825760405162461bcd60e51b815260040161037990610b4e565b60405180910390fd5b606780546001600160a01b0319166001600160a01b0392909216919091179055565b60006103ae610624565b905090565b6103bb610662565b6001600160a01b0316336001600160a01b0316146103eb5760405162461bcd60e51b815260040161037990610b4e565b606880546001600160a01b0319166001600160a01b039390931692909217909155606955565b6001600160a01b03808216600090815260ce6020526040812054909116806104435761043c836106e6565b9392505050565b61043c816106e6565b610454610662565b6001600160a01b0316336001600160a01b0316146104845760405162461bcd60e51b815260040161037990610b4e565b6001600160a01b03828116600081815260ce602090815260409182902080546001600160a01b031916948616948517905581519384528301919091527f8d268954369e04c7941c3a7876f40c618eb97919add31202c9a235e75e84cf1b91015b60405180910390a15050565b6067546000906001600160a01b0316331480610524575061050f610662565b6001600160a01b0316336001600160a01b0316145b6105705760405162461bcd60e51b815260206004820152601d60248201527f6f6e6c792063656c6572206d65737361676520627573206f7220676f760000006044820152606401610379565b6068546001600160a01b0387811691161415806105985750606954856001600160401b031614155b156105a5575060006105e8565b6105e484848080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061074f92505050565b5060015b95945050505050565b6001600160a01b038116600090815260026020526040812054600160801b90046001600160801b03164210155b92915050565b60408051808201909152600080546001600160801b038082168452600160801b909104166020830152906103ae9061078e565b60006103ae426107b0565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316635aa6e6756040518163ffffffff1660e01b8152600401602060405180830381865afa1580156106c2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ae9190610b77565b60006106f1826105f1565b156106fe57506000919050565b6001600160a01b0382166000908152600260209081526040918290208251808401909352546001600160801b038082168452600160801b909104169082015261061e9061074a906107ca565b61078e565b6000806000838060200190518101906107689190610c4e565b925092509250610778838361085c565b80511561078857610788816108ec565b50505050565b60006107998261097e565b156107a657506000919050565b61061e82426109af565b600062093a806107c08184610d3b565b61061e9190610d6f565b604080518082019091526000808252602082015281516107ef906303bfc40090610d3b565b6001600160801b0316602082018190526108385760405162461bcd60e51b815260206004820152600a6024820152697a65726f20736c6f706560b01b6044820152606401610379565b8160200151816020015161084c9190610d6f565b6001600160801b03168152919050565b610865826107b0565b6001600160801b0316826001600160801b03161461088557610885610d9e565b600180546001600160801b038085166001600160801b031990921691909117909155815160208301518216600160801b029116176000556040517f460b96294ff8de4eea3be3fb4fac9f978cffe83c7cc3140a4bfe0bedba26b92f906104e4908390610db4565b600080828060200190518101906109039190610dd8565b6001600160a01b0382166000908152600260209081526040918290208351918401516001600160801b03908116600160801b0292169190911790555191935091507f776960a80ccfa09c52229b183bf0ef49b26a5d15f9ae2c1c0f780a450d3b2a9f90610971908390610db4565b60405180910390a1505050565b600081600001516001600160801b031642836020015161099e9190610d6f565b6001600160801b0316101592915050565b60008183602001516109c19190610d6f565b835161043c9190610e0e565b6001600160a01b03811681146109e257600080fd5b50565b80356109f0816109cd565b919050565b600060208284031215610a0757600080fd5b813561043c816109cd565b60008060408385031215610a2557600080fd5b8235610a30816109cd565b946020939093013593505050565b60008060408385031215610a5157600080fd5b8235610a5c816109cd565b91506020830135610a6c816109cd565b809150509250929050565b600080600080600060808688031215610a8f57600080fd5b8535610a9a816109cd565b945060208601356001600160401b038082168214610ab757600080fd5b90945060408701359080821115610acd57600080fd5b818801915088601f830112610ae157600080fd5b813581811115610af057600080fd5b896020828501011115610b0257600080fd5b602083019550809450505050610b1a606087016109e5565b90509295509295909350565b6020810160038310610b4857634e487b7160e01b600052602160045260246000fd5b91905290565b6020808252600f908201526e4f4e4c595f474f5645524e414e434560881b604082015260600190565b600060208284031215610b8957600080fd5b815161043c816109cd565b80516001600160801b03811681146109f057600080fd5b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715610be957610be9610bab565b604052919050565b600060408284031215610c0357600080fd5b604080519081016001600160401b0381118282101715610c2557610c25610bab565b604052905080610c3483610b94565b8152610c4260208401610b94565b60208201525092915050565b600080600060808486031215610c6357600080fd5b610c6c84610b94565b92506020610c7c86828701610bf1565b60608601519093506001600160401b0380821115610c9957600080fd5b818701915087601f830112610cad57600080fd5b815181811115610cbf57610cbf610bab565b610cd1601f8201601f19168501610bc1565b91508082528884828501011115610ce757600080fd5b60005b81811015610d05578381018501518382018601528401610cea565b81811115610d165760008583850101525b50508093505050509250925092565b634e487b7160e01b600052601160045260246000fd5b60006001600160801b0383811680610d6357634e487b7160e01b600052601260045260246000fd5b92169190910492915050565b60006001600160801b0382811684821681151582840482111615610d9557610d95610d25565b02949350505050565b634e487b7160e01b600052600160045260246000fd5b6040810161061e828480516001600160801b03908116835260209182015116910152565b60008060608385031215610deb57600080fd5b8251610df6816109cd565b9150610e058460208501610bf1565b90509250929050565b60006001600160801b0383811690831681811015610e2e57610e2e610d25565b03939250505056fea26469706673582212203488ae0b871ae44dd93a499f75d7cf010e9f59b0ef1ababe5d03f21b2021eebf64736f6c634300080f0033";
|
|
358
358
|
|
|
359
359
|
type VotingEscrowPendleSidechainConstructorParams =
|
|
360
360
|
| [signer?: Signer]
|
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
import { Contract, Signer, utils } from "ethers";
|
|
6
6
|
import { Provider } from "@ethersproject/providers";
|
|
7
7
|
import type {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
} from "../
|
|
8
|
+
VotingEscrowTokenBase,
|
|
9
|
+
VotingEscrowTokenBaseInterface,
|
|
10
|
+
} from "../VotingEscrowTokenBase";
|
|
11
11
|
|
|
12
12
|
const _abi = [
|
|
13
13
|
{
|
|
@@ -139,15 +139,19 @@ const _abi = [
|
|
|
139
139
|
},
|
|
140
140
|
];
|
|
141
141
|
|
|
142
|
-
export class
|
|
142
|
+
export class VotingEscrowTokenBase__factory {
|
|
143
143
|
static readonly abi = _abi;
|
|
144
|
-
static createInterface():
|
|
145
|
-
return new utils.Interface(_abi) as
|
|
144
|
+
static createInterface(): VotingEscrowTokenBaseInterface {
|
|
145
|
+
return new utils.Interface(_abi) as VotingEscrowTokenBaseInterface;
|
|
146
146
|
}
|
|
147
147
|
static connect(
|
|
148
148
|
address: string,
|
|
149
149
|
signerOrProvider: Signer | Provider
|
|
150
|
-
):
|
|
151
|
-
return new Contract(
|
|
150
|
+
): VotingEscrowTokenBase {
|
|
151
|
+
return new Contract(
|
|
152
|
+
address,
|
|
153
|
+
_abi,
|
|
154
|
+
signerOrProvider
|
|
155
|
+
) as VotingEscrowTokenBase;
|
|
152
156
|
}
|
|
153
157
|
}
|