@gooddollar/goodprotocol 2.0.25-beta.9 → 2.0.26-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (421) hide show
  1. package/artifacts/abis/AdminWallet.min.json +1 -1
  2. package/artifacts/abis/CompoundVotingMachine.min.json +1 -1
  3. package/artifacts/abis/DistributionHelper.min.json +1 -1
  4. package/artifacts/abis/DistributionHelperTest.min.json +1 -1
  5. package/artifacts/abis/DistributionHelperTestHelper.min.json +1 -1
  6. package/artifacts/abis/EternalStorage.min.json +1 -0
  7. package/artifacts/abis/FuseOldBridgeKill.min.json +1 -0
  8. package/artifacts/abis/GoodFundManager.min.json +1 -1
  9. package/artifacts/abis/GoodFundManagerTest.min.json +1 -1
  10. package/artifacts/abis/GoodMarketMaker.min.json +1 -1
  11. package/artifacts/abis/GoodReserveCDai.min.json +1 -1
  12. package/artifacts/abis/IQuoterV2.min.json +1 -1
  13. package/artifacts/abis/ISwapRouter.min.json +1 -1
  14. package/artifacts/abis/IUpgradeabilityOwnerStorage.min.json +1 -0
  15. package/artifacts/abis/Initializable.min.json +1 -0
  16. package/artifacts/abis/Ownable.min.json +1 -0
  17. package/artifacts/abis/ReserveRestore.min.json +1 -0
  18. package/artifacts/abis/SuperfluidFaucet.min.json +1 -0
  19. package/artifacts/abis/Upgradeable.min.json +1 -0
  20. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  21. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  22. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  23. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  24. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  25. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  26. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  27. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  28. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  29. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  30. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  31. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  32. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  33. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  34. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  35. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  36. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  37. package/artifacts/contracts/Interfaces.sol/IIdentityV2.dbg.json +1 -1
  38. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  39. package/artifacts/contracts/Interfaces.sol/IMultichainRouter.dbg.json +1 -1
  40. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  41. package/artifacts/contracts/Interfaces.sol/IQuoterV2.dbg.json +4 -0
  42. package/artifacts/contracts/{utils/BuyGDClone.sol → Interfaces.sol}/IQuoterV2.json +1 -1
  43. package/artifacts/contracts/Interfaces.sol/ISwapRouter.dbg.json +4 -0
  44. package/artifacts/contracts/{utils/BuyGDClone.sol → Interfaces.sol}/ISwapRouter.json +1 -1
  45. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  46. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  47. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  48. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  49. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  50. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  51. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  52. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  53. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.dbg.json +1 -1
  54. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.json +2 -2
  55. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  56. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.json +2 -2
  57. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.dbg.json +1 -1
  58. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.json +2 -2
  59. package/artifacts/contracts/fuseFaucet/SuperfluidFacuet.sol/SuperfluidFaucet.dbg.json +4 -0
  60. package/artifacts/contracts/fuseFaucet/SuperfluidFacuet.sol/SuperfluidFaucet.json +536 -0
  61. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  62. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.json +2 -2
  63. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  64. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.json +20 -2
  65. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  66. package/artifacts/contracts/governance/GReputation.sol/GReputation.json +2 -2
  67. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.dbg.json +1 -1
  68. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.json +2 -2
  69. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.dbg.json +1 -1
  70. package/artifacts/contracts/governance/GoodDollarStaking.sol/IStakingUpgrade.dbg.json +1 -1
  71. package/artifacts/contracts/governance/GoodDollarStaking.sol/RewardsMinter.dbg.json +1 -1
  72. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  73. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.json +2 -2
  74. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  75. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  76. package/artifacts/contracts/governance/Reputation.sol/Reputation.json +2 -2
  77. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  78. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.json +2 -2
  79. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.dbg.json +1 -1
  80. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json +2 -2
  81. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.dbg.json +1 -1
  82. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.json +2 -2
  83. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  84. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.json +2 -2
  85. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.dbg.json +1 -1
  86. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.json +2 -2
  87. package/artifacts/contracts/invite/OneTimeReward.sol/OneTimeReward.dbg.json +1 -1
  88. package/artifacts/contracts/invite/OneTimeReward.sol/OneTimeReward.json +2 -2
  89. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  90. package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.dbg.json +1 -1
  91. package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.dbg.json +1 -1
  92. package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.dbg.json +1 -1
  93. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  94. package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.dbg.json +1 -1
  95. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  96. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.dbg.json +1 -1
  97. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.json +2 -2
  98. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.dbg.json +1 -1
  99. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.json +21 -2
  100. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.dbg.json +1 -1
  101. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.json +21 -2
  102. package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.dbg.json +1 -1
  103. package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.dbg.json +1 -1
  104. package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.dbg.json +1 -1
  105. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  106. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +2 -2
  107. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.dbg.json +1 -1
  108. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.json +2 -2
  109. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  110. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.json +21 -2
  111. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.dbg.json +1 -1
  112. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.json +2 -2
  113. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  114. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  115. package/artifacts/contracts/mocks/MultichainRouterMock.sol/IWrapper.dbg.json +1 -1
  116. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.dbg.json +1 -1
  117. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.json +2 -2
  118. package/artifacts/contracts/mocks/OverMintTester.sol/IGoodDollarStakingTest.dbg.json +1 -1
  119. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  120. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.json +2 -2
  121. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  122. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
  123. package/artifacts/contracts/mocks/PayableMock.sol/PayableMock.dbg.json +1 -1
  124. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  125. package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.dbg.json +1 -1
  126. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  127. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.json +2 -2
  128. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  129. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  130. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.json +2 -2
  131. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  132. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.json +2 -2
  133. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
  134. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.json +2 -2
  135. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
  136. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.json +2 -2
  137. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  138. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  139. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  140. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  141. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  142. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  143. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  144. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  145. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.dbg.json +1 -1
  146. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.json +21 -2
  147. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  148. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.json +2 -2
  149. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  150. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.json +6 -6
  151. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  152. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  153. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.json +3 -3
  154. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  155. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.json +2 -2
  156. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  157. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.json +2 -2
  158. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  159. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +2 -2
  160. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.dbg.json +1 -1
  161. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.json +2 -2
  162. package/artifacts/contracts/staking/FuseStakingV3.sol/IConsensus.dbg.json +1 -1
  163. package/artifacts/contracts/staking/FuseStakingV3.sol/PegSwap.dbg.json +1 -1
  164. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  165. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.json +21 -2
  166. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  167. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  168. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  169. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.json +2 -2
  170. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  171. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +2 -2
  172. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  173. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +2 -2
  174. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  175. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.json +2 -2
  176. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  177. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +2 -2
  178. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  179. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +2 -2
  180. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  181. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.json +2 -2
  182. package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.dbg.json +1 -1
  183. package/artifacts/contracts/staking/utils/StakingRewardsFixedAPY.sol/StakingRewardsFixedAPY.dbg.json +1 -1
  184. package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.dbg.json +1 -1
  185. package/artifacts/contracts/token/ERC677.sol/ERC677.dbg.json +1 -1
  186. package/artifacts/contracts/token/ERC677.sol/ERC677Receiver.dbg.json +1 -1
  187. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.dbg.json +1 -1
  188. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.json +2 -2
  189. package/artifacts/contracts/token/IFeesFormula.sol/IFeesFormula.dbg.json +1 -1
  190. package/artifacts/contracts/token/MultichainFeeFormula.sol/MultichainFeeFormula.dbg.json +1 -1
  191. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/ERC20Permit.dbg.json +1 -1
  192. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/SelfApprove.dbg.json +1 -1
  193. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/IGoodDollarCustom.dbg.json +1 -1
  194. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/ISuperGoodDollar.dbg.json +1 -1
  195. package/artifacts/contracts/token/superfluid/ISuperToken.sol/ISuperToken.dbg.json +1 -1
  196. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.dbg.json +1 -1
  197. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json +2 -2
  198. package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.dbg.json +1 -1
  199. package/artifacts/contracts/token/superfluid/SuperfluidToken.sol/SuperfluidToken.dbg.json +1 -1
  200. package/artifacts/contracts/token/superfluid/UUPSProxiable.sol/UUPSProxiable.dbg.json +1 -1
  201. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/Proxy.dbg.json +1 -1
  202. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.dbg.json +1 -1
  203. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.dbg.json +1 -1
  204. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  205. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +2 -2
  206. package/artifacts/contracts/ubi/UBISchemeV2.sol/UBISchemeV2.dbg.json +1 -1
  207. package/artifacts/contracts/ubi/UBISchemeV2.sol/UBISchemeV2.json +2 -2
  208. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +1 -1
  209. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.json +2 -22
  210. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.dbg.json +1 -1
  211. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.json +2 -2
  212. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  213. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
  214. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.json +2 -2
  215. package/artifacts/contracts/utils/BulkWhitelist.sol/BulkWhitelist.dbg.json +1 -1
  216. package/artifacts/contracts/utils/BulkWhitelist.sol/BulkWhitelist.json +2 -2
  217. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.dbg.json +1 -1
  218. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.json +2 -2
  219. package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDClone.dbg.json +1 -1
  220. package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDClone.json +2 -2
  221. package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDCloneFactory.dbg.json +1 -1
  222. package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDCloneFactory.json +2 -2
  223. package/artifacts/contracts/utils/BuyGDClone.sol/DonateGDClone.dbg.json +1 -1
  224. package/artifacts/contracts/utils/BuyGDClone.sol/DonateGDClone.json +2 -2
  225. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  226. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.json +2 -2
  227. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  228. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.json +2 -2
  229. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  230. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  231. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/EternalStorage.dbg.json +4 -0
  232. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/EternalStorage.json +10 -0
  233. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/FuseOldBridgeKill.dbg.json +4 -0
  234. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/FuseOldBridgeKill.json +31 -0
  235. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/IUpgradeabilityOwnerStorage.dbg.json +4 -0
  236. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/IUpgradeabilityOwnerStorage.json +24 -0
  237. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Initializable.dbg.json +4 -0
  238. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Initializable.json +24 -0
  239. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Ownable.dbg.json +4 -0
  240. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Ownable.json +56 -0
  241. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Upgradeable.dbg.json +4 -0
  242. package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Upgradeable.json +10 -0
  243. package/artifacts/contracts/utils/GDFaucet.sol/GDFaucet.dbg.json +1 -1
  244. package/artifacts/contracts/utils/GDFaucet.sol/GDFaucet.json +2 -2
  245. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json +1 -1
  246. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.json +2 -2
  247. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json +1 -1
  248. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json +1 -1
  249. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json +1 -1
  250. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.json +2 -2
  251. package/artifacts/contracts/utils/IdentityFix.sol/IdentityFix.dbg.json +1 -1
  252. package/artifacts/contracts/utils/IdentityFix.sol/IdentityFix.json +2 -2
  253. package/artifacts/contracts/utils/LastauthReduction.sol/LastauthReduction.dbg.json +1 -1
  254. package/artifacts/contracts/utils/LastauthReduction.sol/LastauthReduction.json +2 -2
  255. package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json +1 -1
  256. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json +1 -1
  257. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.json +2 -2
  258. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  259. package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.dbg.json +1 -1
  260. package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.json +2 -2
  261. package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.dbg.json +1 -1
  262. package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.json +2 -2
  263. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  264. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  265. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.json +2 -2
  266. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  267. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.json +2 -2
  268. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
  269. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json +2 -2
  270. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
  271. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json +2 -2
  272. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
  273. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
  274. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  275. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json +2 -2
  276. package/artifacts/contracts/utils/ReserveRestore.sol/ReserveRestore.dbg.json +4 -0
  277. package/artifacts/contracts/utils/ReserveRestore.sol/ReserveRestore.json +91 -0
  278. package/contracts/Interfaces.sol +122 -0
  279. package/contracts/fuseFaucet/SuperfluidFacuet.sol +129 -0
  280. package/contracts/governance/CompoundVotingMachine.sol +26 -11
  281. package/contracts/governance/StakersDistribution.sol +13 -13
  282. package/contracts/reserve/DistributionHelper.sol +29 -10
  283. package/contracts/reserve/ExchangeHelper.sol +16 -7
  284. package/contracts/reserve/GoodMarketMaker.sol +43 -53
  285. package/contracts/reserve/GoodReserveCDai.sol +44 -16
  286. package/contracts/staking/GoodFundManager.sol +44 -4
  287. package/contracts/utils/AdminWallet.sol +4 -6
  288. package/contracts/utils/BuyGDClone.sol +0 -122
  289. package/contracts/utils/FuseOldBridgeKill.sol +123 -0
  290. package/contracts/utils/ReserveRestore.sol +157 -0
  291. package/dist/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json +2 -2
  292. package/dist/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json +2 -2
  293. package/hardhat.config.ts +21 -39
  294. package/package.json +3 -3
  295. package/releases/deployment.json +6 -0
  296. package/scripts/multichain-deploy/0_proxyFactory-deploy.ts +20 -15
  297. package/scripts/multichain-deploy/7_superfluidfaucet-deploy.ts +95 -0
  298. package/scripts/multichain-deploy/helpers.ts +8 -8
  299. package/scripts/proposals/reserveRestore.ts +429 -0
  300. package/scripts/test/localOldDaoDeploy.ts +2 -1
  301. package/test/governance/CompoundVotingMachine.daoscheme.ts +3 -0
  302. package/test/governance/CompoundVotingMachine.guardian.test.ts +76 -21
  303. package/test/governance/CompoundVotingMachine.state.test.ts +31 -28
  304. package/test/governance/StakersDistribution.test.ts +79 -5
  305. package/test/helpers.ts +7 -0
  306. package/test/reserve/DistributionHelper.test.ts +10 -10
  307. package/test/reserve/GoodMarketMaker.test.ts +75 -26
  308. package/test/staking/StakingRewards.test.ts +106 -29
  309. package/test/utils/ProtocolUpgrade.test.ts +1 -0
  310. package/types/contracts/{utils/BuyGDClone.sol → Interfaces.sol}/IQuoterV2.ts +1 -1
  311. package/types/contracts/{utils/BuyGDClone.sol → Interfaces.sol}/ISwapRouter.ts +1 -1
  312. package/types/contracts/Interfaces.sol/index.ts +2 -0
  313. package/types/contracts/fuseFaucet/SuperfluidFacuet.sol/SuperfluidFaucet.ts +867 -0
  314. package/types/contracts/fuseFaucet/SuperfluidFacuet.sol/index.ts +4 -0
  315. package/types/contracts/fuseFaucet/index.ts +2 -0
  316. package/types/contracts/governance/CompoundVotingMachine.ts +44 -3
  317. package/types/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.ts +35 -0
  318. package/types/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.ts +35 -0
  319. package/types/contracts/mocks/GoodFundManagerTest.ts +35 -0
  320. package/types/contracts/reserve/DistributionHelper.ts +35 -0
  321. package/types/contracts/reserve/GoodMarketMaker.ts +3 -3
  322. package/types/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.ts +5 -5
  323. package/types/contracts/staking/GoodFundManager.ts +35 -0
  324. package/types/contracts/utils/AdminWallet.ts +0 -34
  325. package/types/contracts/utils/BuyGDClone.sol/index.ts +0 -2
  326. package/types/contracts/utils/FuseOldBridgeKill.sol/FuseOldBridgeKill.ts +108 -0
  327. package/types/contracts/utils/FuseOldBridgeKill.sol/IUpgradeabilityOwnerStorage.ts +89 -0
  328. package/types/contracts/utils/FuseOldBridgeKill.sol/Initializable.ts +87 -0
  329. package/types/contracts/utils/FuseOldBridgeKill.sol/Ownable.ts +148 -0
  330. package/types/contracts/utils/FuseOldBridgeKill.sol/index.ts +7 -0
  331. package/types/contracts/utils/ReserveRestore.ts +201 -0
  332. package/types/contracts/utils/index.ts +3 -0
  333. package/types/factories/contracts/{utils/BuyGDClone.sol → Interfaces.sol}/IQuoterV2__factory.ts +1 -1
  334. package/types/factories/contracts/{utils/BuyGDClone.sol → Interfaces.sol}/ISwapRouter__factory.ts +1 -1
  335. package/types/factories/contracts/Interfaces.sol/index.ts +2 -0
  336. package/types/factories/contracts/fuseFaucet/Faucet__factory.ts +1 -1
  337. package/types/factories/contracts/fuseFaucet/FuseFaucetV2__factory.ts +1 -1
  338. package/types/factories/contracts/fuseFaucet/FuseFaucet__factory.ts +1 -1
  339. package/types/factories/contracts/fuseFaucet/SuperfluidFacuet.sol/SuperfluidFaucet__factory.ts +587 -0
  340. package/types/factories/contracts/fuseFaucet/SuperfluidFacuet.sol/index.ts +4 -0
  341. package/types/factories/contracts/fuseFaucet/index.ts +1 -0
  342. package/types/factories/contracts/governance/ClaimersDistribution__factory.ts +1 -1
  343. package/types/factories/contracts/governance/CompoundVotingMachine__factory.ts +19 -1
  344. package/types/factories/contracts/governance/GReputation__factory.ts +1 -1
  345. package/types/factories/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking__factory.ts +1 -1
  346. package/types/factories/contracts/governance/GovernanceStaking__factory.ts +1 -1
  347. package/types/factories/contracts/governance/Reputation__factory.ts +1 -1
  348. package/types/factories/contracts/governance/StakersDistribution__factory.ts +1 -1
  349. package/types/factories/contracts/identity/IdentityV2__factory.ts +1 -1
  350. package/types/factories/contracts/invite/InvitesFuseV2__factory.ts +1 -1
  351. package/types/factories/contracts/invite/InvitesV1__factory.ts +1 -1
  352. package/types/factories/contracts/invite/InvitesV2__factory.ts +1 -1
  353. package/types/factories/contracts/invite/OneTimeReward__factory.ts +1 -1
  354. package/types/factories/contracts/mocks/DistributionBridgeMock__factory.ts +1 -1
  355. package/types/factories/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper__factory.ts +20 -1
  356. package/types/factories/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest__factory.ts +20 -1
  357. package/types/factories/contracts/mocks/GoodCompoundStakingTest__factory.ts +1 -1
  358. package/types/factories/contracts/mocks/GoodDollarStakingMock__factory.ts +1 -1
  359. package/types/factories/contracts/mocks/GoodFundManagerTest__factory.ts +20 -1
  360. package/types/factories/contracts/mocks/IdentityMock__factory.ts +1 -1
  361. package/types/factories/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock__factory.ts +1 -1
  362. package/types/factories/contracts/mocks/OverMintTester.sol/OverMintTester__factory.ts +1 -1
  363. package/types/factories/contracts/mocks/OverMintTesterRegularStake__factory.ts +1 -1
  364. package/types/factories/contracts/mocks/SwapHelperTest__factory.ts +1 -1
  365. package/types/factories/contracts/mocks/UpgradableMocks.sol/UpgradableMock2__factory.ts +1 -1
  366. package/types/factories/contracts/mocks/UpgradableMocks.sol/UpgradableMock3__factory.ts +1 -1
  367. package/types/factories/contracts/mocks/UpgradableMocks.sol/UpgradableMock4__factory.ts +1 -1
  368. package/types/factories/contracts/mocks/UpgradableMocks.sol/UpgradableMock__factory.ts +1 -1
  369. package/types/factories/contracts/reserve/DistributionHelper__factory.ts +20 -1
  370. package/types/factories/contracts/reserve/ExchangeHelper__factory.ts +1 -1
  371. package/types/factories/contracts/reserve/GoodMarketMaker__factory.ts +5 -5
  372. package/types/factories/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai__factory.ts +2 -2
  373. package/types/factories/contracts/staking/BaseShareFieldV2__factory.ts +1 -1
  374. package/types/factories/contracts/staking/BaseShareField__factory.ts +1 -1
  375. package/types/factories/contracts/staking/DonationsStaking__factory.ts +1 -1
  376. package/types/factories/contracts/staking/FuseStakingV3.sol/FuseStakingV3__factory.ts +1 -1
  377. package/types/factories/contracts/staking/GoodFundManager__factory.ts +20 -1
  378. package/types/factories/contracts/staking/UniswapV2SwapHelper__factory.ts +1 -1
  379. package/types/factories/contracts/staking/aave/AaveStakingFactory__factory.ts +1 -1
  380. package/types/factories/contracts/staking/aave/GoodAaveStakingV2__factory.ts +1 -1
  381. package/types/factories/contracts/staking/aave/GoodAaveStaking__factory.ts +1 -1
  382. package/types/factories/contracts/staking/compound/CompoundStakingFactory__factory.ts +1 -1
  383. package/types/factories/contracts/staking/compound/GoodCompoundStakingV2__factory.ts +1 -1
  384. package/types/factories/contracts/staking/compound/GoodCompoundStaking__factory.ts +1 -1
  385. package/types/factories/contracts/token/GoodDollar__factory.ts +1 -1
  386. package/types/factories/contracts/token/superfluid/SuperGoodDollar__factory.ts +1 -1
  387. package/types/factories/contracts/ubi/UBISchemeV2__factory.ts +1 -1
  388. package/types/factories/contracts/ubi/UBIScheme__factory.ts +1 -1
  389. package/types/factories/contracts/utils/AdminWalletFuse__factory.ts +1 -1
  390. package/types/factories/contracts/utils/AdminWallet__factory.ts +1 -21
  391. package/types/factories/contracts/utils/BulkWhitelist__factory.ts +1 -1
  392. package/types/factories/contracts/utils/BuyAndBridgeHelper__factory.ts +1 -1
  393. package/types/factories/contracts/utils/BuyGDClone.sol/BuyGDCloneFactory__factory.ts +1 -1
  394. package/types/factories/contracts/utils/BuyGDClone.sol/BuyGDClone__factory.ts +1 -1
  395. package/types/factories/contracts/utils/BuyGDClone.sol/DonateGDClone__factory.ts +1 -1
  396. package/types/factories/contracts/utils/BuyGDClone.sol/index.ts +0 -2
  397. package/types/factories/contracts/utils/DAOContract__factory.ts +1 -1
  398. package/types/factories/contracts/utils/DAOUpgradeableContract__factory.ts +1 -1
  399. package/types/factories/contracts/utils/FuseOldBridgeKill.sol/FuseOldBridgeKill__factory.ts +82 -0
  400. package/types/factories/contracts/utils/FuseOldBridgeKill.sol/IUpgradeabilityOwnerStorage__factory.ts +43 -0
  401. package/types/factories/contracts/utils/FuseOldBridgeKill.sol/Initializable__factory.ts +75 -0
  402. package/types/factories/contracts/utils/FuseOldBridgeKill.sol/Ownable__factory.ts +105 -0
  403. package/types/factories/contracts/utils/FuseOldBridgeKill.sol/index.ts +7 -0
  404. package/types/factories/contracts/utils/GDFaucet__factory.ts +1 -1
  405. package/types/factories/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper__factory.ts +1 -1
  406. package/types/factories/contracts/utils/IdentityFix__factory.ts +1 -1
  407. package/types/factories/contracts/utils/LastauthReduction__factory.ts +1 -1
  408. package/types/factories/contracts/utils/MultichainBridgeHelper__factory.ts +1 -1
  409. package/types/factories/contracts/utils/OneTimePaymentsV2__factory.ts +1 -1
  410. package/types/factories/contracts/utils/OneTimePayments__factory.ts +1 -1
  411. package/types/factories/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade__factory.ts +1 -1
  412. package/types/factories/contracts/utils/ProtocolUpgradeFuseRecover__factory.ts +1 -1
  413. package/types/factories/contracts/utils/ProtocolUpgradeFuse__factory.ts +1 -1
  414. package/types/factories/contracts/utils/ProtocolUpgradeRecover__factory.ts +1 -1
  415. package/types/factories/contracts/utils/ReputationTestHelper__factory.ts +1 -1
  416. package/types/factories/contracts/utils/ReserveRestore__factory.ts +144 -0
  417. package/types/factories/contracts/utils/index.ts +2 -0
  418. package/types/hardhat.d.ts +70 -16
  419. package/types/index.ts +12 -4
  420. package/artifacts/contracts/utils/BuyGDClone.sol/IQuoterV2.dbg.json +0 -4
  421. package/artifacts/contracts/utils/BuyGDClone.sol/ISwapRouter.dbg.json +0 -4
