@pendle/core-v2 0.16.6-testnet → 0.17.0-testnet

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (321) hide show
  1. package/build/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgReceiveEndpointUpg.sol/PendleMsgReceiveEndpointUpg.dbg.json +1 -1
  2. package/build/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgReceiveEndpointUpg.sol/PendleMsgReceiveEndpointUpg.json +2 -2
  3. package/build/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgReceiverAppUpg.sol/PendleMsgReceiverAppUpg.dbg.json +1 -1
  4. package/build/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgSendEndpointUpg.sol/PendleMsgSendEndpointUpg.dbg.json +1 -1
  5. package/build/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgSendEndpointUpg.sol/PendleMsgSendEndpointUpg.json +2 -2
  6. package/build/artifacts/contracts/LiquidityMining/CrossChainMsg/PendleMsgSenderAppUpg.sol/PendleMsgSenderAppUpg.dbg.json +1 -1
  7. package/build/artifacts/contracts/LiquidityMining/FeeDistributor/EpochResultManager.sol/EpochResultManager.dbg.json +1 -1
  8. package/build/artifacts/contracts/LiquidityMining/FeeDistributor/PendleFeeDistributor.sol/PendleFeeDistributor.dbg.json +1 -1
  9. package/build/artifacts/contracts/LiquidityMining/FeeDistributor/PendleFeeDistributor.sol/PendleFeeDistributor.json +2 -2
  10. package/build/artifacts/contracts/LiquidityMining/FeeDistributor/PendleFeeDistributorFactory.sol/PendleFeeDistributorFactory.dbg.json +1 -1
  11. package/build/artifacts/contracts/LiquidityMining/FeeDistributor/PendleFeeDistributorFactory.sol/PendleFeeDistributorFactory.json +2 -2
  12. package/build/artifacts/contracts/LiquidityMining/GaugeController/PendleGaugeControllerBaseUpg.sol/PendleGaugeControllerBaseUpg.dbg.json +1 -1
  13. package/build/artifacts/contracts/LiquidityMining/GaugeController/PendleGaugeControllerMainchainUpg.sol/PendleGaugeControllerMainchainUpg.dbg.json +1 -1
  14. package/build/artifacts/contracts/LiquidityMining/GaugeController/PendleGaugeControllerMainchainUpg.sol/PendleGaugeControllerMainchainUpg.json +2 -2
  15. package/build/artifacts/contracts/LiquidityMining/GaugeController/PendleGaugeControllerSidechainUpg.sol/PendleGaugeControllerSidechainUpg.dbg.json +1 -1
  16. package/build/artifacts/contracts/LiquidityMining/GaugeController/PendleGaugeControllerSidechainUpg.sol/PendleGaugeControllerSidechainUpg.json +2 -2
  17. package/build/artifacts/contracts/LiquidityMining/VotingController/PendleVotingControllerUpg.sol/PendleVotingControllerUpg.dbg.json +1 -1
  18. package/build/artifacts/contracts/LiquidityMining/VotingController/PendleVotingControllerUpg.sol/PendleVotingControllerUpg.json +2 -2
  19. package/build/artifacts/contracts/LiquidityMining/VotingController/VotingControllerStorageUpg.sol/VotingControllerStorageUpg.dbg.json +1 -1
  20. package/build/artifacts/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleMainchain.sol/VotingEscrowPendleMainchain.dbg.json +1 -1
  21. package/build/artifacts/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleMainchain.sol/VotingEscrowPendleMainchain.json +2 -2
  22. package/build/artifacts/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleSidechain.sol/VotingEscrowPendleSidechain.dbg.json +1 -1
  23. package/build/artifacts/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleSidechain.sol/VotingEscrowPendleSidechain.json +16 -5
  24. package/build/artifacts/contracts/LiquidityMining/VotingEscrow/VotingEscrowTokenBase.sol/VotingEscrowTokenBase.dbg.json +1 -1
  25. package/build/artifacts/contracts/LiquidityMining/VotingEscrow/VotingEscrowTokenBase.sol/VotingEscrowTokenBase.json +0 -13
  26. package/build/artifacts/contracts/LiquidityMining/libraries/VeBalanceLib.sol/VeBalanceLib.dbg.json +1 -1
  27. package/build/artifacts/contracts/LiquidityMining/libraries/VeBalanceLib.sol/VeBalanceLib.json +2 -2
  28. package/build/artifacts/contracts/LiquidityMining/libraries/VeHistoryLib.sol/CheckpointHelper.dbg.json +1 -1
  29. package/build/artifacts/contracts/LiquidityMining/libraries/VeHistoryLib.sol/CheckpointHelper.json +2 -2
  30. package/build/artifacts/contracts/LiquidityMining/libraries/VeHistoryLib.sol/Checkpoints.dbg.json +1 -1
  31. package/build/artifacts/contracts/LiquidityMining/libraries/VeHistoryLib.sol/Checkpoints.json +2 -2
  32. package/build/artifacts/contracts/core/BulkSeller/BulkSeller.sol/BulkSeller.dbg.json +1 -1
  33. package/build/artifacts/contracts/core/BulkSeller/BulkSeller.sol/BulkSeller.json +2 -15
  34. package/build/artifacts/contracts/core/BulkSeller/BulkSellerFactory.sol/BulkSellerFactory.dbg.json +1 -1
  35. package/build/artifacts/contracts/core/BulkSeller/BulkSellerFactory.sol/BulkSellerFactory.json +2 -2
  36. package/build/artifacts/contracts/core/BulkSeller/BulkSellerMathCore.sol/BulkSellerMathCore.dbg.json +1 -1
  37. package/build/artifacts/contracts/core/BulkSeller/BulkSellerMathCore.sol/BulkSellerMathCore.json +2 -2
  38. package/build/artifacts/contracts/core/Market/MarketMathCore.sol/MarketMathCore.dbg.json +1 -1
  39. package/build/artifacts/contracts/core/Market/MarketMathCore.sol/MarketMathCore.json +2 -2
  40. package/build/artifacts/contracts/core/Market/OracleLib.sol/OracleLib.dbg.json +1 -1
  41. package/build/artifacts/contracts/core/Market/OracleLib.sol/OracleLib.json +2 -2
  42. package/build/artifacts/contracts/core/Market/PendleGauge.sol/PendleGauge.dbg.json +1 -1
  43. package/build/artifacts/contracts/core/Market/PendleMarket.sol/PendleMarket.dbg.json +1 -1
  44. package/build/artifacts/contracts/core/Market/PendleMarket.sol/PendleMarket.json +25 -13
  45. package/build/artifacts/contracts/core/Market/PendleMarketFactory.sol/PendleMarketFactory.dbg.json +1 -1
  46. package/build/artifacts/contracts/core/Market/PendleMarketFactory.sol/PendleMarketFactory.json +221 -50
  47. package/build/artifacts/contracts/core/StandardizedYield/PYIndex.sol/PYIndexLib.dbg.json +1 -1
  48. package/build/artifacts/contracts/core/StandardizedYield/PYIndex.sol/PYIndexLib.json +2 -2
  49. package/build/artifacts/contracts/core/StandardizedYield/SYBase.sol/SYBase.dbg.json +1 -1
  50. package/build/artifacts/contracts/core/StandardizedYield/SYBase.sol/SYBase.json +141 -0
  51. package/build/artifacts/contracts/core/StandardizedYield/SYBaseWithRewards.sol/SYBaseWithRewards.dbg.json +1 -1
  52. package/build/artifacts/contracts/core/StandardizedYield/SYBaseWithRewards.sol/SYBaseWithRewards.json +141 -0
  53. package/build/artifacts/contracts/core/StandardizedYield/implementations/BenQi/PendleQiTokenHelper.sol/PendleQiTokenHelper.dbg.json +1 -1
  54. package/build/artifacts/contracts/core/StandardizedYield/implementations/BenQi/PendleQiTokenHelper.sol/PendleQiTokenHelper.json +2 -2
  55. package/build/artifacts/contracts/core/StandardizedYield/implementations/BenQi/PendleQiTokenSY.sol/PendleQiTokenSY.dbg.json +1 -1
  56. package/build/artifacts/contracts/core/StandardizedYield/implementations/BenQi/PendleQiTokenSY.sol/PendleQiTokenSY.json +143 -2
  57. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/PendleCurveFraxUsdcSY.sol/PendleCurveFraxUsdcSY.dbg.json +4 -0
  58. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/PendleCurveFraxUsdcSY.sol/PendleCurveFraxUsdcSY.json +1144 -0
  59. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/PendleCurveUsdd3CrvSY.sol/PendleCurveUsdd3CrvSY.dbg.json +4 -0
  60. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/PendleCurveUsdd3CrvSY.sol/PendleCurveUsdd3CrvSY.json +1209 -0
  61. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/base/Curve3CrvPoolHelper.sol/Curve3CrvPoolHelper.dbg.json +4 -0
  62. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/base/Curve3CrvPoolHelper.sol/Curve3CrvPoolHelper.json +10 -0
  63. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/base/CurveFraxUsdcPoolHelper.sol/CurveFraxUsdcPoolHelper.dbg.json +1 -1
  64. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/base/CurveFraxUsdcPoolHelper.sol/CurveFraxUsdcPoolHelper.json +3 -82
  65. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/base/CurveUsdd3CrvPoolHelper.sol/CurveUsdd3CrvPoolHelper.dbg.json +4 -0
  66. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/base/CurveUsdd3CrvPoolHelper.sol/CurveUsdd3CrvPoolHelper.json +10 -0
  67. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/base/PendleConvexLPSY.sol/PendleConvexLPSY.dbg.json +4 -0
  68. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/{ConvexCurveLP → base}/PendleConvexLPSY.sol/PendleConvexLPSY.json +142 -1
  69. package/build/artifacts/contracts/core/StandardizedYield/implementations/PendleLooksStakingSY.sol/PendleLooksStakingSY.dbg.json +4 -0
  70. package/build/artifacts/contracts/core/StandardizedYield/implementations/PendleLooksStakingSY.sol/PendleLooksStakingSY.json +997 -0
  71. package/build/artifacts/contracts/core/StandardizedYield/implementations/PendleWstEthSY.sol/PendleWstEthSY.dbg.json +1 -1
  72. package/build/artifacts/contracts/core/StandardizedYield/implementations/PendleWstEthSY.sol/PendleWstEthSY.json +143 -2
  73. package/build/artifacts/contracts/core/YieldContracts/InterestManagerYT.sol/InterestManagerYT.dbg.json +1 -1
  74. package/build/artifacts/contracts/core/YieldContracts/PendlePrincipalToken.sol/PendlePrincipalToken.dbg.json +1 -1
  75. package/build/artifacts/contracts/core/YieldContracts/PendlePrincipalToken.sol/PendlePrincipalToken.json +2 -2
  76. package/build/artifacts/contracts/core/YieldContracts/PendleYieldContractFactory.sol/PendleYieldContractFactory.dbg.json +1 -1
  77. package/build/artifacts/contracts/core/YieldContracts/PendleYieldContractFactory.sol/PendleYieldContractFactory.json +83 -10
  78. package/build/artifacts/contracts/core/YieldContracts/PendleYieldToken.sol/PendleYieldToken.dbg.json +1 -1
  79. package/build/artifacts/contracts/core/YieldContracts/PendleYieldToken.sol/PendleYieldToken.json +35 -4
  80. package/build/artifacts/contracts/core/erc20/PendleERC20.sol/PendleERC20.dbg.json +1 -1
  81. package/build/artifacts/contracts/core/erc20/PendleERC20.sol/PendleERC20.json +2 -2
  82. package/build/artifacts/contracts/core/erc20/PendleERC20Permit.sol/PendleERC20Permit.dbg.json +1 -1
  83. package/build/artifacts/contracts/core/erc20/PendleERC20Permit.sol/PendleERC20Permit.json +2 -2
  84. package/build/artifacts/contracts/core/libraries/BaseSplitCodeFactory.sol/BaseSplitCodeFactory.dbg.json +1 -1
  85. package/build/artifacts/contracts/core/libraries/BaseSplitCodeFactory.sol/BaseSplitCodeFactory.json +3 -38
  86. package/build/artifacts/contracts/core/libraries/BaseSplitCodeFactory.sol/CodeDeployer.dbg.json +1 -1
  87. package/build/artifacts/contracts/core/libraries/BaseSplitCodeFactory.sol/CodeDeployer.json +2 -2
  88. package/build/artifacts/contracts/core/libraries/BoringOwnableUpgradeable.sol/BoringOwnableUpgradeable.dbg.json +1 -1
  89. package/build/artifacts/contracts/core/libraries/BoringOwnableUpgradeable.sol/BoringOwnableUpgradeableData.dbg.json +1 -1
  90. package/build/artifacts/contracts/core/libraries/BoringOwnableUpgradeable.sol/BoringOwnableUpgradeableData.json +2 -2
  91. package/build/artifacts/contracts/core/libraries/Errors.sol/Errors.dbg.json +1 -1
  92. package/build/artifacts/contracts/core/libraries/Errors.sol/Errors.json +105 -31
  93. package/build/artifacts/contracts/interfaces/ConvexCurve/IBooster.sol/IBooster.dbg.json +1 -1
  94. package/build/artifacts/contracts/interfaces/ConvexCurve/IBooster.sol/IBooster.json +1 -1
  95. package/build/artifacts/contracts/interfaces/Curve/ICrvPool.sol/ICrvPool.dbg.json +1 -1
  96. package/build/artifacts/contracts/interfaces/Curve/ICrvPool.sol/ICrvPool.json +14 -7
  97. package/build/artifacts/contracts/interfaces/Curve/ITriCrvPool.sol/ITriCrvPool.dbg.json +4 -0
  98. package/build/artifacts/contracts/interfaces/Curve/ITriCrvPool.sol/ITriCrvPool.json +213 -0
  99. package/build/artifacts/contracts/interfaces/IERC4626.sol/IERC4626.dbg.json +1 -1
  100. package/build/artifacts/contracts/interfaces/IERC4626.sol/IERC4626.json +1 -1
  101. package/build/artifacts/contracts/interfaces/ILooksFeeSharing.sol/ILooksFeeSharing.dbg.json +4 -0
  102. package/build/artifacts/contracts/interfaces/ILooksFeeSharing.sol/ILooksFeeSharing.json +30 -0
  103. package/build/artifacts/contracts/interfaces/ILooksStaking.sol/ILooksStaking.dbg.json +4 -0
  104. package/build/artifacts/contracts/interfaces/ILooksStaking.sol/ILooksStaking.json +76 -0
  105. package/build/artifacts/contracts/interfaces/IPActionAddRemoveLiq.sol/IPActionAddRemoveLiq.dbg.json +1 -1
  106. package/build/artifacts/contracts/interfaces/IPActionAddRemoveLiq.sol/IPActionAddRemoveLiq.json +8 -8
  107. package/build/artifacts/contracts/interfaces/IPActionMintRedeem.sol/IPActionMintRedeem.dbg.json +1 -1
  108. package/build/artifacts/contracts/interfaces/IPActionMintRedeem.sol/IPActionMintRedeem.json +18 -18
  109. package/build/artifacts/contracts/interfaces/IPActionSwapPT.sol/IPActionSwapPT.dbg.json +1 -1
  110. package/build/artifacts/contracts/interfaces/IPActionSwapPTYT.sol/IPActionSwapPTYT.dbg.json +1 -1
  111. package/build/artifacts/contracts/interfaces/IPActionSwapYT.sol/IPActionSwapYT.dbg.json +1 -1
  112. package/build/artifacts/contracts/interfaces/IPActionSwapYT.sol/IPActionSwapYT.json +2 -2
  113. package/build/artifacts/contracts/interfaces/IPAllAction.sol/IPAllAction.dbg.json +1 -1
  114. package/build/artifacts/contracts/interfaces/IPAllAction.sol/IPAllAction.json +28 -28
  115. package/build/artifacts/contracts/interfaces/IPBulkSeller.sol/IPBulkSeller.dbg.json +1 -1
  116. package/build/artifacts/contracts/interfaces/IPBulkSellerFactory.sol/IPBulkSellerFactory.dbg.json +1 -1
  117. package/build/artifacts/contracts/interfaces/IPMarket.sol/IPMarket.dbg.json +1 -1
  118. package/build/artifacts/contracts/interfaces/IPMarket.sol/IPMarket.json +17 -5
  119. package/build/artifacts/contracts/interfaces/IPMarketFactory.sol/IPMarketFactory.dbg.json +1 -1
  120. package/build/artifacts/contracts/interfaces/IPMarketFactory.sol/IPMarketFactory.json +50 -19
  121. package/build/artifacts/contracts/interfaces/IPMsgSendEndpoint.sol/IPMsgSendEndpoint.dbg.json +1 -1
  122. package/build/artifacts/contracts/interfaces/IPMsgSendEndpoint.sol/IPMsgSendEndpoint.json +1 -1
  123. package/build/artifacts/contracts/interfaces/IPVotingController.sol/IPVotingController.dbg.json +1 -1
  124. package/build/artifacts/contracts/interfaces/IPVotingEscrowMainchain.sol/IPVotingEscrowMainchain.dbg.json +1 -1
  125. package/build/artifacts/contracts/interfaces/IPYieldContractFactory.sol/IPYieldContractFactory.dbg.json +1 -1
  126. package/build/artifacts/contracts/interfaces/IPYieldContractFactory.sol/IPYieldContractFactory.json +7 -7
  127. package/build/artifacts/contracts/interfaces/IPYieldToken.sol/IPYieldToken.dbg.json +1 -1
  128. package/build/artifacts/contracts/interfaces/IPYieldToken.sol/IPYieldToken.json +13 -0
  129. package/build/artifacts/contracts/interfaces/IStandardizedYield.sol/IStandardizedYield.dbg.json +1 -1
  130. package/build/artifacts/contracts/offchain-helpers/BaseSplitCodeFactoryContract.sol/BaseSplitCodeFactoryContract.dbg.json +1 -1
  131. package/build/artifacts/contracts/offchain-helpers/BaseSplitCodeFactoryContract.sol/BaseSplitCodeFactoryContract.json +2 -2
  132. package/build/artifacts/contracts/offchain-helpers/BulkSellerOffchain.sol/BulkSellerOffchain.dbg.json +1 -1
  133. package/build/artifacts/contracts/offchain-helpers/BulkSellerOffchain.sol/BulkSellerOffchain.json +58 -2
  134. package/build/artifacts/contracts/offchain-helpers/MarketMathStatic.sol/MarketMathStatic.dbg.json +1 -1
  135. package/build/artifacts/contracts/offchain-helpers/MarketMathStatic.sol/MarketMathStatic.json +2 -46
  136. package/build/artifacts/contracts/offchain-helpers/RouterStatic.sol/RouterStatic.dbg.json +1 -1
  137. package/build/artifacts/contracts/offchain-helpers/RouterStatic.sol/RouterStatic.json +62 -62
  138. package/build/artifacts/contracts/router/ActionAddRemoveLiq.sol/ActionAddRemoveLiq.dbg.json +1 -1
  139. package/build/artifacts/contracts/router/ActionAddRemoveLiq.sol/ActionAddRemoveLiq.json +11 -11
  140. package/build/artifacts/contracts/router/ActionCallback.sol/ActionCallback.dbg.json +1 -1
  141. package/build/artifacts/contracts/router/ActionCallback.sol/ActionCallback.json +2 -2
  142. package/build/artifacts/contracts/router/ActionMintRedeem.sol/ActionMintRedeem.dbg.json +1 -1
  143. package/build/artifacts/contracts/router/ActionMintRedeem.sol/ActionMintRedeem.json +20 -20
  144. package/build/artifacts/contracts/router/ActionMisc.sol/ActionMisc.dbg.json +1 -1
  145. package/build/artifacts/contracts/router/ActionMisc.sol/ActionMisc.json +2 -2
  146. package/build/artifacts/contracts/router/ActionSwapPT.sol/ActionSwapPT.dbg.json +1 -1
  147. package/build/artifacts/contracts/router/ActionSwapPT.sol/ActionSwapPT.json +2 -2
  148. package/build/artifacts/contracts/router/ActionSwapPTYT.sol/ActionSwapPTYT.dbg.json +1 -1
  149. package/build/artifacts/contracts/router/ActionSwapPTYT.sol/ActionSwapPTYT.json +3 -3
  150. package/build/artifacts/contracts/router/ActionSwapYT.sol/ActionSwapYT.dbg.json +1 -1
  151. package/build/artifacts/contracts/router/ActionSwapYT.sol/ActionSwapYT.json +4 -4
  152. package/build/artifacts/contracts/router/PendleRouter.sol/PendleRouter.dbg.json +1 -1
  153. package/build/artifacts/contracts/router/PendleRouter.sol/PendleRouter.json +2 -186
  154. package/build/artifacts/contracts/router/base/ActionBaseMintRedeem.sol/ActionBaseMintRedeem.dbg.json +1 -1
  155. package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtInLib.dbg.json +1 -1
  156. package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtInLib.json +2 -2
  157. package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtOutLib.dbg.json +1 -1
  158. package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtOutLib.json +2 -2
  159. package/build/artifacts/contracts/router/kyberswap/AggregationRouterHelper.sol/AggregationRouterHelper.dbg.json +1 -1
  160. package/build/artifacts/contracts/router/kyberswap/AggregationRouterHelper.sol/AggregationRouterHelper.json +2 -2
  161. package/build/artifacts/contracts/router/kyberswap/KyberSwapHelper.sol/KyberSwapHelper.dbg.json +1 -1
  162. package/contracts/LiquidityMining/CrossChainMsg/PendleMsgSenderAppUpg.sol +1 -1
  163. package/contracts/LiquidityMining/VotingController/PendleVotingControllerUpg.sol +3 -6
  164. package/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleMainchain.sol +7 -4
  165. package/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleSidechain.sol +10 -5
  166. package/contracts/LiquidityMining/VotingEscrow/VotingEscrowTokenBase.sol +1 -4
  167. package/contracts/LiquidityMining/libraries/VeHistoryLib.sol +0 -5
  168. package/contracts/core/BulkSeller/BulkSeller.sol +0 -5
  169. package/contracts/core/BulkSeller/BulkSellerFactory.sol +7 -6
  170. package/contracts/core/Market/MarketMathCore.sol +52 -11
  171. package/contracts/core/Market/PendleMarket.sol +35 -22
  172. package/contracts/core/Market/PendleMarketFactory.sol +67 -35
  173. package/contracts/core/StandardizedYield/SYBase.sol +26 -3
  174. package/contracts/core/StandardizedYield/SYBaseWithRewards.sol +3 -1
  175. package/contracts/core/StandardizedYield/implementations/Convex/PendleCurveFraxUsdcSY.sol +102 -0
  176. package/contracts/core/StandardizedYield/implementations/Convex/PendleCurveUsdd3CrvSY.sol +160 -0
  177. package/contracts/core/StandardizedYield/implementations/Convex/README.md +29 -0
  178. package/contracts/core/StandardizedYield/implementations/Convex/base/Curve3CrvPoolHelper.sol +215 -0
  179. package/contracts/core/StandardizedYield/implementations/Convex/base/CurveFraxUsdcPoolHelper.sol +46 -26
  180. package/contracts/core/StandardizedYield/implementations/Convex/base/CurveUsdd3CrvPoolHelper.sol +152 -0
  181. package/contracts/core/StandardizedYield/implementations/Convex/{ConvexCurveLP → base}/PendleConvexLPSY.sol +0 -0
  182. package/contracts/core/StandardizedYield/implementations/PendleLooksStakingSY.sol +128 -0
  183. package/contracts/core/YieldContracts/PendlePrincipalToken.sol +3 -3
  184. package/contracts/core/YieldContracts/PendleYieldContractFactory.sol +30 -12
  185. package/contracts/core/YieldContracts/PendleYieldToken.sol +79 -22
  186. package/contracts/core/erc20/PendleERC20.sol +4 -7
  187. package/contracts/core/libraries/BaseSplitCodeFactory.sol +1 -1
  188. package/contracts/core/libraries/BoringOwnableUpgradeable.sol +1 -1
  189. package/contracts/core/libraries/Errors.sol +12 -2
  190. package/contracts/interfaces/ConvexCurve/IBooster.sol +1 -1
  191. package/contracts/interfaces/Curve/ICrvPool.sol +3 -4
  192. package/contracts/interfaces/Curve/ITriCrvPool.sol +41 -0
  193. package/contracts/interfaces/IERC4626.sol +1 -1
  194. package/contracts/interfaces/ILooksFeeSharing.sol +5 -0
  195. package/contracts/interfaces/ILooksStaking.sol +13 -0
  196. package/contracts/interfaces/IPActionAddRemoveLiq.sol +4 -4
  197. package/contracts/interfaces/IPActionMintRedeem.sol +8 -8
  198. package/contracts/interfaces/IPActionSwapYT.sol +2 -2
  199. package/contracts/interfaces/IPMarket.sol +20 -4
  200. package/contracts/interfaces/IPMarketFactory.sol +15 -5
  201. package/contracts/interfaces/IPMsgSendEndpoint.sol +1 -1
  202. package/contracts/interfaces/IPYieldContractFactory.sol +2 -2
  203. package/contracts/interfaces/IPYieldToken.sol +2 -0
  204. package/contracts/interfaces/IStandardizedYield.sol +15 -10
  205. package/contracts/offchain-helpers/BulkSellerOffchain.sol +17 -8
  206. package/contracts/offchain-helpers/MarketMathStatic.sol +35 -96
  207. package/contracts/offchain-helpers/RouterStatic.sol +8 -6
  208. package/contracts/router/ActionAddRemoveLiq.sol +102 -10
  209. package/contracts/router/ActionMintRedeem.sol +44 -4
  210. package/contracts/router/ActionSwapPT.sol +41 -11
  211. package/contracts/router/ActionSwapPTYT.sol +32 -7
  212. package/contracts/router/ActionSwapYT.sol +49 -33
  213. package/contracts/router/PendleRouter.sol +3 -11
  214. package/contracts/router/base/MarketApproxLib.sol +52 -18
  215. package/deployments/43113-core.json +18 -14
  216. package/deployments/43113-markets/USDC-FEB-2ND.json +10 -0
  217. package/deployments/43113-markets/WETH-FEB-2ND.json +10 -0
  218. package/deployments/43113-testenv.json +1 -2
  219. package/package.json +5 -5
  220. package/typechain-types/ActionAddRemoveLiq.ts +18 -18
  221. package/typechain-types/ActionMintRedeem.ts +30 -30
  222. package/typechain-types/ActionSwapPTYT.ts +5 -5
  223. package/typechain-types/ActionSwapYT.ts +5 -5
  224. package/typechain-types/BulkSeller.ts +0 -19
  225. package/typechain-types/BulkSellerOffchain.ts +74 -0
  226. package/typechain-types/IBooster.ts +9 -3
  227. package/typechain-types/ICrvPool.ts +4 -9
  228. package/typechain-types/IERC4626.ts +5 -5
  229. package/typechain-types/IPActionAddRemoveLiq.ts +13 -13
  230. package/typechain-types/IPActionMintRedeem.ts +30 -30
  231. package/typechain-types/IPActionSwapYT.ts +5 -5
  232. package/typechain-types/IPAllAction.ts +48 -48
  233. package/typechain-types/IPMarket.ts +26 -16
  234. package/typechain-types/IPMarketFactory.ts +70 -37
  235. package/typechain-types/IPMsgSendEndpoint.ts +1 -1
  236. package/typechain-types/IPYieldContractFactory.ts +11 -11
  237. package/typechain-types/IPYieldToken.ts +21 -0
  238. package/typechain-types/MarketMathStatic.ts +0 -67
  239. package/typechain-types/PendleConvexLPSY.ts +204 -0
  240. package/typechain-types/PendleMarket.ts +26 -16
  241. package/typechain-types/PendleMarketFactory.ts +316 -92
  242. package/typechain-types/PendleQiTokenSY.ts +204 -0
  243. package/typechain-types/PendleRouter.ts +3 -287
  244. package/typechain-types/PendleWstEthSY.ts +204 -0
  245. package/typechain-types/PendleYieldContractFactory.ts +63 -18
  246. package/typechain-types/PendleYieldToken.ts +42 -0
  247. package/typechain-types/RouterStatic.ts +2 -2
  248. package/typechain-types/SYBase.ts +204 -0
  249. package/typechain-types/SYBaseWithRewards.ts +204 -0
  250. package/typechain-types/VotingEscrowPendleSidechain.ts +8 -8
  251. package/typechain-types/VotingEscrowTokenBase.ts +0 -21
  252. package/typechain-types/factories/ActionAddRemoveLiq__factory.ts +10 -10
  253. package/typechain-types/factories/ActionCallback__factory.ts +1 -1
  254. package/typechain-types/factories/ActionMintRedeem__factory.ts +19 -19
  255. package/typechain-types/factories/ActionMisc__factory.ts +1 -1
  256. package/typechain-types/factories/ActionSwapPTYT__factory.ts +2 -2
  257. package/typechain-types/factories/ActionSwapPT__factory.ts +1 -1
  258. package/typechain-types/factories/ActionSwapYT__factory.ts +3 -3
  259. package/typechain-types/factories/AggregationRouterHelper__factory.ts +1 -1
  260. package/typechain-types/factories/BaseSplitCodeFactoryContract__factory.ts +1 -1
  261. package/typechain-types/factories/BoringOwnableUpgradeableData__factory.ts +1 -1
  262. package/typechain-types/factories/BulkSellerFactory__factory.ts +1 -1
  263. package/typechain-types/factories/BulkSellerOffchain__factory.ts +57 -1
  264. package/typechain-types/factories/BulkSeller__factory.ts +1 -14
  265. package/typechain-types/factories/Errors__factory.ts +104 -30
  266. package/typechain-types/factories/IBooster__factory.ts +1 -1
  267. package/typechain-types/factories/ICrvPool__factory.ts +14 -7
  268. package/typechain-types/factories/IERC4626__factory.ts +1 -1
  269. package/typechain-types/factories/IPActionAddRemoveLiq__factory.ts +8 -8
  270. package/typechain-types/factories/IPActionMintRedeem__factory.ts +18 -18
  271. package/typechain-types/factories/IPActionSwapYT__factory.ts +2 -2
  272. package/typechain-types/factories/IPAllAction__factory.ts +28 -28
  273. package/typechain-types/factories/IPMarketFactory__factory.ts +50 -19
  274. package/typechain-types/factories/IPMarket__factory.ts +17 -5
  275. package/typechain-types/factories/IPMsgSendEndpoint__factory.ts +1 -1
  276. package/typechain-types/factories/IPYieldContractFactory__factory.ts +7 -7
  277. package/typechain-types/factories/IPYieldToken__factory.ts +13 -0
  278. package/typechain-types/factories/MarketMathStatic__factory.ts +1 -45
  279. package/typechain-types/factories/OracleLib__factory.ts +1 -1
  280. package/typechain-types/factories/PendleConvexLPSY__factory.ts +141 -0
  281. package/typechain-types/factories/PendleCurveFraxUsdcSY__factory.ts +1 -1
  282. package/typechain-types/factories/PendleCurveUsdd3CrvSY__factory.ts +1 -1
  283. package/typechain-types/factories/PendleERC20Permit__factory.ts +1 -1
  284. package/typechain-types/factories/PendleERC20__factory.ts +1 -1
  285. package/typechain-types/factories/PendleFeeDistributorFactory__factory.ts +1 -1
  286. package/typechain-types/factories/PendleFeeDistributor__factory.ts +1 -1
  287. package/typechain-types/factories/PendleGaugeControllerMainchainUpg__factory.ts +1 -1
  288. package/typechain-types/factories/PendleGaugeControllerSidechainUpg__factory.ts +1 -1
  289. package/typechain-types/factories/PendleLooksStakingSY__factory.ts +1 -1
  290. package/typechain-types/factories/PendleMarketFactory__factory.ts +220 -49
  291. package/typechain-types/factories/PendleMarket__factory.ts +18 -6
  292. package/typechain-types/factories/PendleMsgReceiveEndpointUpg__factory.ts +1 -1
  293. package/typechain-types/factories/PendleMsgSendEndpointUpg__factory.ts +1 -1
  294. package/typechain-types/factories/PendlePrincipalToken__factory.ts +1 -1
  295. package/typechain-types/factories/PendleQiTokenHelper__factory.ts +1 -1
  296. package/typechain-types/factories/PendleQiTokenSY__factory.ts +142 -1
  297. package/typechain-types/factories/PendleRouter__factory.ts +1 -185
  298. package/typechain-types/factories/PendleVotingControllerUpg__factory.ts +1 -1
  299. package/typechain-types/factories/PendleWstEthSY__factory.ts +142 -1
  300. package/typechain-types/factories/PendleYieldContractFactory__factory.ts +82 -9
  301. package/typechain-types/factories/PendleYieldToken__factory.ts +38 -3
  302. package/typechain-types/factories/RouterStatic__factory.ts +3 -3
  303. package/typechain-types/factories/SYBaseWithRewards__factory.ts +141 -0
  304. package/typechain-types/factories/SYBase__factory.ts +141 -0
  305. package/typechain-types/factories/VotingEscrowPendleMainchain__factory.ts +1 -1
  306. package/typechain-types/factories/VotingEscrowPendleSidechain__factory.ts +15 -4
  307. package/typechain-types/factories/VotingEscrowTokenBase__factory.ts +0 -13
  308. package/typechain-types/hardhat.d.ts +0 -36
  309. package/typechain-types/index.ts +0 -6
  310. package/build/artifacts/contracts/core/StandardizedYield/implementations/Convex/ConvexCurveLP/PendleConvexLPSY.sol/PendleConvexLPSY.dbg.json +0 -4
  311. package/build/artifacts/contracts/offchain-helpers/ImplicitSwapfeeContract.sol/ImplicitSwapfeeContract.dbg.json +0 -4
  312. package/build/artifacts/contracts/offchain-helpers/ImplicitSwapfeeContract.sol/ImplicitSwapfeeContract.json +0 -182
  313. package/contracts/offchain-helpers/ImplicitSwapfeeContract.sol +0 -30
  314. package/deployments/43113-markets/QIWBTC-3RD-FEB.json +0 -11
  315. package/deployments/43113-markets/benqi-market-QI-AVAX-FEB-2ND.json +0 -9
  316. package/deployments/43113-markets/benqi-market-QI-USDC-FEB-2ND.json +0 -8
  317. package/deployments/43113-markets/benqi-market-QI-WETH-DEC-1ST.json +0 -9
  318. package/deployments/80001-core.json +0 -16
  319. package/deployments/80001-markets/benqi-market-QI-USDC-FEB-2ND.json +0 -8
  320. package/deployments/80001-markets/benqi-market-QI-WETH-DEC-1ST.json +0 -8
  321. package/deployments/80001-testenv.json +0 -22