package/types/factories/contracts/reserve/ExchangeHelper__factory.ts CHANGED
@@ -377,7 +377,7 @@ const _abi = [
377
377
  ] as const;
378
378
 
379
379
  const _bytecode =
380
- "0x60a06040523060805234801561001457600080fd5b506080516129a361004c6000396000818161095c0152818161099c01528181610a2401528181610a640152610ae001526129a36000f3fe6080604052600436106100ad5760003560e01c806303c40ef4146100b25780631b3c90a8146100d85780632c387275146100ef5780633659cfe61461011c5780633e6326fc1461013c5780634162169f1461015c5780634f1ef2861461017c57806352d1902d1461018f5780635aef7de6146101a45780637738fd0b146101c4578063bc3a429b146101e4578063c4d66de8146101f9578063e1758bd814610219578063f2c65bf91461022e575b600080fd5b6100c56100c036600461235a565b61024e565b6040519081526020015b60405180910390f35b3480156100e457600080fd5b506100ed61082b565b005b3480156100fb57600080fd5b50609b5461010f906001600160a01b031681565b6040516100cf9190612424565b34801561012857600080fd5b506100ed610137366004612438565b610952565b34801561014857600080fd5b5060675461010f906001600160a01b031681565b34801561016857600080fd5b5060655461010f906001600160a01b031681565b6100ed61018a366004612455565b610a1a565b34801561019b57600080fd5b506100c5610ad3565b3480156101b057600080fd5b5060665461010f906001600160a01b031681565b3480156101d057600080fd5b506100c56101df36600461235a565b610b81565b3480156101f057600080fd5b506100ed61115c565b34801561020557600080fd5b506100ed610214366004612438565b6113db565b34801561022557600080fd5b5061010f611501565b34801561023a57600080fd5b50609c5461010f906001600160a01b031681565b6000609a5460020361027b5760405162461bcd60e51b8152600401610272906124fc565b60405180910390fd5b6002609a55855161029e5760405162461bcd60e51b815260040161027290612533565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906102cd9060040161255f565b602060405180830381865afa1580156102ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030e9190612580565b905060006001600160a01b038416156103275783610329565b335b905060006001600160a01b0316886000815181106103495761034961259d565b60200260200101516001600160a01b0316036103ba5760003411801561036e57503487145b6103b55760405162461bcd60e51b81526020600482015260186024820152770f2deea40dccacac840e8de40e0c2f240eed2e8d0408aa8960431b6044820152606401610272565b6105a5565b341561043a5760405162461bcd60e51b815260206004820152604360248201527f5768656e20696e70757420746f6b656e20697320646966666572656e7420746860448201527f616e20455448206d6573736167652076616c75652073686f756c64206265207a60648201526265726f60e81b608482015260a401610272565b8760008151811061044d5761044d61259d565b60200260200101516001600160a01b03166323b872dd33609c60009054906101000a90046001600160a01b03166001600160a01b03168b6000815181106104965761049661259d565b60200260200101516001600160a01b0316146104b257306104b4565b845b6040516001600160e01b031960e085901b1681526001600160a01b03928316600482015291166024820152604481018a90526064016020604051808303816000875af1158015610508573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061052c91906125b3565b15156001146105a5576040805162461bcd60e51b81526020600482015260248101919091527f7472616e7366657246726f6d206661696c65642c206d616b652073757265207960448201527f6f7520617070726f76656420696e70757420746f6b656e207472616e736665726064820152608401610272565b609c5488516000916001600160a01b0316908a9083906105c7576105c761259d565b60200260200101516001600160a01b031603610657576040516359a87bc160e01b81526001600160a01b038416906359a87bc19061060d908b908b9087906004016125d5565b6020604051808303816000875af115801561062c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061065091906125f4565b90506107a0565b609b5489516001600160a01b03909116908a906000906106795761067961259d565b60200260200101516001600160a01b03160361069a57610650888884611576565b609b5489516001600160a01b03909116908a906106b99060019061260d565b815181106106c9576106c961259d565b60200260200101516001600160a01b0316146107335760405162461bcd60e51b8152602060048201526024808201527f54617267657420746f6b656e20696e207468652070617468206d7573742062656044820152632044414960e01b6064820152608401610272565b60006107438a8a89600030611889565b905060008160018351610756919061260d565b815181106107665761076661259d565b60200260200101519050600081116107905760405162461bcd60e51b81526004016102729061262e565b61079b818a86611576565b925050505b816001600160a01b0316896000815181106107bd576107bd61259d565b60200260200101516001600160a01b0316336001600160a01b03167fcace70a03cbf3e4fa942b0ab9f70aa3834cfab0a31aa75bc4895262063444e128b85604051610812929190918252602082015260400190565b60405180910390a46001609a5598975050505050505050565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa15801561088e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108b29190612580565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa15801561090c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109309190612580565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361099a5760405162461bcd60e51b81526004016102729061265c565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166109cc611c52565b6001600160a01b0316146109f25760405162461bcd60e51b815260040161027290612696565b6109fb81611c6e565b60408051600080825260208201909252610a1791839190611c76565b50565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610a625760405162461bcd60e51b81526004016102729061265c565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610a94611c52565b6001600160a01b031614610aba5760405162461bcd60e51b815260040161027290612696565b610ac382611c6e565b610acf82826001611c76565b5050565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610b6e5760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610272565b5060008051602061292783398151915290565b6000609a54600203610ba55760405162461bcd60e51b8152600401610272906124fc565b6002609a558551610bc85760405162461bcd60e51b815260040161027290612533565b60006001600160a01b03831615610bdf5782610be1565b335b60675460405163bf40fac160e01b8152919250600091829182916001600160a01b039091169063bf40fac190610c199060040161255f565b602060405180830381865afa158015610c36573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c5a9190612580565b60675460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac190610c89906004016126d0565b602060405180830381865afa158015610ca6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cca9190612580565b6001600160a01b03166379cc6790338b6040518363ffffffff1660e01b8152600401610cf79291906126f4565b600060405180830381600087803b158015610d1157600080fd5b505af1158015610d25573d6000803e3d6000fd5b50505050806001600160a01b0316634f8f02188a8a8d516001148015610d7b5750609c548e516001600160a01b03909116908f90600090610d6857610d6861259d565b60200260200101516001600160a01b0316145b610d855730610d87565b875b6040516001600160e01b031960e086901b168152600481019390935260248301919091526001600160a01b0316604482015233606482015260840160408051808303816000875af1158015610de0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e04919061270d565b8b5191945092506001148015610e845750609b548a516001600160a01b03909116908b90600090610e3757610e3761259d565b60200260200101516001600160a01b03161480610e845750609c548a516001600160a01b03909116908b90600090610e7157610e7161259d565b60200260200101516001600160a01b0316145b15610f9f57609b548a516001600160a01b03909116908b90600090610eab57610eab61259d565b60200260200101516001600160a01b031603610f9a57610eca83611de6565b925089600081518110610edf57610edf61259d565b60200260200101516001600160a01b031663a9059cbb85856040518363ffffffff1660e01b8152600401610f149291906126f4565b6020604051808303816000875af1158015610f33573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f5791906125b3565b1515600114610f9a5760405162461bcd60e51b815260206004820152600f60248201526e151c985b9cd9995c8819985a5b1959608a1b6044820152606401610272565b6110ca565b609c548a516001600160a01b03909116908b90600090610fc157610fc161259d565b60200260200101516001600160a01b0316146100ad57610fe083611de6565b609b548b519194506001600160a01b0316908b906000906110035761100361259d565b60200260200101516001600160a01b03161461106d5760405162461bcd60e51b815260206004820152602360248201527f496e70757420746f6b656e20666f7220756e6973776170206d7573742062652060448201526244414960e81b6064820152608401610272565b600061107d8b8560008b89611889565b9050806001825161108e919061260d565b8151811061109e5761109e61259d565b60200260200101519350600084116110c85760405162461bcd60e51b81526004016102729061262e565b505b836001600160a01b03168a60018c516110e3919061260d565b815181106110f3576110f361259d565b602090810291909101810151604080518d815292830186905282018690526001600160a01b03169033907f067ad67f3f4d17211f9f929d19036c2395bbc9b201d517e46e81f9ceae86032e9060600160405180910390a450506001609a55979650505050505050565b60675460405163bf40fac160e01b815260206004820152600360248201526244414960e81b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156111b8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111dc9190612580565b609b80546001600160a01b0319166001600160a01b0392831617905560675460405163bf40fac160e01b815260206004808301919091526024820152634344414960e01b604482015291169063bf40fac190606401602060405180830381865afa15801561124e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112729190612580565b609c80546001600160a01b0319166001600160a01b03928316908117909155609b5460405163095ea7b360e01b815292169163095ea7b3916112ba91600019906004016126f4565b6020604051808303816000875af11580156112d9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112fd91906125b3565b50609b5460675460405163bf40fac160e01b81526001600160a01b039283169263095ea7b392169063bf40fac19061133790600401612731565b602060405180830381865afa158015611354573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113789190612580565b6000196040518363ffffffff1660e01b81526004016113989291906126f4565b6020604051808303816000875af11580156113b7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a1791906125b3565b600054610100900460ff16158080156113fb5750600054600160ff909116105b8061141c575061140a30611f9e565b15801561141c575060005460ff166001145b61147f5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610272565b6000805460ff1916600117905580156114a2576000805461ff0019166101001790555b6114ab82611fad565b6114b361115c565b6001609a558015610acf576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac190611530906004016126d0565b602060405180830381865afa15801561154d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115719190612580565b905090565b60675460405163bf40fac160e01b815260009182916001600160a01b039091169063bf40fac1906115a99060040161255f565b602060405180830381865afa1580156115c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115ea9190612580565b609c546040516370a0823160e01b81529192506001600160a01b03169060009082906370a0823190611620903090600401612424565b602060405180830381865afa15801561163d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061166191906125f4565b60405163140e25ad60e31b8152600481018990529091506000906001600160a01b0384169063a0712d68906024016020604051808303816000875af11580156116ae573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116d291906125f4565b905080156117185760405162461bcd60e51b8152602060048201526013602482015272135a5b9d1a5b99c818d1185a4819985a5b1959606a1b6044820152606401610272565b600082846001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016117479190612424565b602060405180830381865afa158015611764573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061178891906125f4565b611792919061260d565b60405163a9059cbb60e01b81529091506001600160a01b0385169063a9059cbb906117c390889085906004016126f4565b6020604051808303816000875af11580156117e2573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061180691906125b3565b506040516359a87bc160e01b81526001600160a01b038616906359a87bc1906118379084908c908c906004016125d5565b6020604051808303816000875af1158015611856573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061187a91906125f4565b955050505050505b9392505050565b60675460405163bf40fac160e01b81526060916000916001600160a01b039091169063bf40fac1906118bd90600401612731565b602060405180830381865afa1580156118da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118fe9190612580565b90506000816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015611940573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119649190612580565b609b5489519192506060916000916001600160a01b0316908b9061198a9060019061260d565b8151811061199a5761199a61259d565b60200260200101516001600160a01b031614905060006001600160a01b03168a6000815181106119cc576119cc61259d565b60200260200101516001600160a01b031603611a8c57828a6000815181106119f6576119f661259d565b6001600160a01b039283166020918202929092010152604051637ff36ab560e01b815290851690637ff36ab5908b90611a39908c908f903090429060040161279d565b60006040518083038185885af1158015611a57573d6000803e3d6000fd5b50505050506040513d6000823e601f3d908101601f19168201604052611a8091908101906127d2565b9450611c499350505050565b60006001600160a01b03168a60018c51611aa6919061260d565b81518110611ab657611ab661259d565b60200260200101516001600160a01b031603611b7657828a60018c51611adc919061260d565b81518110611aec57611aec61259d565b6001600160a01b0392831660209182029290920101526040516318cbafe560e01b8152908516906318cbafe590611b2f908c908b908f908c904290600401612857565b6000604051808303816000875af1158015611b4e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611a8091908101906127d2565b8015611c095789600081518110611b8f57611b8f61259d565b60200260200101516001600160a01b031663095ea7b3858b6040518363ffffffff1660e01b8152600401611bc49291906126f4565b6020604051808303816000875af1158015611be3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c0791906125b3565b505b836001600160a01b03166338ed17398a83611c245789611c26565b8a5b8d8a426040518663ffffffff1660e01b8152600401611b2f959493929190612857565b95945050505050565b600080516020612927833981519152546001600160a01b031690565b610a17611fd0565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615611cae57611ca983612095565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015611d08575060408051601f3d908101601f19168201909252611d05918101906125f4565b60015b611d6b5760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610272565b6000805160206129278339815191528114611dda5760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610272565b50611ca983838361212f565b609c54609b546040516370a0823160e01b81526000926001600160a01b03908116921690839082906370a0823190611e22903090600401612424565b602060405180830381865afa158015611e3f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e6391906125f4565b60405163db006a7560e01b8152600481018790529091506000906001600160a01b0385169063db006a75906024016020604051808303816000875af1158015611eb0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ed491906125f4565b90508015611f195760405162461bcd60e51b815260206004820152601260248201527118d1185a481c995919595b4819985a5b195960721b6044820152606401610272565b600082846001600160a01b03166370a08231306040518263ffffffff1660e01b8152600401611f489190612424565b602060405180830381865afa158015611f65573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611f8991906125f4565b611f93919061260d565b979650505050505050565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b038316179055610a1761082b565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa158015612019573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061203d9190612580565b6001600160a01b0316146120935760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610272565b565b61209e81611f9e565b6121005760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610272565b60008051602061292783398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6121388361215a565b6000825111806121455750805b15611ca957612154838361219a565b50505050565b61216381612095565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606121a583611f9e565b6122005760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610272565b600080846001600160a01b03168460405161221b91906128b7565b600060405180830381855af49150503d8060008114612256576040519150601f19603f3d011682016040523d82523d6000602084013e61225b565b606091505b509150915061228382826040518060600160405280602781526020016129476027913961228e565b925050505b92915050565b6060831561229d575081611882565b61188283838151156122b25781518083602001fd5b8060405162461bcd60e51b815260040161027291906128d3565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561230a5761230a6122cc565b604052919050565b60006001600160401b0382111561232b5761232b6122cc565b5060051b60200190565b6001600160a01b0381168114610a1757600080fd5b803561235581612335565b919050565b600080600080600060a0868803121561237257600080fd5b85356001600160401b0381111561238857600080fd5b8601601f8101881361239957600080fd5b803560206123ae6123a983612312565b6122e2565b82815260059290921b8301810191818101908b8411156123cd57600080fd5b938201935b838510156123f45784356123e581612335565b825293820193908201906123d2565b9850508801359550505060408601359250606086013591506124186080870161234a565b90509295509295909350565b6001600160a01b0391909116815260200190565b60006020828403121561244a57600080fd5b813561188281612335565b6000806040838503121561246857600080fd5b823561247381612335565b91506020838101356001600160401b038082111561249057600080fd5b818601915086601f8301126124a457600080fd5b8135818111156124b6576124b66122cc565b6124c8601f8201601f191685016122e2565b915080825287848285010111156124de57600080fd5b80848401858401376000848284010152508093505050509250929050565b6020808252601f908201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604082015260600190565b6020808252601290820152710a0e4deecd2c8ca40ecc2d8d2c840e0c2e8d60731b604082015260600190565b6020808252600790820152665245534552564560c81b604082015260600190565b60006020828403121561259257600080fd5b815161188281612335565b634e487b7160e01b600052603260045260246000fd5b6000602082840312156125c557600080fd5b8151801515811461188257600080fd5b92835260208301919091526001600160a01b0316604082015260600190565b60006020828403121561260657600080fd5b5051919050565b8181038181111561228857634e487b7160e01b600052601160045260246000fd5b6020808252601490820152731d1bdad95b881cd95b1b1a5b99c819985a5b195960621b604082015260600190565b6020808252602c9082015260008051602061290783398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c9082015260008051602061290783398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b6001600160a01b03929092168252602082015260400190565b6000806040838503121561272057600080fd5b505080516020909101519092909150565b6020808252600e908201526d2aa724a9aba0a82fa927aaaa22a960911b604082015260600190565b600081518084526020808501945080840160005b838110156127925781516001600160a01b03168752958201959082019060010161276d565b509495945050505050565b8481526080602082015260006127b66080830186612759565b6001600160a01b03949094166040830152506060015292915050565b600060208083850312156127e557600080fd5b82516001600160401b038111156127fb57600080fd5b8301601f8101851361280c57600080fd5b805161281a6123a982612312565b81815260059190911b8201830190838101908783111561283957600080fd5b928401925b82841015611f935783518252928401929084019061283e565b85815284602082015260a06040820152600061287660a0830186612759565b6001600160a01b0394909416606083015250608001529392505050565b60005b838110156128ae578181015183820152602001612896565b50506000910152565b600082516128c9818460208701612893565b9190910192915050565b60208152600082518060208401526128f2816040850160208701612893565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212201fa9ac886f301b94d491c3517363877859cf3b9d3f66518e8a49adfd4ab61f2564736f6c63430008130033";
380
+ "0x60a06040523060805234801561001457600080fd5b50608051612adb61004c600039600081816108f201528181610932015281816109ba015281816109fa0152610a760152612adb6000f3fe6080604052600436106100ad5760003560e01c806303c40ef4146100b25780631b3c90a8146100d85780632c387275146100ef5780633659cfe61461011c5780633e6326fc1461013c5780634162169f1461015c5780634f1ef2861461017c57806352d1902d1461018f5780635aef7de6146101a45780637738fd0b146101c4578063bc3a429b146101e4578063c4d66de8146101f9578063e1758bd814610219578063f2c65bf91461022e575b600080fd5b6100c56100c036600461246e565b61024e565b6040519081526020015b60405180910390f35b3480156100e457600080fd5b506100ed6107c1565b005b3480156100fb57600080fd5b50609b5461010f906001600160a01b031681565b6040516100cf9190612538565b34801561012857600080fd5b506100ed61013736600461254c565b6108e8565b34801561014857600080fd5b5060675461010f906001600160a01b031681565b34801561016857600080fd5b5060655461010f906001600160a01b031681565b6100ed61018a366004612569565b6109b0565b34801561019b57600080fd5b506100c5610a69565b3480156101b057600080fd5b5060665461010f906001600160a01b031681565b3480156101d057600080fd5b506100c56101df36600461246e565b610b17565b3480156101f057600080fd5b506100ed611106565b34801561020557600080fd5b506100ed61021436600461254c565b611561565b34801561022557600080fd5b5061010f611687565b34801561023a57600080fd5b50609c5461010f906001600160a01b031681565b6000609a5460020361027b5760405162461bcd60e51b815260040161027290612610565b60405180910390fd5b6002609a55855161029e5760405162461bcd60e51b815260040161027290612647565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906102cd90600401612673565b602060405180830381865afa1580156102ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030e9190612694565b905060006001600160a01b038416156103275783610329565b335b905060006001600160a01b031688600081518110610349576103496126b1565b60200260200101516001600160a01b0316036103ba5760003411801561036e57503487145b6103b55760405162461bcd60e51b81526020600482015260186024820152770f2deea40dccacac840e8de40e0c2f240eed2e8d0408aa8960431b6044820152606401610272565b61053b565b341561043a5760405162461bcd60e51b815260206004820152604360248201527f5768656e20696e70757420746f6b656e20697320646966666572656e7420746860448201527f616e20455448206d6573736167652076616c75652073686f756c64206265207a60648201526265726f60e81b608482015260a401610272565b8760008151811061044d5761044d6126b1565b60200260200101516001600160a01b03166323b872dd33308a6040518463ffffffff1660e01b8152600401610484939291906126c7565b6020604051808303816000875af11580156104a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c791906126eb565b61053b576040805162461bcd60e51b81526020600482015260248101919091527f7472616e7366657246726f6d206661696c65642c206d616b652073757265207960448201527f6f7520617070726f76656420696e70757420746f6b656e207472616e736665726064820152608401610272565b609c5488516000916001600160a01b0316908a90839061055d5761055d6126b1565b60200260200101516001600160a01b0316036105ed576040516359a87bc160e01b81526001600160a01b038416906359a87bc1906105a3908b908b90879060040161270d565b6020604051808303816000875af11580156105c2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105e6919061272c565b9050610736565b609b5489516001600160a01b03909116908a9060009061060f5761060f6126b1565b60200260200101516001600160a01b031603610630576105e68888846116fc565b609b5489516001600160a01b03909116908a9061064f90600190612745565b8151811061065f5761065f6126b1565b60200260200101516001600160a01b0316146106c95760405162461bcd60e51b8152602060048201526024808201527f54617267657420746f6b656e20696e207468652070617468206d7573742062656044820152632044414960e01b6064820152608401610272565b60006106d98a8a8960003061199d565b9050600081600183516106ec9190612745565b815181106106fc576106fc6126b1565b60200260200101519050600081116107265760405162461bcd60e51b815260040161027290612766565b610731818a866116fc565b925050505b816001600160a01b031689600081518110610753576107536126b1565b60200260200101516001600160a01b0316336001600160a01b03167fcace70a03cbf3e4fa942b0ab9f70aa3834cfab0a31aa75bc4895262063444e128b856040516107a8929190918252602082015260400190565b60405180910390a46001609a5598975050505050505050565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610824573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108489190612694565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156108a2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108c69190612694565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036109305760405162461bcd60e51b815260040161027290612794565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610962611d66565b6001600160a01b0316146109885760405162461bcd60e51b8152600401610272906127ce565b61099181611d82565b604080516000808252602082019092526109ad91839190611d8a565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036109f85760405162461bcd60e51b815260040161027290612794565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610a2a611d66565b6001600160a01b031614610a505760405162461bcd60e51b8152600401610272906127ce565b610a5982611d82565b610a6582826001611d8a565b5050565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610b045760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610272565b50600080516020612a5f83398151915290565b6000609a54600203610b3b5760405162461bcd60e51b815260040161027290612610565b6002609a558551610b5e5760405162461bcd60e51b815260040161027290612647565b60006001600160a01b03831615610b755782610b77565b335b60675460405163bf40fac160e01b8152919250600091829182916001600160a01b039091169063bf40fac190610baf90600401612673565b602060405180830381865afa158015610bcc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bf09190612694565b60675460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac190610c1f90600401612808565b602060405180830381865afa158015610c3c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c609190612694565b6001600160a01b03166323b872dd33308c6040518463ffffffff1660e01b8152600401610c8f939291906126c7565b6020604051808303816000875af1158015610cae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cd291906126eb565b50806001600160a01b0316634f8f02188a8a8d516001148015610d255750609c548e516001600160a01b03909116908f90600090610d1257610d126126b1565b60200260200101516001600160a01b0316145b610d2f5730610d31565b875b6040516001600160e01b031960e086901b168152600481019390935260248301919091526001600160a01b0316604482015233606482015260840160408051808303816000875af1158015610d8a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dae919061282c565b8b5191945092506001148015610e2e5750609b548a516001600160a01b03909116908b90600090610de157610de16126b1565b60200260200101516001600160a01b03161480610e2e5750609c548a516001600160a01b03909116908b90600090610e1b57610e1b6126b1565b60200260200101516001600160a01b0316145b15610f4957609b548a516001600160a01b03909116908b90600090610e5557610e556126b1565b60200260200101516001600160a01b031603610f4457610e7483611efa565b925089600081518110610e8957610e896126b1565b60200260200101516001600160a01b031663a9059cbb85856040518363ffffffff1660e01b8152600401610ebe929190612850565b6020604051808303816000875af1158015610edd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f0191906126eb565b1515600114610f445760405162461bcd60e51b815260206004820152600f60248201526e151c985b9cd9995c8819985a5b1959608a1b6044820152606401610272565b611074565b609c548a516001600160a01b03909116908b90600090610f6b57610f6b6126b1565b60200260200101516001600160a01b0316146100ad57610f8a83611efa565b609b548b519194506001600160a01b0316908b90600090610fad57610fad6126b1565b60200260200101516001600160a01b0316146110175760405162461bcd60e51b815260206004820152602360248201527f496e70757420746f6b656e20666f7220756e6973776170206d7573742062652060448201526244414960e81b6064820152608401610272565b60006110278b8560008b8961199d565b905080600182516110389190612745565b81518110611048576110486126b1565b60200260200101519350600084116110725760405162461bcd60e51b815260040161027290612766565b505b836001600160a01b03168a60018c5161108d9190612745565b8151811061109d5761109d6126b1565b602090810291909101810151604080518d815292830186905282018690526001600160a01b03169033907f067ad67f3f4d17211f9f929d19036c2395bbc9b201d517e46e81f9ceae86032e9060600160405180910390a450506001609a55979650505050505050565b60675460405163bf40fac160e01b815260206004820152600360248201526244414960e81b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015611162573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111869190612694565b609b80546001600160a01b0319166001600160a01b0392831617905560675460405163bf40fac160e01b815260206004808301919091526024820152634344414960e01b604482015291169063bf40fac190606401602060405180830381865afa1580156111f8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061121c9190612694565b609c80546001600160a01b0319166001600160a01b03928316908117909155609b5460405163095ea7b360e01b815292169163095ea7b3916112649160001990600401612850565b6020604051808303816000875af1158015611283573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112a791906126eb565b5060675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906112d790600401612673565b602060405180830381865afa1580156112f4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113189190612694565b90506001600160a01b038116156114845760675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061135790600401612808565b602060405180830381865afa158015611374573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113989190612694565b6001600160a01b031663095ea7b3826000196040518363ffffffff1660e01b81526004016113c7929190612850565b6020604051808303816000875af11580156113e6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061140a91906126eb565b50609c5460405163095ea7b360e01b81526001600160a01b039091169063095ea7b39061143f90849060001990600401612850565b6020604051808303816000875af115801561145e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061148291906126eb565b505b609b5460675460405163bf40fac160e01b81526001600160a01b039283169263095ea7b392169063bf40fac1906114bd90600401612869565b602060405180830381865afa1580156114da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114fe9190612694565b6000196040518363ffffffff1660e01b815260040161151e929190612850565b6020604051808303816000875af115801561153d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6591906126eb565b600054610100900460ff16158080156115815750600054600160ff909116105b806115a25750611590306120b2565b1580156115a2575060005460ff166001145b6116055760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610272565b6000805460ff191660011790558015611628576000805461ff0019166101001790555b611631826120c1565b611639611106565b6001609a558015610a65576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906116b690600401612808565b602060405180830381865afa1580156116d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116f79190612694565b905090565b60675460405163bf40fac160e01b815260009182916001600160a01b039091169063bf40fac19061172f90600401612673565b602060405180830381865afa15801561174c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117709190612694565b609c546040516370a0823160e01b81529192506001600160a01b03169060009082906370a08231906117a6903090600401612538565b602060405180830381865afa1580156117c3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117e7919061272c565b60405163140e25ad60e31b8152600481018990529091506000906001600160a01b0384169063a0712d68906024016020604051808303816000875af1158015611834573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611858919061272c565b9050801561189e5760405162461bcd60e51b8152602060048201526013602482015272135a5b9d1a5b99c818d1185a4819985a5b1959606a1b6044820152606401610272565b600082846001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016118cd9190612538565b602060405180830381865afa1580156118ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061190e919061272c565b6119189190612745565b6040516359a87bc160e01b81529091506001600160a01b038616906359a87bc19061194b9084908c908c9060040161270d565b6020604051808303816000875af115801561196a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061198e919061272c565b955050505050505b9392505050565b60675460405163bf40fac160e01b81526060916000916001600160a01b039091169063bf40fac1906119d190600401612869565b602060405180830381865afa1580156119ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a129190612694565b90506000816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015611a54573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a789190612694565b609b5489519192506060916000916001600160a01b0316908b90611a9e90600190612745565b81518110611aae57611aae6126b1565b60200260200101516001600160a01b031614905060006001600160a01b03168a600081518110611ae057611ae06126b1565b60200260200101516001600160a01b031603611ba057828a600081518110611b0a57611b0a6126b1565b6001600160a01b039283166020918202929092010152604051637ff36ab560e01b815290851690637ff36ab5908b90611b4d908c908f90309042906004016128d5565b60006040518083038185885af1158015611b6b573d6000803e3d6000fd5b50505050506040513d6000823e601f3d908101601f19168201604052611b94919081019061290a565b9450611d5d9350505050565b60006001600160a01b03168a60018c51611bba9190612745565b81518110611bca57611bca6126b1565b60200260200101516001600160a01b031603611c8a57828a60018c51611bf09190612745565b81518110611c0057611c006126b1565b6001600160a01b0392831660209182029290920101526040516318cbafe560e01b8152908516906318cbafe590611c43908c908b908f908c90429060040161298f565b6000604051808303816000875af1158015611c62573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611b94919081019061290a565b8015611d1d5789600081518110611ca357611ca36126b1565b60200260200101516001600160a01b031663095ea7b3858b6040518363ffffffff1660e01b8152600401611cd8929190612850565b6020604051808303816000875af1158015611cf7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d1b91906126eb565b505b836001600160a01b03166338ed17398a83611d385789611d3a565b8a5b8d8a426040518663ffffffff1660e01b8152600401611c4395949392919061298f565b95945050505050565b600080516020612a5f833981519152546001600160a01b031690565b6109ad6120e4565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615611dc257611dbd836121a9565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015611e1c575060408051601f3d908101601f19168201909252611e199181019061272c565b60015b611e7f5760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610272565b600080516020612a5f8339815191528114611eee5760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610272565b50611dbd838383612243565b609c54609b546040516370a0823160e01b81526000926001600160a01b03908116921690839082906370a0823190611f36903090600401612538565b602060405180830381865afa158015611f53573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611f77919061272c565b60405163db006a7560e01b8152600481018790529091506000906001600160a01b0385169063db006a75906024016020604051808303816000875af1158015611fc4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611fe8919061272c565b9050801561202d5760405162461bcd60e51b815260206004820152601260248201527118d1185a481c995919595b4819985a5b195960721b6044820152606401610272565b600082846001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161205c9190612538565b602060405180830381865afa158015612079573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061209d919061272c565b6120a79190612745565b979650505050505050565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b0383161790556109ad6107c1565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa15801561212d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121519190612694565b6001600160a01b0316146121a75760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610272565b565b6121b2816120b2565b6122145760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610272565b600080516020612a5f83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61224c8361226e565b6000825111806122595750805b15611dbd5761226883836122ae565b50505050565b612277816121a9565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606122b9836120b2565b6123145760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610272565b600080846001600160a01b03168460405161232f91906129ef565b600060405180830381855af49150503d806000811461236a576040519150601f19603f3d011682016040523d82523d6000602084013e61236f565b606091505b50915091506123978282604051806060016040528060278152602001612a7f602791396123a2565b925050505b92915050565b606083156123b1575081611996565b61199683838151156123c65781518083602001fd5b8060405162461bcd60e51b81526004016102729190612a0b565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561241e5761241e6123e0565b604052919050565b60006001600160401b0382111561243f5761243f6123e0565b5060051b60200190565b6001600160a01b03811681146109ad57600080fd5b803561246981612449565b919050565b600080600080600060a0868803121561248657600080fd5b85356001600160401b0381111561249c57600080fd5b8601601f810188136124ad57600080fd5b803560206124c26124bd83612426565b6123f6565b82815260059290921b8301810191818101908b8411156124e157600080fd5b938201935b838510156125085784356124f981612449565b825293820193908201906124e6565b98505088013595505050604086013592506060860135915061252c6080870161245e565b90509295509295909350565b6001600160a01b0391909116815260200190565b60006020828403121561255e57600080fd5b813561199681612449565b6000806040838503121561257c57600080fd5b823561258781612449565b91506020838101356001600160401b03808211156125a457600080fd5b818601915086601f8301126125b857600080fd5b8135818111156125ca576125ca6123e0565b6125dc601f8201601f191685016123f6565b915080825287848285010111156125f257600080fd5b80848401858401376000848284010152508093505050509250929050565b6020808252601f908201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604082015260600190565b6020808252601290820152710a0e4deecd2c8ca40ecc2d8d2c840e0c2e8d60731b604082015260600190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156126a657600080fd5b815161199681612449565b634e487b7160e01b600052603260045260246000fd5b6001600160a01b039384168152919092166020820152604081019190915260600190565b6000602082840312156126fd57600080fd5b8151801515811461199657600080fd5b92835260208301919091526001600160a01b0316604082015260600190565b60006020828403121561273e57600080fd5b5051919050565b8181038181111561239c57634e487b7160e01b600052601160045260246000fd5b6020808252601490820152731d1bdad95b881cd95b1b1a5b99c819985a5b195960621b604082015260600190565b6020808252602c90820152600080516020612a3f83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612a3f83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b6000806040838503121561283f57600080fd5b505080516020909101519092909150565b6001600160a01b03929092168252602082015260400190565b6020808252600e908201526d2aa724a9aba0a82fa927aaaa22a960911b604082015260600190565b600081518084526020808501945080840160005b838110156128ca5781516001600160a01b0316875295820195908201906001016128a5565b509495945050505050565b8481526080602082015260006128ee6080830186612891565b6001600160a01b03949094166040830152506060015292915050565b6000602080838503121561291d57600080fd5b82516001600160401b0381111561293357600080fd5b8301601f8101851361294457600080fd5b80516129526124bd82612426565b81815260059190911b8201830190838101908783111561297157600080fd5b928401925b828410156120a757835182529284019290840190612976565b85815284602082015260a0604082015260006129ae60a0830186612891565b6001600160a01b0394909416606083015250608001529392505050565b60005b838110156129e65781810151838201526020016129ce565b50506000910152565b60008251612a018184602087016129cb565b9190910192915050565b6020815260008251806020840152612a2a8160408501602087016129cb565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212202e6686f7b33727b62678ba7066129a6af2637c3cf5a227f175bacaa0f5a3404164736f6c63430008130033";
381
381
 