package/build/artifacts/contracts/router/base/MarketApproxLib.sol/MarketApproxPtOutLib.json CHANGED
@@ -3,8 +3,8 @@
3
3
  "contractName": "MarketApproxPtOutLib",
4
4
  "sourceName": "contracts/router/base/MarketApproxLib.sol",
5
5
  "abi": [],
6
- "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122020b42fc1e4efe2beb2d7fb6d9f56632b4a3753454003d7ffbdcec17e0f773ddf64736f6c63430008110033",
7
- "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122020b42fc1e4efe2beb2d7fb6d9f56632b4a3753454003d7ffbdcec17e0f773ddf64736f6c63430008110033",
6
+ "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220ec3a2d7111a771f6413aaf61b944b8df7d2f0d055a9fbaf8e22824082108b1a564736f6c63430008110033",
7
+ "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220ec3a2d7111a771f6413aaf61b944b8df7d2f0d055a9fbaf8e22824082108b1a564736f6c63430008110033",
8
8
  "linkReferences": {},
9
9
  "deployedLinkReferences": {}
10
10
  }
package/build/artifacts/contracts/router/kyberswap/AggregationRouterHelper.sol/AggregationRouterHelper.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/2b91cdb0f0322cf804cfb04c4f0fff73.json"
3
+ "buildInfo": "../../../../build-info/aebe3e4c9f299d318b8295a46c6668f0.json"
4
4
  }
package/build/artifacts/contracts/router/kyberswap/AggregationRouterHelper.sol/AggregationRouterHelper.json CHANGED
@@ -217,8 +217,8 @@
217
217
  "type": "function"
218
218
  }
219
219
  ],
220
- "bytecode": "0x60a0604052306080523480156200001557600080fd5b50600154600160a81b900460ff16158080156200003d575060018054600160a01b900460ff16105b806200007357506200005a306200015860201b620007611760201c565b15801562000073575060018054600160a01b900460ff16145b620000db5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840160405180910390fd5b6001805460ff60a01b1916600160a01b179055801562000109576001805460ff60a81b1916600160a81b1790555b801562000151576001805460ff60a81b191681556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5062000167565b6001600160a01b03163b151590565b608051612b386200019f600039600081816102b6015281816102f6015281816104290152818161046901526104e50152612b386000f3fe6080604052600436106100765760003560e01c8063078dfbe71461007b5780633659cfe61461009d5780634e71e0c8146100bd5780634f1ef286146100d257806352d1902d146100e55780638129fc1c1461010d5780638da5cb5b14610122578063e30c39781461015a578063e4da6f2e1461017a575b600080fd5b34801561008757600080fd5b5061009b6100963660046115fd565b6101a7565b005b3480156100a957600080fd5b5061009b6100b8366004611648565b6102ac565b3480156100c957600080fd5b5061009b610374565b61009b6100e03660046117d9565b61041f565b3480156100f157600080fd5b506100fa6104d8565b6040519081526020015b60405180910390f35b34801561011957600080fd5b5061009b610586565b34801561012e57600080fd5b50600054610142906001600160a01b031681565b6040516001600160a01b039091168152602001610104565b34801561016657600080fd5b50600154610142906001600160a01b031681565b34801561018657600080fd5b5061019a610195366004611835565b6106b4565b60405161010491906118fc565b6000546001600160a01b031633146101da5760405162461bcd60e51b81526004016101d19061190f565b60405180910390fd5b811561028b576001600160a01b0383161515806101f45750805b6102385760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b60448201526064016101d1565b600080546040516001600160a01b0380871693921691600080516020612abc83398151915291a3600080546001600160a01b0385166001600160a01b031991821617909155600180549091169055505050565b600180546001600160a01b0319166001600160a01b0385161790555b505050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036102f45760405162461bcd60e51b81526004016101d190611944565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610326610770565b6001600160a01b03161461034c5760405162461bcd60e51b81526004016101d19061197e565b6103558161078c565b60408051600080825260208201909252610371918391906107b6565b50565b6001546001600160a01b03163381146103cf5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e657260448201526064016101d1565b600080546040516001600160a01b0380851693921691600080516020612abc83398151915291a3600080546001600160a01b039092166001600160a01b0319928316179055600180549091169055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036104675760405162461bcd60e51b81526004016101d190611944565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610499610770565b6001600160a01b0316146104bf5760405162461bcd60e51b81526004016101d19061197e565b6104c88261078c565b6104d4828260016107b6565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105735760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b60648201526084016101d1565b50600080516020612a9c83398151915290565b600154600160a81b900460ff16158080156105ac575060018054600160a01b900460ff16105b806105d357506105bb30610761565b1580156105d3575060018054600160a01b900460ff16145b6106365760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016101d1565b6001805460ff60a01b1916600160a01b1790558015610663576001805460ff60a81b1916600160a81b1790555b61066b610921565b8015610371576001805460ff60a81b191681556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a150565b606060006106c560048286886119b8565b6106ce916119e2565b905060008080806106e2886004818c6119b8565b8101906106ef9190611aff565b93509350935093506107028383896109a2565b60405191945092508590610720908690869086908690602401611cce565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152955050505050505b9392505050565b6001600160a01b03163b151590565b600080516020612a9c833981519152546001600160a01b031690565b6000546001600160a01b031633146103715760405162461bcd60e51b81526004016101d19061190f565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107e9576102a783610a72565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610843575060408051601f3d908101601f1916820190925261084091810190611dc9565b60015b6108a65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b60648201526084016101d1565b600080516020612a9c83398151915281146109155760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b60648201526084016101d1565b506102a7838383610b0c565b600154600160a81b900460ff1661098e5760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b60648201526084016101d1565b600080546001600160a01b03191633179055565b6109aa611563565b60e084015160a0850151606091908481036109cc578686935093505050610a6a565b6020821615610a495760408701515115610a285760405162461bcd60e51b815260206004820152601e60248201527f6b796265723a2063616e2774207363616c652069662074616b6520666565000060448201526064016101d1565b610a33878287610b37565b610a3e878388610c92565b935093505050610a6a565b6000610a56878388610dbf565b9050610a63888388610b37565b9450925050505b935093915050565b610a7b81610761565b610add5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016101d1565b600080516020612a9c83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b610b158361105b565b600082511180610b225750805b156102a757610b31838361109b565b50505050565b610b3f611563565b60c084015183610b4f8483611df8565b610b599190611e0f565b60c08601528015801590610b6f575060c0850151155b15610b7c57600160c08601525b60a08501839052604085015151600003610b99578491505061075a565b6000805b866040015151811015610c87576001876040015151610bbc9190611e31565b8103610bf357610bcc8286611e31565b87606001518281518110610be257610be2611e44565b602002602001018181525050610c4a565b858588606001518381518110610c0b57610c0b611e44565b6020026020010151610c1d9190611df8565b610c279190611e0f565b87606001518281518110610c3d57610c3d611e44565b6020026020010181815250505b86606001518181518110610c6057610c60611e44565b602002602001015182610c739190611e5a565b915080610c7f81611e6d565b915050610b9d565b509495945050505050565b6060600084806020019051810190610caa919061201c565b8051519091506000805b82811015610d9257610cc7600184611e31565b8103610cfe57610cd78287611e31565b84602001518281518110610ced57610ced611e44565b602002602001018181525050610d55565b868685602001518381518110610d1657610d16611e44565b6020026020010151610d289190611df8565b610d329190611e0f565b84602001518281518110610d4857610d48611e44565b6020026020010181815250505b83602001518181518110610d6b57610d6b611e44565b602002602001015182610d7e9190611e5a565b915080610d8a81611e6d565b915050610cb4565b5082604051602001610da491906120fe565b60405160208183030381529060405293505050509392505050565b6060600084806020019051810190610dd79190612331565b905083838260600151610dea9190611df8565b610df49190611e0f565b60608201526000805b82515181101561102f57600083600001518281518110610e1f57610e1f611e44565b6020026020010151600081518110610e3957610e39611e44565b6020026020010151905060006008826020015161ffff16901c905060006001866000015151610e689190611e31565b8403610e7b57610e788589611e31565b90505b60ff8216610e9b578251610e9190828b8b6110c9565b908452905061100d565b60ff821660011480610eb0575060ff82166004145b15610ec3578251610e9190828b8b611196565b60011960ff831601610edd578251610e9190828b8b611217565b60021960ff831601610ef7578251610e9190828b8b6110c9565b60041960ff831601610f11578251610e9190828b8b611276565b60051960ff831601610f2b578251610e9190828b8b61133d565b60061960ff831601610f7d5760405162461bcd60e51b815260206004820152601b60248201527a6b796265723a2063616e2774207363616c65206b7962657272667160281b60448201526064016101d1565b60071960ff831601610f97578251610e9190828b8b6113f0565b60081960ff831601610fb1578251610e9190828b8b6110c9565b60405162461bcd60e51b815260206004820152602b60248201527f4167677265676174696f6e4578656375746f723a204465782074797065206e6f60448201526a1d081cdd5c1c1bdc9d195960aa1b60648201526084016101d1565b6110178186611e5a565b9450505050808061102790611e6d565b915050610dfd565b50816040516020016110419190612408565b604051602081830303815290604052925050509392505050565b61106481610a72565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606110c08383604051806060016040528060278152602001612adc6027913961144f565b90505b92915050565b6060600080868060200190518101906110e29190612546565b905085156110f65760808101869052611117565b848482608001516111079190611df8565b6111119190611e0f565b60808201525b80604051602001611174919081516001600160a01b039081168252602080840151821690830152604080840151821690830152606080840151909116908201526080808301519082015260a0918201519181019190915260c00190565b6040516020818303038152906040528160800151925092505094509492505050565b6060600080868060200190518101906111af91906125d4565b905085156111c35760a081018690526111e4565b84848260a001516111d49190611df8565b6111de9190611e0f565b60a08201525b806040516020016111f59190612675565b6040516020818303038152906040528160a00151925092505094509492505050565b6060600080868060200190518101906112309190612722565b905085156112445760a08101869052611265565b84848260a001516112559190611df8565b61125f9190611e0f565b60a08201525b806040516020016111f591906127bf565b60606000808680602001905181019061128f9190612859565b905085156112a357608081018690526112c4565b848482608001516112b49190611df8565b6112be9190611e0f565b60808201525b80604051602001611174919060006101008201905060018060a01b038084511683528060208501511660208401528060408501511660408401528060608501511660608401526080840151608084015260a084015160a08401528060c08501511660c08401525060e0830151151560e083015292915050565b6060600080868060200190518101906113569190612914565b9050851561136a576080810186905261138b565b8484826080015161137b9190611df8565b6113859190611e0f565b60808201525b608081015160405161117491839160200182516001600160a01b03908116825260208085015190830152604080850151821690830152606080850151909116908201526080808401519082015260a0928301519281019290925260c082015260e00190565b6060600080868060200190518101906114099190612953565b9050851561141d576080810186905261143e565b8484826080015161142e9190611df8565b6114389190611e0f565b60808201525b8060405160200161117491906129dd565b606061145a84610761565b6114b55760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016101d1565b600080856001600160a01b0316856040516114d09190612a5f565b600060405180830381855af49150503d806000811461150b576040519150601f19603f3d011682016040523d82523d6000602084013e611510565b606091505b509150915061152082828661152a565b9695505050505050565b6060831561153957508161075a565b8251156115495782518084602001fd5b8160405162461bcd60e51b81526004016101d191906118fc565b60405180610120016040528060006001600160a01b0316815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b03168152602001600081526020016000815260200160008152602001606081525090565b6001600160a01b038116811461037157600080fd5b80356115ea816115ca565b919050565b801515811461037157600080fd5b60008060006060848603121561161257600080fd5b833561161d816115ca565b9250602084013561162d816115ef565b9150604084013561163d816115ef565b809150509250925092565b60006020828403121561165a57600080fd5b813561075a816115ca565b634e487b7160e01b600052604160045260246000fd5b60405161012081016001600160401b038111828210171561169e5761169e611665565b60405290565b60405160a081016001600160401b038111828210171561169e5761169e611665565b604080519081016001600160401b038111828210171561169e5761169e611665565b60405160e081016001600160401b038111828210171561169e5761169e611665565b60405160c081016001600160401b038111828210171561169e5761169e611665565b604051601f8201601f191681016001600160401b038111828210171561175457611754611665565b604052919050565b60006001600160401b0382111561177557611775611665565b50601f01601f191660200190565b600082601f83011261179457600080fd5b81356117a76117a28261175c565b61172c565b8181528460208386010111156117bc57600080fd5b816020850160208301376000918101602001919091529392505050565b600080604083850312156117ec57600080fd5b82356117f7816115ca565b915060208301356001600160401b0381111561181257600080fd5b61181e85828601611783565b9150509250929050565b6001600160a01b03169052565b60008060006040848603121561184a57600080fd5b83356001600160401b038082111561186157600080fd5b818601915086601f83011261187557600080fd5b81358181111561188457600080fd5b87602082850101111561189657600080fd5b6020928301989097509590910135949350505050565b60005b838110156118c75781810151838201526020016118af565b50506000910152565b600081518084526118e88160208601602086016118ac565b601f01601f19169290920160200192915050565b6020815260006110c060208301846118d0565b6020808252818101527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604082015260600190565b6020808252602c90820152600080516020612a7c83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612a7c83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600080858511156119c857600080fd5b838611156119d557600080fd5b5050820193919092039150565b6001600160e01b03198135818116916004851015611a0a5780818660040360031b1b83161692505b505092915050565b60006001600160401b03821115611a2b57611a2b611665565b5060051b60200190565b600082601f830112611a4657600080fd5b81356020611a566117a283611a12565b82815260059290921b84018101918181019086841115611a7557600080fd5b8286015b84811015611a99578035611a8c816115ca565b8352918301918301611a79565b509695505050505050565b600082601f830112611ab557600080fd5b81356020611ac56117a283611a12565b82815260059290921b84018101918181019086841115611ae457600080fd5b8286015b84811015611a995780358352918301918301611ae8565b60008060008060808587031215611b1557600080fd5b8435611b20816115ca565b935060208501356001600160401b0380821115611b3c57600080fd5b908601906101208289031215611b5157600080fd5b611b5961167b565b611b62836115df565b8152611b70602084016115df565b6020820152604083013582811115611b8757600080fd5b611b938a828601611a35565b604083015250606083013582811115611bab57600080fd5b611bb78a828601611aa4565b606083015250611bc9608084016115df565b608082015260a083013560a082015260c083013560c082015260e083013560e08201526101008084013583811115611c0057600080fd5b611c0c8b828701611783565b828401525050809550506040870135915080821115611c2a57600080fd5b611c3688838901611783565b93506060870135915080821115611c4c57600080fd5b50611c5987828801611783565b91505092959194509250565b600081518084526020808501945080840160005b83811015610c875781516001600160a01b031687529582019590820190600101611c79565b600081518084526020808501945080840160005b83811015610c8757815187529582019590820190600101611cb2565b6001600160a01b03851681526080602082018190528451611cf191830190611828565b60006020850151611d0560a0840182611828565b5060408501516101208060c0850152611d226101a0850183611c65565b91506060870151607f19808685030160e0870152611d408483611c9e565b935060808901519150610100611d5881880184611828565b60a08a01518488015260c08a015161014088015260e08a0151610160880152808a015193505080868503016101808701525050611d9582826118d0565b9150508281036040840152611daa81866118d0565b90508281036060840152611dbe81856118d0565b979650505050505050565b600060208284031215611ddb57600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b80820281158282048414176110c3576110c3611de2565b600082611e2c57634e487b7160e01b600052601260045260246000fd5b500490565b818103818111156110c3576110c3611de2565b634e487b7160e01b600052603260045260246000fd5b808201808211156110c3576110c3611de2565b600060018201611e7f57611e7f611de2565b5060010190565b80516115ea816115ca565b600082601f830112611ea257600080fd5b81516020611eb26117a283611a12565b82815260059290921b84018101918181019086841115611ed157600080fd5b8286015b84811015611a99578051611ee8816115ca565b8352918301918301611ed5565b600082601f830112611f0657600080fd5b81516020611f166117a283611a12565b82815260059290921b84018101918181019086841115611f3557600080fd5b8286015b84811015611a995780518352918301918301611f39565b600082601f830112611f6157600080fd5b8151611f6f6117a28261175c565b818152846020838601011115611f8457600080fd5b611f958260208301602087016118ac565b949350505050565b600082601f830112611fae57600080fd5b81516020611fbe6117a283611a12565b82815260059290921b84018101918181019086841115611fdd57600080fd5b8286015b84811015611a995780516001600160401b038111156120005760008081fd5b61200e8986838b0101611f50565b845250918301918301611fe1565b60006020828403121561202e57600080fd5b81516001600160401b038082111561204557600080fd5b9083019060a0828603121561205957600080fd5b6120616116a4565b82518281111561207057600080fd5b61207c87828601611e91565b82525060208301518281111561209157600080fd5b61209d87828601611ef5565b6020830152506040830151828111156120b557600080fd5b6120c187828601611f9d565b604083015250606083015160608201526080830151828111156120e357600080fd5b6120ef87828601611f50565b60808301525095945050505050565b60006020808352835160a08285015261211a60c0850182611c65565b905081850151601f19808684030160408701526121378383611c9e565b60408801518782038301606089015280518083529194508501925084840190600581901b8501860160005b8281101561218e578487830301845261217c8287516118d0565b95880195938801939150600101612162565b5060608a015160808a015260808a01519650838982030160a08a01526121b481886118d0565b9a9950505050505050505050565b600082601f8301126121d357600080fd5b81516121e16117a282611a12565b808282526020820191508560208460051b870101111561220057600080fd5b602085015b60208460051b8701018110156123275780516001600160401b0381111561222b57600080fd5b8601603f8101881361223c57600080fd5b602081015161224d6117a282611a12565b808282526020820191508a60408460051b860101111561226c57600080fd5b604084015b60408460051b8601018110156123115780516001600160401b0381111561229757600080fd5b60408682018e03603f190112156122ad57600080fd5b6122b56116c6565b868201604001516001600160401b038111156122d057600080fd5b6122e18f604083868c010101611f50565b825250908601606001519061ffff821682146122fc57600080fd5b60208181019290925284529283019201612271565b5086525050602093840193919091019050612205565b5095945050505050565b60006020828403121561234357600080fd5b81516001600160401b038082111561235a57600080fd5b9083019060e0828603121561236e57600080fd5b6123766116e8565b82518281111561238557600080fd5b612391878286016121c2565b8252506123a060208401611e86565b60208201526123b160408401611e86565b6040820152606083015160608201526123cc60808401611e86565b608082015260a083015160a082015260c0830151828111156123ed57600080fd5b6123f987828601611f50565b60c08301525095945050505050565b6020808252825160e0838301528051610100840181905260009291600582811b860161012090810193928501929087019186805b838110156124cb5789870361011f1901855285518051808952908901908989019080861b8a018b01855b828110156124b557601f198c830301845284516040815181855261248c828601826118d0565b91505061ffff8f830151168f85015280935050508c850194508c84019350600181019050612466565b509950505095880195509387019360010161243c565b5050505050508185015191506124e46040850183611828565b604085015191506124f86060850183611828565b606085015160808501526080850151915061251660a0850183611828565b60a085015160c085015260c08501519150601f198482030160e085015261253d81836118d0565b95945050505050565b600060c0828403121561255857600080fd5b61256061170a565b825161256b816115ca565b8152602083015161257b816115ca565b6020820152604083015161258e816115ca565b604082015260608301516125a1816115ca565b60608201526080838101519082015260a0928301519281019290925250919050565b805160ff811681146115ea57600080fd5b600061012082840312156125e757600080fd5b6125ef61167b565b6125f883611e86565b815261260660208401611e86565b602082015261261760408401611e86565b6040820152612628606084016125c3565b6060820152612639608084016125c3565b608082015260a083015160a082015260c083015160c082015260e083015160e082015261010061266a818501611e86565b908201529392505050565b81516001600160a01b039081168252602080840151909116908201526040808301516101208301916126a990840182611828565b5060608301516126be606084018260ff169052565b5060808301516126d3608084018260ff169052565b5060a083015160a083015260c083015160c083015260e083015160e083015261010080840151611a0a82850182611828565b8051600f81900b81146115ea57600080fd5b80516115ea816115ef565b6000610120828403121561273557600080fd5b61273d61167b565b61274683611e86565b815261275460208401611e86565b602082015261276560408401611e86565b604082015261277660608401612705565b606082015261278760808401612705565b608082015260a083015160a082015260c083015160c08201526127ac60e08401612717565b60e082015261010061266a818501612717565b81516001600160a01b039081168252602080840151909116908201526040808301516101208301916127f390840182611828565b5060608301516128086060840182600f0b9052565b50608083015161281d6080840182600f0b9052565b5060a083015160a083015260c083015160c083015260e083015161284560e084018215159052565b506101008381015180151584830152611a0a565b600061010080838503121561286d57600080fd5b604051908101906001600160401b038211818310171561288f5761288f611665565b81604052835191506128a0826115ca565b8181526128af60208501611e86565b60208201526128c060408501611e86565b60408201526128d160608501611e86565b60608201526080840151608082015260a084015160a08201526128f660c08501611e86565b60c082015261290760e08501612717565b60e0820152949350505050565b600060c0828403121561292657600080fd5b61292e61170a565b8251612939816115ca565b815260208381015190820152604083015161258e816115ca565b6000610120828403121561296657600080fd5b61296e61167b565b61297783611e86565b815261298560208401611e86565b602082015261299660408401611e86565b60408201526129a760608401611e86565b60608201526080830151608082015260a083015160a08201526129cc60c08401611e86565b60c08201526127ac60e08401612717565b81516001600160a01b03908116825260208084015190911690820152604080830151610120830191612a1190840182611828565b506060830151612a246060840182611828565b506080830151608083015260a083015160a083015260c0830151612a4b60c0840182611828565b5060e083015161284560e084018215159052565b60008251612a718184602087016118ac565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122013a38974bb7c3dd802c6f679f0e31b10ea8b51b4a05f60d90a8fbb404f5b995f64736f6c63430008110033",
221
- "deployedBytecode": "0x6080604052600436106100765760003560e01c8063078dfbe71461007b5780633659cfe61461009d5780634e71e0c8146100bd5780634f1ef286146100d257806352d1902d146100e55780638129fc1c1461010d5780638da5cb5b14610122578063e30c39781461015a578063e4da6f2e1461017a575b600080fd5b34801561008757600080fd5b5061009b6100963660046115fd565b6101a7565b005b3480156100a957600080fd5b5061009b6100b8366004611648565b6102ac565b3480156100c957600080fd5b5061009b610374565b61009b6100e03660046117d9565b61041f565b3480156100f157600080fd5b506100fa6104d8565b6040519081526020015b60405180910390f35b34801561011957600080fd5b5061009b610586565b34801561012e57600080fd5b50600054610142906001600160a01b031681565b6040516001600160a01b039091168152602001610104565b34801561016657600080fd5b50600154610142906001600160a01b031681565b34801561018657600080fd5b5061019a610195366004611835565b6106b4565b60405161010491906118fc565b6000546001600160a01b031633146101da5760405162461bcd60e51b81526004016101d19061190f565b60405180910390fd5b811561028b576001600160a01b0383161515806101f45750805b6102385760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b60448201526064016101d1565b600080546040516001600160a01b0380871693921691600080516020612abc83398151915291a3600080546001600160a01b0385166001600160a01b031991821617909155600180549091169055505050565b600180546001600160a01b0319166001600160a01b0385161790555b505050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036102f45760405162461bcd60e51b81526004016101d190611944565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610326610770565b6001600160a01b03161461034c5760405162461bcd60e51b81526004016101d19061197e565b6103558161078c565b60408051600080825260208201909252610371918391906107b6565b50565b6001546001600160a01b03163381146103cf5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e657260448201526064016101d1565b600080546040516001600160a01b0380851693921691600080516020612abc83398151915291a3600080546001600160a01b039092166001600160a01b0319928316179055600180549091169055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036104675760405162461bcd60e51b81526004016101d190611944565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610499610770565b6001600160a01b0316146104bf5760405162461bcd60e51b81526004016101d19061197e565b6104c88261078c565b6104d4828260016107b6565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105735760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b60648201526084016101d1565b50600080516020612a9c83398151915290565b600154600160a81b900460ff16158080156105ac575060018054600160a01b900460ff16105b806105d357506105bb30610761565b1580156105d3575060018054600160a01b900460ff16145b6106365760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016101d1565b6001805460ff60a01b1916600160a01b1790558015610663576001805460ff60a81b1916600160a81b1790555b61066b610921565b8015610371576001805460ff60a81b191681556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a150565b606060006106c560048286886119b8565b6106ce916119e2565b905060008080806106e2886004818c6119b8565b8101906106ef9190611aff565b93509350935093506107028383896109a2565b60405191945092508590610720908690869086908690602401611cce565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152955050505050505b9392505050565b6001600160a01b03163b151590565b600080516020612a9c833981519152546001600160a01b031690565b6000546001600160a01b031633146103715760405162461bcd60e51b81526004016101d19061190f565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107e9576102a783610a72565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610843575060408051601f3d908101601f1916820190925261084091810190611dc9565b60015b6108a65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b60648201526084016101d1565b600080516020612a9c83398151915281146109155760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b60648201526084016101d1565b506102a7838383610b0c565b600154600160a81b900460ff1661098e5760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b60648201526084016101d1565b600080546001600160a01b03191633179055565b6109aa611563565b60e084015160a0850151606091908481036109cc578686935093505050610a6a565b6020821615610a495760408701515115610a285760405162461bcd60e51b815260206004820152601e60248201527f6b796265723a2063616e2774207363616c652069662074616b6520666565000060448201526064016101d1565b610a33878287610b37565b610a3e878388610c92565b935093505050610a6a565b6000610a56878388610dbf565b9050610a63888388610b37565b9450925050505b935093915050565b610a7b81610761565b610add5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016101d1565b600080516020612a9c83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b610b158361105b565b600082511180610b225750805b156102a757610b31838361109b565b50505050565b610b3f611563565b60c084015183610b4f8483611df8565b610b599190611e0f565b60c08601528015801590610b6f575060c0850151155b15610b7c57600160c08601525b60a08501839052604085015151600003610b99578491505061075a565b6000805b866040015151811015610c87576001876040015151610bbc9190611e31565b8103610bf357610bcc8286611e31565b87606001518281518110610be257610be2611e44565b602002602001018181525050610c4a565b858588606001518381518110610c0b57610c0b611e44565b6020026020010151610c1d9190611df8565b610c279190611e0f565b87606001518281518110610c3d57610c3d611e44565b6020026020010181815250505b86606001518181518110610c6057610c60611e44565b602002602001015182610c739190611e5a565b915080610c7f81611e6d565b915050610b9d565b509495945050505050565b6060600084806020019051810190610caa919061201c565b8051519091506000805b82811015610d9257610cc7600184611e31565b8103610cfe57610cd78287611e31565b84602001518281518110610ced57610ced611e44565b602002602001018181525050610d55565b868685602001518381518110610d1657610d16611e44565b6020026020010151610d289190611df8565b610d329190611e0f565b84602001518281518110610d4857610d48611e44565b6020026020010181815250505b83602001518181518110610d6b57610d6b611e44565b602002602001015182610d7e9190611e5a565b915080610d8a81611e6d565b915050610cb4565b5082604051602001610da491906120fe565b60405160208183030381529060405293505050509392505050565b6060600084806020019051810190610dd79190612331565b905083838260600151610dea9190611df8565b610df49190611e0f565b60608201526000805b82515181101561102f57600083600001518281518110610e1f57610e1f611e44565b6020026020010151600081518110610e3957610e39611e44565b6020026020010151905060006008826020015161ffff16901c905060006001866000015151610e689190611e31565b8403610e7b57610e788589611e31565b90505b60ff8216610e9b578251610e9190828b8b6110c9565b908452905061100d565b60ff821660011480610eb0575060ff82166004145b15610ec3578251610e9190828b8b611196565b60011960ff831601610edd578251610e9190828b8b611217565b60021960ff831601610ef7578251610e9190828b8b6110c9565b60041960ff831601610f11578251610e9190828b8b611276565b60051960ff831601610f2b578251610e9190828b8b61133d565b60061960ff831601610f7d5760405162461bcd60e51b815260206004820152601b60248201527a6b796265723a2063616e2774207363616c65206b7962657272667160281b60448201526064016101d1565b60071960ff831601610f97578251610e9190828b8b6113f0565b60081960ff831601610fb1578251610e9190828b8b6110c9565b60405162461bcd60e51b815260206004820152602b60248201527f4167677265676174696f6e4578656375746f723a204465782074797065206e6f60448201526a1d081cdd5c1c1bdc9d195960aa1b60648201526084016101d1565b6110178186611e5a565b9450505050808061102790611e6d565b915050610dfd565b50816040516020016110419190612408565b604051602081830303815290604052925050509392505050565b61106481610a72565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606110c08383604051806060016040528060278152602001612adc6027913961144f565b90505b92915050565b6060600080868060200190518101906110e29190612546565b905085156110f65760808101869052611117565b848482608001516111079190611df8565b6111119190611e0f565b60808201525b80604051602001611174919081516001600160a01b039081168252602080840151821690830152604080840151821690830152606080840151909116908201526080808301519082015260a0918201519181019190915260c00190565b6040516020818303038152906040528160800151925092505094509492505050565b6060600080868060200190518101906111af91906125d4565b905085156111c35760a081018690526111e4565b84848260a001516111d49190611df8565b6111de9190611e0f565b60a08201525b806040516020016111f59190612675565b6040516020818303038152906040528160a00151925092505094509492505050565b6060600080868060200190518101906112309190612722565b905085156112445760a08101869052611265565b84848260a001516112559190611df8565b61125f9190611e0f565b60a08201525b806040516020016111f591906127bf565b60606000808680602001905181019061128f9190612859565b905085156112a357608081018690526112c4565b848482608001516112b49190611df8565b6112be9190611e0f565b60808201525b80604051602001611174919060006101008201905060018060a01b038084511683528060208501511660208401528060408501511660408401528060608501511660608401526080840151608084015260a084015160a08401528060c08501511660c08401525060e0830151151560e083015292915050565b6060600080868060200190518101906113569190612914565b9050851561136a576080810186905261138b565b8484826080015161137b9190611df8565b6113859190611e0f565b60808201525b608081015160405161117491839160200182516001600160a01b03908116825260208085015190830152604080850151821690830152606080850151909116908201526080808401519082015260a0928301519281019290925260c082015260e00190565b6060600080868060200190518101906114099190612953565b9050851561141d576080810186905261143e565b8484826080015161142e9190611df8565b6114389190611e0f565b60808201525b8060405160200161117491906129dd565b606061145a84610761565b6114b55760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016101d1565b600080856001600160a01b0316856040516114d09190612a5f565b600060405180830381855af49150503d806000811461150b576040519150601f19603f3d011682016040523d82523d6000602084013e611510565b606091505b509150915061152082828661152a565b9695505050505050565b6060831561153957508161075a565b8251156115495782518084602001fd5b8160405162461bcd60e51b81526004016101d191906118fc565b60405180610120016040528060006001600160a01b0316815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b03168152602001600081526020016000815260200160008152602001606081525090565b6001600160a01b038116811461037157600080fd5b80356115ea816115ca565b919050565b801515811461037157600080fd5b60008060006060848603121561161257600080fd5b833561161d816115ca565b9250602084013561162d816115ef565b9150604084013561163d816115ef565b809150509250925092565b60006020828403121561165a57600080fd5b813561075a816115ca565b634e487b7160e01b600052604160045260246000fd5b60405161012081016001600160401b038111828210171561169e5761169e611665565b60405290565b60405160a081016001600160401b038111828210171561169e5761169e611665565b604080519081016001600160401b038111828210171561169e5761169e611665565b60405160e081016001600160401b038111828210171561169e5761169e611665565b60405160c081016001600160401b038111828210171561169e5761169e611665565b604051601f8201601f191681016001600160401b038111828210171561175457611754611665565b604052919050565b60006001600160401b0382111561177557611775611665565b50601f01601f191660200190565b600082601f83011261179457600080fd5b81356117a76117a28261175c565b61172c565b8181528460208386010111156117bc57600080fd5b816020850160208301376000918101602001919091529392505050565b600080604083850312156117ec57600080fd5b82356117f7816115ca565b915060208301356001600160401b0381111561181257600080fd5b61181e85828601611783565b9150509250929050565b6001600160a01b03169052565b60008060006040848603121561184a57600080fd5b83356001600160401b038082111561186157600080fd5b818601915086601f83011261187557600080fd5b81358181111561188457600080fd5b87602082850101111561189657600080fd5b6020928301989097509590910135949350505050565b60005b838110156118c75781810151838201526020016118af565b50506000910152565b600081518084526118e88160208601602086016118ac565b601f01601f19169290920160200192915050565b6020815260006110c060208301846118d0565b6020808252818101527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604082015260600190565b6020808252602c90820152600080516020612a7c83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612a7c83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600080858511156119c857600080fd5b838611156119d557600080fd5b5050820193919092039150565b6001600160e01b03198135818116916004851015611a0a5780818660040360031b1b83161692505b505092915050565b60006001600160401b03821115611a2b57611a2b611665565b5060051b60200190565b600082601f830112611a4657600080fd5b81356020611a566117a283611a12565b82815260059290921b84018101918181019086841115611a7557600080fd5b8286015b84811015611a99578035611a8c816115ca565b8352918301918301611a79565b509695505050505050565b600082601f830112611ab557600080fd5b81356020611ac56117a283611a12565b82815260059290921b84018101918181019086841115611ae457600080fd5b8286015b84811015611a995780358352918301918301611ae8565b60008060008060808587031215611b1557600080fd5b8435611b20816115ca565b935060208501356001600160401b0380821115611b3c57600080fd5b908601906101208289031215611b5157600080fd5b611b5961167b565b611b62836115df565b8152611b70602084016115df565b6020820152604083013582811115611b8757600080fd5b611b938a828601611a35565b604083015250606083013582811115611bab57600080fd5b611bb78a828601611aa4565b606083015250611bc9608084016115df565b608082015260a083013560a082015260c083013560c082015260e083013560e08201526101008084013583811115611c0057600080fd5b611c0c8b828701611783565b828401525050809550506040870135915080821115611c2a57600080fd5b611c3688838901611783565b93506060870135915080821115611c4c57600080fd5b50611c5987828801611783565b91505092959194509250565b600081518084526020808501945080840160005b83811015610c875781516001600160a01b031687529582019590820190600101611c79565b600081518084526020808501945080840160005b83811015610c8757815187529582019590820190600101611cb2565b6001600160a01b03851681526080602082018190528451611cf191830190611828565b60006020850151611d0560a0840182611828565b5060408501516101208060c0850152611d226101a0850183611c65565b91506060870151607f19808685030160e0870152611d408483611c9e565b935060808901519150610100611d5881880184611828565b60a08a01518488015260c08a015161014088015260e08a0151610160880152808a015193505080868503016101808701525050611d9582826118d0565b9150508281036040840152611daa81866118d0565b90508281036060840152611dbe81856118d0565b979650505050505050565b600060208284031215611ddb57600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b80820281158282048414176110c3576110c3611de2565b600082611e2c57634e487b7160e01b600052601260045260246000fd5b500490565b818103818111156110c3576110c3611de2565b634e487b7160e01b600052603260045260246000fd5b808201808211156110c3576110c3611de2565b600060018201611e7f57611e7f611de2565b5060010190565b80516115ea816115ca565b600082601f830112611ea257600080fd5b81516020611eb26117a283611a12565b82815260059290921b84018101918181019086841115611ed157600080fd5b8286015b84811015611a99578051611ee8816115ca565b8352918301918301611ed5565b600082601f830112611f0657600080fd5b81516020611f166117a283611a12565b82815260059290921b84018101918181019086841115611f3557600080fd5b8286015b84811015611a995780518352918301918301611f39565b600082601f830112611f6157600080fd5b8151611f6f6117a28261175c565b818152846020838601011115611f8457600080fd5b611f958260208301602087016118ac565b949350505050565b600082601f830112611fae57600080fd5b81516020611fbe6117a283611a12565b82815260059290921b84018101918181019086841115611fdd57600080fd5b8286015b84811015611a995780516001600160401b038111156120005760008081fd5b61200e8986838b0101611f50565b845250918301918301611fe1565b60006020828403121561202e57600080fd5b81516001600160401b038082111561204557600080fd5b9083019060a0828603121561205957600080fd5b6120616116a4565b82518281111561207057600080fd5b61207c87828601611e91565b82525060208301518281111561209157600080fd5b61209d87828601611ef5565b6020830152506040830151828111156120b557600080fd5b6120c187828601611f9d565b604083015250606083015160608201526080830151828111156120e357600080fd5b6120ef87828601611f50565b60808301525095945050505050565b60006020808352835160a08285015261211a60c0850182611c65565b905081850151601f19808684030160408701526121378383611c9e565b60408801518782038301606089015280518083529194508501925084840190600581901b8501860160005b8281101561218e578487830301845261217c8287516118d0565b95880195938801939150600101612162565b5060608a015160808a015260808a01519650838982030160a08a01526121b481886118d0565b9a9950505050505050505050565b600082601f8301126121d357600080fd5b81516121e16117a282611a12565b808282526020820191508560208460051b870101111561220057600080fd5b602085015b60208460051b8701018110156123275780516001600160401b0381111561222b57600080fd5b8601603f8101881361223c57600080fd5b602081015161224d6117a282611a12565b808282526020820191508a60408460051b860101111561226c57600080fd5b604084015b60408460051b8601018110156123115780516001600160401b0381111561229757600080fd5b60408682018e03603f190112156122ad57600080fd5b6122b56116c6565b868201604001516001600160401b038111156122d057600080fd5b6122e18f604083868c010101611f50565b825250908601606001519061ffff821682146122fc57600080fd5b60208181019290925284529283019201612271565b5086525050602093840193919091019050612205565b5095945050505050565b60006020828403121561234357600080fd5b81516001600160401b038082111561235a57600080fd5b9083019060e0828603121561236e57600080fd5b6123766116e8565b82518281111561238557600080fd5b612391878286016121c2565b8252506123a060208401611e86565b60208201526123b160408401611e86565b6040820152606083015160608201526123cc60808401611e86565b608082015260a083015160a082015260c0830151828111156123ed57600080fd5b6123f987828601611f50565b60c08301525095945050505050565b6020808252825160e0838301528051610100840181905260009291600582811b860161012090810193928501929087019186805b838110156124cb5789870361011f1901855285518051808952908901908989019080861b8a018b01855b828110156124b557601f198c830301845284516040815181855261248c828601826118d0565b91505061ffff8f830151168f85015280935050508c850194508c84019350600181019050612466565b509950505095880195509387019360010161243c565b5050505050508185015191506124e46040850183611828565b604085015191506124f86060850183611828565b606085015160808501526080850151915061251660a0850183611828565b60a085015160c085015260c08501519150601f198482030160e085015261253d81836118d0565b95945050505050565b600060c0828403121561255857600080fd5b61256061170a565b825161256b816115ca565b8152602083015161257b816115ca565b6020820152604083015161258e816115ca565b604082015260608301516125a1816115ca565b60608201526080838101519082015260a0928301519281019290925250919050565b805160ff811681146115ea57600080fd5b600061012082840312156125e757600080fd5b6125ef61167b565b6125f883611e86565b815261260660208401611e86565b602082015261261760408401611e86565b6040820152612628606084016125c3565b6060820152612639608084016125c3565b608082015260a083015160a082015260c083015160c082015260e083015160e082015261010061266a818501611e86565b908201529392505050565b81516001600160a01b039081168252602080840151909116908201526040808301516101208301916126a990840182611828565b5060608301516126be606084018260ff169052565b5060808301516126d3608084018260ff169052565b5060a083015160a083015260c083015160c083015260e083015160e083015261010080840151611a0a82850182611828565b8051600f81900b81146115ea57600080fd5b80516115ea816115ef565b6000610120828403121561273557600080fd5b61273d61167b565b61274683611e86565b815261275460208401611e86565b602082015261276560408401611e86565b604082015261277660608401612705565b606082015261278760808401612705565b608082015260a083015160a082015260c083015160c08201526127ac60e08401612717565b60e082015261010061266a818501612717565b81516001600160a01b039081168252602080840151909116908201526040808301516101208301916127f390840182611828565b5060608301516128086060840182600f0b9052565b50608083015161281d6080840182600f0b9052565b5060a083015160a083015260c083015160c083015260e083015161284560e084018215159052565b506101008381015180151584830152611a0a565b600061010080838503121561286d57600080fd5b604051908101906001600160401b038211818310171561288f5761288f611665565b81604052835191506128a0826115ca565b8181526128af60208501611e86565b60208201526128c060408501611e86565b60408201526128d160608501611e86565b60608201526080840151608082015260a084015160a08201526128f660c08501611e86565b60c082015261290760e08501612717565b60e0820152949350505050565b600060c0828403121561292657600080fd5b61292e61170a565b8251612939816115ca565b815260208381015190820152604083015161258e816115ca565b6000610120828403121561296657600080fd5b61296e61167b565b61297783611e86565b815261298560208401611e86565b602082015261299660408401611e86565b60408201526129a760608401611e86565b60608201526080830151608082015260a083015160a08201526129cc60c08401611e86565b60c08201526127ac60e08401612717565b81516001600160a01b03908116825260208084015190911690820152604080830151610120830191612a1190840182611828565b506060830151612a246060840182611828565b506080830151608083015260a083015160a083015260c0830151612a4b60c0840182611828565b5060e083015161284560e084018215159052565b60008251612a718184602087016118ac565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122013a38974bb7c3dd802c6f679f0e31b10ea8b51b4a05f60d90a8fbb404f5b995f64736f6c63430008110033",
220
+ "bytecode": "0x60a0604052306080523480156200001557600080fd5b50600154600160a81b900460ff16158080156200003d575060018054600160a01b900460ff16105b806200007357506200005a306200015860201b620007611760201c565b15801562000073575060018054600160a01b900460ff16145b620000db5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840160405180910390fd5b6001805460ff60a01b1916600160a01b179055801562000109576001805460ff60a81b1916600160a81b1790555b801562000151576001805460ff60a81b191681556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5062000167565b6001600160a01b03163b151590565b608051612b386200019f600039600081816102b6015281816102f6015281816104290152818161046901526104e50152612b386000f3fe6080604052600436106100765760003560e01c8063078dfbe71461007b5780633659cfe61461009d5780634e71e0c8146100bd5780634f1ef286146100d257806352d1902d146100e55780638129fc1c1461010d5780638da5cb5b14610122578063e30c39781461015a578063e4da6f2e1461017a575b600080fd5b34801561008757600080fd5b5061009b6100963660046115fd565b6101a7565b005b3480156100a957600080fd5b5061009b6100b8366004611648565b6102ac565b3480156100c957600080fd5b5061009b610374565b61009b6100e03660046117d9565b61041f565b3480156100f157600080fd5b506100fa6104d8565b6040519081526020015b60405180910390f35b34801561011957600080fd5b5061009b610586565b34801561012e57600080fd5b50600054610142906001600160a01b031681565b6040516001600160a01b039091168152602001610104565b34801561016657600080fd5b50600154610142906001600160a01b031681565b34801561018657600080fd5b5061019a610195366004611835565b6106b4565b60405161010491906118fc565b6000546001600160a01b031633146101da5760405162461bcd60e51b81526004016101d19061190f565b60405180910390fd5b811561028b576001600160a01b0383161515806101f45750805b6102385760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b60448201526064016101d1565b600080546040516001600160a01b0380871693921691600080516020612abc83398151915291a3600080546001600160a01b0385166001600160a01b031991821617909155600180549091169055505050565b600180546001600160a01b0319166001600160a01b0385161790555b505050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036102f45760405162461bcd60e51b81526004016101d190611944565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610326610770565b6001600160a01b03161461034c5760405162461bcd60e51b81526004016101d19061197e565b6103558161078c565b60408051600080825260208201909252610371918391906107b6565b50565b6001546001600160a01b03163381146103cf5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e657260448201526064016101d1565b600080546040516001600160a01b0380851693921691600080516020612abc83398151915291a3600080546001600160a01b039092166001600160a01b0319928316179055600180549091169055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036104675760405162461bcd60e51b81526004016101d190611944565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610499610770565b6001600160a01b0316146104bf5760405162461bcd60e51b81526004016101d19061197e565b6104c88261078c565b6104d4828260016107b6565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105735760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b60648201526084016101d1565b50600080516020612a9c83398151915290565b600154600160a81b900460ff16158080156105ac575060018054600160a01b900460ff16105b806105d357506105bb30610761565b1580156105d3575060018054600160a01b900460ff16145b6106365760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016101d1565b6001805460ff60a01b1916600160a01b1790558015610663576001805460ff60a81b1916600160a81b1790555b61066b610921565b8015610371576001805460ff60a81b191681556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a150565b606060006106c560048286886119b8565b6106ce916119e2565b905060008080806106e2886004818c6119b8565b8101906106ef9190611aff565b93509350935093506107028383896109a2565b60405191945092508590610720908690869086908690602401611cce565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152955050505050505b9392505050565b6001600160a01b03163b151590565b600080516020612a9c833981519152546001600160a01b031690565b6000546001600160a01b031633146103715760405162461bcd60e51b81526004016101d19061190f565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107e9576102a783610a72565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610843575060408051601f3d908101601f1916820190925261084091810190611dc9565b60015b6108a65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b60648201526084016101d1565b600080516020612a9c83398151915281146109155760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b60648201526084016101d1565b506102a7838383610b0c565b600154600160a81b900460ff1661098e5760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b60648201526084016101d1565b600080546001600160a01b03191633179055565b6109aa611563565b60e084015160a0850151606091908481036109cc578686935093505050610a6a565b6020821615610a495760408701515115610a285760405162461bcd60e51b815260206004820152601e60248201527f6b796265723a2063616e2774207363616c652069662074616b6520666565000060448201526064016101d1565b610a33878287610b37565b610a3e878388610c92565b935093505050610a6a565b6000610a56878388610dbf565b9050610a63888388610b37565b9450925050505b935093915050565b610a7b81610761565b610add5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016101d1565b600080516020612a9c83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b610b158361105b565b600082511180610b225750805b156102a757610b31838361109b565b50505050565b610b3f611563565b60c084015183610b4f8483611df8565b610b599190611e0f565b60c08601528015801590610b6f575060c0850151155b15610b7c57600160c08601525b60a08501839052604085015151600003610b99578491505061075a565b6000805b866040015151811015610c87576001876040015151610bbc9190611e31565b8103610bf357610bcc8286611e31565b87606001518281518110610be257610be2611e44565b602002602001018181525050610c4a565b858588606001518381518110610c0b57610c0b611e44565b6020026020010151610c1d9190611df8565b610c279190611e0f565b87606001518281518110610c3d57610c3d611e44565b6020026020010181815250505b86606001518181518110610c6057610c60611e44565b602002602001015182610c739190611e5a565b915080610c7f81611e6d565b915050610b9d565b509495945050505050565b6060600084806020019051810190610caa919061201c565b8051519091506000805b82811015610d9257610cc7600184611e31565b8103610cfe57610cd78287611e31565b84602001518281518110610ced57610ced611e44565b602002602001018181525050610d55565b868685602001518381518110610d1657610d16611e44565b6020026020010151610d289190611df8565b610d329190611e0f565b84602001518281518110610d4857610d48611e44565b6020026020010181815250505b83602001518181518110610d6b57610d6b611e44565b602002602001015182610d7e9190611e5a565b915080610d8a81611e6d565b915050610cb4565b5082604051602001610da491906120fe565b60405160208183030381529060405293505050509392505050565b6060600084806020019051810190610dd79190612331565b905083838260600151610dea9190611df8565b610df49190611e0f565b60608201526000805b82515181101561102f57600083600001518281518110610e1f57610e1f611e44565b6020026020010151600081518110610e3957610e39611e44565b6020026020010151905060006008826020015161ffff16901c905060006001866000015151610e689190611e31565b8403610e7b57610e788589611e31565b90505b60ff8216610e9b578251610e9190828b8b6110c9565b908452905061100d565b60ff821660011480610eb0575060ff82166004145b15610ec3578251610e9190828b8b611196565b60011960ff831601610edd578251610e9190828b8b611217565b60021960ff831601610ef7578251610e9190828b8b6110c9565b60041960ff831601610f11578251610e9190828b8b611276565b60051960ff831601610f2b578251610e9190828b8b61133d565b60061960ff831601610f7d5760405162461bcd60e51b815260206004820152601b60248201527a6b796265723a2063616e2774207363616c65206b7962657272667160281b60448201526064016101d1565b60071960ff831601610f97578251610e9190828b8b6113f0565b60081960ff831601610fb1578251610e9190828b8b6110c9565b60405162461bcd60e51b815260206004820152602b60248201527f4167677265676174696f6e4578656375746f723a204465782074797065206e6f60448201526a1d081cdd5c1c1bdc9d195960aa1b60648201526084016101d1565b6110178186611e5a565b9450505050808061102790611e6d565b915050610dfd565b50816040516020016110419190612408565b604051602081830303815290604052925050509392505050565b61106481610a72565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606110c08383604051806060016040528060278152602001612adc6027913961144f565b90505b92915050565b6060600080868060200190518101906110e29190612546565b905085156110f65760808101869052611117565b848482608001516111079190611df8565b6111119190611e0f565b60808201525b80604051602001611174919081516001600160a01b039081168252602080840151821690830152604080840151821690830152606080840151909116908201526080808301519082015260a0918201519181019190915260c00190565b6040516020818303038152906040528160800151925092505094509492505050565b6060600080868060200190518101906111af91906125d4565b905085156111c35760a081018690526111e4565b84848260a001516111d49190611df8565b6111de9190611e0f565b60a08201525b806040516020016111f59190612675565b6040516020818303038152906040528160a00151925092505094509492505050565b6060600080868060200190518101906112309190612722565b905085156112445760a08101869052611265565b84848260a001516112559190611df8565b61125f9190611e0f565b60a08201525b806040516020016111f591906127bf565b60606000808680602001905181019061128f9190612859565b905085156112a357608081018690526112c4565b848482608001516112b49190611df8565b6112be9190611e0f565b60808201525b80604051602001611174919060006101008201905060018060a01b038084511683528060208501511660208401528060408501511660408401528060608501511660608401526080840151608084015260a084015160a08401528060c08501511660c08401525060e0830151151560e083015292915050565b6060600080868060200190518101906113569190612914565b9050851561136a576080810186905261138b565b8484826080015161137b9190611df8565b6113859190611e0f565b60808201525b608081015160405161117491839160200182516001600160a01b03908116825260208085015190830152604080850151821690830152606080850151909116908201526080808401519082015260a0928301519281019290925260c082015260e00190565b6060600080868060200190518101906114099190612953565b9050851561141d576080810186905261143e565b8484826080015161142e9190611df8565b6114389190611e0f565b60808201525b8060405160200161117491906129dd565b606061145a84610761565b6114b55760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016101d1565b600080856001600160a01b0316856040516114d09190612a5f565b600060405180830381855af49150503d806000811461150b576040519150601f19603f3d011682016040523d82523d6000602084013e611510565b606091505b509150915061152082828661152a565b9695505050505050565b6060831561153957508161075a565b8251156115495782518084602001fd5b8160405162461bcd60e51b81526004016101d191906118fc565b60405180610120016040528060006001600160a01b0316815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b03168152602001600081526020016000815260200160008152602001606081525090565b6001600160a01b038116811461037157600080fd5b80356115ea816115ca565b919050565b801515811461037157600080fd5b60008060006060848603121561161257600080fd5b833561161d816115ca565b9250602084013561162d816115ef565b9150604084013561163d816115ef565b809150509250925092565b60006020828403121561165a57600080fd5b813561075a816115ca565b634e487b7160e01b600052604160045260246000fd5b60405161012081016001600160401b038111828210171561169e5761169e611665565b60405290565b60405160a081016001600160401b038111828210171561169e5761169e611665565b604080519081016001600160401b038111828210171561169e5761169e611665565b60405160e081016001600160401b038111828210171561169e5761169e611665565b60405160c081016001600160401b038111828210171561169e5761169e611665565b604051601f8201601f191681016001600160401b038111828210171561175457611754611665565b604052919050565b60006001600160401b0382111561177557611775611665565b50601f01601f191660200190565b600082601f83011261179457600080fd5b81356117a76117a28261175c565b61172c565b8181528460208386010111156117bc57600080fd5b816020850160208301376000918101602001919091529392505050565b600080604083850312156117ec57600080fd5b82356117f7816115ca565b915060208301356001600160401b0381111561181257600080fd5b61181e85828601611783565b9150509250929050565b6001600160a01b03169052565b60008060006040848603121561184a57600080fd5b83356001600160401b038082111561186157600080fd5b818601915086601f83011261187557600080fd5b81358181111561188457600080fd5b87602082850101111561189657600080fd5b6020928301989097509590910135949350505050565b60005b838110156118c75781810151838201526020016118af565b50506000910152565b600081518084526118e88160208601602086016118ac565b601f01601f19169290920160200192915050565b6020815260006110c060208301846118d0565b6020808252818101527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604082015260600190565b6020808252602c90820152600080516020612a7c83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612a7c83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600080858511156119c857600080fd5b838611156119d557600080fd5b5050820193919092039150565b6001600160e01b03198135818116916004851015611a0a5780818660040360031b1b83161692505b505092915050565b60006001600160401b03821115611a2b57611a2b611665565b5060051b60200190565b600082601f830112611a4657600080fd5b81356020611a566117a283611a12565b82815260059290921b84018101918181019086841115611a7557600080fd5b8286015b84811015611a99578035611a8c816115ca565b8352918301918301611a79565b509695505050505050565b600082601f830112611ab557600080fd5b81356020611ac56117a283611a12565b82815260059290921b84018101918181019086841115611ae457600080fd5b8286015b84811015611a995780358352918301918301611ae8565b60008060008060808587031215611b1557600080fd5b8435611b20816115ca565b935060208501356001600160401b0380821115611b3c57600080fd5b908601906101208289031215611b5157600080fd5b611b5961167b565b611b62836115df565b8152611b70602084016115df565b6020820152604083013582811115611b8757600080fd5b611b938a828601611a35565b604083015250606083013582811115611bab57600080fd5b611bb78a828601611aa4565b606083015250611bc9608084016115df565b608082015260a083013560a082015260c083013560c082015260e083013560e08201526101008084013583811115611c0057600080fd5b611c0c8b828701611783565b828401525050809550506040870135915080821115611c2a57600080fd5b611c3688838901611783565b93506060870135915080821115611c4c57600080fd5b50611c5987828801611783565b91505092959194509250565b600081518084526020808501945080840160005b83811015610c875781516001600160a01b031687529582019590820190600101611c79565b600081518084526020808501945080840160005b83811015610c8757815187529582019590820190600101611cb2565b6001600160a01b03851681526080602082018190528451611cf191830190611828565b60006020850151611d0560a0840182611828565b5060408501516101208060c0850152611d226101a0850183611c65565b91506060870151607f19808685030160e0870152611d408483611c9e565b935060808901519150610100611d5881880184611828565b60a08a01518488015260c08a015161014088015260e08a0151610160880152808a015193505080868503016101808701525050611d9582826118d0565b9150508281036040840152611daa81866118d0565b90508281036060840152611dbe81856118d0565b979650505050505050565b600060208284031215611ddb57600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b80820281158282048414176110c3576110c3611de2565b600082611e2c57634e487b7160e01b600052601260045260246000fd5b500490565b818103818111156110c3576110c3611de2565b634e487b7160e01b600052603260045260246000fd5b808201808211156110c3576110c3611de2565b600060018201611e7f57611e7f611de2565b5060010190565b80516115ea816115ca565b600082601f830112611ea257600080fd5b81516020611eb26117a283611a12565b82815260059290921b84018101918181019086841115611ed157600080fd5b8286015b84811015611a99578051611ee8816115ca565b8352918301918301611ed5565b600082601f830112611f0657600080fd5b81516020611f166117a283611a12565b82815260059290921b84018101918181019086841115611f3557600080fd5b8286015b84811015611a995780518352918301918301611f39565b600082601f830112611f6157600080fd5b8151611f6f6117a28261175c565b818152846020838601011115611f8457600080fd5b611f958260208301602087016118ac565b949350505050565b600082601f830112611fae57600080fd5b81516020611fbe6117a283611a12565b82815260059290921b84018101918181019086841115611fdd57600080fd5b8286015b84811015611a995780516001600160401b038111156120005760008081fd5b61200e8986838b0101611f50565b845250918301918301611fe1565b60006020828403121561202e57600080fd5b81516001600160401b038082111561204557600080fd5b9083019060a0828603121561205957600080fd5b6120616116a4565b82518281111561207057600080fd5b61207c87828601611e91565b82525060208301518281111561209157600080fd5b61209d87828601611ef5565b6020830152506040830151828111156120b557600080fd5b6120c187828601611f9d565b604083015250606083015160608201526080830151828111156120e357600080fd5b6120ef87828601611f50565b60808301525095945050505050565b60006020808352835160a08285015261211a60c0850182611c65565b905081850151601f19808684030160408701526121378383611c9e565b60408801518782038301606089015280518083529194508501925084840190600581901b8501860160005b8281101561218e578487830301845261217c8287516118d0565b95880195938801939150600101612162565b5060608a015160808a015260808a01519650838982030160a08a01526121b481886118d0565b9a9950505050505050505050565b600082601f8301126121d357600080fd5b81516121e16117a282611a12565b808282526020820191508560208460051b870101111561220057600080fd5b602085015b60208460051b8701018110156123275780516001600160401b0381111561222b57600080fd5b8601603f8101881361223c57600080fd5b602081015161224d6117a282611a12565b808282526020820191508a60408460051b860101111561226c57600080fd5b604084015b60408460051b8601018110156123115780516001600160401b0381111561229757600080fd5b60408682018e03603f190112156122ad57600080fd5b6122b56116c6565b868201604001516001600160401b038111156122d057600080fd5b6122e18f604083868c010101611f50565b825250908601606001519061ffff821682146122fc57600080fd5b60208181019290925284529283019201612271565b5086525050602093840193919091019050612205565b5095945050505050565b60006020828403121561234357600080fd5b81516001600160401b038082111561235a57600080fd5b9083019060e0828603121561236e57600080fd5b6123766116e8565b82518281111561238557600080fd5b612391878286016121c2565b8252506123a060208401611e86565b60208201526123b160408401611e86565b6040820152606083015160608201526123cc60808401611e86565b608082015260a083015160a082015260c0830151828111156123ed57600080fd5b6123f987828601611f50565b60c08301525095945050505050565b6020808252825160e0838301528051610100840181905260009291600582811b860161012090810193928501929087019186805b838110156124cb5789870361011f1901855285518051808952908901908989019080861b8a018b01855b828110156124b557601f198c830301845284516040815181855261248c828601826118d0565b91505061ffff8f830151168f85015280935050508c850194508c84019350600181019050612466565b509950505095880195509387019360010161243c565b5050505050508185015191506124e46040850183611828565b604085015191506124f86060850183611828565b606085015160808501526080850151915061251660a0850183611828565b60a085015160c085015260c08501519150601f198482030160e085015261253d81836118d0565b95945050505050565b600060c0828403121561255857600080fd5b61256061170a565b825161256b816115ca565b8152602083015161257b816115ca565b6020820152604083015161258e816115ca565b604082015260608301516125a1816115ca565b60608201526080838101519082015260a0928301519281019290925250919050565b805160ff811681146115ea57600080fd5b600061012082840312156125e757600080fd5b6125ef61167b565b6125f883611e86565b815261260660208401611e86565b602082015261261760408401611e86565b6040820152612628606084016125c3565b6060820152612639608084016125c3565b608082015260a083015160a082015260c083015160c082015260e083015160e082015261010061266a818501611e86565b908201529392505050565b81516001600160a01b039081168252602080840151909116908201526040808301516101208301916126a990840182611828565b5060608301516126be606084018260ff169052565b5060808301516126d3608084018260ff169052565b5060a083015160a083015260c083015160c083015260e083015160e083015261010080840151611a0a82850182611828565b8051600f81900b81146115ea57600080fd5b80516115ea816115ef565b6000610120828403121561273557600080fd5b61273d61167b565b61274683611e86565b815261275460208401611e86565b602082015261276560408401611e86565b604082015261277660608401612705565b606082015261278760808401612705565b608082015260a083015160a082015260c083015160c08201526127ac60e08401612717565b60e082015261010061266a818501612717565b81516001600160a01b039081168252602080840151909116908201526040808301516101208301916127f390840182611828565b5060608301516128086060840182600f0b9052565b50608083015161281d6080840182600f0b9052565b5060a083015160a083015260c083015160c083015260e083015161284560e084018215159052565b506101008381015180151584830152611a0a565b600061010080838503121561286d57600080fd5b604051908101906001600160401b038211818310171561288f5761288f611665565b81604052835191506128a0826115ca565b8181526128af60208501611e86565b60208201526128c060408501611e86565b60408201526128d160608501611e86565b60608201526080840151608082015260a084015160a08201526128f660c08501611e86565b60c082015261290760e08501612717565b60e0820152949350505050565b600060c0828403121561292657600080fd5b61292e61170a565b8251612939816115ca565b815260208381015190820152604083015161258e816115ca565b6000610120828403121561296657600080fd5b61296e61167b565b61297783611e86565b815261298560208401611e86565b602082015261299660408401611e86565b60408201526129a760608401611e86565b60608201526080830151608082015260a083015160a08201526129cc60c08401611e86565b60c08201526127ac60e08401612717565b81516001600160a01b03908116825260208084015190911690820152604080830151610120830191612a1190840182611828565b506060830151612a246060840182611828565b506080830151608083015260a083015160a083015260c0830151612a4b60c0840182611828565b5060e083015161284560e084018215159052565b60008251612a718184602087016118ac565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212201990797cf7c2b5a985306b2544f40a5365b499084d30df8fc9f837950f1dce9f64736f6c63430008110033",
221
+ "deployedBytecode": "0x6080604052600436106100765760003560e01c8063078dfbe71461007b5780633659cfe61461009d5780634e71e0c8146100bd5780634f1ef286146100d257806352d1902d146100e55780638129fc1c1461010d5780638da5cb5b14610122578063e30c39781461015a578063e4da6f2e1461017a575b600080fd5b34801561008757600080fd5b5061009b6100963660046115fd565b6101a7565b005b3480156100a957600080fd5b5061009b6100b8366004611648565b6102ac565b3480156100c957600080fd5b5061009b610374565b61009b6100e03660046117d9565b61041f565b3480156100f157600080fd5b506100fa6104d8565b6040519081526020015b60405180910390f35b34801561011957600080fd5b5061009b610586565b34801561012e57600080fd5b50600054610142906001600160a01b031681565b6040516001600160a01b039091168152602001610104565b34801561016657600080fd5b50600154610142906001600160a01b031681565b34801561018657600080fd5b5061019a610195366004611835565b6106b4565b60405161010491906118fc565b6000546001600160a01b031633146101da5760405162461bcd60e51b81526004016101d19061190f565b60405180910390fd5b811561028b576001600160a01b0383161515806101f45750805b6102385760405162461bcd60e51b81526020600482015260156024820152744f776e61626c653a207a65726f206164647265737360581b60448201526064016101d1565b600080546040516001600160a01b0380871693921691600080516020612abc83398151915291a3600080546001600160a01b0385166001600160a01b031991821617909155600180549091169055505050565b600180546001600160a01b0319166001600160a01b0385161790555b505050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036102f45760405162461bcd60e51b81526004016101d190611944565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610326610770565b6001600160a01b03161461034c5760405162461bcd60e51b81526004016101d19061197e565b6103558161078c565b60408051600080825260208201909252610371918391906107b6565b50565b6001546001600160a01b03163381146103cf5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c657220213d2070656e64696e67206f776e657260448201526064016101d1565b600080546040516001600160a01b0380851693921691600080516020612abc83398151915291a3600080546001600160a01b039092166001600160a01b0319928316179055600180549091169055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036104675760405162461bcd60e51b81526004016101d190611944565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610499610770565b6001600160a01b0316146104bf5760405162461bcd60e51b81526004016101d19061197e565b6104c88261078c565b6104d4828260016107b6565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105735760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b60648201526084016101d1565b50600080516020612a9c83398151915290565b600154600160a81b900460ff16158080156105ac575060018054600160a01b900460ff16105b806105d357506105bb30610761565b1580156105d3575060018054600160a01b900460ff16145b6106365760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016101d1565b6001805460ff60a01b1916600160a01b1790558015610663576001805460ff60a81b1916600160a81b1790555b61066b610921565b8015610371576001805460ff60a81b191681556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a150565b606060006106c560048286886119b8565b6106ce916119e2565b905060008080806106e2886004818c6119b8565b8101906106ef9190611aff565b93509350935093506107028383896109a2565b60405191945092508590610720908690869086908690602401611cce565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152955050505050505b9392505050565b6001600160a01b03163b151590565b600080516020612a9c833981519152546001600160a01b031690565b6000546001600160a01b031633146103715760405162461bcd60e51b81526004016101d19061190f565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107e9576102a783610a72565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610843575060408051601f3d908101601f1916820190925261084091810190611dc9565b60015b6108a65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b60648201526084016101d1565b600080516020612a9c83398151915281146109155760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b60648201526084016101d1565b506102a7838383610b0c565b600154600160a81b900460ff1661098e5760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b60648201526084016101d1565b600080546001600160a01b03191633179055565b6109aa611563565b60e084015160a0850151606091908481036109cc578686935093505050610a6a565b6020821615610a495760408701515115610a285760405162461bcd60e51b815260206004820152601e60248201527f6b796265723a2063616e2774207363616c652069662074616b6520666565000060448201526064016101d1565b610a33878287610b37565b610a3e878388610c92565b935093505050610a6a565b6000610a56878388610dbf565b9050610a63888388610b37565b9450925050505b935093915050565b610a7b81610761565b610add5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016101d1565b600080516020612a9c83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b610b158361105b565b600082511180610b225750805b156102a757610b31838361109b565b50505050565b610b3f611563565b60c084015183610b4f8483611df8565b610b599190611e0f565b60c08601528015801590610b6f575060c0850151155b15610b7c57600160c08601525b60a08501839052604085015151600003610b99578491505061075a565b6000805b866040015151811015610c87576001876040015151610bbc9190611e31565b8103610bf357610bcc8286611e31565b87606001518281518110610be257610be2611e44565b602002602001018181525050610c4a565b858588606001518381518110610c0b57610c0b611e44565b6020026020010151610c1d9190611df8565b610c279190611e0f565b87606001518281518110610c3d57610c3d611e44565b6020026020010181815250505b86606001518181518110610c6057610c60611e44565b602002602001015182610c739190611e5a565b915080610c7f81611e6d565b915050610b9d565b509495945050505050565b6060600084806020019051810190610caa919061201c565b8051519091506000805b82811015610d9257610cc7600184611e31565b8103610cfe57610cd78287611e31565b84602001518281518110610ced57610ced611e44565b602002602001018181525050610d55565b868685602001518381518110610d1657610d16611e44565b6020026020010151610d289190611df8565b610d329190611e0f565b84602001518281518110610d4857610d48611e44565b6020026020010181815250505b83602001518181518110610d6b57610d6b611e44565b602002602001015182610d7e9190611e5a565b915080610d8a81611e6d565b915050610cb4565b5082604051602001610da491906120fe565b60405160208183030381529060405293505050509392505050565b6060600084806020019051810190610dd79190612331565b905083838260600151610dea9190611df8565b610df49190611e0f565b60608201526000805b82515181101561102f57600083600001518281518110610e1f57610e1f611e44565b6020026020010151600081518110610e3957610e39611e44565b6020026020010151905060006008826020015161ffff16901c905060006001866000015151610e689190611e31565b8403610e7b57610e788589611e31565b90505b60ff8216610e9b578251610e9190828b8b6110c9565b908452905061100d565b60ff821660011480610eb0575060ff82166004145b15610ec3578251610e9190828b8b611196565b60011960ff831601610edd578251610e9190828b8b611217565b60021960ff831601610ef7578251610e9190828b8b6110c9565b60041960ff831601610f11578251610e9190828b8b611276565b60051960ff831601610f2b578251610e9190828b8b61133d565b60061960ff831601610f7d5760405162461bcd60e51b815260206004820152601b60248201527a6b796265723a2063616e2774207363616c65206b7962657272667160281b60448201526064016101d1565b60071960ff831601610f97578251610e9190828b8b6113f0565b60081960ff831601610fb1578251610e9190828b8b6110c9565b60405162461bcd60e51b815260206004820152602b60248201527f4167677265676174696f6e4578656375746f723a204465782074797065206e6f60448201526a1d081cdd5c1c1bdc9d195960aa1b60648201526084016101d1565b6110178186611e5a565b9450505050808061102790611e6d565b915050610dfd565b50816040516020016110419190612408565b604051602081830303815290604052925050509392505050565b61106481610a72565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606110c08383604051806060016040528060278152602001612adc6027913961144f565b90505b92915050565b6060600080868060200190518101906110e29190612546565b905085156110f65760808101869052611117565b848482608001516111079190611df8565b6111119190611e0f565b60808201525b80604051602001611174919081516001600160a01b039081168252602080840151821690830152604080840151821690830152606080840151909116908201526080808301519082015260a0918201519181019190915260c00190565b6040516020818303038152906040528160800151925092505094509492505050565b6060600080868060200190518101906111af91906125d4565b905085156111c35760a081018690526111e4565b84848260a001516111d49190611df8565b6111de9190611e0f565b60a08201525b806040516020016111f59190612675565b6040516020818303038152906040528160a00151925092505094509492505050565b6060600080868060200190518101906112309190612722565b905085156112445760a08101869052611265565b84848260a001516112559190611df8565b61125f9190611e0f565b60a08201525b806040516020016111f591906127bf565b60606000808680602001905181019061128f9190612859565b905085156112a357608081018690526112c4565b848482608001516112b49190611df8565b6112be9190611e0f565b60808201525b80604051602001611174919060006101008201905060018060a01b038084511683528060208501511660208401528060408501511660408401528060608501511660608401526080840151608084015260a084015160a08401528060c08501511660c08401525060e0830151151560e083015292915050565b6060600080868060200190518101906113569190612914565b9050851561136a576080810186905261138b565b8484826080015161137b9190611df8565b6113859190611e0f565b60808201525b608081015160405161117491839160200182516001600160a01b03908116825260208085015190830152604080850151821690830152606080850151909116908201526080808401519082015260a0928301519281019290925260c082015260e00190565b6060600080868060200190518101906114099190612953565b9050851561141d576080810186905261143e565b8484826080015161142e9190611df8565b6114389190611e0f565b60808201525b8060405160200161117491906129dd565b606061145a84610761565b6114b55760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016101d1565b600080856001600160a01b0316856040516114d09190612a5f565b600060405180830381855af49150503d806000811461150b576040519150601f19603f3d011682016040523d82523d6000602084013e611510565b606091505b509150915061152082828661152a565b9695505050505050565b6060831561153957508161075a565b8251156115495782518084602001fd5b8160405162461bcd60e51b81526004016101d191906118fc565b60405180610120016040528060006001600160a01b0316815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b03168152602001600081526020016000815260200160008152602001606081525090565b6001600160a01b038116811461037157600080fd5b80356115ea816115ca565b919050565b801515811461037157600080fd5b60008060006060848603121561161257600080fd5b833561161d816115ca565b9250602084013561162d816115ef565b9150604084013561163d816115ef565b809150509250925092565b60006020828403121561165a57600080fd5b813561075a816115ca565b634e487b7160e01b600052604160045260246000fd5b60405161012081016001600160401b038111828210171561169e5761169e611665565b60405290565b60405160a081016001600160401b038111828210171561169e5761169e611665565b604080519081016001600160401b038111828210171561169e5761169e611665565b60405160e081016001600160401b038111828210171561169e5761169e611665565b60405160c081016001600160401b038111828210171561169e5761169e611665565b604051601f8201601f191681016001600160401b038111828210171561175457611754611665565b604052919050565b60006001600160401b0382111561177557611775611665565b50601f01601f191660200190565b600082601f83011261179457600080fd5b81356117a76117a28261175c565b61172c565b8181528460208386010111156117bc57600080fd5b816020850160208301376000918101602001919091529392505050565b600080604083850312156117ec57600080fd5b82356117f7816115ca565b915060208301356001600160401b0381111561181257600080fd5b61181e85828601611783565b9150509250929050565b6001600160a01b03169052565b60008060006040848603121561184a57600080fd5b83356001600160401b038082111561186157600080fd5b818601915086601f83011261187557600080fd5b81358181111561188457600080fd5b87602082850101111561189657600080fd5b6020928301989097509590910135949350505050565b60005b838110156118c75781810151838201526020016118af565b50506000910152565b600081518084526118e88160208601602086016118ac565b601f01601f19169290920160200192915050565b6020815260006110c060208301846118d0565b6020808252818101527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604082015260600190565b6020808252602c90820152600080516020612a7c83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612a7c83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600080858511156119c857600080fd5b838611156119d557600080fd5b5050820193919092039150565b6001600160e01b03198135818116916004851015611a0a5780818660040360031b1b83161692505b505092915050565b60006001600160401b03821115611a2b57611a2b611665565b5060051b60200190565b600082601f830112611a4657600080fd5b81356020611a566117a283611a12565b82815260059290921b84018101918181019086841115611a7557600080fd5b8286015b84811015611a99578035611a8c816115ca565b8352918301918301611a79565b509695505050505050565b600082601f830112611ab557600080fd5b81356020611ac56117a283611a12565b82815260059290921b84018101918181019086841115611ae457600080fd5b8286015b84811015611a995780358352918301918301611ae8565b60008060008060808587031215611b1557600080fd5b8435611b20816115ca565b935060208501356001600160401b0380821115611b3c57600080fd5b908601906101208289031215611b5157600080fd5b611b5961167b565b611b62836115df565b8152611b70602084016115df565b6020820152604083013582811115611b8757600080fd5b611b938a828601611a35565b604083015250606083013582811115611bab57600080fd5b611bb78a828601611aa4565b606083015250611bc9608084016115df565b608082015260a083013560a082015260c083013560c082015260e083013560e08201526101008084013583811115611c0057600080fd5b611c0c8b828701611783565b828401525050809550506040870135915080821115611c2a57600080fd5b611c3688838901611783565b93506060870135915080821115611c4c57600080fd5b50611c5987828801611783565b91505092959194509250565b600081518084526020808501945080840160005b83811015610c875781516001600160a01b031687529582019590820190600101611c79565b600081518084526020808501945080840160005b83811015610c8757815187529582019590820190600101611cb2565b6001600160a01b03851681526080602082018190528451611cf191830190611828565b60006020850151611d0560a0840182611828565b5060408501516101208060c0850152611d226101a0850183611c65565b91506060870151607f19808685030160e0870152611d408483611c9e565b935060808901519150610100611d5881880184611828565b60a08a01518488015260c08a015161014088015260e08a0151610160880152808a015193505080868503016101808701525050611d9582826118d0565b9150508281036040840152611daa81866118d0565b90508281036060840152611dbe81856118d0565b979650505050505050565b600060208284031215611ddb57600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b80820281158282048414176110c3576110c3611de2565b600082611e2c57634e487b7160e01b600052601260045260246000fd5b500490565b818103818111156110c3576110c3611de2565b634e487b7160e01b600052603260045260246000fd5b808201808211156110c3576110c3611de2565b600060018201611e7f57611e7f611de2565b5060010190565b80516115ea816115ca565b600082601f830112611ea257600080fd5b81516020611eb26117a283611a12565b82815260059290921b84018101918181019086841115611ed157600080fd5b8286015b84811015611a99578051611ee8816115ca565b8352918301918301611ed5565b600082601f830112611f0657600080fd5b81516020611f166117a283611a12565b82815260059290921b84018101918181019086841115611f3557600080fd5b8286015b84811015611a995780518352918301918301611f39565b600082601f830112611f6157600080fd5b8151611f6f6117a28261175c565b818152846020838601011115611f8457600080fd5b611f958260208301602087016118ac565b949350505050565b600082601f830112611fae57600080fd5b81516020611fbe6117a283611a12565b82815260059290921b84018101918181019086841115611fdd57600080fd5b8286015b84811015611a995780516001600160401b038111156120005760008081fd5b61200e8986838b0101611f50565b845250918301918301611fe1565b60006020828403121561202e57600080fd5b81516001600160401b038082111561204557600080fd5b9083019060a0828603121561205957600080fd5b6120616116a4565b82518281111561207057600080fd5b61207c87828601611e91565b82525060208301518281111561209157600080fd5b61209d87828601611ef5565b6020830152506040830151828111156120b557600080fd5b6120c187828601611f9d565b604083015250606083015160608201526080830151828111156120e357600080fd5b6120ef87828601611f50565b60808301525095945050505050565b60006020808352835160a08285015261211a60c0850182611c65565b905081850151601f19808684030160408701526121378383611c9e565b60408801518782038301606089015280518083529194508501925084840190600581901b8501860160005b8281101561218e578487830301845261217c8287516118d0565b95880195938801939150600101612162565b5060608a015160808a015260808a01519650838982030160a08a01526121b481886118d0565b9a9950505050505050505050565b600082601f8301126121d357600080fd5b81516121e16117a282611a12565b808282526020820191508560208460051b870101111561220057600080fd5b602085015b60208460051b8701018110156123275780516001600160401b0381111561222b57600080fd5b8601603f8101881361223c57600080fd5b602081015161224d6117a282611a12565b808282526020820191508a60408460051b860101111561226c57600080fd5b604084015b60408460051b8601018110156123115780516001600160401b0381111561229757600080fd5b60408682018e03603f190112156122ad57600080fd5b6122b56116c6565b868201604001516001600160401b038111156122d057600080fd5b6122e18f604083868c010101611f50565b825250908601606001519061ffff821682146122fc57600080fd5b60208181019290925284529283019201612271565b5086525050602093840193919091019050612205565b5095945050505050565b60006020828403121561234357600080fd5b81516001600160401b038082111561235a57600080fd5b9083019060e0828603121561236e57600080fd5b6123766116e8565b82518281111561238557600080fd5b612391878286016121c2565b8252506123a060208401611e86565b60208201526123b160408401611e86565b6040820152606083015160608201526123cc60808401611e86565b608082015260a083015160a082015260c0830151828111156123ed57600080fd5b6123f987828601611f50565b60c08301525095945050505050565b6020808252825160e0838301528051610100840181905260009291600582811b860161012090810193928501929087019186805b838110156124cb5789870361011f1901855285518051808952908901908989019080861b8a018b01855b828110156124b557601f198c830301845284516040815181855261248c828601826118d0565b91505061ffff8f830151168f85015280935050508c850194508c84019350600181019050612466565b509950505095880195509387019360010161243c565b5050505050508185015191506124e46040850183611828565b604085015191506124f86060850183611828565b606085015160808501526080850151915061251660a0850183611828565b60a085015160c085015260c08501519150601f198482030160e085015261253d81836118d0565b95945050505050565b600060c0828403121561255857600080fd5b61256061170a565b825161256b816115ca565b8152602083015161257b816115ca565b6020820152604083015161258e816115ca565b604082015260608301516125a1816115ca565b60608201526080838101519082015260a0928301519281019290925250919050565b805160ff811681146115ea57600080fd5b600061012082840312156125e757600080fd5b6125ef61167b565b6125f883611e86565b815261260660208401611e86565b602082015261261760408401611e86565b6040820152612628606084016125c3565b6060820152612639608084016125c3565b608082015260a083015160a082015260c083015160c082015260e083015160e082015261010061266a818501611e86565b908201529392505050565b81516001600160a01b039081168252602080840151909116908201526040808301516101208301916126a990840182611828565b5060608301516126be606084018260ff169052565b5060808301516126d3608084018260ff169052565b5060a083015160a083015260c083015160c083015260e083015160e083015261010080840151611a0a82850182611828565b8051600f81900b81146115ea57600080fd5b80516115ea816115ef565b6000610120828403121561273557600080fd5b61273d61167b565b61274683611e86565b815261275460208401611e86565b602082015261276560408401611e86565b604082015261277660608401612705565b606082015261278760808401612705565b608082015260a083015160a082015260c083015160c08201526127ac60e08401612717565b60e082015261010061266a818501612717565b81516001600160a01b039081168252602080840151909116908201526040808301516101208301916127f390840182611828565b5060608301516128086060840182600f0b9052565b50608083015161281d6080840182600f0b9052565b5060a083015160a083015260c083015160c083015260e083015161284560e084018215159052565b506101008381015180151584830152611a0a565b600061010080838503121561286d57600080fd5b604051908101906001600160401b038211818310171561288f5761288f611665565b81604052835191506128a0826115ca565b8181526128af60208501611e86565b60208201526128c060408501611e86565b60408201526128d160608501611e86565b60608201526080840151608082015260a084015160a08201526128f660c08501611e86565b60c082015261290760e08501612717565b60e0820152949350505050565b600060c0828403121561292657600080fd5b61292e61170a565b8251612939816115ca565b815260208381015190820152604083015161258e816115ca565b6000610120828403121561296657600080fd5b61296e61167b565b61297783611e86565b815261298560208401611e86565b602082015261299660408401611e86565b60408201526129a760608401611e86565b60608201526080830151608082015260a083015160a08201526129cc60c08401611e86565b60c08201526127ac60e08401612717565b81516001600160a01b03908116825260208084015190911690820152604080830151610120830191612a1190840182611828565b506060830151612a246060840182611828565b506080830151608083015260a083015160a083015260c0830151612a4b60c0840182611828565b5060e083015161284560e084018215159052565b60008251612a718184602087016118ac565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212201990797cf7c2b5a985306b2544f40a5365b499084d30df8fc9f837950f1dce9f64736f6c63430008110033",
222
222
  "linkReferences": {},