382
382
  type ExchangeHelperConstructorParams =
383
383
  | [signer?: Signer]
package/types/factories/contracts/reserve/GoodMarketMaker__factory.ts CHANGED
@@ -208,7 +208,7 @@ const _abi = [
208
208
  outputs: [
209
209
  {
210
210
  internalType: "uint256",
211
- name: "",
211
+ name: "toMint",
212
212
  type: "uint256",
213
213
  },
214
214
  ],
@@ -232,7 +232,7 @@ const _abi = [
232
232
  outputs: [
233
233
  {
234
234
  internalType: "uint256",
235
- name: "",
235
+ name: "toMint",
236
236
  type: "uint256",
237
237
  },
238
238
  ],
@@ -270,7 +270,7 @@ const _abi = [
270
270
  outputs: [
271
271
  {
272
272
  internalType: "uint256",
273
- name: "",
273
+ name: "price",
274
274
  type: "uint256",
275
275
  },
276
276
  ],
@@ -432,7 +432,7 @@ const _abi = [
432
432
  outputs: [
433
433
  {
434
434
  internalType: "uint256",
435
- name: "",
435
+ name: "toMint",
436
436
  type: "uint256",
437
437
  },
438
438
  ],
@@ -637,7 +637,7 @@ const _abi = [
637
637
  ] as const;
638
638
 
639
639
  const _bytecode =
640
- "0x60a06040523060805234801561001457600080fd5b5060805161227a61004c60003960008181610788015281816107c801528181610b9501528181610bd50152610c51015261227a6000f3fe6080604052600436106101315760003560e01c80630b184866146101365780631b3c90a8146101695780633659cfe614610180578063371d52dc146101a05780633e21374e146101d55780633e6326fc146101f55780634162169f1461022d57806346f7cb231461024d5780634f1ef2861461026d57806352d1902d146102805780635aef7de6146102955780635cf3a7a9146102b55780636a989e6e146102d55780636cb4b4c1146102f557806374920d301461030b5780637a1ac61e1461032b578063835bbd551461034b5780638c495962146103b95780638ee090fb146103ce5780639f2d0d07146103ee578063bc179d451461040e578063cce7ec131461042e578063d5dc7eda1461044e578063e1758bd81461046e578063e72a083314610483578063e9833c2f146104a3575b600080fd5b34801561014257600080fd5b50610156610151366004611cd3565b6104c3565b6040519081526020015b60405180910390f35b34801561017557600080fd5b5061017e610657565b005b34801561018c57600080fd5b5061017e61019b366004611d08565b61077e565b3480156101ac57600080fd5b506101c06101bb366004611d08565b610846565b60405163ffffffff9091168152602001610160565b3480156101e157600080fd5b506101566101f0366004611d08565b610938565b34801561020157600080fd5b50606754610215906001600160a01b031681565b6040516001600160a01b039091168152602001610160565b34801561023957600080fd5b50606554610215906001600160a01b031681565b34801561025957600080fd5b506101c0610268366004611d08565b610ae0565b61017e61027b366004611d3b565b610b8b565b34801561028c57600080fd5b50610156610c44565b3480156102a157600080fd5b50606654610215906001600160a01b031681565b3480156102c157600080fd5b506101566102d0366004611dfe565b610cf2565b3480156102e157600080fd5b506101566102f0366004611dfe565b610dcf565b34801561030157600080fd5b50610156609b5481565b34801561031757600080fd5b50610156610326366004611dfe565b610e61565b34801561033757600080fd5b5061017e610346366004611cd3565b610ee8565b34801561035757600080fd5b50610394610366366004611d08565b609a602052600090815260409020805460018201546002830154600390930154919263ffffffff9091169184565b6040805194855263ffffffff9093166020850152918301526060820152608001610160565b3480156103c557600080fd5b5061021561102c565b3480156103da57600080fd5b5061017e6103e9366004611e2a565b6110be565b3480156103fa57600080fd5b5061017e610409366004611e85565b61115a565b34801561041a57600080fd5b50610156610429366004611dfe565b61126a565b34801561043a57600080fd5b50610156610449366004611dfe565b6112bb565b34801561045a57600080fd5b5061017e610469366004611dfe565b61136d565b34801561047a57600080fd5b5061021561149a565b34801561048f57600080fd5b5061015661049e366004611d08565b6114e6565b3480156104af57600080fd5b506101566104be366004611d08565b61154a565b60006104cd61162c565b6104d6846117ab565b818310156105435760405162461bcd60e51b815260206004820152602f60248201527f474420616d6f756e74206973206c6f776572207468616e2074686520636f6e7460448201526e1c9a589d5d1a5bdb88185b5bdd5b9d608a1b60648201526084015b60405180910390fd5b6001600160a01b0384166000908152609a6020526040902060028101548411156105c15760405162461bcd60e51b815260206004820152602960248201527f474420616d6f756e7420697320686967686572207468616e2074686520746f74604482015268616c20737570706c7960b81b606482015260840161053a565b60006105cd8486611ebd565b905060006105db8783610dcf565b9050858360020160008282546105f19190611ebd565b909155505082548190849060009061060a908490611ebd565b9091555050600283015483546040516001600160a01b038a1692339260008051602061222583398151915292610643928b928892611ed0565b60405180910390a3925050505b9392505050565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156106ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106de9190611eeb565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610738573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061075c9190611eeb565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036107c65760405162461bcd60e51b815260040161053a90611f08565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166107f8611814565b6001600160a01b03161461081e5760405162461bcd60e51b815260040161053a90611f42565b61082781611830565b6040805160008082526020820190925261084391839190611838565b50565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff16938101849052600282015492810192909252600301546060820152908083036108a15750620f42405b6108b4683635c9adc5dea0000082611f7c565b90506000620151808360600151426108cc9190611ebd565b6108d69190611fa9565b905060005b8181101561091b57676765c793fa10079d601b1b609b54846108fd9190611f7c565b6109079190611fa9565b92508061091381611fbd565b9150506108db565b5061092f683635c9adc5dea0000083611fa9565b95945050505050565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff16938101939093526002810154918301919091526003015460608201528161099084610846565b90506000846001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156109d2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f69190611fd6565b610a049060ff16601b611ebd565b90506000676765c793fa10079d601b1b610a1f83600a6120dd565b610a288861154a565b610a4163ffffffff8716683635c9adc5dea00000611f7c565b610a4b9190611f7c565b610a559190611f7c565b610a5f9190611fa9565b90506000609c54601b610a729190611ebd565b90506000610a8182600a6120dd565b83610a8d86600a6120dd565b8851610a999190611f7c565b610aae90676765c793fa10079d601b1b611f7c565b610ab89190611fa9565b610ac29190611fa9565b9050856040015181610ad49190611ebd565b98975050505050505050565b6000610aea61162c565b610af3826117ab565b6001600160a01b0382166000908152609a602052604081206001810154909163ffffffff90911690819003610b285750620f42405b610b3184610846565b60018301805463ffffffff191663ffffffff9290921691909117905560038201546201518090610b619042611ebd565b610b6b91906120e9565b610b759042611ebd565b6003830155506001015463ffffffff1692915050565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610bd35760405162461bcd60e51b815260040161053a90611f08565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610c05611814565b6001600160a01b031614610c2b5760405162461bcd60e51b815260040161053a90611f42565b610c3482611830565b610c4082826001611838565b5050565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610cdf5760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161053a565b506000805160206121de83398151915290565b6001600160a01b0382166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810193909352600281015491830191909152600301546060820152610d4861102c565b604080830151835160208501519251630a68039f60e21b81526001600160a01b0394909416936329a00e7c93610d8493929189906004016120fd565b602060405180830381865afa158015610da1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dc5919061211e565b9150505b92915050565b6001600160a01b0382166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810193909352600281015491830191909152600301546060820152610e2561102c565b6040808301518351602085015192516349f9b0f760e01b81526001600160a01b0394909416936349f9b0f793610d8493929189906004016120fd565b6000610e6b61162c565b610e74836117ab565b81600003610e8457506000610dc9565b6000610e90848461126a565b6001600160a01b0385166000908152609a602052604081206002810180549394509092849290610ec1908490612137565b9091555050805484908290600090610eda908490612137565b909155509195945050505050565b600054610100900460ff1615808015610f085750600054600160ff909116105b80610f295750610f17306119a8565b158015610f29575060005460ff166001145b610f8c5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161053a565b6000805460ff191660011790558015610faf576000805461ff0019166101001790555b81610fc584676765c793fa10079d601b1b611f7c565b610fcf9190611fa9565b609b556002609c55610fe0846119b7565b8015611026576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b50505050565b60675460405163bf40fac160e01b815260206004820152600e60248201526d42414e434f525f464f524d554c4160901b60448201526000916001600160a01b03169063bf40fac1906064015b602060405180830381865afa158015611095573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110b99190611eeb565b905090565b6110c661162c565b60405180608001604052808481526020018363ffffffff168152602001858152602001826000146110f757826110f9565b425b90526001600160a01b03959095166000908152609a6020908152604091829020875181559087015160018201805463ffffffff191663ffffffff90921691909117905590860151600282015560609095015160039095019490945550505050565b61116261162c565b600081116111b05760405162461bcd60e51b815260206004820152601b60248201527a064656e6f6d696e61746f72206d7573742062652061626f7665203602c1b604482015260640161053a565b806111c683676765c793fa10079d601b1b611f7c565b6111d09190611fa9565b609b819055676765c793fa10079d601b1b1161122b5760405162461bcd60e51b815260206004820152601a602482015279496e76616c6964206e6f6d206f722064656e6f6d2076616c756560301b604482015260640161053a565b604080518381526020810183905233917fcd3db955892df8543ef392cb55c3f36e13ad4c38e151c8315101b3006ef105df910160405180910390a25050565b600080609c54601b61127c9190611ebd565b905061128981600a6120dd565b6112928561154a565b6112a785676765c793fa10079d601b1b611f7c565b6112b19190611fa9565b610dc59190611fa9565b60006112c561162c565b6112ce836117ab565b60006112da8484610cf2565b6001600160a01b0385166000908152609a60205260408120600281018054939450909284929061130b908490612137565b9091555050805484908290600090611324908490612137565b9091555050600281015481546040516001600160a01b0388169233926000805160206122258339815191529261135d928a928992611ed0565b60405180910390a3509392505050565b61137561162c565b61137e826117ab565b6000826001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156113be573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113e29190611fd6565b6113f09060ff16601b611ebd565b6001600160a01b0384166000908152609a602052604081209192506114148561154a565b90508382600201600082825461142a9190612137565b9091555061143b905083600a6120dd565b81836002015461144b9190611f7c565b835461146290676765c793fa10079d601b1b611f7c565b61146c9190611fa9565b6114769190611fa9565b600192909201805463ffffffff191663ffffffff9093169290921790915550505050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401611078565b60006114f061162c565b6114f9826117ab565b600061150483610938565b6001600160a01b0384166000908152609a6020526040812060020180549293508392909190611534908490612137565b90915550611543905083610ae0565b5092915050565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff16938101939093526002810154918301919091526003015460608201526115a061102c565b6001600160a01b03166349f9b0f7826040015183600001518460200151609c54600a6115cc91906120dd565b6040518563ffffffff1660e01b81526004016115eb94939291906120fd565b602060405180830381865afa158015611608573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610650919061211e565b60675460405163bf40fac160e01b81526020600482015260076024820152665245534552564560c81b604482015233916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561168c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116b09190611eeb565b6001600160a01b0316148061174e575060675460405163bf40fac160e01b815260206004820152600660248201526520ab20aa20a960d11b604482015233916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561171f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117439190611eeb565b6001600160a01b0316145b6117a95760405162461bcd60e51b815260206004820152602660248201527f476f6f644d61726b65744d616b65723a206e6f742052657365727665206f722060448201526520bb30ba30b960d11b606482015260840161053a565b565b6001600160a01b0381166000908152609a602052604090206002810154610c405760405162461bcd60e51b815260206004820152601d60248201527f5265736572766520746f6b656e206e6f7420696e697469616c697a6564000000604482015260640161053a565b6000805160206121de833981519152546001600160a01b031690565b6108436119da565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156118705761186b83611a9d565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156118ca575060408051601f3d908101601f191682019092526118c79181019061211e565b60015b61192d5760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161053a565b6000805160206121de833981519152811461199c5760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161053a565b5061186b838383611b37565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b038316179055610843610657565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa158015611a23573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a479190611eeb565b6001600160a01b0316146117a95760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161053a565b611aa6816119a8565b611b085760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161053a565b6000805160206121de83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b611b4083611b5c565b600082511180611b4d5750805b1561186b576110268383611b9c565b611b6581611a9d565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060611ba7836119a8565b611c025760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161053a565b600080846001600160a01b031684604051611c1d919061216e565b600060405180830381855af49150503d8060008114611c58576040519150601f19603f3d011682016040523d82523d6000602084013e611c5d565b606091505b509150915061092f82826040518060600160405280602781526020016121fe6027913960608315611c8f575081610650565b6106508383815115611ca45781518083602001fd5b8060405162461bcd60e51b815260040161053a919061218a565b6001600160a01b038116811461084357600080fd5b600080600060608486031215611ce857600080fd5b8335611cf381611cbe565b95602085013595506040909401359392505050565b600060208284031215611d1a57600080fd5b813561065081611cbe565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215611d4e57600080fd5b8235611d5981611cbe565b915060208301356001600160401b0380821115611d7557600080fd5b818501915085601f830112611d8957600080fd5b813581811115611d9b57611d9b611d25565b604051601f8201601f19908116603f01168101908382118183101715611dc357611dc3611d25565b81604052828152886020848701011115611ddc57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b60008060408385031215611e1157600080fd5b8235611e1c81611cbe565b946020939093013593505050565b600080600080600060a08688031215611e4257600080fd5b8535611e4d81611cbe565b94506020860135935060408601359250606086013563ffffffff81168114611e7457600080fd5b949793965091946080013592915050565b60008060408385031215611e9857600080fd5b50508035926020909101359150565b634e487b7160e01b600052601160045260246000fd5b81810381811115610dc957610dc9611ea7565b93845260208401929092526040830152606082015260800190565b600060208284031215611efd57600080fd5b815161065081611cbe565b6020808252602c908201526000805160206121be83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c908201526000805160206121be83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b8082028115828204841417610dc957610dc9611ea7565b634e487b7160e01b600052601260045260246000fd5b600082611fb857611fb8611f93565b500490565b600060018201611fcf57611fcf611ea7565b5060010190565b600060208284031215611fe857600080fd5b815160ff8116811461065057600080fd5b600181815b8085111561203457816000190482111561201a5761201a611ea7565b8085161561202757918102915b93841c9390800290611ffe565b509250929050565b60008261204b57506001610dc9565b8161205857506000610dc9565b816001811461206e576002811461207857612094565b6001915050610dc9565b60ff84111561208957612089611ea7565b50506001821b610dc9565b5060208310610133831016604e8410600b84101617156120b7575081810a610dc9565b6120c18383611ff9565b80600019048211156120d5576120d5611ea7565b029392505050565b6000610650838361203c565b6000826120f8576120f8611f93565b500690565b938452602084019290925263ffffffff166040830152606082015260800190565b60006020828403121561213057600080fd5b5051919050565b80820180821115610dc957610dc9611ea7565b60005b8381101561216557818101518382015260200161214d565b50506000910152565b6000825161218081846020870161214a565b9190910192915050565b60208152600082518060208401526121a981604085016020870161214a565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564ed639966d5b0a89f5ac16d6359c7707785de6e51a00f07dd3197e5fbf0a30374a2646970667358221220ced34ca5e7565e19ea358fb9e097281edb2e6e4b348b623c0e4045e44b723ad964736f6c63430008130033";
640
+ "0x60a06040523060805234801561001457600080fd5b5060805161212061004c60003960008181610788015281816107c801528181610a9a01528181610ada0152610b5601526121206000f3fe6080604052600436106101315760003560e01c80630b184866146101365780631b3c90a8146101695780633659cfe614610180578063371d52dc146101a05780633e21374e146101d55780633e6326fc146101f55780634162169f1461022d57806346f7cb231461024d5780634f1ef2861461026d57806352d1902d146102805780635aef7de6146102955780635cf3a7a9146102b55780636a989e6e146102d55780636cb4b4c1146102f557806374920d301461030b5780637a1ac61e1461032b578063835bbd551461034b5780638c495962146103b95780638ee090fb146103ce5780639f2d0d07146103ee578063bc179d451461040e578063cce7ec131461042e578063d5dc7eda1461044e578063e1758bd81461046e578063e72a083314610483578063e9833c2f146104a3575b600080fd5b34801561014257600080fd5b50610156610151366004611b79565b6104c3565b6040519081526020015b60405180910390f35b34801561017557600080fd5b5061017e610657565b005b34801561018c57600080fd5b5061017e61019b366004611bae565b61077e565b3480156101ac57600080fd5b506101c06101bb366004611bae565b610846565b60405163ffffffff9091168152602001610160565b3480156101e157600080fd5b506101566101f0366004611bae565b610938565b34801561020157600080fd5b50606754610215906001600160a01b031681565b6040516001600160a01b039091168152602001610160565b34801561023957600080fd5b50606554610215906001600160a01b031681565b34801561025957600080fd5b506101c0610268366004611bae565b6109e5565b61017e61027b366004611be1565b610a90565b34801561028c57600080fd5b50610156610b49565b3480156102a157600080fd5b50606654610215906001600160a01b031681565b3480156102c157600080fd5b506101566102d0366004611ca4565b610bf7565b3480156102e157600080fd5b506101566102f0366004611ca4565b610cd4565b34801561030157600080fd5b50610156609b5481565b34801561031757600080fd5b50610156610326366004611ca4565b610d66565b34801561033757600080fd5b5061017e610346366004611b79565b610de9565b34801561035757600080fd5b50610394610366366004611bae565b609a602052600090815260409020805460018201546002830154600390930154919263ffffffff9091169184565b6040805194855263ffffffff9093166020850152918301526060820152608001610160565b3480156103c557600080fd5b50610215610f2d565b3480156103da57600080fd5b5061017e6103e9366004611cd0565b610fbf565b3480156103fa57600080fd5b5061017e610409366004611d2b565b61105b565b34801561041a57600080fd5b50610156610429366004611ca4565b61116b565b34801561043a57600080fd5b50610156610449366004611ca4565b6111d1565b34801561045a57600080fd5b5061017e610469366004611ca4565b611283565b34801561047a57600080fd5b506102156113b0565b34801561048f57600080fd5b5061015661049e366004611bae565b6113fc565b3480156104af57600080fd5b506101566104be366004611bae565b611460565b60006104cd6114d2565b6104d684611651565b818310156105435760405162461bcd60e51b815260206004820152602f60248201527f474420616d6f756e74206973206c6f776572207468616e2074686520636f6e7460448201526e1c9a589d5d1a5bdb88185b5bdd5b9d608a1b60648201526084015b60405180910390fd5b6001600160a01b0384166000908152609a6020526040902060028101548411156105c15760405162461bcd60e51b815260206004820152602960248201527f474420616d6f756e7420697320686967686572207468616e2074686520746f74604482015268616c20737570706c7960b81b606482015260840161053a565b60006105cd8486611d63565b905060006105db8783610cd4565b9050858360020160008282546105f19190611d63565b909155505082548190849060009061060a908490611d63565b9091555050600283015483546040516001600160a01b038a169233926000805160206120cb83398151915292610643928b928892611d76565b60405180910390a3925050505b9392505050565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156106ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106de9190611d91565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610738573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061075c9190611d91565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036107c65760405162461bcd60e51b815260040161053a90611dae565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166107f86116ba565b6001600160a01b03161461081e5760405162461bcd60e51b815260040161053a90611de8565b610827816116d6565b60408051600080825260208201909252610843918391906116de565b50565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff16938101849052600282015492810192909252600301546060820152908083036108a15750620f42405b6108b4683635c9adc5dea0000082611e22565b90506000620151808360600151426108cc9190611d63565b6108d69190611e4f565b905060005b8181101561091b57676765c793fa10079d601b1b609b54846108fd9190611e22565b6109079190611e4f565b92508061091381611e63565b9150506108db565b5061092f683635c9adc5dea0000083611e4f565b95945050505050565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff16938101939093526002810154918301919091526003015460608201528161099084610846565b90508063ffffffff168163ffffffff1683604001516109af9190611e22565b836020015163ffffffff1684604001516109c99190611e22565b6109d39190611d63565b6109dd9190611e4f565b949350505050565b60006109ef6114d2565b6109f882611651565b6001600160a01b0382166000908152609a602052604081206001810154909163ffffffff90911690819003610a2d5750620f42405b610a3684610846565b60018301805463ffffffff191663ffffffff9290921691909117905560038201546201518090610a669042611d63565b610a709190611e7c565b610a7a9042611d63565b6003830155506001015463ffffffff1692915050565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610ad85760405162461bcd60e51b815260040161053a90611dae565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610b0a6116ba565b6001600160a01b031614610b305760405162461bcd60e51b815260040161053a90611de8565b610b39826116d6565b610b45828260016116de565b5050565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610be45760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161053a565b5060008051602061208483398151915290565b6001600160a01b0382166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810193909352600281015491830191909152600301546060820152610c4d610f2d565b604080830151835160208501519251630a68039f60e21b81526001600160a01b0394909416936329a00e7c93610c899392918990600401611e90565b602060405180830381865afa158015610ca6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cca9190611eb1565b9150505b92915050565b6001600160a01b0382166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810193909352600281015491830191909152600301546060820152610d2a610f2d565b6040808301518351602085015192516349f9b0f760e01b81526001600160a01b0394909416936349f9b0f793610c899392918990600401611e90565b6000610d706114d2565b610d7983611651565b81600003610d8957506000610cce565b610d93838361116b565b6001600160a01b0384166000908152609a602052604081206002810180549394509092849290610dc4908490611eca565b9091555050805483908290600090610ddd908490611eca565b90915550505092915050565b600054610100900460ff1615808015610e095750600054600160ff909116105b80610e2a5750610e183061184e565b158015610e2a575060005460ff166001145b610e8d5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161053a565b6000805460ff191660011790558015610eb0576000805461ff0019166101001790555b81610ec684676765c793fa10079d601b1b611e22565b610ed09190611e4f565b609b556002609c55610ee18461185d565b8015610f27576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b50505050565b60675460405163bf40fac160e01b815260206004820152600e60248201526d42414e434f525f464f524d554c4160901b60448201526000916001600160a01b03169063bf40fac1906064015b602060405180830381865afa158015610f96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fba9190611d91565b905090565b610fc76114d2565b60405180608001604052808481526020018363ffffffff16815260200185815260200182600014610ff85782610ffa565b425b90526001600160a01b03959095166000908152609a6020908152604091829020875181559087015160018201805463ffffffff191663ffffffff90921691909117905590860151600282015560609095015160039095019490945550505050565b6110636114d2565b600081116110b15760405162461bcd60e51b815260206004820152601b60248201527a064656e6f6d696e61746f72206d7573742062652061626f7665203602c1b604482015260640161053a565b806110c783676765c793fa10079d601b1b611e22565b6110d19190611e4f565b609b819055676765c793fa10079d601b1b1161112c5760405162461bcd60e51b815260206004820152601a602482015279496e76616c6964206e6f6d206f722064656e6f6d2076616c756560301b604482015260640161053a565b604080518381526020810183905233917fcd3db955892df8543ef392cb55c3f36e13ad4c38e151c8315101b3006ef105df910160405180910390a25050565b6001600160a01b0382166000908152609a6020908152604080832081516080810183528154808252600183015463ffffffff16948201949094526002820154928101839052600390910154606082015291906111c79085611e22565b610cca9190611e4f565b60006111db6114d2565b6111e483611651565b60006111f08484610bf7565b6001600160a01b0385166000908152609a602052604081206002810180549394509092849290611221908490611eca565b909155505080548490829060009061123a908490611eca565b9091555050600281015481546040516001600160a01b0388169233926000805160206120cb83398151915292611273928a928992611d76565b60405180910390a3509392505050565b61128b6114d2565b61129482611651565b6000826001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156112d4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112f89190611edd565b6113069060ff16601b611d63565b6001600160a01b0384166000908152609a6020526040812091925061132a85611460565b9050838260020160008282546113409190611eca565b90915550611351905083600a611fe4565b8183600201546113619190611e22565b835461137890676765c793fa10079d601b1b611e22565b6113829190611e4f565b61138c9190611e4f565b600192909201805463ffffffff191663ffffffff9093169290921790915550505050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401610f79565b60006114066114d2565b61140f82611651565b600061141a83610938565b6001600160a01b0384166000908152609a602052604081206002018054929350839290919061144a908490611eca565b909155506114599050836109e5565b5092915050565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810184905260028201549281018390526003909101546060820152916114b891611e22565b81516114c8906305f5e100611e22565b6106509190611e4f565b60675460405163bf40fac160e01b81526020600482015260076024820152665245534552564560c81b604482015233916001600160a01b03169063bf40fac190606401602060405180830381865afa158015611532573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115569190611d91565b6001600160a01b031614806115f4575060675460405163bf40fac160e01b815260206004820152600660248201526520ab20aa20a960d11b604482015233916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156115c5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115e99190611d91565b6001600160a01b0316145b61164f5760405162461bcd60e51b815260206004820152602660248201527f476f6f644d61726b65744d616b65723a206e6f742052657365727665206f722060448201526520bb30ba30b960d11b606482015260840161053a565b565b6001600160a01b0381166000908152609a602052604090206002810154610b455760405162461bcd60e51b815260206004820152601d60248201527f5265736572766520746f6b656e206e6f7420696e697469616c697a6564000000604482015260640161053a565b600080516020612084833981519152546001600160a01b031690565b610843611880565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156117165761171183611943565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015611770575060408051601f3d908101601f1916820190925261176d91810190611eb1565b60015b6117d35760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161053a565b60008051602061208483398151915281146118425760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161053a565b506117118383836119dd565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b038316179055610843610657565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa1580156118c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118ed9190611d91565b6001600160a01b03161461164f5760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161053a565b61194c8161184e565b6119ae5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161053a565b60008051602061208483398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6119e683611a02565b6000825111806119f35750805b1561171157610f278383611a42565b611a0b81611943565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060611a4d8361184e565b611aa85760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161053a565b600080846001600160a01b031684604051611ac39190612014565b600060405180830381855af49150503d8060008114611afe576040519150601f19603f3d011682016040523d82523d6000602084013e611b03565b606091505b509150915061092f82826040518060600160405280602781526020016120a46027913960608315611b35575081610650565b6106508383815115611b4a5781518083602001fd5b8060405162461bcd60e51b815260040161053a9190612030565b6001600160a01b038116811461084357600080fd5b600080600060608486031215611b8e57600080fd5b8335611b9981611b64565b95602085013595506040909401359392505050565b600060208284031215611bc057600080fd5b813561065081611b64565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215611bf457600080fd5b8235611bff81611b64565b915060208301356001600160401b0380821115611c1b57600080fd5b818501915085601f830112611c2f57600080fd5b813581811115611c4157611c41611bcb565b604051601f8201601f19908116603f01168101908382118183101715611c6957611c69611bcb565b81604052828152886020848701011115611c8257600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b60008060408385031215611cb757600080fd5b8235611cc281611b64565b946020939093013593505050565b600080600080600060a08688031215611ce857600080fd5b8535611cf381611b64565b94506020860135935060408601359250606086013563ffffffff81168114611d1a57600080fd5b949793965091946080013592915050565b60008060408385031215611d3e57600080fd5b50508035926020909101359150565b634e487b7160e01b600052601160045260246000fd5b81810381811115610cce57610cce611d4d565b93845260208401929092526040830152606082015260800190565b600060208284031215611da357600080fd5b815161065081611b64565b6020808252602c9082015260008051602061206483398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c9082015260008051602061206483398151915260408201526b6163746976652070726f787960a01b606082015260800190565b8082028115828204841417610cce57610cce611d4d565b634e487b7160e01b600052601260045260246000fd5b600082611e5e57611e5e611e39565b500490565b600060018201611e7557611e75611d4d565b5060010190565b600082611e8b57611e8b611e39565b500690565b938452602084019290925263ffffffff166040830152606082015260800190565b600060208284031215611ec357600080fd5b5051919050565b80820180821115610cce57610cce611d4d565b600060208284031215611eef57600080fd5b815160ff8116811461065057600080fd5b600181815b80851115611f3b578160001904821115611f2157611f21611d4d565b80851615611f2e57918102915b93841c9390800290611f05565b509250929050565b600082611f5257506001610cce565b81611f5f57506000610cce565b8160018114611f755760028114611f7f57611f9b565b6001915050610cce565b60ff841115611f9057611f90611d4d565b50506001821b610cce565b5060208310610133831016604e8410600b8410161715611fbe575081810a610cce565b611fc88383611f00565b8060001904821115611fdc57611fdc611d4d565b029392505050565b60006106508383611f43565b60005b8381101561200b578181015183820152602001611ff3565b50506000910152565b60008251612026818460208701611ff0565b9190910192915050565b602081526000825180602084015261204f816040850160208701611ff0565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564ed639966d5b0a89f5ac16d6359c7707785de6e51a00f07dd3197e5fbf0a30374a264697066735822122022c7129ef3e0b05407c260ceed6e7dad8212dd37b79c0e9e6cdd371aa958de8864736f6c63430008130033";
641
641
 
642
642
  type GoodMarketMakerConstructorParams =
643
643
  | [signer?: Signer]
package/types/factories/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai__factory.ts CHANGED
@@ -1010,7 +1010,7 @@ const _abi = [
1010
1010
  },
1011
1011
  {
1012
1012
  internalType: "uint256",
1013
- name: "_startingCDAIBalance",
1013
+ name: "",
1014
1014
  type: "uint256",
1015
1015
  },
1016
1016
  {
@@ -1439,7 +1439,7 @@ const _abi = [
1439
1439
  ] as const;
1440
1440
 
1441
1441
  const _bytecode =
1442
- "0x60a06040523060805234801561001457600080fd5b5060805161498861004c60003960008181611178015281816111b801528181611462015281816114a20152611a6601526149886000f3fe6080604052600436106102c85760003560e01c806301ffc9a7146102cd57806306fdde0314610302578063095ea7b3146103245780630cd865ec1461034457806311ab3b341461036657806318160ddd146103885780631b3c90a8146103a85780631de778a5146103bd57806322c65b39146103f257806323b872dd14610409578063248a9ca3146104295780632c387275146104495780632f2ff15d14610477578063313ce56714610497578063355274ea146104b357806336568abe146104ca5780633659cfe6146104ea578063395093511461050a5780633e6326fc1461052a5780633f4ba83a1461054a57806340c10f191461055f5780634162169f1461057f57806342966c681461059f5780634345e979146105bf5780634899bb27146105df5780634cd88b76146106075780634f1ef286146106275780634f8f02181461063a57806352d1902d1461065a57806359a87bc11461066f5780635aef7de61461068f5780635c975abb146106af57806370a08231146106c857806379cc6790146106e857806380d9a50f146107085780638456cb59146107285780639010d07c1461073d57806391d148541461075d57806395d89b411461077d5780639d1b464a146107925780639f2d0d07146107a7578063a217fddf146107c7578063a457c2d7146107dc578063a7ca8c7d146107fc578063a9059cbb1461081e578063acea21d01461083e578063bbc19ab014610853578063bc3a429b1461086a578063be13f47c1461087f578063c1786ab21461089f578063ca15c873146108bf578063d5391393146108df578063d547741f14610901578063dd62ed3e14610921578063df20c4af14610941578063e092b06714610972578063e1758bd814610987578063e2b0caef1461099c578063e462d3b9146109b8578063e63ab1e9146109da578063efbe1c1c146109fc578063f2c65bf914610a11578063f8a9978f14610a32575b600080fd5b3480156102d957600080fd5b506102ed6102e8366004613f42565b610a52565b60405190151581526020015b60405180910390f35b34801561030e57600080fd5b50610317610a7d565b6040516102f99190613f90565b34801561033057600080fd5b506102ed61033f366004613fd8565b610b10565b34801561035057600080fd5b5061036461035f366004614004565b610b28565b005b34801561037257600080fd5b50610262546102ed90600160c81b900460ff1681565b34801561039457600080fd5b50610164545b6040519081526020016102f9565b3480156103b457600080fd5b50610364610c34565b3480156103c957600080fd5b506103dd6103d8366004614021565b610d5b565b604080519283526020830191909152016102f9565b3480156103fe57600080fd5b5061039a6102605481565b34801561041557600080fd5b506102ed61042436600461405a565b611094565b34801561043557600080fd5b5061039a61044436600461409b565b6110ba565b34801561045557600080fd5b5061025e5461046a906001600160a01b031681565b6040516102f991906140b4565b34801561048357600080fd5b506103646104923660046140c8565b6110cf565b3480156104a357600080fd5b50604051600281526020016102f9565b3480156104bf57600080fd5b5061039a61025c5481565b3480156104d657600080fd5b506103646104e53660046140c8565b6110f0565b3480156104f657600080fd5b50610364610505366004614004565b61116e565b34801561051657600080fd5b506102ed610525366004613fd8565b611233565b34801561053657600080fd5b5060675461046a906001600160a01b031681565b34801561055657600080fd5b50610364611255565b34801561056b57600080fd5b5061036461057a366004613fd8565b6112d3565b34801561058b57600080fd5b5060655461046a906001600160a01b031681565b3480156105ab57600080fd5b506103646105ba36600461409b565b61134e565b3480156105cb57600080fd5b506103646105da366004614106565b611358565b3480156105eb57600080fd5b506102625461046a90600160201b90046001600160a01b031681565b34801561061357600080fd5b506103646106223660046141df565b611395565b610364610635366004614242565b611458565b34801561064657600080fd5b506103dd61065536600461429b565b61150d565b34801561066657600080fd5b5061039a611a59565b34801561067b57600080fd5b5061039a61068a366004614021565b611b07565b34801561069b57600080fd5b5060665461046a906001600160a01b031681565b3480156106bb57600080fd5b506101c65460ff166102ed565b3480156106d457600080fd5b5061039a6106e3366004614004565b611e0c565b3480156106f457600080fd5b50610364610703366004613fd8565b611e28565b34801561071457600080fd5b50610364610723366004614004565b611e3d565b34801561073457600080fd5b50610364611ead565b34801561074957600080fd5b5061046a6107583660046142e5565b611f27565b34801561076957600080fd5b506102ed6107783660046140c8565b611f40565b34801561078957600080fd5b50610317611f6b565b34801561079e57600080fd5b5061039a611f7b565b3480156107b357600080fd5b506103646107c23660046142e5565b611ffd565b3480156107d357600080fd5b5061039a600081565b3480156107e857600080fd5b506102ed6107f7366004613fd8565b612074565b34801561080857600080fd5b5061039a60008051602061484c83398151915281565b34801561082a57600080fd5b506102ed610839366004613fd8565b6120fa565b34801561084a57600080fd5b5061039a612108565b34801561085f57600080fd5b5061039a61025d5481565b34801561087657600080fd5b506103646121b8565b34801561088b57600080fd5b5061036461089a366004613fd8565b61235c565b3480156108ab57600080fd5b506102ed6108ba366004614307565b6124e7565b3480156108cb57600080fd5b5061039a6108da36600461409b565b612505565b3480156108eb57600080fd5b5061039a60008051602061491383398151915281565b34801561090d57600080fd5b5061036461091c3660046140c8565b61251d565b34801561092d57600080fd5b5061039a61093c36600461433c565b612539565b34801561094d57600080fd5b506102ed61095c366004614004565b6102616020526000908152604090205460ff1681565b34801561097e57600080fd5b5061046a612565565b34801561099357600080fd5b5061046a6125f0565b3480156109a857600080fd5b5060006040516102f9919061436a565b3480156109c457600080fd5b50610262546102ed90600160c01b900460ff1681565b3480156109e657600080fd5b5061039a6000805160206148cc83398151915281565b348015610a0857600080fd5b5061036461261f565b348015610a1d57600080fd5b5061025f5461046a906001600160a01b031681565b348015610a3e57600080fd5b50610364610a4d36600461405a565b6129b1565b60006001600160e01b03198216635a05180f60e01b1480610a775750610a7782612a2e565b92915050565b60606101658054610a8d90614392565b80601f0160208091040260200160405190810160405280929190818152602001828054610ab990614392565b8015610b065780601f10610adb57610100808354040283529160200191610b06565b820191906000526020600020905b815481529060010190602001808311610ae957829003601f168201915b5050505050905090565b600033610b1e818585612a63565b5060019392505050565b610b30612b88565b6066546040516370a0823160e01b81526001600160a01b038084169263a9059cbb9291169083906370a0823190610b6b9030906004016140b4565b602060405180830381865afa158015610b88573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bac91906143cc565b6040518363ffffffff1660e01b8152600401610bc99291906143e5565b6020604051808303816000875af1158015610be8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c0c91906143fe565b610c315760405162461bcd60e51b8152600401610c289061441b565b60405180910390fd5b50565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610c97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cbb919061444c565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610d15573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d39919061444c565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b61025f5460405163140e25ad60e31b81526004810185905260009182916001600160a01b039091169063a0712d68906024016020604051808303816000875af1158015610dac573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dd091906143cc565b50600084846001600160a01b03166370a08231306040518263ffffffff1660e01b8152600401610e0091906140b4565b602060405180830381865afa158015610e1d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e4191906143cc565b610e4b919061447f565b90506000610e57612565565b6001600160a01b03166374920d3086846040518363ffffffff1660e01b8152600401610e849291906143e5565b6020604051808303816000875af1158015610ea3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ec791906143cc565b90506000610ed3612565565b6001600160a01b031663e72a0833876040518263ffffffff1660e01b8152600401610efe91906140b4565b6020604051808303816000875af1158015610f1d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f4191906143cc565b4361025d5590506000610f548284614492565b61026254909150600160201b90046001600160a01b0316610fa85760405162461bcd60e51b815260206004820152600e60248201526d1a195b1c195c881b9bdd081cd95d60921b6044820152606401610c28565b61026254610fc890600160201b90046001600160a01b0316826000612c4b565b61026254604051630a8ba38960e41b815260048101839052600160201b9091046001600160a01b03169063a8ba389090602401600060405180830381600087803b15801561101557600080fd5b505af1158015611029573d6000803e3d6000fd5b505061025d546040805188815260208101889052908101869052606081018590526001600160a01b038b1693509091507f1a962236b7c7b3d7b9f6b56036cbce44ab2f93a22b0827d2f2a92a8f055552b99060800160405180910390a3989297509195505050505050565b6000336110a2858285612f87565b6110ad858585612ffb565b60019150505b9392505050565b600090815260fe602052604090206001015490565b6110d8826110ba565b6110e1816131a1565b6110eb83836131ab565b505050565b6001600160a01b03811633146111605760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b6064820152608401610c28565b61116a82826131ce565b5050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036111b65760405162461bcd60e51b8152600401610c28906144a5565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166111e86131f1565b6001600160a01b03161461120e5760405162461bcd60e51b8152600401610c28906144df565b6112178161320d565b60408051600080825260208201909252610c3191839190613215565b600033610b1e8185856112468383612539565b6112509190614492565b612a63565b61126d6000805160206148cc83398151915233611f40565b6112c95760405162461bcd60e51b8152602060048201526039602482015260008051602061482c83398151915260448201527876652070617573657220726f6c6520746f20756e706175736560381b6064820152608401610c28565b6112d1613380565b565b6112eb60008051602061491383398151915233611f40565b6113445760405162461bcd60e51b8152602060048201526036602482015260008051602061482c8339815191526044820152751d99481b5a5b9d195c881c9bdb19481d1bc81b5a5b9d60521b6064820152608401610c28565b61116a82826133cd565b610c31338261348a565b611360612b88565b610262805461ffff60c01b1916600160c01b9315159390930260ff60c81b191692909217600160c81b91151591909102179055565b600054610100900460ff16158080156113b55750600054600160ff909116105b806113d657506113c4306135bb565b1580156113d6575060005460ff166001145b6113f25760405162461bcd60e51b8152600401610c2890614519565b6000805460ff191660011790558015611415576000805461ff0019166101001790555b61141f83836135ca565b80156110eb576000805461ff0019169055604051600181526000805160206148ac833981519152906020015b60405180910390a1505050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036114a05760405162461bcd60e51b8152600401610c28906144a5565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166114d26131f1565b6001600160a01b0316146114f85760405162461bcd60e51b8152600401610c28906144df565b6115018261320d565b61116a82826001613215565b60008061151d6101c65460ff1690565b1561153a5760405162461bcd60e51b8152600401610c2890614567565b6000611544612565565b60675460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac19061157390600401614587565b602060405180830381865afa158015611590573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115b4919061444c565b6001600160a01b0316336001600160a01b03161461169e5760675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906115fa906004016145b0565b602060405180830381865afa158015611617573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061163b919061444c565b6001600160a01b03166379cc679033896040518363ffffffff1660e01b81526004016116689291906143e5565b600060405180830381600087803b15801561168257600080fd5b505af1158015611696573d6000803e3d6000fd5b505050503393505b6001600160a01b038516156116b357846116b5565b335b61026254909550600090600160c81b900460ff16151581036117025760006116dc86611e0c565b9050888111156116ec57886116ee565b805b9150811561170057611700868361348a565b505b600088808310156118545760675460405163bf40fac160e01b815260206004820152601860248201527721a7a72a2924a12aaa24a7a72fa1a0a621aaa620aa24a7a760411b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa15801561177e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117a2919061444c565b61025f546001600160a01b0391821691632cfa94fe91879130918c91166117c9898861447f565b60405160e087901b6001600160e01b03191681526001600160a01b039586166004820152938516602485015291841660448401529092166064820152608481019190915260a401602060405180830381865afa15801561182d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061185191906143cc565b91505b61025f5460405163058c243360e11b81526001600160a01b0391821660048201526024810183905260448101849052600091861690630b184866906064016020604051808303816000875af11580156118b1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118d591906143cc565b9050898110156119385760405162461bcd60e51b815260206004820152602860248201527f546f6b656e2072657475726e206d7573742062652061626f766520746865206d60448201526734b72932ba3ab93760c11b6064820152608401610c28565b61025f5460405163a9059cbb60e01b81526001600160a01b039091169063a9059cbb9061196b908c9085906004016143e5565b6020604051808303816000875af115801561198a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119ae91906143fe565b6119f15760405162461bcd60e51b815260206004820152601460248201527318d9185a481d1c985b9cd9995c8819985a5b195960621b6044820152606401610c28565b61025f54604080518d8152602081018690529081018390526001600160a01b03808c1692811691908b16907f067ad67f3f4d17211f9f929d19036c2395bbc9b201d517e46e81f9ceae86032e9060600160405180910390a49a91995090975050505050505050565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614611af45760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610c28565b5060008051602061488c83398151915290565b61025f546000906001600160a01b031681611b20612565565b6001600160a01b031663cce7ec1383886040518363ffffffff1660e01b8152600401611b4d9291906143e5565b6020604051808303816000875af1158015611b6c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b9091906143cc565b90506001600160a01b03841615611ba75783611ba9565b335b60675460405163bf40fac160e01b81529195506000916001600160a01b039091169063bf40fac190611bdd90600401614587565b602060405180830381865afa158015611bfa573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c1e919061444c565b9050336001600160a01b03821614611d20576040516323b872dd60e01b8152336004820152306024820152604481018890526001600160a01b038416906323b872dd906064016020604051808303816000875af1158015611c83573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ca791906143fe565b1515600114611d20576040805162461bcd60e51b81526020600482015260248101919091527f7472616e7366657246726f6d206661696c65642c206d616b652073757265207960448201527f6f7520617070726f76656420696e70757420746f6b656e207472616e736665726064820152608401610c28565b85821015611d7e5760405162461bcd60e51b815260206004820152602560248201527f47442072657475726e206d7573742062652061626f766520746865206d696e5260448201526432ba3ab93760d91b6064820152608401610c28565b611d8a85836001612c4b565b611d94858361360d565b61025f546001600160a01b038087169181169083163303611db55732611db7565b335b6001600160a01b03167fcace70a03cbf3e4fa942b0ab9f70aa3834cfab0a31aa75bc4895262063444e128a86604051611dfa929190918252602082015260400190565b60405180910390a45095945050505050565b6001600160a01b03166000908152610162602052604090205490565b611e33823383612f87565b61116a828261348a565b611e45612b88565b6102628054600160201b600160c01b031916600160201b6001600160a01b038416908102919091179091556040805191825261271060208301527f0fa8d325f44a93da78a029607ba0c95db6a44fa32278f04de5396797a4306ead910160405180910390a150565b611ec56000805160206148cc83398151915233611f40565b611f1f5760405162461bcd60e51b8152602060048201526037602482015260008051602061482c83398151915260448201527676652070617573657220726f6c6520746f20706175736560481b6064820152608401610c28565b6112d161362e565b6000828152610130602052604081206110b3908361366c565b600091825260fe602090815260408084206001600160a01b0393909316845291905290205460ff1690565b60606101668054610a8d90614392565b6000611f85612565565b61025f5460405163e9833c2f60e01b81526001600160a01b039283169263e9833c2f92611fb7929116906004016140b4565b602060405180830381865afa158015611fd4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ff891906143cc565b905090565b612005612b88565b61200d612565565b604051639f2d0d0760e01b815260048101849052602481018390526001600160a01b039190911690639f2d0d0790604401600060405180830381600087803b15801561205857600080fd5b505af115801561206c573d6000803e3d6000fd5b505050505050565b600033816120828286612539565b9050838110156120e25760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610c28565b6120ef8286868403612a63565b506001949350505050565b600033610b1e818585612ffb565b61025f546040805163182df0f560e01b815290516000926001600160a01b0316916b204fce5e3e2502611000000091839163182df0f59160048083019260209291908290030181865afa158015612163573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061218791906143cc565b61218f611f7b565b61219e906402540be4006145d4565b6121a891906145d4565b6121b291906145eb565b91505090565b60675460405163bf40fac160e01b815260206004820152600360248201526244414960e81b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015612214573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612238919061444c565b61025e80546001600160a01b0319166001600160a01b0392831617905560675460405163bf40fac160e01b815260206004808301919091526024820152634344414960e01b604482015291169063bf40fac190606401602060405180830381865afa1580156122ab573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122cf919061444c565b61025f80546001600160a01b0319166001600160a01b0392831690811790915561025e5460405163095ea7b360e01b815292169163095ea7b39161231991600019906004016143e5565b6020604051808303816000875af1158015612338573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c3191906143fe565b600054610100900460ff161580801561237c5750600054600160ff909116105b8061239d575061238b306135bb565b15801561239d575060005460ff166001145b6123b95760405162461bcd60e51b8152600401610c2890614519565b6000805460ff1916600117905580156123dc576000805461ff0019166101001790555b61241c6040518060400160405280600381526020016208e88b60eb1b8152506040518060400160405280600381526020016208e48b60eb1b8152506135ca565b61242583613678565b61242d6121b8565b612445600080516020614913833981519152336110f0565b61245d6000805160206148cc833981519152336110f0565b6124686000336110f0565b606654612480906000906001600160a01b031661369b565b6066546124a59060008051602061484c833981519152906001600160a01b031661369b565b6607d0e36a81800061025c5561026082905580156110eb576000805461ff0019169055604051600181526000805160206148ac8339815191529060200161144b565b600081696d696e74546f6b656e7360b01b03610b1e575060006110b3565b600081815261013060205260408120610a77906136a5565b612526826110ba565b61252f816131a1565b6110eb83836131ce565b6001600160a01b0391821660009081526101636020908152604080832093909416825291909152205490565b60675460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526000916001600160a01b03169063bf40fac1906064015b602060405180830381865afa1580156125cc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ff8919061444c565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906125af906004016145b0565b612627612b88565b61025f546040516370a0823160e01b81526000916001600160a01b0316906370a08231906126599030906004016140b4565b602060405180830381865afa158015612676573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061269a91906143cc565b111561279b5761025f546066546040516370a0823160e01b81526001600160a01b039283169263a9059cbb92169083906370a08231906126de9030906004016140b4565b602060405180830381865afa1580156126fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061271f91906143cc565b6040518363ffffffff1660e01b815260040161273c9291906143e5565b6020604051808303816000875af115801561275b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061277f91906143fe565b61279b5760405162461bcd60e51b8152600401610c289061441b565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906127ca906004016145b0565b602060405180830381865afa1580156127e7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061280b919061444c565b6066546040516355138f0d60e11b81529192506001600160a01b038084169263aa271e1a9261283e9216906004016140b4565b602060405180830381865afa15801561285b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061287f91906143fe565b15156000036128ed57606654604051634c1d96ab60e11b81526001600160a01b038381169263983b2d56926128ba92909116906004016140b4565b600060405180830381600087803b1580156128d457600080fd5b505af11580156128e8573d6000803e3d6000fd5b505050505b60675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061291b906004016145b0565b602060405180830381865afa158015612938573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061295c919061444c565b6001600160a01b031663986502756040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561299657600080fd5b505af11580156129aa573d6000803e3d6000fd5b5050505050565b6129b9612565565b6001600160a01b031663d5dc7eda84836040518363ffffffff1660e01b81526004016129e69291906143e5565b600060405180830381600087803b158015612a0057600080fd5b505af1158015612a14573d6000803e3d6000fd5b50505050612a2482826000612c4b565b6110eb828261360d565b60006001600160e01b03198216637965db0b60e01b1480610a7757506301ffc9a760e01b6001600160e01b0319831614610a77565b6001600160a01b038316612ac55760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610c28565b6001600160a01b038216612b265760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610c28565b6001600160a01b038381166000818152610163602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa158015612bd1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612bf5919061444c565b6001600160a01b0316146112d15760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610c28565b6101c65460ff1615612c6f5760405162461bcd60e51b8152600401610c2890614567565b8080612d14575060675460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015612cdb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612cff919061444c565b6001600160a01b0316336001600160a01b0316145b80612d325750612d3260008051602061484c83398151915233611f40565b612d7a5760405162461bcd60e51b815260206004820152601960248201527823b7b7b22932b9b2b93b329d103737ba10309036b4b73a32b960391b6044820152606401610c28565b61025c5460675460405163bf40fac160e01b815284916001600160a01b03169063bf40fac190612dac906004016145b0565b602060405180830381865afa158015612dc9573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612ded919061444c565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa158015612e2a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612e4e91906143cc565b612e589190614492565b1115612ea25760405162461bcd60e51b815260206004820152601960248201527811dbdbd914995cd95c9d994e8818d85c08195b999bdc98d959603a1b6044820152606401610c28565b60675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190612ed0906004016145b0565b602060405180830381865afa158015612eed573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f11919061444c565b6001600160a01b03166340c10f1984846040518363ffffffff1660e01b8152600401612f3e9291906143e5565b6020604051808303816000875af1158015612f5d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f8191906143cc565b50505050565b6000612f938484612539565b90506000198114612f815781811015612fee5760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e63650000006044820152606401610c28565b612f818484848403612a63565b6001600160a01b03831661305f5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610c28565b6001600160a01b0382166130c15760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610c28565b6130cc8383836136af565b6001600160a01b03831660009081526101626020526040902054818110156131455760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610c28565b6001600160a01b03808516600081815261016260205260408082208686039055928616808252908390208054860190559151600080516020614933833981519152906131949086815260200190565b60405180910390a3612f81565b610c3181336136ba565b6131b58282613713565b6000828152610130602052604090206110eb9082613799565b6131d882826137ae565b6000828152610130602052604090206110eb9082613815565b60008051602061488c833981519152546001600160a01b031690565b610c31612b88565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615613248576110eb8361382a565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156132a2575060408051601f3d908101601f1916820190925261329f918101906143cc565b60015b6133055760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610c28565b60008051602061488c83398151915281146133745760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610c28565b506110eb8383836138c4565b6133886138e9565b6101c6805460ff191690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b6040516133c391906140b4565b60405180910390a1565b6001600160a01b0382166134235760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610c28565b61342f600083836136af565b8061016460008282546134429190614492565b90915550506001600160a01b03821660008181526101626020908152604080832080548601905551848152600080516020614933833981519152910160405180910390a35050565b6001600160a01b0382166134ea5760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610c28565b6134f6826000836136af565b6001600160a01b038216600090815261016260205260409020548181101561356b5760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610c28565b6001600160a01b03831660008181526101626020908152604080832086860390556101648054879003905551858152919291600080516020614933833981519152910160405180910390a3505050565b6001600160a01b03163b151590565b600054610100900460ff166135f15760405162461bcd60e51b8152600401610c289061460d565b6135fb8282613933565b613603613975565b61116a82826139a9565b61026254600160c01b900460ff16151560000361116a5761116a82826133cd565b613636613a0b565b6101c6805460ff191660011790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a2586133b63390565b60006110b38383613a52565b606780546001600160a01b0319166001600160a01b038316179055610c31610c34565b61116a82826131ab565b6000610a77825490565b6110eb838383613a7c565b6136c48282611f40565b61116a576136d181613ae3565b6136dc836020613af5565b6040516020016136ed929190614658565b60408051601f198184030181529082905262461bcd60e51b8252610c2891600401613f90565b61371d8282611f40565b61116a57600082815260fe602090815260408083206001600160a01b03851684529091529020805460ff191660011790556137553390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b60006110b3836001600160a01b038416613c90565b6137b88282611f40565b1561116a57600082815260fe602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b60006110b3836001600160a01b038416613cdf565b613833816135bb565b6138955760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610c28565b60008051602061488c83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6138cd83613dd2565b6000825111806138da5750805b156110eb57612f818383613e12565b6101c65460ff166112d15760405162461bcd60e51b815260206004820152601460248201527314185d5cd8589b194e881b9bdd081c185d5cd95960621b6044820152606401610c28565b600054610100900460ff1661395a5760405162461bcd60e51b8152600401610c289061460d565b610165613967838261470d565b506101666110eb828261470d565b600054610100900460ff1661399c5760405162461bcd60e51b8152600401610c289061460d565b6101c6805460ff19169055565b600054610100900460ff166139d05760405162461bcd60e51b8152600401610c289061460d565b6139db60003361369b565b6139f36000805160206149138339815191523361369b565b61116a6000805160206148cc8339815191523361369b565b6101c65460ff16156112d15760405162461bcd60e51b815260206004820152601060248201526f14185d5cd8589b194e881c185d5cd95960821b6044820152606401610c28565b6000826000018281548110613a6957613a696147cc565b9060005260206000200154905092915050565b6101c65460ff16156110eb5760405162461bcd60e51b815260206004820152602a60248201527f45524332305061757361626c653a20746f6b656e207472616e736665722077686044820152691a5b19481c185d5cd95960b21b6064820152608401610c28565b6060610a776001600160a01b03831660145b60606000613b048360026145d4565b613b0f906002614492565b6001600160401b03811115613b2657613b26614134565b6040519080825280601f01601f191660200182016040528015613b50576020820181803683370190505b509050600360fc1b81600081518110613b6b57613b6b6147cc565b60200101906001600160f81b031916908160001a905350600f60fb1b81600181518110613b9a57613b9a6147cc565b60200101906001600160f81b031916908160001a9053506000613bbe8460026145d4565b613bc9906001614492565b90505b6001811115613c41576f181899199a1a9b1b9c1cb0b131b232b360811b85600f1660108110613bfd57613bfd6147cc565b1a60f81b828281518110613c1357613c136147cc565b60200101906001600160f81b031916908160001a90535060049490941c93613c3a816147e2565b9050613bcc565b5083156110b35760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610c28565b6000818152600183016020526040812054613cd757508154600181810184556000848152602080822090930184905584548482528286019093526040902091909155610a77565b506000610a77565b60008181526001830160205260408120548015613dc8576000613d0360018361447f565b8554909150600090613d179060019061447f565b9050818114613d7c576000866000018281548110613d3757613d376147cc565b9060005260206000200154905080876000018481548110613d5a57613d5a6147cc565b6000918252602080832090910192909255918252600188019052604090208390555b8554869080613d8d57613d8d6147f9565b600190038181906000526020600020016000905590558560010160008681526020019081526020016000206000905560019350505050610a77565b6000915050610a77565b613ddb8161382a565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060613e1d836135bb565b613e785760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610c28565b600080846001600160a01b031684604051613e93919061480f565b600060405180830381855af49150503d8060008114613ece576040519150601f19603f3d011682016040523d82523d6000602084013e613ed3565b606091505b5091509150613efb82826040518060600160405280602781526020016148ec60279139613f04565b95945050505050565b60608315613f135750816110b3565b6110b38383815115613f285781518083602001fd5b8060405162461bcd60e51b8152600401610c289190613f90565b600060208284031215613f5457600080fd5b81356001600160e01b0319811681146110b357600080fd5b60005b83811015613f87578181015183820152602001613f6f565b50506000910152565b6020815260008251806020840152613faf816040850160208701613f6c565b601f01601f19169190910160400192915050565b6001600160a01b0381168114610c3157600080fd5b60008060408385031215613feb57600080fd5b8235613ff681613fc3565b946020939093013593505050565b60006020828403121561401657600080fd5b81356110b381613fc3565b60008060006060848603121561403657600080fd5b8335925060208401359150604084013561404f81613fc3565b809150509250925092565b60008060006060848603121561406f57600080fd5b833561407a81613fc3565b9250602084013561408a81613fc3565b929592945050506040919091013590565b6000602082840312156140ad57600080fd5b5035919050565b6001600160a01b0391909116815260200190565b600080604083850312156140db57600080fd5b8235915060208301356140ed81613fc3565b809150509250929050565b8015158114610c3157600080fd5b6000806040838503121561411957600080fd5b8235614124816140f8565b915060208301356140ed816140f8565b634e487b7160e01b600052604160045260246000fd5b60006001600160401b038084111561416457614164614134565b604051601f8501601f19908116603f0116810190828211818310171561418c5761418c614134565b816040528093508581528686860111156141a557600080fd5b858560208301376000602087830101525050509392505050565b600082601f8301126141d057600080fd5b6110b38383356020850161414a565b600080604083850312156141f257600080fd5b82356001600160401b038082111561420957600080fd5b614215868387016141bf565b9350602085013591508082111561422b57600080fd5b50614238858286016141bf565b9150509250929050565b6000806040838503121561425557600080fd5b823561426081613fc3565b915060208301356001600160401b0381111561427b57600080fd5b8301601f8101851361428c57600080fd5b6142388582356020840161414a565b600080600080608085870312156142b157600080fd5b843593506020850135925060408501356142ca81613fc3565b915060608501356142da81613fc3565b939692955090935050565b600080604083850312156142f857600080fd5b50508035926020909101359150565b60008060006060848603121561431c57600080fd5b833561432781613fc3565b95602085013595506040909401359392505050565b6000806040838503121561434f57600080fd5b823561435a81613fc3565b915060208301356140ed81613fc3565b602081016003831061438c57634e487b7160e01b600052602160045260246000fd5b91905290565b600181811c908216806143a657607f821691505b6020821081036143c657634e487b7160e01b600052602260045260246000fd5b50919050565b6000602082840312156143de57600080fd5b5051919050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561441057600080fd5b81516110b3816140f8565b6020808252601790820152761c9958dbdd995c881d1c985b9cd9995c8819985a5b1959604a1b604082015260600190565b60006020828403121561445e57600080fd5b81516110b381613fc3565b634e487b7160e01b600052601160045260246000fd5b81810381811115610a7757610a77614469565b80820180821115610a7757610a77614469565b6020808252602c9082015260008051602061486c83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c9082015260008051602061486c83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b6020808252600690820152651c185d5cd95960d21b604082015260600190565b6020808252600f908201526e22ac21a420a723a2afa422a62822a960891b604082015260600190565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b8082028115828204841417610a7757610a77614469565b60008261460857634e487b7160e01b600052601260045260246000fd5b500490565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b81526000835161468a816017850160208801613f6c565b7001034b99036b4b9b9b4b733903937b6329607d1b60179184019182015283516146bb816028840160208801613f6c565b01602801949350505050565b601f8211156110eb57600081815260208120601f850160051c810160208610156146ee5750805b601f850160051c820191505b8181101561206c578281556001016146fa565b81516001600160401b0381111561472657614726614134565b61473a816147348454614392565b846146c7565b602080601f83116001811461476f57600084156147575750858301515b600019600386901b1c1916600185901b17855561206c565b600085815260208120601f198616915b8281101561479e5788860151825594840194600190910190840161477f565b50858210156147bc5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b634e487b7160e01b600052603260045260246000fd5b6000816147f1576147f1614469565b506000190190565b634e487b7160e01b600052603160045260246000fd5b60008251614821818460208701613f6c565b919091019291505056fe45524332305072657365744d696e7465725061757365723a206d75737420686182ce2ced7fc86cde9b16f1f3a5508a82078c42c54a7cf0af011ce529199a18bb46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249865d7a28e3265b37a6474929f336521b332c1681b933f6cb9f3376673440d862a416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c65649f2df0fed2c77648de5860a4cc508cd0818c85b8b8a1ab4ceeef8d981c8956a6ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa264697066735822122083ab34c87fdd0fdaff2d558cd55300218f8ce27f1461307c185bc6c402b8837b64736f6c63430008130033";
1442
+ "0x60a06040523060805234801561001457600080fd5b50608051614c3561004c600039600081816112280152818161126801528181611512015281816115520152611c210152614c356000f3fe6080604052600436106102c85760003560e01c806301ffc9a7146102cd57806306fdde0314610302578063095ea7b3146103245780630cd865ec1461034457806311ab3b341461036657806318160ddd146103885780631b3c90a8146103a85780631de778a5146103bd57806322c65b39146103f257806323b872dd14610409578063248a9ca3146104295780632c387275146104495780632f2ff15d14610477578063313ce56714610497578063355274ea146104b357806336568abe146104ca5780633659cfe6146104ea578063395093511461050a5780633e6326fc1461052a5780633f4ba83a1461054a57806340c10f191461055f5780634162169f1461057f57806342966c681461059f5780634345e979146105bf5780634899bb27146105df5780634cd88b76146106075780634f1ef286146106275780634f8f02181461063a57806352d1902d1461065a57806359a87bc11461066f5780635aef7de61461068f5780635c975abb146106af57806370a08231146106c857806379cc6790146106e857806380d9a50f146107085780638456cb59146107285780639010d07c1461073d57806391d148541461075d57806395d89b411461077d5780639d1b464a146107925780639f2d0d07146107a7578063a217fddf146107c7578063a457c2d7146107dc578063a7ca8c7d146107fc578063a9059cbb1461081e578063acea21d01461083e578063bbc19ab014610853578063bc3a429b1461086a578063be13f47c1461087f578063c1786ab21461089f578063ca15c873146108bf578063d5391393146108df578063d547741f14610901578063dd62ed3e14610921578063df20c4af14610941578063e092b06714610972578063e1758bd814610987578063e2b0caef1461099c578063e462d3b9146109b8578063e63ab1e9146109da578063efbe1c1c146109fc578063f2c65bf914610a11578063f8a9978f14610a32575b600080fd5b3480156102d957600080fd5b506102ed6102e836600461414d565b610a52565b60405190151581526020015b60405180910390f35b34801561030e57600080fd5b50610317610a7d565b6040516102f9919061419b565b34801561033057600080fd5b506102ed61033f3660046141e3565b610b10565b34801561035057600080fd5b5061036461035f36600461420f565b610b28565b005b34801561037257600080fd5b50610262546102ed90600160c81b900460ff1681565b34801561039457600080fd5b50610164545b6040519081526020016102f9565b3480156103b457600080fd5b50610364610c34565b3480156103c957600080fd5b506103dd6103d836600461422c565b610d5b565b604080519283526020830191909152016102f9565b3480156103fe57600080fd5b5061039a6102605481565b34801561041557600080fd5b506102ed610424366004614265565b611144565b34801561043557600080fd5b5061039a6104443660046142a6565b61116a565b34801561045557600080fd5b5061025e5461046a906001600160a01b031681565b6040516102f991906142bf565b34801561048357600080fd5b506103646104923660046142d3565b61117f565b3480156104a357600080fd5b50604051600281526020016102f9565b3480156104bf57600080fd5b5061039a61025c5481565b3480156104d657600080fd5b506103646104e53660046142d3565b6111a0565b3480156104f657600080fd5b5061036461050536600461420f565b61121e565b34801561051657600080fd5b506102ed6105253660046141e3565b6112e3565b34801561053657600080fd5b5060675461046a906001600160a01b031681565b34801561055657600080fd5b50610364611305565b34801561056b57600080fd5b5061036461057a3660046141e3565b611383565b34801561058b57600080fd5b5060655461046a906001600160a01b031681565b3480156105ab57600080fd5b506103646105ba3660046142a6565b6113fe565b3480156105cb57600080fd5b506103646105da366004614311565b611408565b3480156105eb57600080fd5b506102625461046a90600160201b90046001600160a01b031681565b34801561061357600080fd5b506103646106223660046143ea565b611445565b61036461063536600461444d565b611508565b34801561064657600080fd5b506103dd6106553660046144a6565b6115bd565b34801561066657600080fd5b5061039a611c14565b34801561067b57600080fd5b5061039a61068a36600461422c565b611cc2565b34801561069b57600080fd5b5060665461046a906001600160a01b031681565b3480156106bb57600080fd5b506101c65460ff166102ed565b3480156106d457600080fd5b5061039a6106e336600461420f565b611fe3565b3480156106f457600080fd5b506103646107033660046141e3565b611fff565b34801561071457600080fd5b5061036461072336600461420f565b612014565b34801561073457600080fd5b50610364612084565b34801561074957600080fd5b5061046a6107583660046144f0565b6120fe565b34801561076957600080fd5b506102ed6107783660046142d3565b612117565b34801561078957600080fd5b50610317612142565b34801561079e57600080fd5b5061039a612152565b3480156107b357600080fd5b506103646107c23660046144f0565b6121d4565b3480156107d357600080fd5b5061039a600081565b3480156107e857600080fd5b506102ed6107f73660046141e3565b61224b565b34801561080857600080fd5b5061039a600080516020614af983398151915281565b34801561082a57600080fd5b506102ed6108393660046141e3565b6122d1565b34801561084a57600080fd5b5061039a6122df565b34801561085f57600080fd5b5061039a61025d5481565b34801561087657600080fd5b5061036461238f565b34801561088b57600080fd5b5061036461089a3660046141e3565b612533565b3480156108ab57600080fd5b506102ed6108ba366004614512565b6126be565b3480156108cb57600080fd5b5061039a6108da3660046142a6565b6126dc565b3480156108eb57600080fd5b5061039a600080516020614bc083398151915281565b34801561090d57600080fd5b5061036461091c3660046142d3565b6126f4565b34801561092d57600080fd5b5061039a61093c366004614547565b612710565b34801561094d57600080fd5b506102ed61095c36600461420f565b6102616020526000908152604090205460ff1681565b34801561097e57600080fd5b5061046a61273c565b34801561099357600080fd5b5061046a6127c7565b3480156109a857600080fd5b5060006040516102f99190614575565b3480156109c457600080fd5b50610262546102ed90600160c01b900460ff1681565b3480156109e657600080fd5b5061039a600080516020614b7983398151915281565b348015610a0857600080fd5b506103646127f6565b348015610a1d57600080fd5b5061025f5461046a906001600160a01b031681565b348015610a3e57600080fd5b50610364610a4d366004614265565b612b88565b60006001600160e01b03198216635a05180f60e01b1480610a775750610a7782612c39565b92915050565b60606101658054610a8d9061459d565b80601f0160208091040260200160405190810160405280929190818152602001828054610ab99061459d565b8015610b065780601f10610adb57610100808354040283529160200191610b06565b820191906000526020600020905b815481529060010190602001808311610ae957829003601f168201915b5050505050905090565b600033610b1e818585612c6e565b5060019392505050565b610b30612d93565b6066546040516370a0823160e01b81526001600160a01b038084169263a9059cbb9291169083906370a0823190610b6b9030906004016142bf565b602060405180830381865afa158015610b88573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bac91906145d7565b6040518363ffffffff1660e01b8152600401610bc99291906145f0565b6020604051808303816000875af1158015610be8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c0c9190614609565b610c315760405162461bcd60e51b8152600401610c2890614626565b60405180910390fd5b50565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610c97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cbb9190614657565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610d15573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d399190614657565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60008061026354600103610d815760405162461bcd60e51b8152600401610c2890614674565b60016102635561025f5460405163140e25ad60e31b8152600481018790526001600160a01b039091169063a0712d68906024016020604051808303816000875af1158015610dd3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610df791906145d7565b506000610e0261273c565b61025f5460405163835bbd5560e01b81526001600160a01b039283169263835bbd5592610e34929116906004016142bf565b608060405180830381865afa158015610e51573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e7591906146ab565b5050509050600081856001600160a01b03166370a08231306040518263ffffffff1660e01b8152600401610ea991906142bf565b602060405180830381865afa158015610ec6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610eea91906145d7565b610ef49190614708565b90506000610f0061273c565b6001600160a01b03166374920d3087846040518363ffffffff1660e01b8152600401610f2d9291906145f0565b6020604051808303816000875af1158015610f4c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f7091906145d7565b90506000610f7c61273c565b6001600160a01b031663e72a0833886040518263ffffffff1660e01b8152600401610fa791906142bf565b6020604051808303816000875af1158015610fc6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fea91906145d7565b4361025d5590506000610ffd828461471b565b61026254909150600160201b90046001600160a01b03166110515760405162461bcd60e51b815260206004820152600e60248201526d1a195b1c195c881b9bdd081cd95d60921b6044820152606401610c28565b6102625461107190600160201b90046001600160a01b0316826000612e56565b61026254604051630a8ba38960e41b815260048101839052600160201b9091046001600160a01b03169063a8ba389090602401600060405180830381600087803b1580156110be57600080fd5b505af11580156110d2573d6000803e3d6000fd5b505061025d546040805188815260208101889052908101869052606081018590526001600160a01b038c1693509091507f1a962236b7c7b3d7b9f6b56036cbce44ab2f93a22b0827d2f2a92a8f055552b99060800160405180910390a360006102635599929850919650505050505050565b600033611152858285613192565b61115d858585613206565b60019150505b9392505050565b600090815260fe602052604090206001015490565b6111888261116a565b611191816133ac565b61119b83836133b6565b505050565b6001600160a01b03811633146112105760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b6064820152608401610c28565b61121a82826133d9565b5050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036112665760405162461bcd60e51b8152600401610c289061472e565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166112986133fc565b6001600160a01b0316146112be5760405162461bcd60e51b8152600401610c2890614768565b6112c781613418565b60408051600080825260208201909252610c3191839190613420565b600033610b1e8185856112f68383612710565b611300919061471b565b612c6e565b61131d600080516020614b7983398151915233612117565b6113795760405162461bcd60e51b81526020600482015260396024820152600080516020614ad983398151915260448201527876652070617573657220726f6c6520746f20756e706175736560381b6064820152608401610c28565b61138161358b565b565b61139b600080516020614bc083398151915233612117565b6113f45760405162461bcd60e51b81526020600482015260366024820152600080516020614ad98339815191526044820152751d99481b5a5b9d195c881c9bdb19481d1bc81b5a5b9d60521b6064820152608401610c28565b61121a82826135d8565b610c313382613695565b611410612d93565b610262805461ffff60c01b1916600160c01b9315159390930260ff60c81b191692909217600160c81b91151591909102179055565b600054610100900460ff16158080156114655750600054600160ff909116105b806114865750611474306137c6565b158015611486575060005460ff166001145b6114a25760405162461bcd60e51b8152600401610c28906147a2565b6000805460ff1916600117905580156114c5576000805461ff0019166101001790555b6114cf83836137d5565b801561119b576000805461ff001916905560405160018152600080516020614b59833981519152906020015b60405180910390a1505050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036115505760405162461bcd60e51b8152600401610c289061472e565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166115826133fc565b6001600160a01b0316146115a85760405162461bcd60e51b8152600401610c2890614768565b6115b182613418565b61121a82826001613420565b600080610263546001036115e35760405162461bcd60e51b8152600401610c2890614674565b6001610263556101c65460ff161561160d5760405162461bcd60e51b8152600401610c28906147f0565b600061161761273c565b60675460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac19061164690600401614810565b602060405180830381865afa158015611663573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116879190614657565b6001600160a01b0316336001600160a01b0316146116a3573393505b60675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906116d190600401614839565b602060405180830381865afa1580156116ee573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117129190614657565b6001600160a01b03166323b872dd33308a6040518463ffffffff1660e01b81526004016117419392919061485d565b6020604051808303816000875af1158015611760573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117849190614609565b5060675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906117b390600401614839565b602060405180830381865afa1580156117d0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117f49190614657565b6001600160a01b03166342966c68886040518263ffffffff1660e01b815260040161182191815260200190565b600060405180830381600087803b15801561183b57600080fd5b505af115801561184f573d6000803e3d6000fd5b505050506001600160a01b03851615611868578461186a565b335b61026254909550600090600160c81b900460ff16151581036118b757600061189186611fe3565b9050888111156118a157886118a3565b805b915081156118b5576118b58683613695565b505b60008880831015611a095760675460405163bf40fac160e01b815260206004820152601860248201527721a7a72a2924a12aaa24a7a72fa1a0a621aaa620aa24a7a760411b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015611933573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119579190614657565b61025f546001600160a01b0391821691632cfa94fe91879130918c911661197e8988614708565b60405160e087901b6001600160e01b03191681526001600160a01b039586166004820152938516602485015291841660448401529092166064820152608481019190915260a401602060405180830381865afa1580156119e2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a0691906145d7565b91505b61025f5460405163058c243360e11b81526001600160a01b0391821660048201526024810183905260448101849052600091861690630b184866906064016020604051808303816000875af1158015611a66573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a8a91906145d7565b905089811015611aed5760405162461bcd60e51b815260206004820152602860248201527f546f6b656e2072657475726e206d7573742062652061626f766520746865206d60448201526734b72932ba3ab93760c11b6064820152608401610c28565b61025f5460405163a9059cbb60e01b81526001600160a01b039091169063a9059cbb90611b20908c9085906004016145f0565b6020604051808303816000875af1158015611b3f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b639190614609565b611ba65760405162461bcd60e51b815260206004820152601460248201527318d9185a481d1c985b9cd9995c8819985a5b195960621b6044820152606401610c28565b61025f54604080518d8152602081018690529081018390526001600160a01b03808c1692811691908b16907f067ad67f3f4d17211f9f929d19036c2395bbc9b201d517e46e81f9ceae86032e9060600160405180910390a46000610263559a91995090975050505050505050565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614611caf5760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610c28565b50600080516020614b3983398151915290565b600061026354600103611ce75760405162461bcd60e51b8152600401610c2890614674565b60016102635561025f546001600160a01b03166000611d0461273c565b6001600160a01b031663cce7ec1383886040518363ffffffff1660e01b8152600401611d319291906145f0565b6020604051808303816000875af1158015611d50573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d7491906145d7565b90506001600160a01b03841615611d8b5783611d8d565b335b60675460405163bf40fac160e01b81529195506000916001600160a01b039091169063bf40fac190611dc190600401614810565b602060405180830381865afa158015611dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e029190614657565b6040516323b872dd60e01b81529091506001600160a01b038416906323b872dd90611e3590339030908c9060040161485d565b6020604051808303816000875af1158015611e54573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e789190614609565b1515600114611ef1576040805162461bcd60e51b81526020600482015260248101919091527f7472616e7366657246726f6d206661696c65642c206d616b652073757265207960448201527f6f7520617070726f76656420696e70757420746f6b656e207472616e736665726064820152608401610c28565b85821015611f4f5760405162461bcd60e51b815260206004820152602560248201527f47442072657475726e206d7573742062652061626f766520746865206d696e5260448201526432ba3ab93760d91b6064820152608401610c28565b611f5b85836001612e56565b611f658583613818565b61025f546001600160a01b038087169181169083163303611f865732611f88565b335b6001600160a01b03167fcace70a03cbf3e4fa942b0ab9f70aa3834cfab0a31aa75bc4895262063444e128a86604051611fcb929190918252602082015260400190565b60405180910390a45060006102635595945050505050565b6001600160a01b03166000908152610162602052604090205490565b61200a823383613192565b61121a8282613695565b61201c612d93565b6102628054600160201b600160c01b031916600160201b6001600160a01b038416908102919091179091556040805191825261271060208301527f0fa8d325f44a93da78a029607ba0c95db6a44fa32278f04de5396797a4306ead910160405180910390a150565b61209c600080516020614b7983398151915233612117565b6120f65760405162461bcd60e51b81526020600482015260376024820152600080516020614ad983398151915260448201527676652070617573657220726f6c6520746f20706175736560481b6064820152608401610c28565b611381613839565b6000828152610130602052604081206111639083613877565b600091825260fe602090815260408084206001600160a01b0393909316845291905290205460ff1690565b60606101668054610a8d9061459d565b600061215c61273c565b61025f5460405163e9833c2f60e01b81526001600160a01b039283169263e9833c2f9261218e929116906004016142bf565b602060405180830381865afa1580156121ab573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121cf91906145d7565b905090565b6121dc612d93565b6121e461273c565b604051639f2d0d0760e01b815260048101849052602481018390526001600160a01b039190911690639f2d0d0790604401600060405180830381600087803b15801561222f57600080fd5b505af1158015612243573d6000803e3d6000fd5b505050505050565b600033816122598286612710565b9050838110156122b95760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610c28565b6122c68286868403612c6e565b506001949350505050565b600033610b1e818585613206565b61025f546040805163182df0f560e01b815290516000926001600160a01b0316916b204fce5e3e2502611000000091839163182df0f59160048083019260209291908290030181865afa15801561233a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061235e91906145d7565b612366612152565b612375906402540be400614881565b61237f9190614881565b6123899190614898565b91505090565b60675460405163bf40fac160e01b815260206004820152600360248201526244414960e81b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156123eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061240f9190614657565b61025e80546001600160a01b0319166001600160a01b0392831617905560675460405163bf40fac160e01b815260206004808301919091526024820152634344414960e01b604482015291169063bf40fac190606401602060405180830381865afa158015612482573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124a69190614657565b61025f80546001600160a01b0319166001600160a01b0392831690811790915561025e5460405163095ea7b360e01b815292169163095ea7b3916124f091600019906004016145f0565b6020604051808303816000875af115801561250f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c319190614609565b600054610100900460ff16158080156125535750600054600160ff909116105b806125745750612562306137c6565b158015612574575060005460ff166001145b6125905760405162461bcd60e51b8152600401610c28906147a2565b6000805460ff1916600117905580156125b3576000805461ff0019166101001790555b6125f36040518060400160405280600381526020016208e88b60eb1b8152506040518060400160405280600381526020016208e48b60eb1b8152506137d5565b6125fc83613883565b61260461238f565b61261c600080516020614bc0833981519152336111a0565b612634600080516020614b79833981519152336111a0565b61263f6000336111a0565b606654612657906000906001600160a01b03166138a6565b60665461267c90600080516020614af9833981519152906001600160a01b03166138a6565b6607d0e36a81800061025c55610260829055801561119b576000805461ff001916905560405160018152600080516020614b59833981519152906020016114fb565b600081696d696e74546f6b656e7360b01b03610b1e57506000611163565b600081815261013060205260408120610a77906138b0565b6126fd8261116a565b612706816133ac565b61119b83836133d9565b6001600160a01b0391821660009081526101636020908152604080832093909416825291909152205490565b60675460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526000916001600160a01b03169063bf40fac1906064015b602060405180830381865afa1580156127a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121cf9190614657565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac19061278690600401614839565b6127fe612d93565b61025f546040516370a0823160e01b81526000916001600160a01b0316906370a08231906128309030906004016142bf565b602060405180830381865afa15801561284d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061287191906145d7565b11156129725761025f546066546040516370a0823160e01b81526001600160a01b039283169263a9059cbb92169083906370a08231906128b59030906004016142bf565b602060405180830381865afa1580156128d2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906128f691906145d7565b6040518363ffffffff1660e01b81526004016129139291906145f0565b6020604051808303816000875af1158015612932573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906129569190614609565b6129725760405162461bcd60e51b8152600401610c2890614626565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906129a190600401614839565b602060405180830381865afa1580156129be573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906129e29190614657565b6066546040516355138f0d60e11b81529192506001600160a01b038084169263aa271e1a92612a159216906004016142bf565b602060405180830381865afa158015612a32573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612a569190614609565b1515600003612ac457606654604051634c1d96ab60e11b81526001600160a01b038381169263983b2d5692612a9192909116906004016142bf565b600060405180830381600087803b158015612aab57600080fd5b505af1158015612abf573d6000803e3d6000fd5b505050505b60675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190612af290600401614839565b602060405180830381865afa158015612b0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612b339190614657565b6001600160a01b031663986502756040518163ffffffff1660e01b8152600401600060405180830381600087803b158015612b6d57600080fd5b505af1158015612b81573d6000803e3d6000fd5b5050505050565b61026354600103612bab5760405162461bcd60e51b8152600401610c2890614674565b600161026355612bb961273c565b6001600160a01b031663d5dc7eda84836040518363ffffffff1660e01b8152600401612be69291906145f0565b600060405180830381600087803b158015612c0057600080fd5b505af1158015612c14573d6000803e3d6000fd5b50505050612c2482826000612e56565b612c2e8282613818565b505060006102635550565b60006001600160e01b03198216637965db0b60e01b1480610a7757506301ffc9a760e01b6001600160e01b0319831614610a77565b6001600160a01b038316612cd05760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610c28565b6001600160a01b038216612d315760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610c28565b6001600160a01b038381166000818152610163602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa158015612ddc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612e009190614657565b6001600160a01b0316146113815760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610c28565b6101c65460ff1615612e7a5760405162461bcd60e51b8152600401610c28906147f0565b8080612f1f575060675460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015612ee6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f0a9190614657565b6001600160a01b0316336001600160a01b0316145b80612f3d5750612f3d600080516020614af983398151915233612117565b612f855760405162461bcd60e51b815260206004820152601960248201527823b7b7b22932b9b2b93b329d103737ba10309036b4b73a32b960391b6044820152606401610c28565b61025c5460675460405163bf40fac160e01b815284916001600160a01b03169063bf40fac190612fb790600401614839565b602060405180830381865afa158015612fd4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612ff89190614657565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa158015613035573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061305991906145d7565b613063919061471b565b11156130ad5760405162461bcd60e51b815260206004820152601960248201527811dbdbd914995cd95c9d994e8818d85c08195b999bdc98d959603a1b6044820152606401610c28565b60675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906130db90600401614839565b602060405180830381865afa1580156130f8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061311c9190614657565b6001600160a01b03166340c10f1984846040518363ffffffff1660e01b81526004016131499291906145f0565b6020604051808303816000875af1158015613168573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061318c91906145d7565b50505050565b600061319e8484612710565b9050600019811461318c57818110156131f95760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e63650000006044820152606401610c28565b61318c8484848403612c6e565b6001600160a01b03831661326a5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610c28565b6001600160a01b0382166132cc5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610c28565b6132d78383836138ba565b6001600160a01b03831660009081526101626020526040902054818110156133505760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610c28565b6001600160a01b03808516600081815261016260205260408082208686039055928616808252908390208054860190559151600080516020614be08339815191529061339f9086815260200190565b60405180910390a361318c565b610c3181336138c5565b6133c0828261391e565b60008281526101306020526040902061119b90826139a4565b6133e382826139b9565b60008281526101306020526040902061119b9082613a20565b600080516020614b39833981519152546001600160a01b031690565b610c31612d93565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156134535761119b83613a35565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156134ad575060408051601f3d908101601f191682019092526134aa918101906145d7565b60015b6135105760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610c28565b600080516020614b39833981519152811461357f5760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610c28565b5061119b838383613acf565b613593613af4565b6101c6805460ff191690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b6040516135ce91906142bf565b60405180910390a1565b6001600160a01b03821661362e5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610c28565b61363a600083836138ba565b80610164600082825461364d919061471b565b90915550506001600160a01b03821660008181526101626020908152604080832080548601905551848152600080516020614be0833981519152910160405180910390a35050565b6001600160a01b0382166136f55760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610c28565b613701826000836138ba565b6001600160a01b03821660009081526101626020526040902054818110156137765760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610c28565b6001600160a01b03831660008181526101626020908152604080832086860390556101648054879003905551858152919291600080516020614be0833981519152910160405180910390a3505050565b6001600160a01b03163b151590565b600054610100900460ff166137fc5760405162461bcd60e51b8152600401610c28906148ba565b6138068282613b3e565b61380e613b80565b61121a8282613bb4565b61026254600160c01b900460ff16151560000361121a5761121a82826135d8565b613841613c16565b6101c6805460ff191660011790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a2586135c13390565b60006111638383613c5d565b606780546001600160a01b0319166001600160a01b038316179055610c31610c34565b61121a82826133b6565b6000610a77825490565b61119b838383613c87565b6138cf8282612117565b61121a576138dc81613cee565b6138e7836020613d00565b6040516020016138f8929190614905565b60408051601f198184030181529082905262461bcd60e51b8252610c289160040161419b565b6139288282612117565b61121a57600082815260fe602090815260408083206001600160a01b03851684529091529020805460ff191660011790556139603390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b6000611163836001600160a01b038416613e9b565b6139c38282612117565b1561121a57600082815260fe602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b6000611163836001600160a01b038416613eea565b613a3e816137c6565b613aa05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610c28565b600080516020614b3983398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b613ad883613fdd565b600082511180613ae55750805b1561119b5761318c838361401d565b6101c65460ff166113815760405162461bcd60e51b815260206004820152601460248201527314185d5cd8589b194e881b9bdd081c185d5cd95960621b6044820152606401610c28565b600054610100900460ff16613b655760405162461bcd60e51b8152600401610c28906148ba565b610165613b7283826149ba565b5061016661119b82826149ba565b600054610100900460ff16613ba75760405162461bcd60e51b8152600401610c28906148ba565b6101c6805460ff19169055565b600054610100900460ff16613bdb5760405162461bcd60e51b8152600401610c28906148ba565b613be66000336138a6565b613bfe600080516020614bc0833981519152336138a6565b61121a600080516020614b79833981519152336138a6565b6101c65460ff16156113815760405162461bcd60e51b815260206004820152601060248201526f14185d5cd8589b194e881c185d5cd95960821b6044820152606401610c28565b6000826000018281548110613c7457613c74614a79565b9060005260206000200154905092915050565b6101c65460ff161561119b5760405162461bcd60e51b815260206004820152602a60248201527f45524332305061757361626c653a20746f6b656e207472616e736665722077686044820152691a5b19481c185d5cd95960b21b6064820152608401610c28565b6060610a776001600160a01b03831660145b60606000613d0f836002614881565b613d1a90600261471b565b6001600160401b03811115613d3157613d3161433f565b6040519080825280601f01601f191660200182016040528015613d5b576020820181803683370190505b509050600360fc1b81600081518110613d7657613d76614a79565b60200101906001600160f81b031916908160001a905350600f60fb1b81600181518110613da557613da5614a79565b60200101906001600160f81b031916908160001a9053506000613dc9846002614881565b613dd490600161471b565b90505b6001811115613e4c576f181899199a1a9b1b9c1cb0b131b232b360811b85600f1660108110613e0857613e08614a79565b1a60f81b828281518110613e1e57613e1e614a79565b60200101906001600160f81b031916908160001a90535060049490941c93613e4581614a8f565b9050613dd7565b5083156111635760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610c28565b6000818152600183016020526040812054613ee257508154600181810184556000848152602080822090930184905584548482528286019093526040902091909155610a77565b506000610a77565b60008181526001830160205260408120548015613fd3576000613f0e600183614708565b8554909150600090613f2290600190614708565b9050818114613f87576000866000018281548110613f4257613f42614a79565b9060005260206000200154905080876000018481548110613f6557613f65614a79565b6000918252602080832090910192909255918252600188019052604090208390555b8554869080613f9857613f98614aa6565b600190038181906000526020600020016000905590558560010160008681526020019081526020016000206000905560019350505050610a77565b6000915050610a77565b613fe681613a35565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060614028836137c6565b6140835760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610c28565b600080846001600160a01b03168460405161409e9190614abc565b600060405180830381855af49150503d80600081146140d9576040519150601f19603f3d011682016040523d82523d6000602084013e6140de565b606091505b50915091506141068282604051806060016040528060278152602001614b996027913961410f565b95945050505050565b6060831561411e575081611163565b61116383838151156141335781518083602001fd5b8060405162461bcd60e51b8152600401610c28919061419b565b60006020828403121561415f57600080fd5b81356001600160e01b03198116811461116357600080fd5b60005b8381101561419257818101518382015260200161417a565b50506000910152565b60208152600082518060208401526141ba816040850160208701614177565b601f01601f19169190910160400192915050565b6001600160a01b0381168114610c3157600080fd5b600080604083850312156141f657600080fd5b8235614201816141ce565b946020939093013593505050565b60006020828403121561422157600080fd5b8135611163816141ce565b60008060006060848603121561424157600080fd5b8335925060208401359150604084013561425a816141ce565b809150509250925092565b60008060006060848603121561427a57600080fd5b8335614285816141ce565b92506020840135614295816141ce565b929592945050506040919091013590565b6000602082840312156142b857600080fd5b5035919050565b6001600160a01b0391909116815260200190565b600080604083850312156142e657600080fd5b8235915060208301356142f8816141ce565b809150509250929050565b8015158114610c3157600080fd5b6000806040838503121561432457600080fd5b823561432f81614303565b915060208301356142f881614303565b634e487b7160e01b600052604160045260246000fd5b60006001600160401b038084111561436f5761436f61433f565b604051601f8501601f19908116603f011681019082821181831017156143975761439761433f565b816040528093508581528686860111156143b057600080fd5b858560208301376000602087830101525050509392505050565b600082601f8301126143db57600080fd5b61116383833560208501614355565b600080604083850312156143fd57600080fd5b82356001600160401b038082111561441457600080fd5b614420868387016143ca565b9350602085013591508082111561443657600080fd5b50614443858286016143ca565b9150509250929050565b6000806040838503121561446057600080fd5b823561446b816141ce565b915060208301356001600160401b0381111561448657600080fd5b8301601f8101851361449757600080fd5b61444385823560208401614355565b600080600080608085870312156144bc57600080fd5b843593506020850135925060408501356144d5816141ce565b915060608501356144e5816141ce565b939692955090935050565b6000806040838503121561450357600080fd5b50508035926020909101359150565b60008060006060848603121561452757600080fd5b8335614532816141ce565b95602085013595506040909401359392505050565b6000806040838503121561455a57600080fd5b8235614565816141ce565b915060208301356142f8816141ce565b602081016003831061459757634e487b7160e01b600052602160045260246000fd5b91905290565b600181811c908216806145b157607f821691505b6020821081036145d157634e487b7160e01b600052602260045260246000fd5b50919050565b6000602082840312156145e957600080fd5b5051919050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561461b57600080fd5b815161116381614303565b6020808252601790820152761c9958dbdd995c881d1c985b9cd9995c8819985a5b1959604a1b604082015260600190565b60006020828403121561466957600080fd5b8151611163816141ce565b6020808252601f908201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604082015260600190565b600080600080608085870312156146c157600080fd5b84519350602085015163ffffffff811681146146dc57600080fd5b6040860151606090960151949790965092505050565b634e487b7160e01b600052601160045260246000fd5b81810381811115610a7757610a776146f2565b80820180821115610a7757610a776146f2565b6020808252602c90820152600080516020614b1983398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020614b1983398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b6020808252600690820152651c185d5cd95960d21b604082015260600190565b6020808252600f908201526e22ac21a420a723a2afa422a62822a960891b604082015260600190565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b6001600160a01b039384168152919092166020820152604081019190915260600190565b8082028115828204841417610a7757610a776146f2565b6000826148b557634e487b7160e01b600052601260045260246000fd5b500490565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b815260008351614937816017850160208801614177565b7001034b99036b4b9b9b4b733903937b6329607d1b6017918401918201528351614968816028840160208801614177565b01602801949350505050565b601f82111561119b57600081815260208120601f850160051c8101602086101561499b5750805b601f850160051c820191505b81811015612243578281556001016149a7565b81516001600160401b038111156149d3576149d361433f565b6149e7816149e1845461459d565b84614974565b602080601f831160018114614a1c5760008415614a045750858301515b600019600386901b1c1916600185901b178555612243565b600085815260208120601f198616915b82811015614a4b57888601518255948401946001909101908401614a2c565b5085821015614a695787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b634e487b7160e01b600052603260045260246000fd5b600081614a9e57614a9e6146f2565b506000190190565b634e487b7160e01b600052603160045260246000fd5b60008251614ace818460208701614177565b919091019291505056fe45524332305072657365744d696e7465725061757365723a206d75737420686182ce2ced7fc86cde9b16f1f3a5508a82078c42c54a7cf0af011ce529199a18bb46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249865d7a28e3265b37a6474929f336521b332c1681b933f6cb9f3376673440d862a416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c65649f2df0fed2c77648de5860a4cc508cd0818c85b8b8a1ab4ceeef8d981c8956a6ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa26469706673582212205ca5f720a6eaddcb50d23ac5eef457789e4426c2a5b4ab26a146c0d8aa199cbc64736f6c63430008130033";
1443
1443
 
1444
1444
  type GoodReserveCDaiConstructorParams =
1445
1445
  | [signer?: Signer]
package/types/factories/contracts/staking/BaseShareFieldV2__factory.ts CHANGED
@@ -201,7 +201,7 @@ const _abi = [
201
201
  ] as const;
202
202
 
203
203
  const _bytecode =
204
- "0x608060405234801561001057600080fd5b50610f86806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c806328e964e91461005c578063574c5c93146100b8578063a82415ae146100d9578063a87430ba146100ec578063c59d4847146101a9575b600080fd5b61009e61006a366004610cf2565b6001600160a01b031660009081526004602052604081205490546001600160801b0391821692600160801b90910490911690565b604080519283526020830191909152015b60405180910390f35b6100cb6100c6366004610d14565b610222565b6040519081526020016100af565b6100cb6100e7366004610d14565b610335565b6101556100fa366004610cf2565b6004602052600090815260409020805460018201546002909201546001600160801b0380831693600160801b9384900482169381831693918190048316928216916001600160401b03918104821691600160c01b9091041687565b604080516001600160801b039889168152968816602088015294871694860194909452918516606085015290931660808301526001600160401b0392831660a08301529190911660c082015260e0016100af565b600354600054600154600254604080519485526001600160801b038085166020870152600160801b948590048116918601919091528083166060860152918390048216608085015290811660a08401529081046001600160401b031660c0830152600160c01b900460ff1660e0820152610100016100af565b600061022f8484846105c2565b6001600160a01b03851660009081526004602052604090205461025e9086906001600160801b03166001610746565b6001600160a01b03851660009081526004602052604081206001810180546001600160801b0380821690925560029092018054600160801b9093048216938493919290916102ae91859116610d63565b92506101000a8154816001600160801b0302191690836001600160801b031602179055508060008054906101000a90046001600160801b03166102f19190610d63565b600080546001600160801b0319166001600160801b0392909216919091179055610322662386f26fc1000082610da0565b6001600160801b03169695505050505050565b6001600160a01b0384166000908152600460209081526040808320815160e08101835281546001600160801b038082168352600160801b9182900481169583019590955260018084015480871695840195909552938190048516606083015260029092015480851660808301526001600160401b03928104831660a0830152600160c01b900490911660c082015260035491549092849116158015906103db5750854310155b80156103e75750438510155b1561059d57600254600090610405906001600160801b031643610dc6565b9050600061041a89662386f26fc10000610ddf565b6104249083610ddf565b9050600080600061043488610be0565b600254929550909350915061045490600160c01b900460ff16600a610eda565b60015461046a91906001600160801b0316610ddf565b61047f85676765c793fa10079d601b1b610ddf565b6104899190610ee9565b6104939088610efd565b96508783156105965780604001516001600160801b0316676765c793fa10079d601b1b89600260189054906101000a900460ff16600a6104d39190610eda565b84602001516001600160801b03166104eb9190610ddf565b6104f59190610ddf565b6104ff9190610ee9565b6105099190610dc6565b9650600061051f85670de0b6b3a7640000610ddf565b61053489676765c793fa10079d601b1b610ddf565b61053e9190610ee9565b905064174876e80081610552856064610ddf565b600a61055f886064610ddf565b61056a906005610ddf565b6105749190610ee9565b61057e9190610efd565b6105889190610ddf565b6105929190610ee9565b9750505b5050505050505b8083606001516001600160801b03166105b69190610efd565b98975050505050505050565b6001546001600160801b03166000036105f5575050600280546001600160801b031916436001600160801b031617905550565b81431015801561060f57506002546001600160801b031682115b1561063057600280546001600160801b0319166001600160801b0384161790555b6002546000906001600160801b03168311801561064d5750824310155b610662576002546001600160801b0316610664565b825b905060008243116106755743610677565b825b9050838110806106875750828210155b15610693575050505050565b600061069f8383610dc6565b905060006106b487662386f26fc10000610ddf565b6106be9083610ddf565b6002549091506106d990600160c01b900460ff16600a610eda565b6001546106ef91906001600160801b0316610ddf565b61070482676765c793fa10079d601b1b610ddf565b61070e9190610ee9565b60035461071b9190610efd565b6003555050600280546001600160801b0319166001600160801b039290921691909117905550505050565b6001600160a01b038316600090815260046020526040902080546001600160801b0380821691600160801b9004168015610958576040805160e08101825284546001600160801b038082168352600160801b91829004811660208401526001870154808216948401949094529281900483166060830152600286015492831660808301526001600160401b03908304811660a0830152600160c01b90920490911660c0820152600090819081906107fc90610be0565b925092509250826000146109505760018601546003546002546000926001600160801b031691676765c793fa10079d601b1b9161084490600160c01b900460ff16600a610eda565b61084e9089610ddf565b6108589190610ddf565b6108629190610ee9565b61086c9190610dc6565b905060008461087f83633b9aca00610ddf565b6108899190610ee9565b905064174876e8008161089d856064610ddf565b600a6108aa886064610ddf565b6108b5906005610ddf565b6108bf9190610ee9565b6108c99190610efd565b6108d39190610ddf565b6108dd9190610ee9565b6001890154909250610900908390600160801b90046001600160801b0316610efd565b600189810180546001600160801b03908116600160801b9482168502179091559054610930928592910416610efd565b600180546001600160801b03928316600160801b02921691909117905550505b50505061097b565b6002830180546001600160c01b0316600160c01b436001600160401b0316021790555b818511610a79576002830180546001600160c01b0316600160c01b436001600160401b0316021790558115610a745782546000908390600160801b90046001600160801b03166109cb8883610dc6565b6109d59190610ddf565b6109df9190610ee9565b845490915081908590601090610a06908490600160801b90046001600160801b0316610f10565b92506101000a8154816001600160801b0302191690836001600160801b0316021790555080600160008282829054906101000a90046001600160801b0316610a4e9190610f10565b92506101000a8154816001600160801b0302191690836001600160801b03160217905550505b610b1d565b83600003610b1d57610a8b8286610dc6565b83548490601090610aad908490600160801b90046001600160801b0316610d63565b92506101000a8154816001600160801b0302191690836001600160801b031602179055508185610add9190610dc6565b60018054600090610af89084906001600160801b0316610d63565b92506101000a8154816001600160801b0302191690836001600160801b031602179055505b60028381018054600160801b600160c01b031916600160801b436001600160401b03160217905583546001600160801b0319166001600160801b0387161784556003549054676765c793fa10079d601b1b9190610b8590600160c01b900460ff16600a610eda565b8554610ba19190600160801b90046001600160801b0316610ddf565b610bab9190610ddf565b610bb59190610ee9565b60019390930180546001600160801b0319166001600160801b03909416939093179092555050505050565b6000806000808460c001518560a00151610bfa9190610f30565b6001600160401b0316905060008560c001516001600160401b031643610c209190610dc6565b600254600160801b90046001600160401b031610610c555760c0860151610c50906001600160401b031643610dc6565b610c69565b600254600160801b90046001600160401b03165b905060008660a001516001600160401b031643610c869190610dc6565b600254909150600090600160801b90046001600160401b0316841015610cb557610cb08484610dc6565b610cb8565b60005b90506000610cc68284610dc6565b9299919850919650945050505050565b80356001600160a01b0381168114610ced57600080fd5b919050565b600060208284031215610d0457600080fd5b610d0d82610cd6565b9392505050565b60008060008060808587031215610d2a57600080fd5b610d3385610cd6565b966020860135965060408601359560600135945092505050565b634e487b7160e01b600052601160045260246000fd5b6001600160801b03818116838216019080821115610d8357610d83610d4d565b5092915050565b634e487b7160e01b600052601260045260246000fd5b60006001600160801b0383811680610dba57610dba610d8a565b92169190910492915050565b81810381811115610dd957610dd9610d4d565b92915050565b8082028115828204841417610dd957610dd9610d4d565b600181815b80851115610e31578160001904821115610e1757610e17610d4d565b80851615610e2457918102915b93841c9390800290610dfb565b509250929050565b600082610e4857506001610dd9565b81610e5557506000610dd9565b8160018114610e6b5760028114610e7557610e91565b6001915050610dd9565b60ff841115610e8657610e86610d4d565b50506001821b610dd9565b5060208310610133831016604e8410600b8410161715610eb4575081810a610dd9565b610ebe8383610df6565b8060001904821115610ed257610ed2610d4d565b029392505050565b6000610d0d60ff841683610e39565b600082610ef857610ef8610d8a565b500490565b80820180821115610dd957610dd9610d4d565b6001600160801b03828116828216039080821115610d8357610d83610d4d565b6001600160401b03828116828216039080821115610d8357610d83610d4d56fea26469706673582212202e0ff57f7fe96f5a0799b0d01b5ecabdadc8805f1a5d626180cbd28e31ec96c164736f6c63430008130033";
204
+ "0x608060405234801561001057600080fd5b50610f86806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c806328e964e91461005c578063574c5c93146100b8578063a82415ae146100d9578063a87430ba146100ec578063c59d4847146101a9575b600080fd5b61009e61006a366004610cf2565b6001600160a01b031660009081526004602052604081205490546001600160801b0391821692600160801b90910490911690565b604080519283526020830191909152015b60405180910390f35b6100cb6100c6366004610d14565b610222565b6040519081526020016100af565b6100cb6100e7366004610d14565b610335565b6101556100fa366004610cf2565b6004602052600090815260409020805460018201546002909201546001600160801b0380831693600160801b9384900482169381831693918190048316928216916001600160401b03918104821691600160c01b9091041687565b604080516001600160801b039889168152968816602088015294871694860194909452918516606085015290931660808301526001600160401b0392831660a08301529190911660c082015260e0016100af565b600354600054600154600254604080519485526001600160801b038085166020870152600160801b948590048116918601919091528083166060860152918390048216608085015290811660a08401529081046001600160401b031660c0830152600160c01b900460ff1660e0820152610100016100af565b600061022f8484846105c2565b6001600160a01b03851660009081526004602052604090205461025e9086906001600160801b03166001610746565b6001600160a01b03851660009081526004602052604081206001810180546001600160801b0380821690925560029092018054600160801b9093048216938493919290916102ae91859116610d63565b92506101000a8154816001600160801b0302191690836001600160801b031602179055508060008054906101000a90046001600160801b03166102f19190610d63565b600080546001600160801b0319166001600160801b0392909216919091179055610322662386f26fc1000082610da0565b6001600160801b03169695505050505050565b6001600160a01b0384166000908152600460209081526040808320815160e08101835281546001600160801b038082168352600160801b9182900481169583019590955260018084015480871695840195909552938190048516606083015260029092015480851660808301526001600160401b03928104831660a0830152600160c01b900490911660c082015260035491549092849116158015906103db5750854310155b80156103e75750438510155b1561059d57600254600090610405906001600160801b031643610dc6565b9050600061041a89662386f26fc10000610ddf565b6104249083610ddf565b9050600080600061043488610be0565b600254929550909350915061045490600160c01b900460ff16600a610eda565b60015461046a91906001600160801b0316610ddf565b61047f85676765c793fa10079d601b1b610ddf565b6104899190610ee9565b6104939088610efd565b96508783156105965780604001516001600160801b0316676765c793fa10079d601b1b89600260189054906101000a900460ff16600a6104d39190610eda565b84602001516001600160801b03166104eb9190610ddf565b6104f59190610ddf565b6104ff9190610ee9565b6105099190610dc6565b9650600061051f85670de0b6b3a7640000610ddf565b61053489676765c793fa10079d601b1b610ddf565b61053e9190610ee9565b905064174876e80081610552856064610ddf565b600a61055f886064610ddf565b61056a906005610ddf565b6105749190610ee9565b61057e9190610efd565b6105889190610ddf565b6105929190610ee9565b9750505b5050505050505b8083606001516001600160801b03166105b69190610efd565b98975050505050505050565b6001546001600160801b03166000036105f5575050600280546001600160801b031916436001600160801b031617905550565b81431015801561060f57506002546001600160801b031682115b1561063057600280546001600160801b0319166001600160801b0384161790555b6002546000906001600160801b03168311801561064d5750824310155b610662576002546001600160801b0316610664565b825b905060008243116106755743610677565b825b9050838110806106875750828210155b15610693575050505050565b600061069f8383610dc6565b905060006106b487662386f26fc10000610ddf565b6106be9083610ddf565b6002549091506106d990600160c01b900460ff16600a610eda565b6001546106ef91906001600160801b0316610ddf565b61070482676765c793fa10079d601b1b610ddf565b61070e9190610ee9565b60035461071b9190610efd565b6003555050600280546001600160801b0319166001600160801b039290921691909117905550505050565b6001600160a01b038316600090815260046020526040902080546001600160801b0380821691600160801b9004168015610958576040805160e08101825284546001600160801b038082168352600160801b91829004811660208401526001870154808216948401949094529281900483166060830152600286015492831660808301526001600160401b03908304811660a0830152600160c01b90920490911660c0820152600090819081906107fc90610be0565b925092509250826000146109505760018601546003546002546000926001600160801b031691676765c793fa10079d601b1b9161084490600160c01b900460ff16600a610eda565b61084e9089610ddf565b6108589190610ddf565b6108629190610ee9565b61086c9190610dc6565b905060008461087f83633b9aca00610ddf565b6108899190610ee9565b905064174876e8008161089d856064610ddf565b600a6108aa886064610ddf565b6108b5906005610ddf565b6108bf9190610ee9565b6108c99190610efd565b6108d39190610ddf565b6108dd9190610ee9565b6001890154909250610900908390600160801b90046001600160801b0316610efd565b600189810180546001600160801b03908116600160801b9482168502179091559054610930928592910416610efd565b600180546001600160801b03928316600160801b02921691909117905550505b50505061097b565b6002830180546001600160c01b0316600160c01b436001600160401b0316021790555b818511610a79576002830180546001600160c01b0316600160c01b436001600160401b0316021790558115610a745782546000908390600160801b90046001600160801b03166109cb8883610dc6565b6109d59190610ddf565b6109df9190610ee9565b845490915081908590601090610a06908490600160801b90046001600160801b0316610f10565b92506101000a8154816001600160801b0302191690836001600160801b0316021790555080600160008282829054906101000a90046001600160801b0316610a4e9190610f10565b92506101000a8154816001600160801b0302191690836001600160801b03160217905550505b610b1d565b83600003610b1d57610a8b8286610dc6565b83548490601090610aad908490600160801b90046001600160801b0316610d63565b92506101000a8154816001600160801b0302191690836001600160801b031602179055508185610add9190610dc6565b60018054600090610af89084906001600160801b0316610d63565b92506101000a8154816001600160801b0302191690836001600160801b031602179055505b60028381018054600160801b600160c01b031916600160801b436001600160401b03160217905583546001600160801b0319166001600160801b0387161784556003549054676765c793fa10079d601b1b9190610b8590600160c01b900460ff16600a610eda565b8554610ba19190600160801b90046001600160801b0316610ddf565b610bab9190610ddf565b610bb59190610ee9565b60019390930180546001600160801b0319166001600160801b03909416939093179092555050505050565b6000806000808460c001518560a00151610bfa9190610f30565b6001600160401b0316905060008560c001516001600160401b031643610c209190610dc6565b600254600160801b90046001600160401b031610610c555760c0860151610c50906001600160401b031643610dc6565b610c69565b600254600160801b90046001600160401b03165b905060008660a001516001600160401b031643610c869190610dc6565b600254909150600090600160801b90046001600160401b0316841015610cb557610cb08484610dc6565b610cb8565b60005b90506000610cc68284610dc6565b9299919850919650945050505050565b80356001600160a01b0381168114610ced57600080fd5b919050565b600060208284031215610d0457600080fd5b610d0d82610cd6565b9392505050565b60008060008060808587031215610d2a57600080fd5b610d3385610cd6565b966020860135965060408601359560600135945092505050565b634e487b7160e01b600052601160045260246000fd5b6001600160801b03818116838216019080821115610d8357610d83610d4d565b5092915050565b634e487b7160e01b600052601260045260246000fd5b60006001600160801b0383811680610dba57610dba610d8a565b92169190910492915050565b81810381811115610dd957610dd9610d4d565b92915050565b8082028115828204841417610dd957610dd9610d4d565b600181815b80851115610e31578160001904821115610e1757610e17610d4d565b80851615610e2457918102915b93841c9390800290610dfb565b509250929050565b600082610e4857506001610dd9565b81610e5557506000610dd9565b8160018114610e6b5760028114610e7557610e91565b6001915050610dd9565b60ff841115610e8657610e86610d4d565b50506001821b610dd9565b5060208310610133831016604e8410600b8410161715610eb4575081810a610dd9565b610ebe8383610df6565b8060001904821115610ed257610ed2610d4d565b029392505050565b6000610d0d60ff841683610e39565b600082610ef857610ef8610d8a565b500490565b80820180821115610dd957610dd9610d4d565b6001600160801b03828116828216039080821115610d8357610d83610d4d565b6001600160401b03828116828216039080821115610d8357610d83610d4d56fea26469706673582212208293f37ca7950c55824772f541a38a7fcf817c3e303a1a822b475f442d553f4f64736f6c63430008130033";
205
205
 
206
206
  type BaseShareFieldV2ConstructorParams =
207
207
  | [signer?: Signer]
package/types/factories/contracts/staking/BaseShareField__factory.ts CHANGED
@@ -257,7 +257,7 @@ const _abi = [
257
257
  ] as const;
258
258
 
259
259
  const _bytecode =
260
- "0x608060405234801561001057600080fd5b50610c28806100206000396000f3fe608060405234801561001057600080fd5b50600436106100a45760003560e01c80631ce720f3146100a957806328e964e9146100cd5780633a6080321461010e5780634a291b0114610125578063574c5c931461012e578063899e1b6c146101415780639c81ff6b1461016c578063a82415ae14610175578063a87430ba14610188578063a9f8d18114610220578063bea2811514610229578063e319828c14610232575b600080fd5b6007546100b69060ff1681565b60405160ff90911681526020015b60405180910390f35b6100f96100db366004610a0f565b6001600160a01b031660009081526008602052604081205490549091565b604080519283526020830191909152016100c4565b61011760025481565b6040519081526020016100c4565b61011760015481565b61011761013c366004610a2a565b61023b565b600554610154906001600160401b031681565b6040516001600160401b0390911681526020016100c4565b61011760045481565b610117610183366004610a2a565b6102c1565b6101df610196366004610a0f565b60086020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160401b0380821691600160401b90041687565b60408051978852602088019690965294860193909352606085019190915260808401526001600160401b0390811660a08401521660c082015260e0016100c4565b61011760065481565b61011760005481565b61011760035481565b6001600160a01b038416600090815260086020526040812061025e8585856104fb565b61026e8682600001546001610600565b6003810180546000918290556004830180549192839261028f908490610a79565b90915550506003546102a2908290610a79565b6003556102b6662386f26fc1000082610a8c565b979650505050505050565b6001600160a01b0384166000908152600860209081526040808320815160e08101835281548152600180830154948201949094526002808301549382019390935260038201546060820152600482015460808201526005909101546001600160401b0380821660a0840152600160401b9091041660c0820152905491549091908390158015906103515750854310155b801561035d5750438510155b156104df576000600654436103729190610aae565b9050600061038789662386f26fc10000610ac1565b6103919083610ac1565b905060008060006103a18861092a565b60075492955090935091506103ba9060ff16600a610bbc565b6001546103c79190610ac1565b6103dc85676765c793fa10079d601b1b610ac1565b6103e69190610a8c565b6103f09088610a79565b96508783156104d8576040810151600754676765c793fa10079d601b1b908a9061041e9060ff16600a610bbc565b846020015161042d9190610ac1565b6104379190610ac1565b6104419190610a8c565b61044b9190610aae565b9650600061046185670de0b6b3a7640000610ac1565b61047689676765c793fa10079d601b1b610ac1565b6104809190610a8c565b905064174876e80081610494856064610ac1565b600a6104a1886064610ac1565b6104ac906005610ac1565b6104b69190610a8c565b6104c09190610a79565b6104ca9190610ac1565b6104d49190610a8c565b9750505b5050505050505b8083606001516104ef9190610a79565b98975050505050505050565b60015460000361050e5750504360065550565b81431015801561051f575081600654105b1561052a5760068290555b60008260065410801561053d5750824310155b6105495760065461054b565b825b9050600082431161055c574361055e565b825b90508381108061056e5750828210155b1561057a575050505050565b60006105868383610aae565b9050600061059b87662386f26fc10000610ac1565b6105a59083610ac1565b6007549091506105b99060ff16600a610bbc565b6001546105c69190610ac1565b6105db82676765c793fa10079d601b1b610ac1565b6105e59190610a8c565b6002546105f29190610a79565b600255505060065550505050565b6001600160a01b03831660009081526008602052604090208054600182015480156107ac576040805160e0810182528454815260018501546020820152600285015491810191909152600384015460608201526004840154608082015260058401546001600160401b0380821660a0840152600160401b9091041660c0820152600090819081906106909061092a565b925092509250826000146107a457600280870154905460075460009291676765c793fa10079d601b1b916106c89060ff16600a610bbc565b6106d29089610ac1565b6106dc9190610ac1565b6106e69190610a8c565b6106f09190610aae565b9050600061070685670de0b6b3a7640000610ac1565b61071b83676765c793fa10079d601b1b610ac1565b6107259190610a8c565b905064174876e80081610739856064610ac1565b600a610746886064610ac1565b610751906005610ac1565b61075b9190610a8c565b6107659190610a79565b61076f9190610ac1565b6107799190610a8c565b915081886003015461078b9190610a79565b600389015560045461079e908390610a79565b60045550505b5050506107d3565b600583018054600160401b600160801b031916600160401b436001600160401b0316021790555b81851161086957600583018054600160401b600160801b031916600160401b436001600160401b0316021790558115610864576000828460010154878561081a9190610aae565b6108249190610ac1565b61082e9190610a8c565b9050808460010160008282546108449190610aae565b92505081905550806001600082825461085d9190610aae565b9091555050505b6108b5565b836000036108b55761087b8286610aae565b83600101600082825461088e9190610a79565b9091555061089e90508286610aae565b600160008282546108af9190610a79565b90915550505b6005830180546001600160401b031916436001600160401b0316179055848355600254600754676765c793fa10079d601b1b91906108f79060ff16600a610bbc565b85600101546109069190610ac1565b6109109190610ac1565b61091a9190610a8c565b8360020181905550505050505050565b6000806000808460c001518560a001516109449190610bcb565b60055460c08701516001600160401b0392831693506000926109739281169161096e911643610aae565b6109d9565b905060008660a001516001600160401b0316436109909190610aae565b6005549091506000906001600160401b03168410156109b8576109b38484610aae565b6109bb565b60005b905060006109c98284610aae565b9299919850919650945050505050565b60008183106109e857816109ea565b825b90505b92915050565b80356001600160a01b0381168114610a0a57600080fd5b919050565b600060208284031215610a2157600080fd5b6109ea826109f3565b60008060008060808587031215610a4057600080fd5b610a49856109f3565b966020860135965060408601359560600135945092505050565b634e487b7160e01b600052601160045260246000fd5b808201808211156109ed576109ed610a63565b600082610aa957634e487b7160e01b600052601260045260246000fd5b500490565b818103818111156109ed576109ed610a63565b80820281158282048414176109ed576109ed610a63565b600181815b80851115610b13578160001904821115610af957610af9610a63565b80851615610b0657918102915b93841c9390800290610add565b509250929050565b600082610b2a575060016109ed565b81610b37575060006109ed565b8160018114610b4d5760028114610b5757610b73565b60019150506109ed565b60ff841115610b6857610b68610a63565b50506001821b6109ed565b5060208310610133831016604e8410600b8410161715610b96575081810a6109ed565b610ba08383610ad8565b8060001904821115610bb457610bb4610a63565b029392505050565b60006109ea60ff841683610b1b565b6001600160401b03828116828216039080821115610beb57610beb610a63565b509291505056fea2646970667358221220ebcea1e546b6e93988c608c082d8dea1ca3b0d10d5ead48a53f36450889473a264736f6c63430008130033";
260
+ "0x608060405234801561001057600080fd5b50610c28806100206000396000f3fe608060405234801561001057600080fd5b50600436106100a45760003560e01c80631ce720f3146100a957806328e964e9146100cd5780633a6080321461010e5780634a291b0114610125578063574c5c931461012e578063899e1b6c146101415780639c81ff6b1461016c578063a82415ae14610175578063a87430ba14610188578063a9f8d18114610220578063bea2811514610229578063e319828c14610232575b600080fd5b6007546100b69060ff1681565b60405160ff90911681526020015b60405180910390f35b6100f96100db366004610a0f565b6001600160a01b031660009081526008602052604081205490549091565b604080519283526020830191909152016100c4565b61011760025481565b6040519081526020016100c4565b61011760015481565b61011761013c366004610a2a565b61023b565b600554610154906001600160401b031681565b6040516001600160401b0390911681526020016100c4565b61011760045481565b610117610183366004610a2a565b6102c1565b6101df610196366004610a0f565b60086020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160401b0380821691600160401b90041687565b60408051978852602088019690965294860193909352606085019190915260808401526001600160401b0390811660a08401521660c082015260e0016100c4565b61011760065481565b61011760005481565b61011760035481565b6001600160a01b038416600090815260086020526040812061025e8585856104fb565b61026e8682600001546001610600565b6003810180546000918290556004830180549192839261028f908490610a79565b90915550506003546102a2908290610a79565b6003556102b6662386f26fc1000082610a8c565b979650505050505050565b6001600160a01b0384166000908152600860209081526040808320815160e08101835281548152600180830154948201949094526002808301549382019390935260038201546060820152600482015460808201526005909101546001600160401b0380821660a0840152600160401b9091041660c0820152905491549091908390158015906103515750854310155b801561035d5750438510155b156104df576000600654436103729190610aae565b9050600061038789662386f26fc10000610ac1565b6103919083610ac1565b905060008060006103a18861092a565b60075492955090935091506103ba9060ff16600a610bbc565b6001546103c79190610ac1565b6103dc85676765c793fa10079d601b1b610ac1565b6103e69190610a8c565b6103f09088610a79565b96508783156104d8576040810151600754676765c793fa10079d601b1b908a9061041e9060ff16600a610bbc565b846020015161042d9190610ac1565b6104379190610ac1565b6104419190610a8c565b61044b9190610aae565b9650600061046185670de0b6b3a7640000610ac1565b61047689676765c793fa10079d601b1b610ac1565b6104809190610a8c565b905064174876e80081610494856064610ac1565b600a6104a1886064610ac1565b6104ac906005610ac1565b6104b69190610a8c565b6104c09190610a79565b6104ca9190610ac1565b6104d49190610a8c565b9750505b5050505050505b8083606001516104ef9190610a79565b98975050505050505050565b60015460000361050e5750504360065550565b81431015801561051f575081600654105b1561052a5760068290555b60008260065410801561053d5750824310155b6105495760065461054b565b825b9050600082431161055c574361055e565b825b90508381108061056e5750828210155b1561057a575050505050565b60006105868383610aae565b9050600061059b87662386f26fc10000610ac1565b6105a59083610ac1565b6007549091506105b99060ff16600a610bbc565b6001546105c69190610ac1565b6105db82676765c793fa10079d601b1b610ac1565b6105e59190610a8c565b6002546105f29190610a79565b600255505060065550505050565b6001600160a01b03831660009081526008602052604090208054600182015480156107ac576040805160e0810182528454815260018501546020820152600285015491810191909152600384015460608201526004840154608082015260058401546001600160401b0380821660a0840152600160401b9091041660c0820152600090819081906106909061092a565b925092509250826000146107a457600280870154905460075460009291676765c793fa10079d601b1b916106c89060ff16600a610bbc565b6106d29089610ac1565b6106dc9190610ac1565b6106e69190610a8c565b6106f09190610aae565b9050600061070685670de0b6b3a7640000610ac1565b61071b83676765c793fa10079d601b1b610ac1565b6107259190610a8c565b905064174876e80081610739856064610ac1565b600a610746886064610ac1565b610751906005610ac1565b61075b9190610a8c565b6107659190610a79565b61076f9190610ac1565b6107799190610a8c565b915081886003015461078b9190610a79565b600389015560045461079e908390610a79565b60045550505b5050506107d3565b600583018054600160401b600160801b031916600160401b436001600160401b0316021790555b81851161086957600583018054600160401b600160801b031916600160401b436001600160401b0316021790558115610864576000828460010154878561081a9190610aae565b6108249190610ac1565b61082e9190610a8c565b9050808460010160008282546108449190610aae565b92505081905550806001600082825461085d9190610aae565b9091555050505b6108b5565b836000036108b55761087b8286610aae565b83600101600082825461088e9190610a79565b9091555061089e90508286610aae565b600160008282546108af9190610a79565b90915550505b6005830180546001600160401b031916436001600160401b0316179055848355600254600754676765c793fa10079d601b1b91906108f79060ff16600a610bbc565b85600101546109069190610ac1565b6109109190610ac1565b61091a9190610a8c565b8360020181905550505050505050565b6000806000808460c001518560a001516109449190610bcb565b60055460c08701516001600160401b0392831693506000926109739281169161096e911643610aae565b6109d9565b905060008660a001516001600160401b0316436109909190610aae565b6005549091506000906001600160401b03168410156109b8576109b38484610aae565b6109bb565b60005b905060006109c98284610aae565b9299919850919650945050505050565b60008183106109e857816109ea565b825b90505b92915050565b80356001600160a01b0381168114610a0a57600080fd5b919050565b600060208284031215610a2157600080fd5b6109ea826109f3565b60008060008060808587031215610a4057600080fd5b610a49856109f3565b966020860135965060408601359560600135945092505050565b634e487b7160e01b600052601160045260246000fd5b808201808211156109ed576109ed610a63565b600082610aa957634e487b7160e01b600052601260045260246000fd5b500490565b818103818111156109ed576109ed610a63565b80820281158282048414176109ed576109ed610a63565b600181815b80851115610b13578160001904821115610af957610af9610a63565b80851615610b0657918102915b93841c9390800290610add565b509250929050565b600082610b2a575060016109ed565b81610b37575060006109ed565b8160018114610b4d5760028114610b5757610b73565b60019150506109ed565b60ff841115610b6857610b68610a63565b50506001821b6109ed565b5060208310610133831016604e8410600b8410161715610b96575081810a6109ed565b610ba08383610ad8565b8060001904821115610bb457610bb4610a63565b029392505050565b60006109ea60ff841683610b1b565b6001600160401b03828116828216039080821115610beb57610beb610a63565b509291505056fea2646970667358221220b050fb6bb86fe0da18801bba366e32609be7be345cf12225e4aada1f28dc693e64736f6c63430008130033";
261
261
 
262
262
  type BaseShareFieldConstructorParams =
263
263
  | [signer?: Signer]