223
223
  "deployedLinkReferences": {}
224
224
  }
package/build/artifacts/contracts/router/kyberswap/KyberSwapHelper.sol/KyberSwapHelper.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/2b91cdb0f0322cf804cfb04c4f0fff73.json"
3
+ "buildInfo": "../../../../build-info/60cc5ebd1b135029746337b92cb235c1.json"
4
4
  }
package/contracts/LiquidityMining/CrossChainMsg/PendleMsgSenderAppUpg.sol CHANGED
@@ -26,7 +26,7 @@ abstract contract PendleMsgSenderAppUpg is BoringOwnableUpgradeable {
26
26
  modifier refundUnusedEth() {
27
27
  _;
28
28
  if (address(this).balance > 0) {
29
- Address.sendValue(payable(msg.sender), address(this).balance);
29
+ AddressUpgradeable.sendValue(payable(msg.sender), address(this).balance);
30
30
  }
31
31
  }
32
32
 
package/contracts/LiquidityMining/VotingController/PendleVotingControllerUpg.sol CHANGED
@@ -83,7 +83,6 @@ contract PendleVotingControllerUpg is
83
83
  if (pools.length != weights.length) revert Errors.ArrayLengthMismatch();
84
84
  if (user != owner && vePendle.balanceOf(user) == 0) revert Errors.VCZeroVePendle(user);
85
85
 
86
- UserData storage uData = userData[user];
87
86
  LockedPosition memory userPosition = _getUserVePendlePosition(user);
88
87
 
89
88
  for (uint256 i = 0; i < pools.length; ++i) {
@@ -92,11 +91,9 @@ contract PendleVotingControllerUpg is
92
91
  emit Vote(user, pools[i], weights[i], newVote);
93
92
  }
94
93
 
95
- if (uData.totalVotedWeight > VeBalanceLib.USER_VOTE_MAX_WEIGHT)
96
- revert Errors.VCExceededMaxWeight(
97
- uData.totalVotedWeight,
98
- VeBalanceLib.USER_VOTE_MAX_WEIGHT
99
- );
94
+ uint256 totalVotedWeight = userData[user].totalVotedWeight;
95
+ if (totalVotedWeight > VeBalanceLib.USER_VOTE_MAX_WEIGHT)
96
+ revert Errors.VCExceededMaxWeight(totalVotedWeight, VeBalanceLib.USER_VOTE_MAX_WEIGHT);
100
97
  }
101
98
 
102
99
  /**
package/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleMainchain.sol CHANGED
@@ -32,6 +32,8 @@ contract VotingEscrowPendleMainchain is
32
32
 
33
33
  IERC20 public immutable pendle;
34
34
 
35
+ uint128 public lastSlopeChangeAppliedAt;
36
+
35
37
  // [wTime] => slopeChanges
36
38
  mapping(uint128 => uint128) public slopeChanges;
37
39
 
@@ -49,6 +51,7 @@ contract VotingEscrowPendleMainchain is
49
51
  uint256 initialApproxDestinationGas
50
52
  ) initializer PendleMsgSenderAppUpg(_pendleMsgSendEndpoint, initialApproxDestinationGas) {
51
53
  pendle = _pendle;
54
+ lastSlopeChangeAppliedAt = WeekMath.getCurrentWeekStart();
52
55
  __BoringOwnable_init();
53
56
  }
54
57
 
@@ -268,7 +271,7 @@ contract VotingEscrowPendleMainchain is
268
271
  function _broadcastPosition(address user, uint256[] calldata chainIds) internal {
269
272
  if (chainIds.length == 0) revert Errors.ArrayEmpty();
270
273
 
271
- (VeBalance memory supply, uint128 wTime) = _applySlopeChange();
274
+ (VeBalance memory supply,) = _applySlopeChange();
272
275
 
273
276
  bytes memory userData = (
274
277
  user == address(0) ? EMPTY_BYTES : abi.encode(user, positionData[user])
@@ -277,7 +280,7 @@ contract VotingEscrowPendleMainchain is
277
280
  for (uint256 i = 0; i < chainIds.length; ++i) {
278
281
  if (!destinationContracts.contains(chainIds[i]))
279
282
  revert Errors.ChainNotSupported(chainIds[i]);
280
- _broadcast(chainIds[i], wTime, supply, userData);
283
+ _broadcast(chainIds[i], uint128(block.timestamp), supply, userData);
281
284
  }
282
285
 
283
286
  if (user != address(0)) {
@@ -288,10 +291,10 @@ contract VotingEscrowPendleMainchain is
288
291
 
289
292
  function _broadcast(
290
293
  uint256 chainId,
291
- uint128 wTime,
294
+ uint128 msgTime,
292
295
  VeBalance memory supply,
293
296
  bytes memory userData
294
297
  ) internal {
295
- _sendMessage(chainId, abi.encode(wTime, supply, userData));
298
+ _sendMessage(chainId, abi.encode(msgTime, supply, userData));
296
299
  }
297
300
  }
package/contracts/LiquidityMining/VotingEscrow/VotingEscrowPendleSidechain.sol CHANGED
@@ -14,6 +14,8 @@ contract VotingEscrowPendleSidechain is
14
14
  PendleMsgReceiverAppUpg,
15
15
  BoringOwnableUpgradeable
16
16
  {
17
+ uint256 public lastTotalSupplyReceivedAt;
18
+
17
19
  mapping(address => address) internal delegatorOf;
18
20
 
19
21
  event SetNewDelegator(address delegator, address receiver);
@@ -47,11 +49,11 @@ contract VotingEscrowPendleSidechain is
47
49
  * @dev If the message also contains some users' position, we should update it
48
50
  */
49
51
  function _executeMessage(bytes memory message) internal virtual override {
50
- (uint128 wTime, VeBalance memory supply, bytes memory userData) = abi.decode(
52
+ (uint128 msgTime, VeBalance memory supply, bytes memory userData) = abi.decode(
51
53
  message,
52
54
  (uint128, VeBalance, bytes)
53
55
  );
54
- _setNewTotalSupply(wTime, supply);
56
+ _setNewTotalSupply(msgTime, supply);
55
57
  if (userData.length > 0) {
56
58
  _setNewUserPosition(userData);
57
59
  }
@@ -66,9 +68,12 @@ contract VotingEscrowPendleSidechain is
66
68
  emit SetNewUserPosition(position);
67
69
  }
68
70
 
69
- function _setNewTotalSupply(uint128 wTime, VeBalance memory supply) internal {
70
- assert(wTime == WeekMath.getWeekStartTimestamp(wTime));
71
- lastSlopeChangeAppliedAt = wTime;
71
+ function _setNewTotalSupply(uint128 msgTime, VeBalance memory supply) internal {
72
+ // lastSlopeChangeAppliedAt = wTime;
73
+ if (msgTime < lastTotalSupplyReceivedAt) {
74
+ revert Errors.VEReceiveOldSupply(msgTime);
75
+ }
76
+ lastTotalSupplyReceivedAt = msgTime;
72
77
  _totalSupply = supply;
73
78
  emit SetNewTotalSupply(supply);
74
79
  }
package/contracts/LiquidityMining/VotingEscrow/VotingEscrowTokenBase.sol CHANGED
@@ -30,13 +30,10 @@ abstract contract VotingEscrowTokenBase is IPVeToken {
30
30
  uint128 public constant MIN_LOCK_TIME = 1 weeks;
31
31
 
32
32
  VeBalance internal _totalSupply;
33
- uint128 public lastSlopeChangeAppliedAt;
34
33
 
35
34
  mapping(address => LockedPosition) public positionData;
36
35
 
37
- constructor() {
38
- lastSlopeChangeAppliedAt = WeekMath.getCurrentWeekStart();
39
- }
36
+ constructor() {}
40
37
 
41
38
  function balanceOf(address user) public view virtual returns (uint128) {
42
39
  return positionData[user].convertToVeBalance().getCurrentValue();
package/contracts/LiquidityMining/libraries/VeHistoryLib.sol CHANGED
@@ -31,11 +31,6 @@ library Checkpoints {
31
31
  return self._checkpoints[index];
32
32
  }
33
33
 
34
- /**
35
- * @dev Pushes a value onto a History so that it is stored as the checkpoint for the current block.
36
- *
37
- * Returns previous value and new value.
38
- */
39
34
  function push(History storage self, VeBalance memory value) internal {
40
35
  uint256 pos = self._checkpoints.length;
41
36
  if (pos > 0 && self._checkpoints[pos - 1].timestamp == WeekMath.getCurrentWeekStart()) {
package/contracts/core/BulkSeller/BulkSeller.sol CHANGED
@@ -233,11 +233,6 @@ contract BulkSeller is IPBulkSeller, Initializable, TokenHelper, ReentrancyGuard
233
233
  feeRate = newFeeRate;
234
234
  }
235
235
 
236
- function getTokenProp() external view returns (uint256) {
237
- BulkSellerState memory state = readState();
238
- return state.getTokenProp();
239
- }
240
-
241
236
  function _depositToken(uint256 netTokenDeposit) internal returns (uint256 netSyFromToken) {
242
237
  _safeApprove(token, SY, netTokenDeposit);
243
238
  uint256 nativeToDeposit = token == NATIVE ? netTokenDeposit : 0;
package/contracts/core/BulkSeller/BulkSellerFactory.sol CHANGED
@@ -3,20 +3,21 @@ pragma solidity 0.8.17;
3
3
 
4
4
  import "@openzeppelin/contracts/proxy/beacon/IBeacon.sol";
5
5
  import "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol";
6
- import "@openzeppelin/contracts/access/AccessControl.sol";
7
6
  import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
8
7
 
8
+ import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
9
+ import "../libraries/BoringOwnableUpgradeable.sol";
10
+
9
11
  import "../../interfaces/IStandardizedYield.sol";
10
12
  import "../../interfaces/IPBulkSellerFactory.sol";
11
- import "../libraries/BoringOwnableUpgradeable.sol";
12
13
  import "../libraries/Errors.sol";
13
14
 
14
15
  contract BulkSellerFactory is
15
16
  IBeacon,
16
17
  IPBulkSellerFactory,
17
- AccessControl,
18
- UUPSUpgradeable,
19
- Initializable
18
+ Initializable,
19
+ AccessControlUpgradeable,
20
+ UUPSUpgradeable
20
21
  {
21
22
  bytes32 public constant MAINTAINER = keccak256("MAINTAINER");
22
23
 
@@ -78,7 +79,7 @@ contract BulkSellerFactory is
78
79
  // ----------------- upgrade-related -----------------
79
80
  function upgradeBeacon(address newImplementation) public onlyAdmin {
80
81
  require(
81
- Address.isContract(newImplementation),
82
+ AddressUpgradeable.isContract(newImplementation),
82
83
  "UpgradeableBeacon: implementation is not a contract"
83
84
  );
84
85
  implementation = newImplementation;
package/contracts/core/Market/MarketMathCore.sol CHANGED
@@ -15,8 +15,9 @@ struct MarketState {
15
15
  address treasury;
16
16
  /// immutable variables ///
17
17
  int256 scalarRoot;
18
- uint256 lnFeeRateRoot;
19
18
  uint256 expiry;
19
+ /// fee data ///
20
+ uint256 lnFeeRateRoot;
20
21
  uint256 reserveFeePercent; // base 100
21
22
  /// last trade data ///
22
23
  uint256 lastLnImpliedRate;
@@ -82,11 +83,11 @@ library MarketMathCore {
82
83
  function removeLiquidity(MarketState memory market, uint256 lpToRemove)
83
84
  internal
84
85
  pure
85
- returns (uint256 syToAccount, uint256 netPtToAccount)
86
+ returns (uint256 netSyToAccount, uint256 netPtToAccount)
86
87
  {
87
88
  (int256 _syToAccount, int256 _ptToAccount) = removeLiquidityCore(market, lpToRemove.Int());
88
89
 
89
- syToAccount = _syToAccount.Uint();
90
+ netSyToAccount = _syToAccount.Uint();
90
91
  netPtToAccount = _ptToAccount.Uint();
91
92
  }
92
93
 
@@ -95,8 +96,16 @@ library MarketMathCore {
95
96
  PYIndex index,
96
97
  uint256 exactPtToMarket,
97
98
  uint256 blockTime
98
- ) internal pure returns (uint256 netSyToAccount, uint256 netSyToReserve) {
99
- (int256 _netSyToAccount, int256 _netSyToReserve) = executeTradeCore(
99
+ )
100
+ internal
101
+ pure
102
+ returns (
103
+ uint256 netSyToAccount,
104
+ uint256 netSyFee,
105
+ uint256 netSyToReserve
106
+ )
107
+ {
108
+ (int256 _netSyToAccount, int256 _netSyFee, int256 _netSyToReserve) = executeTradeCore(
100
109
  market,
101
110
  index,
102
111
  exactPtToMarket.neg(),
@@ -104,6 +113,7 @@ library MarketMathCore {
104
113
  );
105
114
 
106
115
  netSyToAccount = _netSyToAccount.Uint();
116
+ netSyFee = _netSyFee.Uint();
107
117
  netSyToReserve = _netSyToReserve.Uint();
108
118
  }
109
119
 
@@ -112,8 +122,16 @@ library MarketMathCore {
112
122
  PYIndex index,
113
123
  uint256 exactPtToAccount,
114
124
  uint256 blockTime
115
- ) internal pure returns (uint256 netSyToMarket, uint256 netSyToReserve) {
116
- (int256 _netSyToAccount, int256 _netSyToReserve) = executeTradeCore(
125
+ )
126
+ internal
127
+ pure
128
+ returns (
129
+ uint256 netSyToMarket,
130
+ uint256 netSyFee,
131
+ uint256 netSyToReserve
132
+ )
133
+ {
134
+ (int256 _netSyToAccount, int256 _netSyFee, int256 _netSyToReserve) = executeTradeCore(
117
135
  market,
118
136
  index,
119
137
  exactPtToAccount.Int(),
@@ -121,6 +139,7 @@ library MarketMathCore {
121
139
  );
122
140
 
123
141
  netSyToMarket = _netSyToAccount.neg().Uint();
142
+ netSyFee = _netSyFee.Uint();
124
143
  netSyToReserve = _netSyToReserve.Uint();
125
144
  }
126
145
 
@@ -197,7 +216,7 @@ library MarketMathCore {
197
216
  netSyToAccount = (lpToRemove * market.totalSy) / market.totalLp;
198
217
  netPtToAccount = (lpToRemove * market.totalPt) / market.totalLp;
199
218
 
200
- if (netSyToAccount == 0 || netPtToAccount == 0) revert Errors.MarketZeroAmountsOutput();
219
+ if (netSyToAccount == 0 && netPtToAccount == 0) revert Errors.MarketZeroAmountsOutput();
201
220
 
202
221
  /// ------------------------------------------------------------
203
222
  /// WRITE
@@ -212,7 +231,15 @@ library MarketMathCore {
212
231
  PYIndex index,
213
232
  int256 netPtToAccount,
214
233
  uint256 blockTime
215
- ) internal pure returns (int256 netSyToAccount, int256 netSyToReserve) {
234
+ )
235
+ internal
236
+ pure
237
+ returns (
238
+ int256 netSyToAccount,
239
+ int256 netSyFee,
240
+ int256 netSyToReserve
241
+ )
242
+ {
216
243
  /// ------------------------------------------------------------
217
244
  /// CHECKS
218
245
  /// ------------------------------------------------------------
@@ -225,7 +252,12 @@ library MarketMathCore {
225
252
  /// ------------------------------------------------------------
226
253
  MarketPreCompute memory comp = getMarketPreCompute(market, index, blockTime);
227
254
 
228
- (netSyToAccount, netSyToReserve) = calcTrade(market, comp, index, netPtToAccount);
255
+ (netSyToAccount, netSyFee, netSyToReserve) = calcTrade(
256
+ market,
257
+ comp,
258
+ index,
259
+ netPtToAccount
260
+ );
229
261
 
230
262
  /// ------------------------------------------------------------
231
263
  /// WRITE
@@ -271,7 +303,15 @@ library MarketMathCore {
271
303
  MarketPreCompute memory comp,
272
304
  PYIndex index,
273
305
  int256 netPtToAccount
274
- ) internal pure returns (int256 netSyToAccount, int256 netSyToReserve) {
306
+ )
307
+ internal
308
+ pure
309
+ returns (
310
+ int256 netSyToAccount,
311
+ int256 netSyFee,
312
+ int256 netSyToReserve
313
+ )
314
+ {
275
315
  int256 preFeeExchangeRate = _getExchangeRate(
276
316
  market.totalPt,
277
317
  comp.totalAsset,
@@ -299,6 +339,7 @@ library MarketMathCore {
299
339
  netSyToAccount = netAssetToAccount < 0
300
340
  ? index.assetToSyUp(netAssetToAccount)
301
341
  : index.assetToSy(netAssetToAccount);
342
+ netSyFee = index.assetToSy(fee);
302
343
  netSyToReserve = index.assetToSy(netAssetToReserve);
303
344
  }
304
345