@gooddollar/goodprotocol 1.0.29-beta.3 → 1.0.29

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 (296) hide show
  1. package/artifacts/abis/AdminWallet.min.json +1 -1
  2. package/artifacts/abis/GoodDollarMintBurnWrapper.min.json +1 -1
  3. package/artifacts/abis/GoodDollarStaking.min.json +1 -1
  4. package/artifacts/abis/GoodDollarStakingMock.min.json +1 -1
  5. package/artifacts/abis/IGoodDollar.min.json +1 -1
  6. package/artifacts/abis/IIdentity.min.json +1 -1
  7. package/artifacts/abis/UBIScheme.min.json +1 -1
  8. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  9. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  10. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  11. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  12. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  13. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  14. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  15. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  16. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  17. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  18. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  19. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  20. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  21. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  22. package/artifacts/contracts/Interfaces.sol/IGoodDollar.json +0 -39
  23. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  24. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  25. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  26. package/artifacts/contracts/Interfaces.sol/IIdentity.json +0 -51
  27. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  28. package/artifacts/contracts/Interfaces.sol/IMultichainRouter.dbg.json +1 -1
  29. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  30. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  31. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  32. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  33. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  34. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  35. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  36. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  37. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  38. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  39. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.json +2 -2
  40. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  41. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.json +2 -2
  42. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  43. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.json +2 -2
  44. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  45. package/artifacts/contracts/governance/GReputation.sol/GReputation.json +2 -2
  46. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.dbg.json +1 -1
  47. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.json +2 -15
  48. package/artifacts/contracts/governance/GoodDollarStaking.sol/RewardsMinter.dbg.json +1 -1
  49. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  50. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.json +2 -2
  51. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  52. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  53. package/artifacts/contracts/governance/Reputation.sol/Reputation.json +2 -2
  54. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  55. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.json +2 -2
  56. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  57. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.json +2 -2
  58. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  59. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  60. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  61. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.dbg.json +1 -1
  62. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.json +2 -2
  63. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.dbg.json +1 -1
  64. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.json +2 -2
  65. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.dbg.json +1 -1
  66. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.json +2 -2
  67. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  68. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +2 -2
  69. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.dbg.json +1 -1
  70. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.json +2 -15
  71. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  72. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.json +2 -2
  73. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  74. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  75. package/artifacts/contracts/mocks/MultichainRouterMock.sol/IWrapper.dbg.json +1 -1
  76. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.dbg.json +1 -1
  77. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.json +2 -2
  78. package/artifacts/contracts/mocks/OverMintTester.sol/IGoodDollarStakingTest.dbg.json +1 -1
  79. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  80. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.json +2 -2
  81. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  82. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
  83. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  84. package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.dbg.json +1 -1
  85. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  86. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.json +2 -2
  87. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  88. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  89. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.json +2 -2
  90. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  91. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.json +2 -2
  92. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
  93. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.json +2 -2
  94. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
  95. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.json +2 -2
  96. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  97. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  98. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  99. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  100. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  101. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  102. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  103. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  104. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.dbg.json +1 -1
  105. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.json +2 -2
  106. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  107. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.json +2 -2
  108. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  109. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.json +2 -2
  110. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  111. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  112. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.json +2 -2
  113. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  114. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.json +2 -2
  115. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  116. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.json +2 -2
  117. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  118. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +2 -2
  119. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.dbg.json +1 -1
  120. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.json +2 -2
  121. package/artifacts/contracts/staking/FuseStakingV3.sol/IConsensus.dbg.json +1 -1
  122. package/artifacts/contracts/staking/FuseStakingV3.sol/PegSwap.dbg.json +1 -1
  123. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  124. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.json +2 -2
  125. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  126. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  127. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  128. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.json +2 -2
  129. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  130. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +2 -2
  131. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  132. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +2 -2
  133. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  134. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.json +2 -2
  135. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  136. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +2 -2
  137. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  138. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +2 -2
  139. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  140. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.json +2 -2
  141. package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.dbg.json +1 -1
  142. package/artifacts/contracts/staking/utils/StakingRewardsFixedAPY.sol/StakingRewardsFixedAPY.dbg.json +1 -1
  143. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  144. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +22 -15
  145. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +1 -1
  146. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.json +56 -76
  147. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  148. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
  149. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.json +2 -2
  150. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  151. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.json +2 -2
  152. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  153. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.json +2 -2
  154. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  155. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  156. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json +1 -1
  157. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.json +2 -16
  158. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json +1 -1
  159. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json +1 -1
  160. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json +1 -1
  161. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.json +2 -2
  162. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json +1 -1
  163. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.json +2 -2
  164. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  165. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  166. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  167. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.json +2 -2
  168. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  169. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.json +2 -2
  170. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
  171. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json +2 -2
  172. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
  173. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json +2 -2
  174. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
  175. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
  176. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  177. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json +2 -2
  178. package/contracts/Interfaces.sol +0 -26
  179. package/contracts/governance/GoodDollarStaking.sol +9 -23
  180. package/contracts/ubi/UBIScheme.sol +40 -45
  181. package/contracts/utils/AdminWallet.sol +11 -42
  182. package/contracts/utils/GoodDollarMintBurnWrapper.sol +3 -13
  183. package/hardhat.config.ts +7 -21
  184. package/package.json +2 -3
  185. package/releases/deploy-settings.json +1 -36
  186. package/releases/deployment.json +53 -94
  187. package/scripts/analytics/gdinflow.ts +56 -0
  188. package/scripts/analytics/tokenInOutStats.ts +50 -0
  189. package/scripts/deployFullDAO.ts +19 -39
  190. package/scripts/multichain-deploy/{1_basicdao-deploy.ts → basicdao-deploy.ts} +52 -56
  191. package/scripts/multichain-deploy/{3_gdSavings-deploy.ts → gdSavings-deploy.ts} +76 -90
  192. package/scripts/multichain-deploy/helpers.ts +1 -0
  193. package/scripts/{upgrades → multichain-deploy}/nonubiDistribution-deploy.ts +5 -2
  194. package/scripts/test/localOldDaoDeploy.ts +3 -10
  195. package/test/helpers.ts +8 -12
  196. package/test/ubi/UBIScheme.test.ts +30 -30
  197. package/test/ubi/UBISchemeCycle.test.ts +7 -9
  198. package/test/utils/AdminWallet.test.ts +11 -33
  199. package/types/AdminWallet.ts +113 -124
  200. package/types/GoodDollarMintBurnWrapper.ts +0 -42
  201. package/types/GoodDollarStaking.ts +0 -34
  202. package/types/GoodDollarStakingMock.ts +0 -34
  203. package/types/IGoodDollar.ts +0 -54
  204. package/types/IIdentity.ts +0 -75
  205. package/types/UBIScheme.ts +40 -19
  206. package/types/factories/AaveStakingFactory__factory.ts +1 -1
  207. package/types/factories/AdminWallet__factory.ts +55 -75
  208. package/types/factories/BaseShareFieldV2__factory.ts +1 -1
  209. package/types/factories/BaseShareField__factory.ts +1 -1
  210. package/types/factories/ClaimersDistribution__factory.ts +1 -1
  211. package/types/factories/CompoundStakingFactory__factory.ts +1 -1
  212. package/types/factories/CompoundVotingMachine__factory.ts +1 -1
  213. package/types/factories/DAOContract__factory.ts +1 -1
  214. package/types/factories/DAOUpgradeableContract__factory.ts +1 -1
  215. package/types/factories/DistributionBridgeMock__factory.ts +1 -1
  216. package/types/factories/DistributionHelperTestHelper__factory.ts +1 -1
  217. package/types/factories/DistributionHelperTest__factory.ts +1 -1
  218. package/types/factories/DistributionHelper__factory.ts +1 -1
  219. package/types/factories/DonationsStaking__factory.ts +1 -1
  220. package/types/factories/ExchangeHelper__factory.ts +1 -1
  221. package/types/factories/FuseFaucet__factory.ts +1 -1
  222. package/types/factories/FuseStakingV3__factory.ts +1 -1
  223. package/types/factories/GReputation__factory.ts +1 -1
  224. package/types/factories/GoodAaveStakingV2__factory.ts +1 -1
  225. package/types/factories/GoodAaveStaking__factory.ts +1 -1
  226. package/types/factories/GoodCompoundStakingTest__factory.ts +1 -1
  227. package/types/factories/GoodCompoundStakingV2__factory.ts +1 -1
  228. package/types/factories/GoodCompoundStaking__factory.ts +1 -1
  229. package/types/factories/GoodDollarMintBurnWrapper__factory.ts +1 -15
  230. package/types/factories/GoodDollarStakingMock__factory.ts +1 -14
  231. package/types/factories/GoodDollarStaking__factory.ts +1 -14
  232. package/types/factories/GoodFundManagerTest__factory.ts +1 -1
  233. package/types/factories/GoodFundManager__factory.ts +1 -1
  234. package/types/factories/GoodMarketMaker__factory.ts +1 -1
  235. package/types/factories/GoodReserveCDai__factory.ts +1 -1
  236. package/types/factories/GovernanceStaking__factory.ts +1 -1
  237. package/types/factories/IGoodDollar__factory.ts +0 -39
  238. package/types/factories/IIdentity__factory.ts +0 -51
  239. package/types/factories/InvitesV1__factory.ts +1 -1
  240. package/types/factories/MultichainBridgeHelper__factory.ts +1 -1
  241. package/types/factories/MultichainRouterMock__factory.ts +1 -1
  242. package/types/factories/OverMintTesterRegularStake__factory.ts +1 -1
  243. package/types/factories/OverMintTester__factory.ts +1 -1
  244. package/types/factories/ProtocolUpgradeFuseRecover__factory.ts +1 -1
  245. package/types/factories/ProtocolUpgradeFuse__factory.ts +1 -1
  246. package/types/factories/ProtocolUpgradeRecover__factory.ts +1 -1
  247. package/types/factories/ProtocolUpgrade__factory.ts +1 -1
  248. package/types/factories/ReputationTestHelper__factory.ts +1 -1
  249. package/types/factories/Reputation__factory.ts +1 -1
  250. package/types/factories/StakersDistribution__factory.ts +1 -1
  251. package/types/factories/SwapHelperTest__factory.ts +1 -1
  252. package/types/factories/UBIScheme__factory.ts +21 -14
  253. package/types/factories/UniswapV2SwapHelper__factory.ts +1 -1
  254. package/types/factories/UpgradableMock2__factory.ts +1 -1
  255. package/types/factories/UpgradableMock3__factory.ts +1 -1
  256. package/types/factories/UpgradableMock4__factory.ts +1 -1
  257. package/types/factories/UpgradableMock__factory.ts +1 -1
  258. package/types/hardhat.d.ts +0 -54
  259. package/types/index.ts +0 -12
  260. package/yarn.lock +4 -4
  261. package/artifacts/abis/Faucet.min.json +0 -1
  262. package/artifacts/abis/IGovernanceStaking.min.json +0 -1
  263. package/artifacts/abis/IIdentityV2.min.json +0 -1
  264. package/artifacts/abis/IdentityV2.min.json +0 -1
  265. package/artifacts/abis/InvitesV2.min.json +0 -1
  266. package/artifacts/contracts/Interfaces.sol/IIdentityV2.dbg.json +0 -4
  267. package/artifacts/contracts/Interfaces.sol/IIdentityV2.json +0 -281
  268. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.dbg.json +0 -4
  269. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.json +0 -684
  270. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.dbg.json +0 -4
  271. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.json +0 -24
  272. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.dbg.json +0 -4
  273. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json +0 -1000
  274. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.dbg.json +0 -4
  275. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.json +0 -586
  276. package/contracts/fuseFaucet/Faucet.sol +0 -245
  277. package/contracts/identity/IdentityV2.sol +0 -434
  278. package/contracts/invite/InvitesV2.sol +0 -316
  279. package/scripts/multichain-deploy/0_proxyFactory-deploy.ts +0 -45
  280. package/scripts/multichain-deploy/2_helpers-deploy.ts +0 -143
  281. package/scripts/multichain-deploy/4_ubi-deploy.ts +0 -121
  282. package/scripts/multichain-deploy/5_gov-deploy.ts +0 -123
  283. package/scripts/multichain-deploy/verifyEtherscan.ts +0 -84
  284. package/scripts/upgrades/identity-upgrade.ts +0 -153
  285. package/types/Faucet.ts +0 -1014
  286. package/types/IERC1271.ts +0 -109
  287. package/types/IGovernanceStaking.ts +0 -98
  288. package/types/IIdentityV2.ts +0 -526
  289. package/types/IdentityV2.ts +0 -1612
  290. package/types/InvitesV2.ts +0 -933
  291. package/types/factories/Faucet__factory.ts +0 -729
  292. package/types/factories/IERC1271__factory.ts +0 -47
  293. package/types/factories/IGovernanceStaking__factory.ts +0 -39
  294. package/types/factories/IIdentityV2__factory.ts +0 -293
  295. package/types/factories/IdentityV2__factory.ts +0 -1048
  296. package/types/factories/InvitesV2__factory.ts +0 -634
package/types/factories/GoodFundManager__factory.ts CHANGED
@@ -684,7 +684,7 @@ const _abi = [
684
684
  ];
685
685
 
686
686
  const _bytecode =
687
- "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c61333f61004b60003960008181610b7001528181610bb901528181610fe10152611021015261333f6000f3fe6080604052600436106101475760003560e01c8063089445141461014c5780630e47dbd91461016e57806312ce63d914610192578063195dc7cc146101a85780631b3c90a8146101d457806324ccc1e7146101e95780633659cfe61461020b5780633e6326fc1461022b5780634162169f1461025857806344fa7622146102785780634f1ef286146102985780635aef7de6146102ab57806372d00e9f146102cb578063791b6bc3146102eb5780637c6b63b41461030b5780638aba46591461032b5780639d89e9a41461034b578063a25dc5f41461036a578063aac7efb414610380578063b6eee2c9146103a0578063b7714ae2146103c0578063c4d66de8146103e0578063c81a2b5d14610400578063d025014414610416578063e1758bd8146104a9578063e31bf132146104be578063f03b2890146104d4578063f4a7a395146104f4575b600080fd5b34801561015857600080fd5b5061016c610167366004612abe565b61050a565b005b34801561017a57600080fd5b5060a0545b6040519081526020015b60405180910390f35b34801561019e57600080fd5b5061017f609a5481565b3480156101b457600080fd5b50609f546101c29060ff1681565b60405160ff9091168152602001610189565b3480156101e057600080fd5b5061016c61055b565b3480156101f557600080fd5b506101fe6106a0565b6040516101899190612ae1565b34801561021757600080fd5b5061016c610226366004612b79565b610b65565b34801561023757600080fd5b5060675461024b906001600160a01b031681565b6040516101899190612b96565b34801561026457600080fd5b5060655461024b906001600160a01b031681565b34801561028457600080fd5b5061017f610293366004612bb8565b610c37565b61016c6102a6366004612bfe565b610fd6565b3480156102b757600080fd5b5060665461024b906001600160a01b031681565b3480156102d757600080fd5b5061024b6102e6366004612cc1565b611090565b3480156102f757600080fd5b5061016c610306366004612cc1565b6110ba565b34801561031757600080fd5b5061016c610326366004612cf3565b6110f7565b34801561033757600080fd5b5061016c610346366004612cc1565b611476565b34801561035757600080fd5b50609f546101c290610100900460ff1681565b34801561037657600080fd5b5061017f609d5481565b34801561038c57600080fd5b5061017f61039b366004612cc1565b6114b3565b3480156103ac57600080fd5b5061016c6103bb366004612d5e565b6115f5565b3480156103cc57600080fd5b5061016c6103db366004612cc1565b61200f565b3480156103ec57600080fd5b5061016c6103fb366004612b79565b61204c565b34801561040c57600080fd5b5061017f609c5481565b34801561042257600080fd5b50610473610431366004612b79565b60a16020526000908152604090205463ffffffff8116906001600160401b03600160201b8204811691600160601b81049091169060ff600160a01b9091041684565b6040805163ffffffff9590951685526001600160401b039384166020860152919092169083015215156060820152608001610189565b3480156104b557600080fd5b5061024b61212c565b3480156104ca57600080fd5b5061017f609b5481565b3480156104e057600080fd5b5061016c6104ef366004612de3565b6121b0565b34801561050057600080fd5b5061017f609e5481565b610512612440565b609f805460ff191660ff83169081179091556040519081527fceef3bba37867319344ac9cc91b1d2318daa822bae8d15118d84aedc1fbba330906020015b60405180910390a150565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156105b957600080fd5b505afa1580156105cd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105f19190612e11565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561064657600080fd5b505afa15801561065a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061067e9190612e11565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60a0546060906000906001600160401b038111156106c0576106c0612be8565b6040519080825280602002602001820160405280156106e9578160200160208202803683370190505b5060a0549091506000906001600160401b0381111561070a5761070a612be8565b604051908082528060200260200182016040528015610733578160200160208202803683370190505b5060a0549091506000906001600160401b0381111561075457610754612be8565b6040519080825280602002602001820160405280156107c957816020015b6107b66040518060c0016040528060006001600160a01b03168152602001600081526020016000815260200160008152602001600081526020016000151581525090565b8152602001906001900390816107725790505b5090506000805b60a05481121561091a5760a081815481106107ed576107ed612e2e565b600091825260208220015460405163026c13ed60e21b81526004810192909252600160248301526001600160a01b0316906309b04fb49060440160a06040518083038186803b15801561083f57600080fd5b505afa158015610853573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108779190612e44565b955050841592506109089150505760a0818154811061089857610898612e2e565b9060005260206000200160009054906101000a90046001600160a01b03168582815181106108c8576108c8612e2e565b60200260200101906001600160a01b031690816001600160a01b031681525050818482815181106108fb576108fb612e2e565b6020026020010181815250505b8061091281612e9a565b9150506107d0565b609c546109278587612514565b6000806000600160a08054905061093e9190612eba565b94505b60008512610b575760006001600160a01b031689868151811061096657610966612e2e565b60200260200101516001600160a01b031614610b405788858151811061098e5761098e612e2e565b60200260200101516001600160a01b031663e660b53f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156109ce57600080fd5b505afa1580156109e2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a069190612ef9565b9250878581518110610a1a57610a1a612e2e565b602002602001015182610a2d9190612f12565b9150610a398385612f12565b9350609e54609a54610a4b9190612f12565b421015610a8b57610a5d600180610c37565b609f54610a6d919060ff16612f2a565b610a7c836402540be400612f2a565b610a869190612f49565b610aaf565b610a96600180610c37565b610aa5836402540be400612f2a565b610aaf9190612f49565b90506040518060c001604052808a8781518110610ace57610ace612e2e565b60200260200101516001600160a01b03168152602001898781518110610af657610af6612e2e565b60200260200101518152602001838152602001858152602001828152602001858310151515815250878681518110610b3057610b30612e2e565b6020026020010181905250610b45565b610b57565b84610b4f81612f6b565b955050610941565b509498975050505050505050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610bb75760405162461bcd60e51b8152600401610bae90612f89565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610be9612538565b6001600160a01b031614610c0f5760405162461bcd60e51b8152600401610bae90612fc3565b610c1881612554565b60408051600080825260208201909252610c349183919061255c565b50565b60675460405163bf40fac160e01b815260206004820152601060248201526f4741535f50524943455f4f5241434c4560801b604482015260009182916001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610ca057600080fd5b505afa158015610cb4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cd89190612e11565b90506000816001600160a01b03166350d25bcd6040518163ffffffff1660e01b815260040160206040518083038186803b158015610d1557600080fd5b505afa158015610d29573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d4d9190612ef9565b60675460405163bf40fac160e01b815260206004820152600e60248201526d4441495f4554485f4f5241434c4560901b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610db557600080fd5b505afa158015610dc9573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ded9190612e11565b90506000816001600160a01b03166350d25bcd6040518163ffffffff1660e01b815260040160206040518083038186803b158015610e2a57600080fd5b505afa158015610e3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e629190612ef9565b9050600081610e7985670de0b6b3a7640000612f2a565b610e839190612f49565b90508615610ea157610e958882612f2a565b95505050505050610fd0565b60675460405163bf40fac160e01b815289916001600160a01b03169063bf40fac190610ecf90600401612ffd565b60206040518083038186803b158015610ee757600080fd5b505afa158015610efb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f1f9190612e11565b6001600160a01b031663182df0f56040518163ffffffff1660e01b815260040160206040518083038186803b158015610f5757600080fd5b505afa158015610f6b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8f9190612ef9565b610f9e6402540be40084612f49565b610fb4906b204fce5e3e25026110000000612f2a565b610fbe9190612f49565b610fc89190612f2a565b955050505050505b92915050565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561101f5760405162461bcd60e51b8152600401610bae90612f89565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316611051612538565b6001600160a01b0316146110775760405162461bcd60e51b8152600401610bae90612fc3565b61108082612554565b61108c8282600161255c565b5050565b60a081815481106110a057600080fd5b6000918252602090912001546001600160a01b0316905081565b6110c2612440565b609c8190556040518181527fcc09a90bef37a706a00b53dd3f515f9326b029e41271b4bb87777773962cbc6090602001610550565b6110ff612440565b808061112b57506001600160a01b038416600090815260a16020526040902054600160a01b900460ff16155b6111715760405162461bcd60e51b815260206004820152601760248201527663616e277420756e646f20626c61636b6c697374696e6760481b6044820152606401610bae565b600060405180608001604052808763ffffffff16815260200160008663ffffffff161161119e57436111a0565b855b63ffffffff166001600160401b0316815260200160008563ffffffff16116111cc5763ffffffff6111ce565b845b63ffffffff90811682528415156020928301526001600160a01b038816600090815260a18352604080822085518154958701519287015160608801511515600160a01b0260ff60a01b196001600160401b03928316600160601b0216600160601b600160a81b031995909216600160201b026001600160601b0319909816929096169190911795909517919091169390931791909117909155909150805b60a05460ff821610156112cf57866001600160a01b031660a08260ff168154811061129957611299612e2e565b6000918252602090912001546001600160a01b031614156112bd57600191506112cf565b806112c78161301b565b91505061126c565b8180156112e7575083806112e7575063ffffffff8816155b156113a15760a080546112fc9060019061303b565b8154811061130c5761130c612e2e565b60009182526020909120015460a080546001600160a01b039092169160ff841690811061133b5761133b612e2e565b9060005260206000200160006101000a8154816001600160a01b0302191690836001600160a01b0316021790555060a080548061137a5761137a613052565b600082815260209020810160001990810180546001600160a01b031916905501905561140d565b811580156113bc575083806113ba575063ffffffff8816155b155b1561140d5760a080546001810182556000919091527f78fdc8d422c49ced035a9edf18d00d3c6a8d81df210f3e5e448e045e77b41e880180546001600160a01b0319166001600160a01b0389161790555b6040805163ffffffff8a811682526001600160a01b038a1660208301528881168284015287166060820152851515608082015290517fcfeece178cde5fc0c509d31ec15ec2d996342bec5d9820be8aabbda11a21205b9181900360a00190a15050505050505050565b61147e612440565b609d8190556040518181527f08deabc2cb3286b159d9350bf977350e1f31e39ae44075269082a800e9ee59de90602001610550565b6000806114c1836000610c37565b60675460405163bf40fac160e01b81529192506000916001600160a01b039091169063bf40fac1906114f590600401613068565b60206040518083038186803b15801561150d57600080fd5b505afa158015611521573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115459190612e11565b6001600160a01b0316639d1b464a6040518163ffffffff1660e01b815260040160206040518083038186803b15801561157d57600080fd5b505afa158015611591573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115b59190612ef9565b90506a084595161401484a000000816115d984676765c793fa10079d601b1b612f2a565b6115e39190612f49565b6115ed9190612f49565b949350505050565b60005a60675460405163bf40fac160e01b81529192506000918291829182916001600160a01b03169063bf40fac19061163090600401612ffd565b60206040518083038186803b15801561164857600080fd5b505afa15801561165c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116809190612e11565b60675460405163bf40fac160e01b815260206004820152600360248201526244414960e81b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156116dd57600080fd5b505afa1580156116f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117159190612e11565b60675460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac19061174490600401613068565b60206040518083038186803b15801561175c57600080fd5b505afa158015611770573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117949190612e11565b92506000816001600160a01b03166370a08231856040518263ffffffff1660e01b81526004016117c49190612b96565b60206040518083038186803b1580156117dc57600080fd5b505afa1580156117f0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118149190612ef9565b90506000836001600160a01b03166370a08231866040518263ffffffff1660e01b81526004016118449190612b96565b60206040518083038186803b15801561185c57600080fd5b505afa158015611870573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118949190612ef9565b905060006118a360018c61303b565b90505b60008c8c838181106118ba576118ba612e2e565b90506020020160208101906118cf9190612b79565b6001600160a01b031614611985578b8b828181106118ef576118ef612e2e565b90506020020160208101906119049190612b79565b6001600160a01b03166337455990876040518263ffffffff1660e01b815260040161192f9190612b96565b606060405180830381600087803b15801561194957600080fd5b505af115801561195d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119819190613089565b5050505b8061198f576119a1565b80611999816130b7565b9150506118a6565b50600082846001600160a01b03166370a08231886040518263ffffffff1660e01b81526004016119d19190612b96565b60206040518083038186803b1580156119e957600080fd5b505afa1580156119fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a219190612ef9565b611a2b919061303b565b604051631de778a560e01b815260048101829052602481018490526001600160a01b03878116604483015291925090871690631de778a5906064016040805180830381600087803b158015611a7f57600080fd5b505af1158015611a93573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ab791906130c6565b60675460405163bf40fac160e01b8152929a509098506000916001600160a01b039091169063bf40fac190611aee906004016130ea565b60206040518083038186803b158015611b0657600080fd5b505afa158015611b1a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b3e9190612e11565b90508815611d6e5760675460405163bf40fac160e01b815260206004820152600f60248201526e1094925111d157d0d3d395149050d5608a1b60448201526001600160a01b0383811692634000aea09291169063bf40fac19060640160206040518083038186803b158015611bb257600080fd5b505afa158015611bc6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611bea9190612e11565b60675460405163bf40fac160e01b815260206004820152600d60248201526c15509257d49150d25412515395609a1b60448201528d916001600160a01b03169063bf40fac19060640160206040518083038186803b158015611c4b57600080fd5b505afa158015611c5f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c839190612e11565b604051602001611ca6919060609190911b6001600160601b031916815260140190565b6040516020818303038152906040526040518463ffffffff1660e01b8152600401611cd393929190613166565b602060405180830381600087803b158015611ced57600080fd5b505af1158015611d01573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d25919061318d565b611d6e5760405162461bcd60e51b815260206004820152601a6024820152791d589a48189c9a5919d9481d1c985b9cd9995c8819985a5b195960321b6044820152606401610bae565b506000945050508715159150611fb290505760006064609d545a611d92908961303b565b611d9c9190612f12565b611da790606e612f2a565b611db19190612f49565b9050611dbc816114b3565b60675460405163bf40fac160e01b81529193506001600160a01b038086169263f8a9978f929091169063bf40fac190611df790600401612ffd565b60206040518083038186803b158015611e0f57600080fd5b505afa158015611e23573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e479190612e11565b33856040518463ffffffff1660e01b8152600401611e67939291906131aa565b600060405180830381600087803b158015611e8157600080fd5b505af1158015611e95573d6000803e3d6000fd5b505050506000611eb05a611ea9908961303b565b6000610c37565b9050609e54609a54611ec29190612f12565b4210611f315780851015611f2c5760405162461bcd60e51b815260206004820152603e60248201526000805160206132ea83398151915260448201527f6265206c6172676572207468616e207370656e742067617320636f73747300006064820152608401610bae565b611faf565b609f54611f4290829060ff16612f2a565b851015611faf5760405162461bcd60e51b815260206004820152604160248201526000805160206132ea83398151915260448201527f626520696e7465726573744d756c7469706c69657220782067617320636f73746064820152607360f81b608482015260a401610bae565b50505b336001600160a01b03167fa152fd34a7e4c4c82eb0c0b0319d3913dc9189d62ae2fe75aef590f0e391a928838a8a878987604051611ff5969594939291906131ce565b60405180910390a2505042609a55505043609b5550505050565b612017612440565b609e8190556040518181527f28b3b60d9fa0f6edab793c2422ff4784f9381ff9d2062481d1254f732452bfbf90602001610550565b600054610100900460ff1680612065575060005460ff16155b6120c85760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610bae565b600054610100900460ff161580156120ea576000805461ffff19166101011790555b6120f3826126a3565b6203d090609d55624f1a00609e55609f8054620cf850609c5561ffff1916610704179055801561108c576000805461ff00191690555050565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac19061215b906004016130ea565b60206040518083038186803b15801561217357600080fd5b505afa158015612187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121ab9190612e11565b905090565b33600090815260a160209081526040918290208251608081018452905463ffffffff81168252600160201b81046001600160401b03908116938301849052600160601b82041693820193909352600160a01b90920460ff161515606083015261225b5760405162461bcd60e51b815260206004820152601f60248201527f5374616b696e6720636f6e7472616374206e6f742072656769737465726564006044820152606401610bae565b80516020820151604080840151905163574c5c9360e01b81526001600160a01b038616600482015263ffffffff90931660248401526001600160401b039182166044840152166064820152600090339063574c5c9390608401602060405180830381600087803b1580156122ce57600080fd5b505af11580156122e2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123069190612ef9565b905060008111801561231a57506060820151155b1561243a5760675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061234d90600401613068565b60206040518083038186803b15801561236557600080fd5b505afa158015612379573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061239d9190612e11565b6001600160a01b031663f8a9978f8585846040518463ffffffff1660e01b81526004016123cc939291906131aa565b600060405180830381600087803b1580156123e657600080fd5b505af11580156123fa573d6000803e3d6000fd5b505050507f5c4a97f844ad1dc8cad420327f32da9b4bd075bab26efa2ae5bd66f84d1fce07338483604051612431939291906131aa565b60405180910390a15b50505050565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561248457600080fd5b505afa158015612498573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124bc9190612e11565b6001600160a01b0316146125125760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610bae565b565b60018251111561108c5761108c8282600060018651612533919061303b565b6126c6565b6000805160206132a3833981519152546001600160a01b031690565b610c34612440565b6000612566612538565b9050612571846128c0565b60008351118061257e5750815b1561258f5761258d8484612953565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661269c57805460ff1916600117815560405161260a9086906125db908590602401612b96565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b179052612953565b50805460ff1916815561261b612538565b6001600160a01b0316826001600160a01b0316146126935760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610bae565b61269c85612a3e565b5050505050565b606780546001600160a01b0319166001600160a01b038316179055610c3461055b565b8082101561243a5760008460026126dd8486612f12565b6126e79190612f49565b815181106126f7576126f7612e2e565b6020908102919091010151905082825b8287838151811061271a5761271a612e2e565b6020026020010151101561273a57816127328161323f565b925050612707565b8287828151811061274d5761274d612e2e565b6020026020010151111561276d5780612765816130b7565b91505061273a565b80821061277957612882565b86818151811061278b5761278b612e2e565b60200260200101518783815181106127a5576127a5612e2e565b60200260200101518884815181106127bf576127bf612e2e565b602002602001018984815181106127d8576127d8612e2e565b60200260200101828152508281525050508581815181106127fb576127fb612e2e565b602002602001015186838151811061281557612815612e2e565b602002602001015187848151811061282f5761282f612e2e565b6020026020010188848151811061284857612848612e2e565b6001600160a01b039384166020918202929092010152911690528161286c8161323f565b925050808061287a906130b7565b915050612707565b8085101561289657612896878787846126c6565b806128a08161323f565b915050838110156128b7576128b7878783876126c6565b50505050505050565b803b6129245760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610bae565b6000805160206132a383398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6129b25760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610bae565b600080846001600160a01b0316846040516129cd9190613253565b600060405180830381855af49150503d8060008114612a08576040519150601f19603f3d011682016040523d82523d6000602084013e612a0d565b606091505b5091509150612a3582826040518060600160405280602781526020016132c360279139612a7e565b95945050505050565b612a47816128c0565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60608315612a8d575081612ab7565b825115612a9d5782518084602001fd5b8160405162461bcd60e51b8152600401610bae919061326f565b9392505050565b600060208284031215612ad057600080fd5b813560ff81168114612ab757600080fd5b602080825282518282018190526000919060409081850190868401855b82811015612b5757815180516001600160a01b0316855286810151878601528581015186860152606080820151908601526080808201519086015260a09081015115159085015260c09093019290850190600101612afe565b5091979650505050505050565b6001600160a01b0381168114610c3457600080fd5b600060208284031215612b8b57600080fd5b8135612ab781612b64565b6001600160a01b0391909116815260200190565b8015158114610c3457600080fd5b60008060408385031215612bcb57600080fd5b823591506020830135612bdd81612baa565b809150509250929050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215612c1157600080fd5b8235612c1c81612b64565b915060208301356001600160401b0380821115612c3857600080fd5b818501915085601f830112612c4c57600080fd5b813581811115612c5e57612c5e612be8565b604051601f8201601f19908116603f01168101908382118183101715612c8657612c86612be8565b81604052828152886020848701011115612c9f57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215612cd357600080fd5b5035919050565b803563ffffffff81168114612cee57600080fd5b919050565b600080600080600060a08688031215612d0b57600080fd5b612d1486612cda565b94506020860135612d2481612b64565b9350612d3260408701612cda565b9250612d4060608701612cda565b91506080860135612d5081612baa565b809150509295509295909350565b600080600060408486031215612d7357600080fd5b83356001600160401b0380821115612d8a57600080fd5b818601915086601f830112612d9e57600080fd5b813581811115612dad57600080fd5b8760208260051b8501011115612dc257600080fd5b60209283019550935050840135612dd881612baa565b809150509250925092565b60008060408385031215612df657600080fd5b8235612e0181612b64565b91506020830135612bdd81612b64565b600060208284031215612e2357600080fd5b8151612ab781612b64565b634e487b7160e01b600052603260045260246000fd5b600080600080600060a08688031215612e5c57600080fd5b5050835160208501516040860151606087015160809097015192989197509594509092509050565b634e487b7160e01b600052601160045260246000fd5b60006001600160ff1b03821415612eb357612eb3612e84565b5060010190565b60008083128015600160ff1b850184121615612ed857612ed8612e84565b6001600160ff1b0384018313811615612ef357612ef3612e84565b50500390565b600060208284031215612f0b57600080fd5b5051919050565b60008219821115612f2557612f25612e84565b500190565b6000816000190483118215151615612f4457612f44612e84565b500290565b600082612f6657634e487b7160e01b600052601260045260246000fd5b500490565b6000600160ff1b821415612f8157612f81612e84565b506000190190565b6020808252602c9082015260008051602061328383398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c9082015260008051602061328383398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6020808252600490820152634344414960e01b604082015260600190565b600060ff821660ff81141561303257613032612e84565b60010192915050565b60008282101561304d5761304d612e84565b500390565b634e487b7160e01b600052603160045260246000fd5b6020808252600790820152665245534552564560c81b604082015260600190565b60008060006060848603121561309e57600080fd5b8351925060208401519150604084015190509250925092565b600081612f8157612f81612e84565b600080604083850312156130d957600080fd5b505080516020909101519092909150565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60005b83811015613129578181015183820152602001613111565b8381111561243a5750506000910152565b6000815180845261315281602086016020860161310e565b601f01601f19169290920160200192915050565b60018060a01b0384168152826020820152606060408201526000612a35606083018461313a565b60006020828403121561319f57600080fd5b8151612ab781612baa565b6001600160a01b039384168152919092166020820152604081019190915260600190565b6001600160a01b03878116825260a06020808401829052908301879052600091889160c08501845b8a81101561321d57843561320981612b64565b8416825293820193908201906001016131f6565b5060408601989098525050505060608101929092526080909101529392505050565b6000600019821415612eb357612eb3612e84565b6000825161326581846020870161310e565b9190910192915050565b602081526000612ab7602083018461313a56fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564436f6c6c656374656420696e7465726573742076616c75652073686f756c6420a2646970667358221220e64815065479982be3d05567e8376d2b07e1e4c6647bba76ad140f5e44b8158364736f6c63430008080033";
687
+ "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c61333f61004b60003960008181610b7001528181610bb901528181610fe10152611021015261333f6000f3fe6080604052600436106101475760003560e01c8063089445141461014c5780630e47dbd91461016e57806312ce63d914610192578063195dc7cc146101a85780631b3c90a8146101d457806324ccc1e7146101e95780633659cfe61461020b5780633e6326fc1461022b5780634162169f1461025857806344fa7622146102785780634f1ef286146102985780635aef7de6146102ab57806372d00e9f146102cb578063791b6bc3146102eb5780637c6b63b41461030b5780638aba46591461032b5780639d89e9a41461034b578063a25dc5f41461036a578063aac7efb414610380578063b6eee2c9146103a0578063b7714ae2146103c0578063c4d66de8146103e0578063c81a2b5d14610400578063d025014414610416578063e1758bd8146104a9578063e31bf132146104be578063f03b2890146104d4578063f4a7a395146104f4575b600080fd5b34801561015857600080fd5b5061016c610167366004612abe565b61050a565b005b34801561017a57600080fd5b5060a0545b6040519081526020015b60405180910390f35b34801561019e57600080fd5b5061017f609a5481565b3480156101b457600080fd5b50609f546101c29060ff1681565b60405160ff9091168152602001610189565b3480156101e057600080fd5b5061016c61055b565b3480156101f557600080fd5b506101fe6106a0565b6040516101899190612ae1565b34801561021757600080fd5b5061016c610226366004612b79565b610b65565b34801561023757600080fd5b5060675461024b906001600160a01b031681565b6040516101899190612b96565b34801561026457600080fd5b5060655461024b906001600160a01b031681565b34801561028457600080fd5b5061017f610293366004612bb8565b610c37565b61016c6102a6366004612bfe565b610fd6565b3480156102b757600080fd5b5060665461024b906001600160a01b031681565b3480156102d757600080fd5b5061024b6102e6366004612cc1565b611090565b3480156102f757600080fd5b5061016c610306366004612cc1565b6110ba565b34801561031757600080fd5b5061016c610326366004612cf3565b6110f7565b34801561033757600080fd5b5061016c610346366004612cc1565b611476565b34801561035757600080fd5b50609f546101c290610100900460ff1681565b34801561037657600080fd5b5061017f609d5481565b34801561038c57600080fd5b5061017f61039b366004612cc1565b6114b3565b3480156103ac57600080fd5b5061016c6103bb366004612d5e565b6115f5565b3480156103cc57600080fd5b5061016c6103db366004612cc1565b61200f565b3480156103ec57600080fd5b5061016c6103fb366004612b79565b61204c565b34801561040c57600080fd5b5061017f609c5481565b34801561042257600080fd5b50610473610431366004612b79565b60a16020526000908152604090205463ffffffff8116906001600160401b03600160201b8204811691600160601b81049091169060ff600160a01b9091041684565b6040805163ffffffff9590951685526001600160401b039384166020860152919092169083015215156060820152608001610189565b3480156104b557600080fd5b5061024b61212c565b3480156104ca57600080fd5b5061017f609b5481565b3480156104e057600080fd5b5061016c6104ef366004612de3565b6121b0565b34801561050057600080fd5b5061017f609e5481565b610512612440565b609f805460ff191660ff83169081179091556040519081527fceef3bba37867319344ac9cc91b1d2318daa822bae8d15118d84aedc1fbba330906020015b60405180910390a150565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156105b957600080fd5b505afa1580156105cd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105f19190612e11565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561064657600080fd5b505afa15801561065a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061067e9190612e11565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60a0546060906000906001600160401b038111156106c0576106c0612be8565b6040519080825280602002602001820160405280156106e9578160200160208202803683370190505b5060a0549091506000906001600160401b0381111561070a5761070a612be8565b604051908082528060200260200182016040528015610733578160200160208202803683370190505b5060a0549091506000906001600160401b0381111561075457610754612be8565b6040519080825280602002602001820160405280156107c957816020015b6107b66040518060c0016040528060006001600160a01b03168152602001600081526020016000815260200160008152602001600081526020016000151581525090565b8152602001906001900390816107725790505b5090506000805b60a05481121561091a5760a081815481106107ed576107ed612e2e565b600091825260208220015460405163026c13ed60e21b81526004810192909252600160248301526001600160a01b0316906309b04fb49060440160a06040518083038186803b15801561083f57600080fd5b505afa158015610853573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108779190612e44565b955050841592506109089150505760a0818154811061089857610898612e2e565b9060005260206000200160009054906101000a90046001600160a01b03168582815181106108c8576108c8612e2e565b60200260200101906001600160a01b031690816001600160a01b031681525050818482815181106108fb576108fb612e2e565b6020026020010181815250505b8061091281612e9a565b9150506107d0565b609c546109278587612514565b6000806000600160a08054905061093e9190612eba565b94505b60008512610b575760006001600160a01b031689868151811061096657610966612e2e565b60200260200101516001600160a01b031614610b405788858151811061098e5761098e612e2e565b60200260200101516001600160a01b031663e660b53f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156109ce57600080fd5b505afa1580156109e2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a069190612ef9565b9250878581518110610a1a57610a1a612e2e565b602002602001015182610a2d9190612f12565b9150610a398385612f12565b9350609e54609a54610a4b9190612f12565b421015610a8b57610a5d600180610c37565b609f54610a6d919060ff16612f2a565b610a7c836402540be400612f2a565b610a869190612f49565b610aaf565b610a96600180610c37565b610aa5836402540be400612f2a565b610aaf9190612f49565b90506040518060c001604052808a8781518110610ace57610ace612e2e565b60200260200101516001600160a01b03168152602001898781518110610af657610af6612e2e565b60200260200101518152602001838152602001858152602001828152602001858310151515815250878681518110610b3057610b30612e2e565b6020026020010181905250610b45565b610b57565b84610b4f81612f6b565b955050610941565b509498975050505050505050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610bb75760405162461bcd60e51b8152600401610bae90612f89565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610be9612538565b6001600160a01b031614610c0f5760405162461bcd60e51b8152600401610bae90612fc3565b610c1881612554565b60408051600080825260208201909252610c349183919061255c565b50565b60675460405163bf40fac160e01b815260206004820152601060248201526f4741535f50524943455f4f5241434c4560801b604482015260009182916001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610ca057600080fd5b505afa158015610cb4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cd89190612e11565b90506000816001600160a01b03166350d25bcd6040518163ffffffff1660e01b815260040160206040518083038186803b158015610d1557600080fd5b505afa158015610d29573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d4d9190612ef9565b60675460405163bf40fac160e01b815260206004820152600e60248201526d4441495f4554485f4f5241434c4560901b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610db557600080fd5b505afa158015610dc9573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ded9190612e11565b90506000816001600160a01b03166350d25bcd6040518163ffffffff1660e01b815260040160206040518083038186803b158015610e2a57600080fd5b505afa158015610e3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e629190612ef9565b9050600081610e7985670de0b6b3a7640000612f2a565b610e839190612f49565b90508615610ea157610e958882612f2a565b95505050505050610fd0565b60675460405163bf40fac160e01b815289916001600160a01b03169063bf40fac190610ecf90600401612ffd565b60206040518083038186803b158015610ee757600080fd5b505afa158015610efb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f1f9190612e11565b6001600160a01b031663182df0f56040518163ffffffff1660e01b815260040160206040518083038186803b158015610f5757600080fd5b505afa158015610f6b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8f9190612ef9565b610f9e6402540be40084612f49565b610fb4906b204fce5e3e25026110000000612f2a565b610fbe9190612f49565b610fc89190612f2a565b955050505050505b92915050565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561101f5760405162461bcd60e51b8152600401610bae90612f89565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316611051612538565b6001600160a01b0316146110775760405162461bcd60e51b8152600401610bae90612fc3565b61108082612554565b61108c8282600161255c565b5050565b60a081815481106110a057600080fd5b6000918252602090912001546001600160a01b0316905081565b6110c2612440565b609c8190556040518181527fcc09a90bef37a706a00b53dd3f515f9326b029e41271b4bb87777773962cbc6090602001610550565b6110ff612440565b808061112b57506001600160a01b038416600090815260a16020526040902054600160a01b900460ff16155b6111715760405162461bcd60e51b815260206004820152601760248201527663616e277420756e646f20626c61636b6c697374696e6760481b6044820152606401610bae565b600060405180608001604052808763ffffffff16815260200160008663ffffffff161161119e57436111a0565b855b63ffffffff166001600160401b0316815260200160008563ffffffff16116111cc5763ffffffff6111ce565b845b63ffffffff90811682528415156020928301526001600160a01b038816600090815260a18352604080822085518154958701519287015160608801511515600160a01b0260ff60a01b196001600160401b03928316600160601b0216600160601b600160a81b031995909216600160201b026001600160601b0319909816929096169190911795909517919091169390931791909117909155909150805b60a05460ff821610156112cf57866001600160a01b031660a08260ff168154811061129957611299612e2e565b6000918252602090912001546001600160a01b031614156112bd57600191506112cf565b806112c78161301b565b91505061126c565b8180156112e7575083806112e7575063ffffffff8816155b156113a15760a080546112fc9060019061303b565b8154811061130c5761130c612e2e565b60009182526020909120015460a080546001600160a01b039092169160ff841690811061133b5761133b612e2e565b9060005260206000200160006101000a8154816001600160a01b0302191690836001600160a01b0316021790555060a080548061137a5761137a613052565b600082815260209020810160001990810180546001600160a01b031916905501905561140d565b811580156113bc575083806113ba575063ffffffff8816155b155b1561140d5760a080546001810182556000919091527f78fdc8d422c49ced035a9edf18d00d3c6a8d81df210f3e5e448e045e77b41e880180546001600160a01b0319166001600160a01b0389161790555b6040805163ffffffff8a811682526001600160a01b038a1660208301528881168284015287166060820152851515608082015290517fcfeece178cde5fc0c509d31ec15ec2d996342bec5d9820be8aabbda11a21205b9181900360a00190a15050505050505050565b61147e612440565b609d8190556040518181527f08deabc2cb3286b159d9350bf977350e1f31e39ae44075269082a800e9ee59de90602001610550565b6000806114c1836000610c37565b60675460405163bf40fac160e01b81529192506000916001600160a01b039091169063bf40fac1906114f590600401613068565b60206040518083038186803b15801561150d57600080fd5b505afa158015611521573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115459190612e11565b6001600160a01b0316639d1b464a6040518163ffffffff1660e01b815260040160206040518083038186803b15801561157d57600080fd5b505afa158015611591573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115b59190612ef9565b90506a084595161401484a000000816115d984676765c793fa10079d601b1b612f2a565b6115e39190612f49565b6115ed9190612f49565b949350505050565b60005a60675460405163bf40fac160e01b81529192506000918291829182916001600160a01b03169063bf40fac19061163090600401612ffd565b60206040518083038186803b15801561164857600080fd5b505afa15801561165c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116809190612e11565b60675460405163bf40fac160e01b815260206004820152600360248201526244414960e81b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156116dd57600080fd5b505afa1580156116f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117159190612e11565b60675460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac19061174490600401613068565b60206040518083038186803b15801561175c57600080fd5b505afa158015611770573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117949190612e11565b92506000816001600160a01b03166370a08231856040518263ffffffff1660e01b81526004016117c49190612b96565b60206040518083038186803b1580156117dc57600080fd5b505afa1580156117f0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118149190612ef9565b90506000836001600160a01b03166370a08231866040518263ffffffff1660e01b81526004016118449190612b96565b60206040518083038186803b15801561185c57600080fd5b505afa158015611870573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118949190612ef9565b905060006118a360018c61303b565b90505b60008c8c838181106118ba576118ba612e2e565b90506020020160208101906118cf9190612b79565b6001600160a01b031614611985578b8b828181106118ef576118ef612e2e565b90506020020160208101906119049190612b79565b6001600160a01b03166337455990876040518263ffffffff1660e01b815260040161192f9190612b96565b606060405180830381600087803b15801561194957600080fd5b505af115801561195d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119819190613089565b5050505b8061198f576119a1565b80611999816130b7565b9150506118a6565b50600082846001600160a01b03166370a08231886040518263ffffffff1660e01b81526004016119d19190612b96565b60206040518083038186803b1580156119e957600080fd5b505afa1580156119fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a219190612ef9565b611a2b919061303b565b604051631de778a560e01b815260048101829052602481018490526001600160a01b03878116604483015291925090871690631de778a5906064016040805180830381600087803b158015611a7f57600080fd5b505af1158015611a93573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ab791906130c6565b60675460405163bf40fac160e01b8152929a509098506000916001600160a01b039091169063bf40fac190611aee906004016130ea565b60206040518083038186803b158015611b0657600080fd5b505afa158015611b1a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b3e9190612e11565b90508815611d6e5760675460405163bf40fac160e01b815260206004820152600f60248201526e1094925111d157d0d3d395149050d5608a1b60448201526001600160a01b0383811692634000aea09291169063bf40fac19060640160206040518083038186803b158015611bb257600080fd5b505afa158015611bc6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611bea9190612e11565b60675460405163bf40fac160e01b815260206004820152600d60248201526c15509257d49150d25412515395609a1b60448201528d916001600160a01b03169063bf40fac19060640160206040518083038186803b158015611c4b57600080fd5b505afa158015611c5f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c839190612e11565b604051602001611ca6919060609190911b6001600160601b031916815260140190565b6040516020818303038152906040526040518463ffffffff1660e01b8152600401611cd393929190613166565b602060405180830381600087803b158015611ced57600080fd5b505af1158015611d01573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d25919061318d565b611d6e5760405162461bcd60e51b815260206004820152601a6024820152791d589a48189c9a5919d9481d1c985b9cd9995c8819985a5b195960321b6044820152606401610bae565b506000945050508715159150611fb290505760006064609d545a611d92908961303b565b611d9c9190612f12565b611da790606e612f2a565b611db19190612f49565b9050611dbc816114b3565b60675460405163bf40fac160e01b81529193506001600160a01b038086169263f8a9978f929091169063bf40fac190611df790600401612ffd565b60206040518083038186803b158015611e0f57600080fd5b505afa158015611e23573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e479190612e11565b33856040518463ffffffff1660e01b8152600401611e67939291906131aa565b600060405180830381600087803b158015611e8157600080fd5b505af1158015611e95573d6000803e3d6000fd5b505050506000611eb05a611ea9908961303b565b6000610c37565b9050609e54609a54611ec29190612f12565b4210611f315780851015611f2c5760405162461bcd60e51b815260206004820152603e60248201526000805160206132ea83398151915260448201527f6265206c6172676572207468616e207370656e742067617320636f73747300006064820152608401610bae565b611faf565b609f54611f4290829060ff16612f2a565b851015611faf5760405162461bcd60e51b815260206004820152604160248201526000805160206132ea83398151915260448201527f626520696e7465726573744d756c7469706c69657220782067617320636f73746064820152607360f81b608482015260a401610bae565b50505b336001600160a01b03167fa152fd34a7e4c4c82eb0c0b0319d3913dc9189d62ae2fe75aef590f0e391a928838a8a878987604051611ff5969594939291906131ce565b60405180910390a2505042609a55505043609b5550505050565b612017612440565b609e8190556040518181527f28b3b60d9fa0f6edab793c2422ff4784f9381ff9d2062481d1254f732452bfbf90602001610550565b600054610100900460ff1680612065575060005460ff16155b6120c85760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610bae565b600054610100900460ff161580156120ea576000805461ffff19166101011790555b6120f3826126a3565b6203d090609d55624f1a00609e55609f8054620cf850609c5561ffff1916610704179055801561108c576000805461ff00191690555050565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac19061215b906004016130ea565b60206040518083038186803b15801561217357600080fd5b505afa158015612187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121ab9190612e11565b905090565b33600090815260a160209081526040918290208251608081018452905463ffffffff81168252600160201b81046001600160401b03908116938301849052600160601b82041693820193909352600160a01b90920460ff161515606083015261225b5760405162461bcd60e51b815260206004820152601f60248201527f5374616b696e6720636f6e7472616374206e6f742072656769737465726564006044820152606401610bae565b80516020820151604080840151905163574c5c9360e01b81526001600160a01b038616600482015263ffffffff90931660248401526001600160401b039182166044840152166064820152600090339063574c5c9390608401602060405180830381600087803b1580156122ce57600080fd5b505af11580156122e2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123069190612ef9565b905060008111801561231a57506060820151155b1561243a5760675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061234d90600401613068565b60206040518083038186803b15801561236557600080fd5b505afa158015612379573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061239d9190612e11565b6001600160a01b031663f8a9978f8585846040518463ffffffff1660e01b81526004016123cc939291906131aa565b600060405180830381600087803b1580156123e657600080fd5b505af11580156123fa573d6000803e3d6000fd5b505050507f5c4a97f844ad1dc8cad420327f32da9b4bd075bab26efa2ae5bd66f84d1fce07338483604051612431939291906131aa565b60405180910390a15b50505050565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561248457600080fd5b505afa158015612498573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124bc9190612e11565b6001600160a01b0316146125125760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610bae565b565b60018251111561108c5761108c8282600060018651612533919061303b565b6126c6565b6000805160206132a3833981519152546001600160a01b031690565b610c34612440565b6000612566612538565b9050612571846128c0565b60008351118061257e5750815b1561258f5761258d8484612953565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661269c57805460ff1916600117815560405161260a9086906125db908590602401612b96565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b179052612953565b50805460ff1916815561261b612538565b6001600160a01b0316826001600160a01b0316146126935760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610bae565b61269c85612a3e565b5050505050565b606780546001600160a01b0319166001600160a01b038316179055610c3461055b565b8082101561243a5760008460026126dd8486612f12565b6126e79190612f49565b815181106126f7576126f7612e2e565b6020908102919091010151905082825b8287838151811061271a5761271a612e2e565b6020026020010151101561273a57816127328161323f565b925050612707565b8287828151811061274d5761274d612e2e565b6020026020010151111561276d5780612765816130b7565b91505061273a565b80821061277957612882565b86818151811061278b5761278b612e2e565b60200260200101518783815181106127a5576127a5612e2e565b60200260200101518884815181106127bf576127bf612e2e565b602002602001018984815181106127d8576127d8612e2e565b60200260200101828152508281525050508581815181106127fb576127fb612e2e565b602002602001015186838151811061281557612815612e2e565b602002602001015187848151811061282f5761282f612e2e565b6020026020010188848151811061284857612848612e2e565b6001600160a01b039384166020918202929092010152911690528161286c8161323f565b925050808061287a906130b7565b915050612707565b8085101561289657612896878787846126c6565b806128a08161323f565b915050838110156128b7576128b7878783876126c6565b50505050505050565b803b6129245760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610bae565b6000805160206132a383398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6129b25760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610bae565b600080846001600160a01b0316846040516129cd9190613253565b600060405180830381855af49150503d8060008114612a08576040519150601f19603f3d011682016040523d82523d6000602084013e612a0d565b606091505b5091509150612a3582826040518060600160405280602781526020016132c360279139612a7e565b95945050505050565b612a47816128c0565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60608315612a8d575081612ab7565b825115612a9d5782518084602001fd5b8160405162461bcd60e51b8152600401610bae919061326f565b9392505050565b600060208284031215612ad057600080fd5b813560ff81168114612ab757600080fd5b602080825282518282018190526000919060409081850190868401855b82811015612b5757815180516001600160a01b0316855286810151878601528581015186860152606080820151908601526080808201519086015260a09081015115159085015260c09093019290850190600101612afe565b5091979650505050505050565b6001600160a01b0381168114610c3457600080fd5b600060208284031215612b8b57600080fd5b8135612ab781612b64565b6001600160a01b0391909116815260200190565b8015158114610c3457600080fd5b60008060408385031215612bcb57600080fd5b823591506020830135612bdd81612baa565b809150509250929050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215612c1157600080fd5b8235612c1c81612b64565b915060208301356001600160401b0380821115612c3857600080fd5b818501915085601f830112612c4c57600080fd5b813581811115612c5e57612c5e612be8565b604051601f8201601f19908116603f01168101908382118183101715612c8657612c86612be8565b81604052828152886020848701011115612c9f57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215612cd357600080fd5b5035919050565b803563ffffffff81168114612cee57600080fd5b919050565b600080600080600060a08688031215612d0b57600080fd5b612d1486612cda565b94506020860135612d2481612b64565b9350612d3260408701612cda565b9250612d4060608701612cda565b91506080860135612d5081612baa565b809150509295509295909350565b600080600060408486031215612d7357600080fd5b83356001600160401b0380821115612d8a57600080fd5b818601915086601f830112612d9e57600080fd5b813581811115612dad57600080fd5b8760208260051b8501011115612dc257600080fd5b60209283019550935050840135612dd881612baa565b809150509250925092565b60008060408385031215612df657600080fd5b8235612e0181612b64565b91506020830135612bdd81612b64565b600060208284031215612e2357600080fd5b8151612ab781612b64565b634e487b7160e01b600052603260045260246000fd5b600080600080600060a08688031215612e5c57600080fd5b5050835160208501516040860151606087015160809097015192989197509594509092509050565b634e487b7160e01b600052601160045260246000fd5b60006001600160ff1b03821415612eb357612eb3612e84565b5060010190565b60008083128015600160ff1b850184121615612ed857612ed8612e84565b6001600160ff1b0384018313811615612ef357612ef3612e84565b50500390565b600060208284031215612f0b57600080fd5b5051919050565b60008219821115612f2557612f25612e84565b500190565b6000816000190483118215151615612f4457612f44612e84565b500290565b600082612f6657634e487b7160e01b600052601260045260246000fd5b500490565b6000600160ff1b821415612f8157612f81612e84565b506000190190565b6020808252602c9082015260008051602061328383398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c9082015260008051602061328383398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6020808252600490820152634344414960e01b604082015260600190565b600060ff821660ff81141561303257613032612e84565b60010192915050565b60008282101561304d5761304d612e84565b500390565b634e487b7160e01b600052603160045260246000fd5b6020808252600790820152665245534552564560c81b604082015260600190565b60008060006060848603121561309e57600080fd5b8351925060208401519150604084015190509250925092565b600081612f8157612f81612e84565b600080604083850312156130d957600080fd5b505080516020909101519092909150565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60005b83811015613129578181015183820152602001613111565b8381111561243a5750506000910152565b6000815180845261315281602086016020860161310e565b601f01601f19169290920160200192915050565b60018060a01b0384168152826020820152606060408201526000612a35606083018461313a565b60006020828403121561319f57600080fd5b8151612ab781612baa565b6001600160a01b039384168152919092166020820152604081019190915260600190565b6001600160a01b03878116825260a06020808401829052908301879052600091889160c08501845b8a81101561321d57843561320981612b64565b8416825293820193908201906001016131f6565b5060408601989098525050505060608101929092526080909101529392505050565b6000600019821415612eb357612eb3612e84565b6000825161326581846020870161310e565b9190910192915050565b602081526000612ab7602083018461313a56fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564436f6c6c656374656420696e7465726573742076616c75652073686f756c6420a26469706673582212203fb2ba7ac7d7643fcd1bb3c4405a15b29dccc760b96ee6aed3375d8611297ff164736f6c63430008080033";
688
688
 
689
689
  type GoodFundManagerConstructorParams =
690
690
  | [signer?: Signer]
package/types/factories/GoodMarketMaker__factory.ts CHANGED
@@ -612,7 +612,7 @@ const _abi = [
612
612
  ];
613
613
 
614
614
  const _bytecode =
615
- "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c61219461004b6000396000818161077c015281816107bc01528181610b900152610bd001526121946000f3fe6080604052600436106101265760003560e01c80630b1848661461012b5780631b3c90a81461015e5780633659cfe614610175578063371d52dc146101955780633e21374e146101ca5780633e6326fc146101ea5780634162169f1461021757806346f7cb23146102375780634f1ef286146102575780635aef7de61461026a5780635cf3a7a91461028a5780636a989e6e146102aa5780636cb4b4c1146102ca57806374920d30146102e05780637a1ac61e14610300578063835bbd55146103205780638c4959621461038e5780638ee090fb146103a35780639f2d0d07146103c3578063bc179d45146103e3578063cce7ec1314610403578063d5dc7eda14610423578063e1758bd814610443578063e72a083314610458578063e9833c2f14610478575b600080fd5b34801561013757600080fd5b5061014b610146366004611bbe565b610498565b6040519081526020015b60405180910390f35b34801561016a57600080fd5b5061017361062c565b005b34801561018157600080fd5b50610173610190366004611bf3565b610771565b3480156101a157600080fd5b506101b56101b0366004611bf3565b61083a565b60405163ffffffff9091168152602001610155565b3480156101d657600080fd5b5061014b6101e5366004611bf3565b61092a565b3480156101f657600080fd5b5060675461020a906001600160a01b031681565b6040516101559190611c10565b34801561022357600080fd5b5060655461020a906001600160a01b031681565b34801561024357600080fd5b506101b5610252366004611bf3565b610ae1565b610173610265366004611c3a565b610b85565b34801561027657600080fd5b5060665461020a906001600160a01b031681565b34801561029657600080fd5b5061014b6102a5366004611cfd565b610c3f565b3480156102b657600080fd5b5061014b6102c5366004611cfd565b610d2b565b3480156102d657600080fd5b5061014b609b5481565b3480156102ec57600080fd5b5061014b6102fb366004611cfd565b610dbd565b34801561030c57600080fd5b5061017361031b366004611bbe565b610e41565b34801561032c57600080fd5b5061036961033b366004611bf3565b609a602052600090815260409020805460018201546002830154600390930154919263ffffffff9091169184565b6040805194855263ffffffff9093166020850152918301526060820152608001610155565b34801561039a57600080fd5b5061020a610f28565b3480156103af57600080fd5b506101736103be366004611d29565b610fc9565b3480156103cf57600080fd5b506101736103de366004611d84565b611065565b3480156103ef57600080fd5b5061014b6103fe366004611cfd565b611175565b34801561040f57600080fd5b5061014b61041e366004611cfd565b6111c6565b34801561042f57600080fd5b5061017361043e366004611cfd565b611278565b34801561044f57600080fd5b5061020a6113b4565b34801561046457600080fd5b5061014b610473366004611bf3565b611400565b34801561048457600080fd5b5061014b610493366004611bf3565b611464565b60006104a2611555565b6104ab846116f2565b818310156105185760405162461bcd60e51b815260206004820152602f60248201527f474420616d6f756e74206973206c6f776572207468616e2074686520636f6e7460448201526e1c9a589d5d1a5bdb88185b5bdd5b9d608a1b60648201526084015b60405180910390fd5b6001600160a01b0384166000908152609a6020526040902060028101548411156105965760405162461bcd60e51b815260206004820152602960248201527f474420616d6f756e7420697320686967686572207468616e2074686520746f74604482015268616c20737570706c7960b81b606482015260840161050f565b60006105a28486611dbc565b905060006105b08783610d2b565b9050858360020160008282546105c69190611dbc565b90915550508254819084906000906105df908490611dbc565b9091555050600283015483546040516001600160a01b038a1692339260008051602061213f83398151915292610618928b928892611dd3565b60405180910390a3925050505b9392505050565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561068a57600080fd5b505afa15801561069e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106c29190611dee565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561071757600080fd5b505afa15801561072b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061074f9190611dee565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156107ba5760405162461bcd60e51b815260040161050f90611e0b565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166107ec61175b565b6001600160a01b0316146108125760405162461bcd60e51b815260040161050f90611e45565b61081b81611777565b604080516000808252602082019092526108379183919061177f565b50565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810184905260028201549281019290925260030154606082015290806108935750620f42405b6108a6683635c9adc5dea0000082611e7f565b90506000620151808360600151426108be9190611dbc565b6108c89190611eb4565b905060005b8181101561090d57676765c793fa10079d601b1b609b54846108ef9190611e7f565b6108f99190611eb4565b92508061090581611ec8565b9150506108cd565b50610921683635c9adc5dea0000083611eb4565b95945050505050565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810193909352600281015491830191909152600301546060820152816109828461083a565b90506000846001600160a01b031663313ce5676040518163ffffffff1660e01b815260040160206040518083038186803b1580156109bf57600080fd5b505afa1580156109d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f79190611ee3565b610a059060ff16601b611dbc565b90506000676765c793fa10079d601b1b610a2083600a611fea565b610a2988611464565b610a4263ffffffff8716683635c9adc5dea00000611e7f565b610a4c9190611e7f565b610a569190611e7f565b610a609190611eb4565b90506000609c54601b610a739190611dbc565b90506000610a8282600a611fea565b83610a8e86600a611fea565b8851610a9a9190611e7f565b610aaf90676765c793fa10079d601b1b611e7f565b610ab99190611eb4565b610ac39190611eb4565b9050856040015181610ad59190611dbc565b98975050505050505050565b6000610aeb611555565b610af4826116f2565b6001600160a01b0382166000908152609a60205260409020600181015463ffffffff1680610b225750620f42405b610b2b8461083a565b60018301805463ffffffff191663ffffffff9290921691909117905560038201546201518090610b5b9042611dbc565b610b659190611ff6565b610b6f9042611dbc565b6003830155506001015463ffffffff1692915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610bce5760405162461bcd60e51b815260040161050f90611e0b565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610c0061175b565b6001600160a01b031614610c265760405162461bcd60e51b815260040161050f90611e45565b610c2f82611777565b610c3b8282600161177f565b5050565b6001600160a01b0382166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810193909352600281015491830191909152600301546060820152610c95610f28565b604080830151835160208501519251630a68039f60e21b81526001600160a01b0394909416936329a00e7c93610cd1939291899060040161200a565b60206040518083038186803b158015610ce957600080fd5b505afa158015610cfd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d21919061202b565b9150505b92915050565b6001600160a01b0382166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810193909352600281015491830191909152600301546060820152610d81610f28565b6040808301518351602085015192516349f9b0f760e01b81526001600160a01b0394909416936349f9b0f793610cd1939291899060040161200a565b6000610dc7611555565b610dd0836116f2565b81610ddd57506000610d25565b6000610de98484611175565b6001600160a01b0385166000908152609a602052604081206002810180549394509092849290610e1a908490612044565b9091555050805484908290600090610e33908490612044565b909155509195945050505050565b600054610100900460ff1680610e5a575060005460ff16155b610ebd5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161050f565b600054610100900460ff16158015610edf576000805461ffff19166101011790555b81610ef584676765c793fa10079d601b1b611e7f565b610eff9190611eb4565b609b556002609c55610f10846118c6565b8015610f22576000805461ff00191690555b50505050565b60675460405163bf40fac160e01b815260206004820152600e60248201526d42414e434f525f464f524d554c4160901b60448201526000916001600160a01b03169063bf40fac1906064015b60206040518083038186803b158015610f8c57600080fd5b505afa158015610fa0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fc49190611dee565b905090565b610fd1611555565b60405180608001604052808481526020018363ffffffff168152602001858152602001826000146110025782611004565b425b90526001600160a01b03959095166000908152609a6020908152604091829020875181559087015160018201805463ffffffff191663ffffffff90921691909117905590860151600282015560609095015160039095019490945550505050565b61106d611555565b600081116110bb5760405162461bcd60e51b815260206004820152601b60248201527a064656e6f6d696e61746f72206d7573742062652061626f7665203602c1b604482015260640161050f565b806110d183676765c793fa10079d601b1b611e7f565b6110db9190611eb4565b609b819055676765c793fa10079d601b1b116111365760405162461bcd60e51b815260206004820152601a602482015279496e76616c6964206e6f6d206f722064656e6f6d2076616c756560301b604482015260640161050f565b604080518381526020810183905233917fcd3db955892df8543ef392cb55c3f36e13ad4c38e151c8315101b3006ef105df910160405180910390a25050565b600080609c54601b6111879190611dbc565b905061119481600a611fea565b61119d85611464565b6111b285676765c793fa10079d601b1b611e7f565b6111bc9190611eb4565b610d219190611eb4565b60006111d0611555565b6111d9836116f2565b60006111e58484610c3f565b6001600160a01b0385166000908152609a602052604081206002810180549394509092849290611216908490612044565b909155505080548490829060009061122f908490612044565b9091555050600281015481546040516001600160a01b03881692339260008051602061213f83398151915292611268928a928992611dd3565b60405180910390a3509392505050565b611280611555565b611289826116f2565b6000826001600160a01b031663313ce5676040518163ffffffff1660e01b815260040160206040518083038186803b1580156112c457600080fd5b505afa1580156112d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112fc9190611ee3565b61130a9060ff16601b611dbc565b6001600160a01b0384166000908152609a6020526040812091925061132e85611464565b9050838260020160008282546113449190612044565b90915550611355905083600a611fea565b8183600201546113659190611e7f565b835461137c90676765c793fa10079d601b1b611e7f565b6113869190611eb4565b6113909190611eb4565b600192909201805463ffffffff191663ffffffff9093169290921790915550505050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401610f74565b600061140a611555565b611413826116f2565b600061141e8361092a565b6001600160a01b0384166000908152609a602052604081206002018054929350839290919061144e908490612044565b9091555061145d905083610ae1565b5092915050565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff16938101939093526002810154918301919091526003015460608201526114ba610f28565b6001600160a01b03166349f9b0f7826040015183600001518460200151609c54600a6114e69190611fea565b6040518563ffffffff1660e01b8152600401611505949392919061200a565b60206040518083038186803b15801561151d57600080fd5b505afa158015611531573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610625919061202b565b60675460405163bf40fac160e01b81526020600482015260076024820152665245534552564560c81b604482015233916001600160a01b03169063bf40fac19060640160206040518083038186803b1580156115b057600080fd5b505afa1580156115c4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115e89190611dee565b6001600160a01b03161480611695575060675460405163bf40fac160e01b815260206004820152600660248201526520ab20aa20a960d11b604482015233916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561165257600080fd5b505afa158015611666573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061168a9190611dee565b6001600160a01b0316145b6116f05760405162461bcd60e51b815260206004820152602660248201527f476f6f644d61726b65744d616b65723a206e6f742052657365727665206f722060448201526520bb30ba30b960d11b606482015260840161050f565b565b6001600160a01b0381166000908152609a602052604090206002810154610c3b5760405162461bcd60e51b815260206004820152601d60248201527f5265736572766520746f6b656e206e6f7420696e697469616c697a6564000000604482015260640161050f565b6000805160206120f8833981519152546001600160a01b031690565b6108376118e9565b600061178961175b565b9050611794846119bb565b6000835111806117a15750815b156117b2576117b08484611a4e565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff166118bf57805460ff1916600117815560405161182d9086906117fe908590602401611c10565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b179052611a4e565b50805460ff1916815561183e61175b565b6001600160a01b0316826001600160a01b0316146118b65760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b606482015260840161050f565b6118bf85611b30565b5050505050565b606780546001600160a01b0319166001600160a01b03831617905561083761062c565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561192d57600080fd5b505afa158015611941573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119659190611dee565b6001600160a01b0316146116f05760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161050f565b803b611a1f5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161050f565b6000805160206120f883398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b611aad5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161050f565b600080846001600160a01b031684604051611ac89190612088565b600060405180830381855af49150503d8060008114611b03576040519150601f19603f3d011682016040523d82523d6000602084013e611b08565b606091505b5091509150610921828260405180606001604052806027815260200161211860279139611b70565b611b39816119bb565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60608315611b7f575081610625565b825115611b8f5782518084602001fd5b8160405162461bcd60e51b815260040161050f91906120a4565b6001600160a01b038116811461083757600080fd5b600080600060608486031215611bd357600080fd5b8335611bde81611ba9565b95602085013595506040909401359392505050565b600060208284031215611c0557600080fd5b813561062581611ba9565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215611c4d57600080fd5b8235611c5881611ba9565b915060208301356001600160401b0380821115611c7457600080fd5b818501915085601f830112611c8857600080fd5b813581811115611c9a57611c9a611c24565b604051601f8201601f19908116603f01168101908382118183101715611cc257611cc2611c24565b81604052828152886020848701011115611cdb57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b60008060408385031215611d1057600080fd5b8235611d1b81611ba9565b946020939093013593505050565b600080600080600060a08688031215611d4157600080fd5b8535611d4c81611ba9565b94506020860135935060408601359250606086013563ffffffff81168114611d7357600080fd5b949793965091946080013592915050565b60008060408385031215611d9757600080fd5b50508035926020909101359150565b634e487b7160e01b600052601160045260246000fd5b600082821015611dce57611dce611da6565b500390565b93845260208401929092526040830152606082015260800190565b600060208284031215611e0057600080fd5b815161062581611ba9565b6020808252602c908201526000805160206120d883398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c908201526000805160206120d883398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6000816000190483118215151615611e9957611e99611da6565b500290565b634e487b7160e01b600052601260045260246000fd5b600082611ec357611ec3611e9e565b500490565b6000600019821415611edc57611edc611da6565b5060010190565b600060208284031215611ef557600080fd5b815160ff8116811461062557600080fd5b600181815b80851115611f41578160001904821115611f2757611f27611da6565b80851615611f3457918102915b93841c9390800290611f0b565b509250929050565b600082611f5857506001610d25565b81611f6557506000610d25565b8160018114611f7b5760028114611f8557611fa1565b6001915050610d25565b60ff841115611f9657611f96611da6565b50506001821b610d25565b5060208310610133831016604e8410600b8410161715611fc4575081810a610d25565b611fce8383611f06565b8060001904821115611fe257611fe2611da6565b029392505050565b60006106258383611f49565b60008261200557612005611e9e565b500690565b938452602084019290925263ffffffff166040830152606082015260800190565b60006020828403121561203d57600080fd5b5051919050565b6000821982111561205757612057611da6565b500190565b60005b8381101561207757818101518382015260200161205f565b83811115610f225750506000910152565b6000825161209a81846020870161205c565b9190910192915050565b60208152600082518060208401526120c381604085016020870161205c565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564ed639966d5b0a89f5ac16d6359c7707785de6e51a00f07dd3197e5fbf0a30374a264697066735822122006c36557b7d6fea13e6901300892941f1aa3de60937504bfbce3e020baf7870f64736f6c63430008080033";
615
+ "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c61219461004b6000396000818161077c015281816107bc01528181610b900152610bd001526121946000f3fe6080604052600436106101265760003560e01c80630b1848661461012b5780631b3c90a81461015e5780633659cfe614610175578063371d52dc146101955780633e21374e146101ca5780633e6326fc146101ea5780634162169f1461021757806346f7cb23146102375780634f1ef286146102575780635aef7de61461026a5780635cf3a7a91461028a5780636a989e6e146102aa5780636cb4b4c1146102ca57806374920d30146102e05780637a1ac61e14610300578063835bbd55146103205780638c4959621461038e5780638ee090fb146103a35780639f2d0d07146103c3578063bc179d45146103e3578063cce7ec1314610403578063d5dc7eda14610423578063e1758bd814610443578063e72a083314610458578063e9833c2f14610478575b600080fd5b34801561013757600080fd5b5061014b610146366004611bbe565b610498565b6040519081526020015b60405180910390f35b34801561016a57600080fd5b5061017361062c565b005b34801561018157600080fd5b50610173610190366004611bf3565b610771565b3480156101a157600080fd5b506101b56101b0366004611bf3565b61083a565b60405163ffffffff9091168152602001610155565b3480156101d657600080fd5b5061014b6101e5366004611bf3565b61092a565b3480156101f657600080fd5b5060675461020a906001600160a01b031681565b6040516101559190611c10565b34801561022357600080fd5b5060655461020a906001600160a01b031681565b34801561024357600080fd5b506101b5610252366004611bf3565b610ae1565b610173610265366004611c3a565b610b85565b34801561027657600080fd5b5060665461020a906001600160a01b031681565b34801561029657600080fd5b5061014b6102a5366004611cfd565b610c3f565b3480156102b657600080fd5b5061014b6102c5366004611cfd565b610d2b565b3480156102d657600080fd5b5061014b609b5481565b3480156102ec57600080fd5b5061014b6102fb366004611cfd565b610dbd565b34801561030c57600080fd5b5061017361031b366004611bbe565b610e41565b34801561032c57600080fd5b5061036961033b366004611bf3565b609a602052600090815260409020805460018201546002830154600390930154919263ffffffff9091169184565b6040805194855263ffffffff9093166020850152918301526060820152608001610155565b34801561039a57600080fd5b5061020a610f28565b3480156103af57600080fd5b506101736103be366004611d29565b610fc9565b3480156103cf57600080fd5b506101736103de366004611d84565b611065565b3480156103ef57600080fd5b5061014b6103fe366004611cfd565b611175565b34801561040f57600080fd5b5061014b61041e366004611cfd565b6111c6565b34801561042f57600080fd5b5061017361043e366004611cfd565b611278565b34801561044f57600080fd5b5061020a6113b4565b34801561046457600080fd5b5061014b610473366004611bf3565b611400565b34801561048457600080fd5b5061014b610493366004611bf3565b611464565b60006104a2611555565b6104ab846116f2565b818310156105185760405162461bcd60e51b815260206004820152602f60248201527f474420616d6f756e74206973206c6f776572207468616e2074686520636f6e7460448201526e1c9a589d5d1a5bdb88185b5bdd5b9d608a1b60648201526084015b60405180910390fd5b6001600160a01b0384166000908152609a6020526040902060028101548411156105965760405162461bcd60e51b815260206004820152602960248201527f474420616d6f756e7420697320686967686572207468616e2074686520746f74604482015268616c20737570706c7960b81b606482015260840161050f565b60006105a28486611dbc565b905060006105b08783610d2b565b9050858360020160008282546105c69190611dbc565b90915550508254819084906000906105df908490611dbc565b9091555050600283015483546040516001600160a01b038a1692339260008051602061213f83398151915292610618928b928892611dd3565b60405180910390a3925050505b9392505050565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561068a57600080fd5b505afa15801561069e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106c29190611dee565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561071757600080fd5b505afa15801561072b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061074f9190611dee565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156107ba5760405162461bcd60e51b815260040161050f90611e0b565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166107ec61175b565b6001600160a01b0316146108125760405162461bcd60e51b815260040161050f90611e45565b61081b81611777565b604080516000808252602082019092526108379183919061177f565b50565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810184905260028201549281019290925260030154606082015290806108935750620f42405b6108a6683635c9adc5dea0000082611e7f565b90506000620151808360600151426108be9190611dbc565b6108c89190611eb4565b905060005b8181101561090d57676765c793fa10079d601b1b609b54846108ef9190611e7f565b6108f99190611eb4565b92508061090581611ec8565b9150506108cd565b50610921683635c9adc5dea0000083611eb4565b95945050505050565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810193909352600281015491830191909152600301546060820152816109828461083a565b90506000846001600160a01b031663313ce5676040518163ffffffff1660e01b815260040160206040518083038186803b1580156109bf57600080fd5b505afa1580156109d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f79190611ee3565b610a059060ff16601b611dbc565b90506000676765c793fa10079d601b1b610a2083600a611fea565b610a2988611464565b610a4263ffffffff8716683635c9adc5dea00000611e7f565b610a4c9190611e7f565b610a569190611e7f565b610a609190611eb4565b90506000609c54601b610a739190611dbc565b90506000610a8282600a611fea565b83610a8e86600a611fea565b8851610a9a9190611e7f565b610aaf90676765c793fa10079d601b1b611e7f565b610ab99190611eb4565b610ac39190611eb4565b9050856040015181610ad59190611dbc565b98975050505050505050565b6000610aeb611555565b610af4826116f2565b6001600160a01b0382166000908152609a60205260409020600181015463ffffffff1680610b225750620f42405b610b2b8461083a565b60018301805463ffffffff191663ffffffff9290921691909117905560038201546201518090610b5b9042611dbc565b610b659190611ff6565b610b6f9042611dbc565b6003830155506001015463ffffffff1692915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610bce5760405162461bcd60e51b815260040161050f90611e0b565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610c0061175b565b6001600160a01b031614610c265760405162461bcd60e51b815260040161050f90611e45565b610c2f82611777565b610c3b8282600161177f565b5050565b6001600160a01b0382166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810193909352600281015491830191909152600301546060820152610c95610f28565b604080830151835160208501519251630a68039f60e21b81526001600160a01b0394909416936329a00e7c93610cd1939291899060040161200a565b60206040518083038186803b158015610ce957600080fd5b505afa158015610cfd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d21919061202b565b9150505b92915050565b6001600160a01b0382166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff1693810193909352600281015491830191909152600301546060820152610d81610f28565b6040808301518351602085015192516349f9b0f760e01b81526001600160a01b0394909416936349f9b0f793610cd1939291899060040161200a565b6000610dc7611555565b610dd0836116f2565b81610ddd57506000610d25565b6000610de98484611175565b6001600160a01b0385166000908152609a602052604081206002810180549394509092849290610e1a908490612044565b9091555050805484908290600090610e33908490612044565b909155509195945050505050565b600054610100900460ff1680610e5a575060005460ff16155b610ebd5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161050f565b600054610100900460ff16158015610edf576000805461ffff19166101011790555b81610ef584676765c793fa10079d601b1b611e7f565b610eff9190611eb4565b609b556002609c55610f10846118c6565b8015610f22576000805461ff00191690555b50505050565b60675460405163bf40fac160e01b815260206004820152600e60248201526d42414e434f525f464f524d554c4160901b60448201526000916001600160a01b03169063bf40fac1906064015b60206040518083038186803b158015610f8c57600080fd5b505afa158015610fa0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fc49190611dee565b905090565b610fd1611555565b60405180608001604052808481526020018363ffffffff168152602001858152602001826000146110025782611004565b425b90526001600160a01b03959095166000908152609a6020908152604091829020875181559087015160018201805463ffffffff191663ffffffff90921691909117905590860151600282015560609095015160039095019490945550505050565b61106d611555565b600081116110bb5760405162461bcd60e51b815260206004820152601b60248201527a064656e6f6d696e61746f72206d7573742062652061626f7665203602c1b604482015260640161050f565b806110d183676765c793fa10079d601b1b611e7f565b6110db9190611eb4565b609b819055676765c793fa10079d601b1b116111365760405162461bcd60e51b815260206004820152601a602482015279496e76616c6964206e6f6d206f722064656e6f6d2076616c756560301b604482015260640161050f565b604080518381526020810183905233917fcd3db955892df8543ef392cb55c3f36e13ad4c38e151c8315101b3006ef105df910160405180910390a25050565b600080609c54601b6111879190611dbc565b905061119481600a611fea565b61119d85611464565b6111b285676765c793fa10079d601b1b611e7f565b6111bc9190611eb4565b610d219190611eb4565b60006111d0611555565b6111d9836116f2565b60006111e58484610c3f565b6001600160a01b0385166000908152609a602052604081206002810180549394509092849290611216908490612044565b909155505080548490829060009061122f908490612044565b9091555050600281015481546040516001600160a01b03881692339260008051602061213f83398151915292611268928a928992611dd3565b60405180910390a3509392505050565b611280611555565b611289826116f2565b6000826001600160a01b031663313ce5676040518163ffffffff1660e01b815260040160206040518083038186803b1580156112c457600080fd5b505afa1580156112d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112fc9190611ee3565b61130a9060ff16601b611dbc565b6001600160a01b0384166000908152609a6020526040812091925061132e85611464565b9050838260020160008282546113449190612044565b90915550611355905083600a611fea565b8183600201546113659190611e7f565b835461137c90676765c793fa10079d601b1b611e7f565b6113869190611eb4565b6113909190611eb4565b600192909201805463ffffffff191663ffffffff9093169290921790915550505050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401610f74565b600061140a611555565b611413826116f2565b600061141e8361092a565b6001600160a01b0384166000908152609a602052604081206002018054929350839290919061144e908490612044565b9091555061145d905083610ae1565b5092915050565b6001600160a01b0381166000908152609a60209081526040808320815160808101835281548152600182015463ffffffff16938101939093526002810154918301919091526003015460608201526114ba610f28565b6001600160a01b03166349f9b0f7826040015183600001518460200151609c54600a6114e69190611fea565b6040518563ffffffff1660e01b8152600401611505949392919061200a565b60206040518083038186803b15801561151d57600080fd5b505afa158015611531573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610625919061202b565b60675460405163bf40fac160e01b81526020600482015260076024820152665245534552564560c81b604482015233916001600160a01b03169063bf40fac19060640160206040518083038186803b1580156115b057600080fd5b505afa1580156115c4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115e89190611dee565b6001600160a01b03161480611695575060675460405163bf40fac160e01b815260206004820152600660248201526520ab20aa20a960d11b604482015233916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561165257600080fd5b505afa158015611666573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061168a9190611dee565b6001600160a01b0316145b6116f05760405162461bcd60e51b815260206004820152602660248201527f476f6f644d61726b65744d616b65723a206e6f742052657365727665206f722060448201526520bb30ba30b960d11b606482015260840161050f565b565b6001600160a01b0381166000908152609a602052604090206002810154610c3b5760405162461bcd60e51b815260206004820152601d60248201527f5265736572766520746f6b656e206e6f7420696e697469616c697a6564000000604482015260640161050f565b6000805160206120f8833981519152546001600160a01b031690565b6108376118e9565b600061178961175b565b9050611794846119bb565b6000835111806117a15750815b156117b2576117b08484611a4e565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff166118bf57805460ff1916600117815560405161182d9086906117fe908590602401611c10565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b179052611a4e565b50805460ff1916815561183e61175b565b6001600160a01b0316826001600160a01b0316146118b65760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b606482015260840161050f565b6118bf85611b30565b5050505050565b606780546001600160a01b0319166001600160a01b03831617905561083761062c565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561192d57600080fd5b505afa158015611941573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119659190611dee565b6001600160a01b0316146116f05760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161050f565b803b611a1f5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161050f565b6000805160206120f883398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b611aad5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161050f565b600080846001600160a01b031684604051611ac89190612088565b600060405180830381855af49150503d8060008114611b03576040519150601f19603f3d011682016040523d82523d6000602084013e611b08565b606091505b5091509150610921828260405180606001604052806027815260200161211860279139611b70565b611b39816119bb565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60608315611b7f575081610625565b825115611b8f5782518084602001fd5b8160405162461bcd60e51b815260040161050f91906120a4565b6001600160a01b038116811461083757600080fd5b600080600060608486031215611bd357600080fd5b8335611bde81611ba9565b95602085013595506040909401359392505050565b600060208284031215611c0557600080fd5b813561062581611ba9565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215611c4d57600080fd5b8235611c5881611ba9565b915060208301356001600160401b0380821115611c7457600080fd5b818501915085601f830112611c8857600080fd5b813581811115611c9a57611c9a611c24565b604051601f8201601f19908116603f01168101908382118183101715611cc257611cc2611c24565b81604052828152886020848701011115611cdb57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b60008060408385031215611d1057600080fd5b8235611d1b81611ba9565b946020939093013593505050565b600080600080600060a08688031215611d4157600080fd5b8535611d4c81611ba9565b94506020860135935060408601359250606086013563ffffffff81168114611d7357600080fd5b949793965091946080013592915050565b60008060408385031215611d9757600080fd5b50508035926020909101359150565b634e487b7160e01b600052601160045260246000fd5b600082821015611dce57611dce611da6565b500390565b93845260208401929092526040830152606082015260800190565b600060208284031215611e0057600080fd5b815161062581611ba9565b6020808252602c908201526000805160206120d883398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c908201526000805160206120d883398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6000816000190483118215151615611e9957611e99611da6565b500290565b634e487b7160e01b600052601260045260246000fd5b600082611ec357611ec3611e9e565b500490565b6000600019821415611edc57611edc611da6565b5060010190565b600060208284031215611ef557600080fd5b815160ff8116811461062557600080fd5b600181815b80851115611f41578160001904821115611f2757611f27611da6565b80851615611f3457918102915b93841c9390800290611f0b565b509250929050565b600082611f5857506001610d25565b81611f6557506000610d25565b8160018114611f7b5760028114611f8557611fa1565b6001915050610d25565b60ff841115611f9657611f96611da6565b50506001821b610d25565b5060208310610133831016604e8410600b8410161715611fc4575081810a610d25565b611fce8383611f06565b8060001904821115611fe257611fe2611da6565b029392505050565b60006106258383611f49565b60008261200557612005611e9e565b500690565b938452602084019290925263ffffffff166040830152606082015260800190565b60006020828403121561203d57600080fd5b5051919050565b6000821982111561205757612057611da6565b500190565b60005b8381101561207757818101518382015260200161205f565b83811115610f225750506000910152565b6000825161209a81846020870161205c565b9190910192915050565b60208152600082518060208401526120c381604085016020870161205c565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564ed639966d5b0a89f5ac16d6359c7707785de6e51a00f07dd3197e5fbf0a30374a2646970667358221220095224ac4733fb73f40c6a49a534b283bd6a0cae0d7c60c8b88254fd1eefa52864736f6c63430008080033";
616
616
 
617
617
  type GoodMarketMakerConstructorParams =
618
618
  | [signer?: Signer]
package/types/factories/GoodReserveCDai__factory.ts CHANGED
@@ -1382,7 +1382,7 @@ const _abi = [
1382
1382
  ];
1383
1383
 
1384
1384
  const _bytecode =
1385
- "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c614b8d61004b600039600081816112c4015281816113040152818161154501526115850152614b8d6000f3fe6080604052600436106102a75760003560e01c806301ffc9a7146102ac57806306fdde03146102e1578063095ea7b3146103035780630cd865ec1461032357806318160ddd146103455780631b3c90a8146103655780631de778a51461037a57806322c65b39146103af57806323b872dd146103c6578063248a9ca3146103e65780632c387275146104065780632f2ff15d14610434578063313ce56714610454578063355274ea1461047057806336568abe146104875780633659cfe6146104a757806339509351146104c75780633e6326fc146104e75780633f4ba83a1461050757806340c10f191461051c5780634162169f1461053c57806342966c681461055c5780634899bb271461057c5780634cd88b76146105a45780634f1ef286146105c45780634f8f0218146105d757806359a87bc1146105f75780635aef7de6146106175780635c975abb1461063757806370a082311461065057806379cc6790146106705780638456cb59146106905780639010d07c146106a557806391d14854146106c557806395d89b41146106e55780639d1b464a146106fa5780639f2d0d071461070f578063a217fddf1461072f578063a457c2d714610744578063a49bb68d14610764578063a7ca8c7d14610797578063a9059cbb146107b9578063acea21d0146107d9578063bbc19ab0146107ee578063bc3a429b14610805578063be13f47c1461081a578063c1786ab21461083a578063ca15c8731461085a578063d53913931461087a578063d547741f1461089c578063dd62ed3e146108bc578063df20c4af14610903578063e092b06714610934578063e1758bd814610949578063e2b0caef1461095e578063e63ab1e91461097a578063efbe1c1c1461099c578063f2c65bf9146109b1578063f8a9978f146109d2578063fa7f8fa3146109f2575b600080fd5b3480156102b857600080fd5b506102cc6102c7366004614277565b610a12565b60405190151581526020015b60405180910390f35b3480156102ed57600080fd5b506102f6610a3d565b6040516102d891906142cd565b34801561030f57600080fd5b506102cc61031e366004614315565b610ad0565b34801561032f57600080fd5b5061034361033e366004614341565b610ae6565b005b34801561035157600080fd5b50610164545b6040519081526020016102d8565b34801561037157600080fd5b50610343610c10565b34801561038657600080fd5b5061039a61039536600461435e565b610d55565b604080519283526020830191909152016102d8565b3480156103bb57600080fd5b506103576102605481565b3480156103d257600080fd5b506102cc6103e1366004614397565b6111ac565b3480156103f257600080fd5b506103576104013660046143d8565b611259565b34801561041257600080fd5b5061025e54610427906001600160a01b031681565b6040516102d891906143f1565b34801561044057600080fd5b5061034361044f366004614405565b61126e565b34801561046057600080fd5b50604051600281526020016102d8565b34801561047c57600080fd5b5061035761025c5481565b34801561049357600080fd5b506103436104a2366004614405565b611296565b3480156104b357600080fd5b506103436104c2366004614341565b6112b9565b3480156104d357600080fd5b506102cc6104e2366004614315565b61137f565b3480156104f357600080fd5b50606754610427906001600160a01b031681565b34801561051357600080fd5b506103436113bc565b34801561052857600080fd5b50610343610537366004614315565b61143a565b34801561054857600080fd5b50606554610427906001600160a01b031681565b34801561056857600080fd5b506103436105773660046143d8565b6114b9565b34801561058857600080fd5b506102625461042790600160201b90046001600160a01b031681565b3480156105b057600080fd5b506103436105bf3660046144e0565b6114c3565b6103436105d2366004614543565b61153a565b3480156105e357600080fd5b5061039a6105f236600461459c565b6115f0565b34801561060357600080fd5b5061035761061236600461435e565b611b3b565b34801561062357600080fd5b50606654610427906001600160a01b031681565b34801561064357600080fd5b506101c65460ff166102cc565b34801561065c57600080fd5b5061035761066b366004614341565b611e6e565b34801561067c57600080fd5b5061034361068b366004614315565b611e8a565b34801561069c57600080fd5b50610343611f0b565b3480156106b157600080fd5b506104276106c03660046145e6565b611f85565b3480156106d157600080fd5b506102cc6106e0366004614405565b611f9e565b3480156106f157600080fd5b506102f6611fc9565b34801561070657600080fd5b50610357611fd9565b34801561071b57600080fd5b5061034361072a3660046145e6565b61206a565b34801561073b57600080fd5b50610357600081565b34801561075057600080fd5b506102cc61075f366004614315565b6120e1565b34801561077057600080fd5b50610262546107829063ffffffff1681565b60405163ffffffff90911681526020016102d8565b3480156107a357600080fd5b50610357600080516020614a7183398151915281565b3480156107c557600080fd5b506102cc6107d4366004614315565b61217b565b3480156107e557600080fd5b50610357612188565b3480156107fa57600080fd5b5061035761025d5481565b34801561081157600080fd5b50610343612247565b34801561082657600080fd5b50610343610835366004614315565b612418565b34801561084657600080fd5b506102cc610855366004614608565b612560565b34801561086657600080fd5b506103576108753660046143d8565b61257f565b34801561088657600080fd5b50610357600080516020614b1883398151915281565b3480156108a857600080fd5b506103436108b7366004614405565b612597565b3480156108c857600080fd5b506103576108d736600461463d565b6001600160a01b0391821660009081526101636020908152604080832093909416825291909152205490565b34801561090f57600080fd5b506102cc61091e366004614341565b6102616020526000908152604090205460ff1681565b34801561094057600080fd5b506104276125a1565b34801561095557600080fd5b5061042761263b565b34801561096a57600080fd5b5060006040516102d8919061466b565b34801561098657600080fd5b50610357600080516020614ad183398151915281565b3480156109a857600080fd5b5061034361266a565b3480156109bd57600080fd5b5061025f54610427906001600160a01b031681565b3480156109de57600080fd5b506103436109ed366004614397565b612a51565b3480156109fe57600080fd5b50610343610a0d366004614693565b612ace565b60006001600160e01b03198216635a05180f60e01b1480610a375750610a3782612b4d565b92915050565b60606101658054610a4d906146ca565b80601f0160208091040260200160405190810160405280929190818152602001828054610a79906146ca565b8015610ac65780601f10610a9b57610100808354040283529160200191610ac6565b820191906000526020600020905b815481529060010190602001808311610aa957829003601f168201915b5050505050905090565b6000610add338484612b82565b50600192915050565b610aee612ca7565b6066546040516370a0823160e01b81526001600160a01b038084169263a9059cbb9291169083906370a0823190610b299030906004016143f1565b60206040518083038186803b158015610b4157600080fd5b505afa158015610b55573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b799190614705565b6040518363ffffffff1660e01b8152600401610b9692919061471e565b602060405180830381600087803b158015610bb057600080fd5b505af1158015610bc4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610be89190614737565b610c0d5760405162461bcd60e51b8152600401610c0490614759565b60405180910390fd5b50565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610c6e57600080fd5b505afa158015610c82573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ca6919061478a565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610cfb57600080fd5b505afa158015610d0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d33919061478a565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b61025f5460405163140e25ad60e31b81526004810185905260009182916001600160a01b039091169063a0712d6890602401602060405180830381600087803b158015610da157600080fd5b505af1158015610db5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dd99190614705565b50600084846001600160a01b03166370a08231306040518263ffffffff1660e01b8152600401610e0991906143f1565b60206040518083038186803b158015610e2157600080fd5b505afa158015610e35573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e599190614705565b610e6391906147bd565b90506000610e6f6125a1565b6001600160a01b03166374920d3086846040518363ffffffff1660e01b8152600401610e9c92919061471e565b602060405180830381600087803b158015610eb657600080fd5b505af1158015610eca573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610eee9190614705565b90506000610efa6125a1565b6001600160a01b031663e72a0833876040518263ffffffff1660e01b8152600401610f2591906143f1565b602060405180830381600087803b158015610f3f57600080fd5b505af1158015610f53573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f779190614705565b4361025d559050600080610f8b83856147d4565b6102625490915063ffffffff1615801590610fb8575061026254600160201b90046001600160a01b031615155b156110bd576102625461271090610fd59063ffffffff16856147ec565b610fdf919061480b565b9150610feb82826147bd565b6102625490915061100e90600160201b90046001600160a01b0316836000612d79565b61026254604051630a8ba38960e41b815260048101849052600160201b9091046001600160a01b03169063a8ba389090602401600060405180830381600087803b15801561105b57600080fd5b505af192505050801561106c575060015b507fde41b9edcefe436997b5c8dc42cf65415ed297bb2f7afd4c3b62570ef7ca092261026260049054906101000a90046001600160a01b0316836040516110b492919061471e565b60405180910390a15b60675460405163bf40fac160e01b8152611145916001600160a01b03169063bf40fac1906110ed9060040161482d565b60206040518083038186803b15801561110557600080fd5b505afa158015611119573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061113d919061478a565b826000612d79565b61025d546040805187815260208101879052908101859052606081018390526001600160a01b038a1691907f1a962236b7c7b3d7b9f6b56036cbce44ab2f93a22b0827d2f2a92a8f055552b99060800160405180910390a399939850929650505050505050565b60006111b98484846130e6565b6001600160a01b0384166000908152610163602090815260408083203384529091529020548281101561123f5760405162461bcd60e51b815260206004820152602860248201527f45524332303a207472616e7366657220616d6f756e74206578636565647320616044820152676c6c6f77616e636560c01b6064820152608401610c04565b61124c8533858403612b82565b60019150505b9392505050565b600090815260fe602052604090206001015490565b61127882826132af565b60008281526101306020526040902061129190826132cc565b505050565b6112a082826132e1565b600082815261013060205260409020611291908261335b565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156113025760405162461bcd60e51b8152600401610c0490614853565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316611334613370565b6001600160a01b03161461135a5760405162461bcd60e51b8152600401610c049061488d565b6113638161338c565b60408051600080825260208201909252610c0d91839190613394565b336000818152610163602090815260408083206001600160a01b03871684529091528120549091610add9185906113b79086906147d4565b612b82565b6113d4600080516020614ad183398151915233611f9e565b6114305760405162461bcd60e51b81526020600482015260396024820152600080516020614a5183398151915260448201527876652070617573657220726f6c6520746f20756e706175736560381b6064820152608401610c04565b6114386134d4565b565b611452600080516020614b1883398151915233611f9e565b6114ab5760405162461bcd60e51b81526020600482015260366024820152600080516020614a518339815191526044820152751d99481b5a5b9d195c881c9bdb19481d1bc81b5a5b9d60521b6064820152608401610c04565b6114b58282613563565b5050565b610c0d338261363e565b600054610100900460ff16806114dc575060005460ff16155b6114f85760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff1615801561151a576000805461ffff19166101011790555b6115248383613789565b8015611291576000805461ff0019169055505050565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156115835760405162461bcd60e51b8152600401610c0490614853565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166115b5613370565b6001600160a01b0316146115db5760405162461bcd60e51b8152600401610c049061488d565b6115e48261338c565b6114b582826001613394565b6000806116006101c65460ff1690565b1561161d5760405162461bcd60e51b8152600401610c0490614915565b60006116276125a1565b60675460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac19061165690600401614935565b60206040518083038186803b15801561166e57600080fd5b505afa158015611682573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116a6919061478a565b6001600160a01b0316336001600160a01b03161461179f5760675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906116ec9060040161495e565b60206040518083038186803b15801561170457600080fd5b505afa158015611718573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061173c919061478a565b6001600160a01b03166379cc679033896040518363ffffffff1660e01b815260040161176992919061471e565b600060405180830381600087803b15801561178357600080fd5b505af1158015611797573d6000803e3d6000fd5b505050503393505b6001600160a01b038516156117b457846117b6565b335b945060006117c385611e6e565b90506000888211156117d557886117d7565b815b905080156117e9576117e9868261363e565b600089808310156119595760675460405163bf40fac160e01b815260206004820152601860248201527721a7a72a2924a12aaa24a7a72fa1a0a621aaa620aa24a7a760411b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561186057600080fd5b505afa158015611874573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611898919061478a565b61025f546001600160a01b0391821691632cfa94fe91889130918d91166118bf89886147bd565b60405160e087901b6001600160e01b03191681526001600160a01b039586166004820152938516602485015291841660448401529092166064820152608481019190915260a40160206040518083038186803b15801561191e57600080fd5b505afa158015611932573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119569190614705565b91505b61025f5460405163058c243360e11b81526001600160a01b0391821660048201526024810183905260448101849052600091871690630b18486690606401602060405180830381600087803b1580156119b157600080fd5b505af11580156119c5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119e99190614705565b90508a811015611a4c5760405162461bcd60e51b815260206004820152602860248201527f546f6b656e2072657475726e206d7573742062652061626f766520746865206d60448201526734b72932ba3ab93760c11b6064820152608401610c04565b61025f5460405163a9059cbb60e01b81526001600160a01b039091169063a9059cbb90611a7f908d90859060040161471e565b602060405180830381600087803b158015611a9957600080fd5b505af1158015611aad573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ad19190614737565b5061025f54604080518e8152602081018690529081018390526001600160a01b03808d1692811691908c16907f067ad67f3f4d17211f9f929d19036c2395bbc9b201d517e46e81f9ceae86032e9060600160405180910390a49b919a509098505050505050505050565b61025f546000906001600160a01b031681611b546125a1565b6001600160a01b031663cce7ec1383886040518363ffffffff1660e01b8152600401611b8192919061471e565b602060405180830381600087803b158015611b9b57600080fd5b505af1158015611baf573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611bd39190614705565b90506001600160a01b03841615611bea5783611bec565b335b60675460405163bf40fac160e01b81529195506000916001600160a01b039091169063bf40fac190611c2090600401614935565b60206040518083038186803b158015611c3857600080fd5b505afa158015611c4c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c70919061478a565b9050336001600160a01b03821614611d81576040516323b872dd60e01b8152336004820152306024820152604481018890526001600160a01b038416906323b872dd90606401602060405180830381600087803b158015611cd057600080fd5b505af1158015611ce4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d089190614737565b1515600114611d81576040805162461bcd60e51b81526020600482015260248101919091527f7472616e7366657246726f6d206661696c65642c206d616b652073757265207960448201527f6f7520617070726f76656420696e70757420746f6b656e207472616e736665726064820152608401610c04565b85821015611ddf5760405162461bcd60e51b815260206004820152602560248201527f47442072657475726e206d7573742062652061626f766520746865206d696e5260448201526432ba3ab93760d91b6064820152608401610c04565b611deb85836001612d79565b611df585836114ab565b61025f546001600160a01b03868116918116908316331415611e175732611e19565b335b6001600160a01b03167fcace70a03cbf3e4fa942b0ab9f70aa3834cfab0a31aa75bc4895262063444e128a86604051611e5c929190918252602082015260400190565b60405180910390a45095945050505050565b6001600160a01b03166000908152610162602052604090205490565b6000611e9683336108d7565b905081811015611ef45760405162461bcd60e51b8152602060048201526024808201527f45524332303a206275726e20616d6f756e74206578636565647320616c6c6f77604482015263616e636560e01b6064820152608401610c04565b611f018333848403612b82565b611291838361363e565b611f23600080516020614ad183398151915233611f9e565b611f7d5760405162461bcd60e51b81526020600482015260376024820152600080516020614a5183398151915260448201527676652070617573657220726f6c6520746f20706175736560481b6064820152608401610c04565b61143861382c565b60008281526101306020526040812061125290836138a9565b600091825260fe602090815260408084206001600160a01b0393909316845291905290205460ff1690565b60606101668054610a4d906146ca565b6000611fe36125a1565b61025f5460405163e9833c2f60e01b81526001600160a01b039283169263e9833c2f92612015929116906004016143f1565b60206040518083038186803b15801561202d57600080fd5b505afa158015612041573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120659190614705565b905090565b612072612ca7565b61207a6125a1565b604051639f2d0d0760e01b815260048101849052602481018390526001600160a01b039190911690639f2d0d0790604401600060405180830381600087803b1580156120c557600080fd5b505af11580156120d9573d6000803e3d6000fd5b505050505050565b336000908152610163602090815260408083206001600160a01b0386168452909152812054828110156121645760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610c04565b6121713385858403612b82565b5060019392505050565b6000610add3384846130e6565b61025f546040805163182df0f560e01b815290516000926001600160a01b0316916b204fce5e3e2502611000000091839163182df0f5916004808301926020929190829003018186803b1580156121de57600080fd5b505afa1580156121f2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122169190614705565b61221e611fd9565b61222d906402540be4006147ec565b61223791906147ec565b612241919061480b565b91505090565b60675460405163bf40fac160e01b815260206004820152600360248201526244414960e81b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561229e57600080fd5b505afa1580156122b2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122d6919061478a565b61025e80546001600160a01b0319166001600160a01b0392831617905560675460405163bf40fac160e01b815260206004808301919091526024820152634344414960e01b604482015291169063bf40fac19060640160206040518083038186803b15801561234457600080fd5b505afa158015612358573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061237c919061478a565b61025f80546001600160a01b0319166001600160a01b0392831690811790915561025e5460405163095ea7b360e01b815292169163095ea7b3916123c6916000199060040161471e565b602060405180830381600087803b1580156123e057600080fd5b505af11580156123f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c0d9190614737565b600054610100900460ff1680612431575060005460ff16155b61244d5760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff1615801561246f576000805461ffff19166101011790555b6124af6040518060400160405280600381526020016208e88b60eb1b8152506040518060400160405280600381526020016208e48b60eb1b815250613789565b6124b8836138b5565b6124c0612247565b6124d8600080516020614b1883398151915233611296565b6124f0600080516020614ad183398151915233611296565b6124fb600033611296565b606654612513906000906001600160a01b03166138d8565b60665461253890600080516020614a71833981519152906001600160a01b03166138d8565b6607d0e36a81800061025c556102608290558015611291576000805461ff0019169055505050565b600081696d696e74546f6b656e7360b01b141561217157506000611252565b600081815261013060205260408120610a37906138e2565b6112a082826138ec565b60675460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526000916001600160a01b03169063bf40fac1906064015b60206040518083038186803b15801561260357600080fd5b505afa158015612617573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612065919061478a565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906125eb9060040161495e565b612672612ca7565b61025f546040516370a0823160e01b81526000916001600160a01b0316906370a08231906126a49030906004016143f1565b60206040518083038186803b1580156126bc57600080fd5b505afa1580156126d0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906126f49190614705565b11156128135761025f546066546040516370a0823160e01b81526001600160a01b039283169263a9059cbb92169083906370a08231906127389030906004016143f1565b60206040518083038186803b15801561275057600080fd5b505afa158015612764573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906127889190614705565b6040518363ffffffff1660e01b81526004016127a592919061471e565b602060405180830381600087803b1580156127bf57600080fd5b505af11580156127d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906127f79190614737565b6128135760405162461bcd60e51b8152600401610c0490614759565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906128429060040161495e565b60206040518083038186803b15801561285a57600080fd5b505afa15801561286e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612892919061478a565b6066546040516355138f0d60e11b81529192506001600160a01b038084169263aa271e1a926128c59216906004016143f1565b60206040518083038186803b1580156128dd57600080fd5b505afa1580156128f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906129159190614737565b61297e57606654604051634c1d96ab60e11b81526001600160a01b038381169263983b2d569261294b92909116906004016143f1565b600060405180830381600087803b15801561296557600080fd5b505af1158015612979573d6000803e3d6000fd5b505050505b60675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906129ac9060040161495e565b60206040518083038186803b1580156129c457600080fd5b505afa1580156129d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906129fc919061478a565b6001600160a01b031663986502756040518163ffffffff1660e01b8152600401600060405180830381600087803b158015612a3657600080fd5b505af1158015612a4a573d6000803e3d6000fd5b5050505050565b612a596125a1565b6001600160a01b031663d5dc7eda84836040518363ffffffff1660e01b8152600401612a8692919061471e565b600060405180830381600087803b158015612aa057600080fd5b505af1158015612ab4573d6000803e3d6000fd5b50505050612ac482826000612d79565b61129182826114ab565b612ad6612ca7565b61026280546001600160c01b031916600160201b6001600160a01b03851690810263ffffffff19169190911763ffffffff84169081179092556040805191825260208201929092527f0fa8d325f44a93da78a029607ba0c95db6a44fa32278f04de5396797a4306ead910160405180910390a15050565b60006001600160e01b03198216637965db0b60e01b1480610a3757506301ffc9a760e01b6001600160e01b0319831614610a37565b6001600160a01b038316612be45760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610c04565b6001600160a01b038216612c455760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610c04565b6001600160a01b038381166000818152610163602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b158015612ceb57600080fd5b505afa158015612cff573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612d23919061478a565b6001600160a01b0316146114385760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610c04565b6101c65460ff1615612d9d5760405162461bcd60e51b8152600401610c0490614915565b8080612e37575060675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190612dd29060040161482d565b60206040518083038186803b158015612dea57600080fd5b505afa158015612dfe573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612e22919061478a565b6001600160a01b0316336001600160a01b0316145b80612e555750612e55600080516020614a7183398151915233611f9e565b612e9d5760405162461bcd60e51b815260206004820152601960248201527823b7b7b22932b9b2b93b329d103737ba10309036b4b73a32b960391b6044820152606401610c04565b61025c5460675460405163bf40fac160e01b815284916001600160a01b03169063bf40fac190612ecf9060040161495e565b60206040518083038186803b158015612ee757600080fd5b505afa158015612efb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f1f919061478a565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b158015612f5757600080fd5b505afa158015612f6b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f8f9190614705565b612f9991906147d4565b1115612fe35760405162461bcd60e51b815260206004820152601960248201527811dbdbd914995cd95c9d994e8818d85c08195b999bdc98d959603a1b6044820152606401610c04565b60675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906130119060040161495e565b60206040518083038186803b15801561302957600080fd5b505afa15801561303d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613061919061478a565b6001600160a01b03166340c10f1984846040518363ffffffff1660e01b815260040161308e92919061471e565b602060405180830381600087803b1580156130a857600080fd5b505af11580156130bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906130e09190614705565b50505050565b6001600160a01b03831661314a5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610c04565b6001600160a01b0382166131ac5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610c04565b6131b7838383613909565b6001600160a01b03831660009081526101626020526040902054818110156132305760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610c04565b6001600160a01b03808516600090815261016260205260408082208585039055918516815290812080548492906132689084906147d4565b92505081905550826001600160a01b0316846001600160a01b0316600080516020614b38833981519152846040516132a291815260200190565b60405180910390a36130e0565b6132b882611259565b6132c28133613914565b6112918383613978565b6000611252836001600160a01b0384166139fe565b6001600160a01b03811633146133515760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b6064820152608401610c04565b6114b58282613a4d565b6000611252836001600160a01b038416613ab4565b600080516020614ab1833981519152546001600160a01b031690565b610c0d612ca7565b600061339e613370565b90506133a984613ba7565b6000835111806133b65750815b156133c7576133c58484613c3a565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16612a4a57805460ff191660011781556040516134429086906134139085906024016143f1565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b179052613c3a565b50805460ff19168155613453613370565b6001600160a01b0316826001600160a01b0316146134cb5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610c04565b612a4a85613d25565b6101c65460ff1661351e5760405162461bcd60e51b815260206004820152601460248201527314185d5cd8589b194e881b9bdd081c185d5cd95960621b6044820152606401610c04565b6101c6805460ff191690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b60405161355991906143f1565b60405180910390a1565b6001600160a01b0382166135b95760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610c04565b6135c560008383613909565b8061016460008282546135d891906147d4565b90915550506001600160a01b03821660009081526101626020526040812080548392906136069084906147d4565b90915550506040518181526001600160a01b03831690600090600080516020614b388339815191529060200160405180910390a35050565b6001600160a01b03821661369e5760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610c04565b6136aa82600083613909565b6001600160a01b038216600090815261016260205260409020548181101561371f5760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610c04565b6001600160a01b038316600090815261016260205260408120838303905561016480548492906137509084906147bd565b90915550506040518281526000906001600160a01b03851690600080516020614b388339815191529060200160405180910390a3505050565b600054610100900460ff16806137a2575060005460ff16155b6137be5760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff161580156137e0576000805461ffff19166101011790555b6137e8613d65565b6137f0613d65565b6137f8613d65565b613800613d65565b61380a8383613dd0565b613812613d65565b61381a613e67565b613822613d65565b6115248383613edd565b6101c65460ff16156138735760405162461bcd60e51b815260206004820152601060248201526f14185d5cd8589b194e881c185d5cd95960821b6044820152606401610c04565b6101c6805460ff191660011790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a25861354c3390565b60006112528383613f6f565b606780546001600160a01b0319166001600160a01b038316179055610c0d610c10565b6112788282613f99565b6000610a37825490565b6138f582611259565b6138ff8133613914565b6112918383613a4d565b611291838383613fa3565b61391e8282611f9e565b6114b557613936816001600160a01b0316601461400a565b61394183602061400a565b604051602001613952929190614982565b60408051601f198184030181529082905262461bcd60e51b8252610c04916004016142cd565b6139828282611f9e565b6114b557600082815260fe602090815260408083206001600160a01b03851684529091529020805460ff191660011790556139ba3390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b6000818152600183016020526040812054613a4557508154600181810184556000848152602080822090930184905584548482528286019093526040902091909155610a37565b506000610a37565b613a578282611f9e565b156114b557600082815260fe602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b60008181526001830160205260408120548015613b9d576000613ad86001836147bd565b8554909150600090613aec906001906147bd565b9050818114613b51576000866000018281548110613b0c57613b0c6149f1565b9060005260206000200154905080876000018481548110613b2f57613b2f6149f1565b6000918252602080832090910192909255918252600188019052604090208390555b8554869080613b6257613b62614a07565b600190038181906000526020600020016000905590558560010160008681526020019081526020016000206000905560019350505050610a37565b6000915050610a37565b803b613c0b5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610c04565b600080516020614ab183398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b613c995760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610c04565b600080846001600160a01b031684604051613cb49190614a1d565b600060405180830381855af49150503d8060008114613cef576040519150601f19603f3d011682016040523d82523d6000602084013e613cf4565b606091505b5091509150613d1c8282604051806060016040528060278152602001614af1602791396141a5565b95945050505050565b613d2e81613ba7565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b600054610100900460ff1680613d7e575060005460ff16155b613d9a5760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff16158015613dbc576000805461ffff19166101011790555b8015610c0d576000805461ff001916905550565b600054610100900460ff1680613de9575060005460ff16155b613e055760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff16158015613e27576000805461ffff19166101011790555b8251613e3b906101659060208601906141de565b508151613e50906101669060208501906141de565b508015611291576000805461ff0019169055505050565b600054610100900460ff1680613e80575060005460ff16155b613e9c5760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff16158015613ebe576000805461ffff19166101011790555b6101c6805460ff191690558015610c0d576000805461ff001916905550565b600054610100900460ff1680613ef6575060005460ff16155b613f125760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff16158015613f34576000805461ffff19166101011790555b613f3f6000336138d8565b613f57600080516020614b18833981519152336138d8565b611524600080516020614ad1833981519152336138d8565b6000826000018281548110613f8657613f866149f1565b9060005260206000200154905092915050565b6114b58282613978565b6101c65460ff16156112915760405162461bcd60e51b815260206004820152602a60248201527f45524332305061757361626c653a20746f6b656e207472616e736665722077686044820152691a5b19481c185d5cd95960b21b6064820152608401610c04565b606060006140198360026147ec565b6140249060026147d4565b6001600160401b0381111561403b5761403b614435565b6040519080825280601f01601f191660200182016040528015614065576020820181803683370190505b509050600360fc1b81600081518110614080576140806149f1565b60200101906001600160f81b031916908160001a905350600f60fb1b816001815181106140af576140af6149f1565b60200101906001600160f81b031916908160001a90535060006140d38460026147ec565b6140de9060016147d4565b90505b6001811115614156576f181899199a1a9b1b9c1cb0b131b232b360811b85600f1660108110614112576141126149f1565b1a60f81b828281518110614128576141286149f1565b60200101906001600160f81b031916908160001a90535060049490941c9361414f81614a39565b90506140e1565b5083156112525760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610c04565b606083156141b4575081611252565b8251156141c45782518084602001fd5b8160405162461bcd60e51b8152600401610c0491906142cd565b8280546141ea906146ca565b90600052602060002090601f01602090048101928261420c5760008555614252565b82601f1061422557805160ff1916838001178555614252565b82800160010185558215614252579182015b82811115614252578251825591602001919060010190614237565b5061425e929150614262565b5090565b5b8082111561425e5760008155600101614263565b60006020828403121561428957600080fd5b81356001600160e01b03198116811461125257600080fd5b60005b838110156142bc5781810151838201526020016142a4565b838111156130e05750506000910152565b60208152600082518060208401526142ec8160408501602087016142a1565b601f01601f19169190910160400192915050565b6001600160a01b0381168114610c0d57600080fd5b6000806040838503121561432857600080fd5b823561433381614300565b946020939093013593505050565b60006020828403121561435357600080fd5b813561125281614300565b60008060006060848603121561437357600080fd5b8335925060208401359150604084013561438c81614300565b809150509250925092565b6000806000606084860312156143ac57600080fd5b83356143b781614300565b925060208401356143c781614300565b929592945050506040919091013590565b6000602082840312156143ea57600080fd5b5035919050565b6001600160a01b0391909116815260200190565b6000806040838503121561441857600080fd5b82359150602083013561442a81614300565b809150509250929050565b634e487b7160e01b600052604160045260246000fd5b60006001600160401b038084111561446557614465614435565b604051601f8501601f19908116603f0116810190828211818310171561448d5761448d614435565b816040528093508581528686860111156144a657600080fd5b858560208301376000602087830101525050509392505050565b600082601f8301126144d157600080fd5b6112528383356020850161444b565b600080604083850312156144f357600080fd5b82356001600160401b038082111561450a57600080fd5b614516868387016144c0565b9350602085013591508082111561452c57600080fd5b50614539858286016144c0565b9150509250929050565b6000806040838503121561455657600080fd5b823561456181614300565b915060208301356001600160401b0381111561457c57600080fd5b8301601f8101851361458d57600080fd5b6145398582356020840161444b565b600080600080608085870312156145b257600080fd5b843593506020850135925060408501356145cb81614300565b915060608501356145db81614300565b939692955090935050565b600080604083850312156145f957600080fd5b50508035926020909101359150565b60008060006060848603121561461d57600080fd5b833561462881614300565b95602085013595506040909401359392505050565b6000806040838503121561465057600080fd5b823561465b81614300565b9150602083013561442a81614300565b602081016003831061468d57634e487b7160e01b600052602160045260246000fd5b91905290565b600080604083850312156146a657600080fd5b82356146b181614300565b9150602083013563ffffffff8116811461442a57600080fd5b600181811c908216806146de57607f821691505b602082108114156146ff57634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561471757600080fd5b5051919050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561474957600080fd5b8151801515811461125257600080fd5b6020808252601790820152761c9958dbdd995c881d1c985b9cd9995c8819985a5b1959604a1b604082015260600190565b60006020828403121561479c57600080fd5b815161125281614300565b634e487b7160e01b600052601160045260246000fd5b6000828210156147cf576147cf6147a7565b500390565b600082198211156147e7576147e76147a7565b500190565b6000816000190483118215151615614806576148066147a7565b500290565b60008261482857634e487b7160e01b600052601260045260246000fd5b500490565b6020808252600c908201526b232aa7222fa6a0a720a3a2a960a11b604082015260600190565b6020808252602c90820152600080516020614a9183398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020614a9183398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b6020808252600690820152651c185d5cd95960d21b604082015260600190565b6020808252600f908201526e22ac21a420a723a2afa422a62822a960891b604082015260600190565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b8152600083516149b48160178501602088016142a1565b7001034b99036b4b9b9b4b733903937b6329607d1b60179184019182015283516149e58160288401602088016142a1565b01602801949350505050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fd5b60008251614a2f8184602087016142a1565b9190910192915050565b600081614a4857614a486147a7565b50600019019056fe45524332305072657365744d696e7465725061757365723a206d75737420686182ce2ced7fc86cde9b16f1f3a5508a82078c42c54a7cf0af011ce529199a18bb46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc65d7a28e3265b37a6474929f336521b332c1681b933f6cb9f3376673440d862a416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c65649f2df0fed2c77648de5860a4cc508cd0818c85b8b8a1ab4ceeef8d981c8956a6ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa2646970667358221220fc2c0bf8b08bb95368f719ec798d71fbe600154aba02ae6949c67ed65861639864736f6c63430008080033";
1385
+ "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c614b8d61004b600039600081816112c4015281816113040152818161154501526115850152614b8d6000f3fe6080604052600436106102a75760003560e01c806301ffc9a7146102ac57806306fdde03146102e1578063095ea7b3146103035780630cd865ec1461032357806318160ddd146103455780631b3c90a8146103655780631de778a51461037a57806322c65b39146103af57806323b872dd146103c6578063248a9ca3146103e65780632c387275146104065780632f2ff15d14610434578063313ce56714610454578063355274ea1461047057806336568abe146104875780633659cfe6146104a757806339509351146104c75780633e6326fc146104e75780633f4ba83a1461050757806340c10f191461051c5780634162169f1461053c57806342966c681461055c5780634899bb271461057c5780634cd88b76146105a45780634f1ef286146105c45780634f8f0218146105d757806359a87bc1146105f75780635aef7de6146106175780635c975abb1461063757806370a082311461065057806379cc6790146106705780638456cb59146106905780639010d07c146106a557806391d14854146106c557806395d89b41146106e55780639d1b464a146106fa5780639f2d0d071461070f578063a217fddf1461072f578063a457c2d714610744578063a49bb68d14610764578063a7ca8c7d14610797578063a9059cbb146107b9578063acea21d0146107d9578063bbc19ab0146107ee578063bc3a429b14610805578063be13f47c1461081a578063c1786ab21461083a578063ca15c8731461085a578063d53913931461087a578063d547741f1461089c578063dd62ed3e146108bc578063df20c4af14610903578063e092b06714610934578063e1758bd814610949578063e2b0caef1461095e578063e63ab1e91461097a578063efbe1c1c1461099c578063f2c65bf9146109b1578063f8a9978f146109d2578063fa7f8fa3146109f2575b600080fd5b3480156102b857600080fd5b506102cc6102c7366004614277565b610a12565b60405190151581526020015b60405180910390f35b3480156102ed57600080fd5b506102f6610a3d565b6040516102d891906142cd565b34801561030f57600080fd5b506102cc61031e366004614315565b610ad0565b34801561032f57600080fd5b5061034361033e366004614341565b610ae6565b005b34801561035157600080fd5b50610164545b6040519081526020016102d8565b34801561037157600080fd5b50610343610c10565b34801561038657600080fd5b5061039a61039536600461435e565b610d55565b604080519283526020830191909152016102d8565b3480156103bb57600080fd5b506103576102605481565b3480156103d257600080fd5b506102cc6103e1366004614397565b6111ac565b3480156103f257600080fd5b506103576104013660046143d8565b611259565b34801561041257600080fd5b5061025e54610427906001600160a01b031681565b6040516102d891906143f1565b34801561044057600080fd5b5061034361044f366004614405565b61126e565b34801561046057600080fd5b50604051600281526020016102d8565b34801561047c57600080fd5b5061035761025c5481565b34801561049357600080fd5b506103436104a2366004614405565b611296565b3480156104b357600080fd5b506103436104c2366004614341565b6112b9565b3480156104d357600080fd5b506102cc6104e2366004614315565b61137f565b3480156104f357600080fd5b50606754610427906001600160a01b031681565b34801561051357600080fd5b506103436113bc565b34801561052857600080fd5b50610343610537366004614315565b61143a565b34801561054857600080fd5b50606554610427906001600160a01b031681565b34801561056857600080fd5b506103436105773660046143d8565b6114b9565b34801561058857600080fd5b506102625461042790600160201b90046001600160a01b031681565b3480156105b057600080fd5b506103436105bf3660046144e0565b6114c3565b6103436105d2366004614543565b61153a565b3480156105e357600080fd5b5061039a6105f236600461459c565b6115f0565b34801561060357600080fd5b5061035761061236600461435e565b611b3b565b34801561062357600080fd5b50606654610427906001600160a01b031681565b34801561064357600080fd5b506101c65460ff166102cc565b34801561065c57600080fd5b5061035761066b366004614341565b611e6e565b34801561067c57600080fd5b5061034361068b366004614315565b611e8a565b34801561069c57600080fd5b50610343611f0b565b3480156106b157600080fd5b506104276106c03660046145e6565b611f85565b3480156106d157600080fd5b506102cc6106e0366004614405565b611f9e565b3480156106f157600080fd5b506102f6611fc9565b34801561070657600080fd5b50610357611fd9565b34801561071b57600080fd5b5061034361072a3660046145e6565b61206a565b34801561073b57600080fd5b50610357600081565b34801561075057600080fd5b506102cc61075f366004614315565b6120e1565b34801561077057600080fd5b50610262546107829063ffffffff1681565b60405163ffffffff90911681526020016102d8565b3480156107a357600080fd5b50610357600080516020614a7183398151915281565b3480156107c557600080fd5b506102cc6107d4366004614315565b61217b565b3480156107e557600080fd5b50610357612188565b3480156107fa57600080fd5b5061035761025d5481565b34801561081157600080fd5b50610343612247565b34801561082657600080fd5b50610343610835366004614315565b612418565b34801561084657600080fd5b506102cc610855366004614608565b612560565b34801561086657600080fd5b506103576108753660046143d8565b61257f565b34801561088657600080fd5b50610357600080516020614b1883398151915281565b3480156108a857600080fd5b506103436108b7366004614405565b612597565b3480156108c857600080fd5b506103576108d736600461463d565b6001600160a01b0391821660009081526101636020908152604080832093909416825291909152205490565b34801561090f57600080fd5b506102cc61091e366004614341565b6102616020526000908152604090205460ff1681565b34801561094057600080fd5b506104276125a1565b34801561095557600080fd5b5061042761263b565b34801561096a57600080fd5b5060006040516102d8919061466b565b34801561098657600080fd5b50610357600080516020614ad183398151915281565b3480156109a857600080fd5b5061034361266a565b3480156109bd57600080fd5b5061025f54610427906001600160a01b031681565b3480156109de57600080fd5b506103436109ed366004614397565b612a51565b3480156109fe57600080fd5b50610343610a0d366004614693565b612ace565b60006001600160e01b03198216635a05180f60e01b1480610a375750610a3782612b4d565b92915050565b60606101658054610a4d906146ca565b80601f0160208091040260200160405190810160405280929190818152602001828054610a79906146ca565b8015610ac65780601f10610a9b57610100808354040283529160200191610ac6565b820191906000526020600020905b815481529060010190602001808311610aa957829003601f168201915b5050505050905090565b6000610add338484612b82565b50600192915050565b610aee612ca7565b6066546040516370a0823160e01b81526001600160a01b038084169263a9059cbb9291169083906370a0823190610b299030906004016143f1565b60206040518083038186803b158015610b4157600080fd5b505afa158015610b55573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b799190614705565b6040518363ffffffff1660e01b8152600401610b9692919061471e565b602060405180830381600087803b158015610bb057600080fd5b505af1158015610bc4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610be89190614737565b610c0d5760405162461bcd60e51b8152600401610c0490614759565b60405180910390fd5b50565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610c6e57600080fd5b505afa158015610c82573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ca6919061478a565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610cfb57600080fd5b505afa158015610d0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d33919061478a565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b61025f5460405163140e25ad60e31b81526004810185905260009182916001600160a01b039091169063a0712d6890602401602060405180830381600087803b158015610da157600080fd5b505af1158015610db5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dd99190614705565b50600084846001600160a01b03166370a08231306040518263ffffffff1660e01b8152600401610e0991906143f1565b60206040518083038186803b158015610e2157600080fd5b505afa158015610e35573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e599190614705565b610e6391906147bd565b90506000610e6f6125a1565b6001600160a01b03166374920d3086846040518363ffffffff1660e01b8152600401610e9c92919061471e565b602060405180830381600087803b158015610eb657600080fd5b505af1158015610eca573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610eee9190614705565b90506000610efa6125a1565b6001600160a01b031663e72a0833876040518263ffffffff1660e01b8152600401610f2591906143f1565b602060405180830381600087803b158015610f3f57600080fd5b505af1158015610f53573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f779190614705565b4361025d559050600080610f8b83856147d4565b6102625490915063ffffffff1615801590610fb8575061026254600160201b90046001600160a01b031615155b156110bd576102625461271090610fd59063ffffffff16856147ec565b610fdf919061480b565b9150610feb82826147bd565b6102625490915061100e90600160201b90046001600160a01b0316836000612d79565b61026254604051630a8ba38960e41b815260048101849052600160201b9091046001600160a01b03169063a8ba389090602401600060405180830381600087803b15801561105b57600080fd5b505af192505050801561106c575060015b507fde41b9edcefe436997b5c8dc42cf65415ed297bb2f7afd4c3b62570ef7ca092261026260049054906101000a90046001600160a01b0316836040516110b492919061471e565b60405180910390a15b60675460405163bf40fac160e01b8152611145916001600160a01b03169063bf40fac1906110ed9060040161482d565b60206040518083038186803b15801561110557600080fd5b505afa158015611119573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061113d919061478a565b826000612d79565b61025d546040805187815260208101879052908101859052606081018390526001600160a01b038a1691907f1a962236b7c7b3d7b9f6b56036cbce44ab2f93a22b0827d2f2a92a8f055552b99060800160405180910390a399939850929650505050505050565b60006111b98484846130e6565b6001600160a01b0384166000908152610163602090815260408083203384529091529020548281101561123f5760405162461bcd60e51b815260206004820152602860248201527f45524332303a207472616e7366657220616d6f756e74206578636565647320616044820152676c6c6f77616e636560c01b6064820152608401610c04565b61124c8533858403612b82565b60019150505b9392505050565b600090815260fe602052604090206001015490565b61127882826132af565b60008281526101306020526040902061129190826132cc565b505050565b6112a082826132e1565b600082815261013060205260409020611291908261335b565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156113025760405162461bcd60e51b8152600401610c0490614853565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316611334613370565b6001600160a01b03161461135a5760405162461bcd60e51b8152600401610c049061488d565b6113638161338c565b60408051600080825260208201909252610c0d91839190613394565b336000818152610163602090815260408083206001600160a01b03871684529091528120549091610add9185906113b79086906147d4565b612b82565b6113d4600080516020614ad183398151915233611f9e565b6114305760405162461bcd60e51b81526020600482015260396024820152600080516020614a5183398151915260448201527876652070617573657220726f6c6520746f20756e706175736560381b6064820152608401610c04565b6114386134d4565b565b611452600080516020614b1883398151915233611f9e565b6114ab5760405162461bcd60e51b81526020600482015260366024820152600080516020614a518339815191526044820152751d99481b5a5b9d195c881c9bdb19481d1bc81b5a5b9d60521b6064820152608401610c04565b6114b58282613563565b5050565b610c0d338261363e565b600054610100900460ff16806114dc575060005460ff16155b6114f85760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff1615801561151a576000805461ffff19166101011790555b6115248383613789565b8015611291576000805461ff0019169055505050565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156115835760405162461bcd60e51b8152600401610c0490614853565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166115b5613370565b6001600160a01b0316146115db5760405162461bcd60e51b8152600401610c049061488d565b6115e48261338c565b6114b582826001613394565b6000806116006101c65460ff1690565b1561161d5760405162461bcd60e51b8152600401610c0490614915565b60006116276125a1565b60675460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac19061165690600401614935565b60206040518083038186803b15801561166e57600080fd5b505afa158015611682573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116a6919061478a565b6001600160a01b0316336001600160a01b03161461179f5760675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906116ec9060040161495e565b60206040518083038186803b15801561170457600080fd5b505afa158015611718573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061173c919061478a565b6001600160a01b03166379cc679033896040518363ffffffff1660e01b815260040161176992919061471e565b600060405180830381600087803b15801561178357600080fd5b505af1158015611797573d6000803e3d6000fd5b505050503393505b6001600160a01b038516156117b457846117b6565b335b945060006117c385611e6e565b90506000888211156117d557886117d7565b815b905080156117e9576117e9868261363e565b600089808310156119595760675460405163bf40fac160e01b815260206004820152601860248201527721a7a72a2924a12aaa24a7a72fa1a0a621aaa620aa24a7a760411b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561186057600080fd5b505afa158015611874573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611898919061478a565b61025f546001600160a01b0391821691632cfa94fe91889130918d91166118bf89886147bd565b60405160e087901b6001600160e01b03191681526001600160a01b039586166004820152938516602485015291841660448401529092166064820152608481019190915260a40160206040518083038186803b15801561191e57600080fd5b505afa158015611932573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119569190614705565b91505b61025f5460405163058c243360e11b81526001600160a01b0391821660048201526024810183905260448101849052600091871690630b18486690606401602060405180830381600087803b1580156119b157600080fd5b505af11580156119c5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119e99190614705565b90508a811015611a4c5760405162461bcd60e51b815260206004820152602860248201527f546f6b656e2072657475726e206d7573742062652061626f766520746865206d60448201526734b72932ba3ab93760c11b6064820152608401610c04565b61025f5460405163a9059cbb60e01b81526001600160a01b039091169063a9059cbb90611a7f908d90859060040161471e565b602060405180830381600087803b158015611a9957600080fd5b505af1158015611aad573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ad19190614737565b5061025f54604080518e8152602081018690529081018390526001600160a01b03808d1692811691908c16907f067ad67f3f4d17211f9f929d19036c2395bbc9b201d517e46e81f9ceae86032e9060600160405180910390a49b919a509098505050505050505050565b61025f546000906001600160a01b031681611b546125a1565b6001600160a01b031663cce7ec1383886040518363ffffffff1660e01b8152600401611b8192919061471e565b602060405180830381600087803b158015611b9b57600080fd5b505af1158015611baf573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611bd39190614705565b90506001600160a01b03841615611bea5783611bec565b335b60675460405163bf40fac160e01b81529195506000916001600160a01b039091169063bf40fac190611c2090600401614935565b60206040518083038186803b158015611c3857600080fd5b505afa158015611c4c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c70919061478a565b9050336001600160a01b03821614611d81576040516323b872dd60e01b8152336004820152306024820152604481018890526001600160a01b038416906323b872dd90606401602060405180830381600087803b158015611cd057600080fd5b505af1158015611ce4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d089190614737565b1515600114611d81576040805162461bcd60e51b81526020600482015260248101919091527f7472616e7366657246726f6d206661696c65642c206d616b652073757265207960448201527f6f7520617070726f76656420696e70757420746f6b656e207472616e736665726064820152608401610c04565b85821015611ddf5760405162461bcd60e51b815260206004820152602560248201527f47442072657475726e206d7573742062652061626f766520746865206d696e5260448201526432ba3ab93760d91b6064820152608401610c04565b611deb85836001612d79565b611df585836114ab565b61025f546001600160a01b03868116918116908316331415611e175732611e19565b335b6001600160a01b03167fcace70a03cbf3e4fa942b0ab9f70aa3834cfab0a31aa75bc4895262063444e128a86604051611e5c929190918252602082015260400190565b60405180910390a45095945050505050565b6001600160a01b03166000908152610162602052604090205490565b6000611e9683336108d7565b905081811015611ef45760405162461bcd60e51b8152602060048201526024808201527f45524332303a206275726e20616d6f756e74206578636565647320616c6c6f77604482015263616e636560e01b6064820152608401610c04565b611f018333848403612b82565b611291838361363e565b611f23600080516020614ad183398151915233611f9e565b611f7d5760405162461bcd60e51b81526020600482015260376024820152600080516020614a5183398151915260448201527676652070617573657220726f6c6520746f20706175736560481b6064820152608401610c04565b61143861382c565b60008281526101306020526040812061125290836138a9565b600091825260fe602090815260408084206001600160a01b0393909316845291905290205460ff1690565b60606101668054610a4d906146ca565b6000611fe36125a1565b61025f5460405163e9833c2f60e01b81526001600160a01b039283169263e9833c2f92612015929116906004016143f1565b60206040518083038186803b15801561202d57600080fd5b505afa158015612041573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120659190614705565b905090565b612072612ca7565b61207a6125a1565b604051639f2d0d0760e01b815260048101849052602481018390526001600160a01b039190911690639f2d0d0790604401600060405180830381600087803b1580156120c557600080fd5b505af11580156120d9573d6000803e3d6000fd5b505050505050565b336000908152610163602090815260408083206001600160a01b0386168452909152812054828110156121645760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610c04565b6121713385858403612b82565b5060019392505050565b6000610add3384846130e6565b61025f546040805163182df0f560e01b815290516000926001600160a01b0316916b204fce5e3e2502611000000091839163182df0f5916004808301926020929190829003018186803b1580156121de57600080fd5b505afa1580156121f2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122169190614705565b61221e611fd9565b61222d906402540be4006147ec565b61223791906147ec565b612241919061480b565b91505090565b60675460405163bf40fac160e01b815260206004820152600360248201526244414960e81b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561229e57600080fd5b505afa1580156122b2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122d6919061478a565b61025e80546001600160a01b0319166001600160a01b0392831617905560675460405163bf40fac160e01b815260206004808301919091526024820152634344414960e01b604482015291169063bf40fac19060640160206040518083038186803b15801561234457600080fd5b505afa158015612358573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061237c919061478a565b61025f80546001600160a01b0319166001600160a01b0392831690811790915561025e5460405163095ea7b360e01b815292169163095ea7b3916123c6916000199060040161471e565b602060405180830381600087803b1580156123e057600080fd5b505af11580156123f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c0d9190614737565b600054610100900460ff1680612431575060005460ff16155b61244d5760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff1615801561246f576000805461ffff19166101011790555b6124af6040518060400160405280600381526020016208e88b60eb1b8152506040518060400160405280600381526020016208e48b60eb1b815250613789565b6124b8836138b5565b6124c0612247565b6124d8600080516020614b1883398151915233611296565b6124f0600080516020614ad183398151915233611296565b6124fb600033611296565b606654612513906000906001600160a01b03166138d8565b60665461253890600080516020614a71833981519152906001600160a01b03166138d8565b6607d0e36a81800061025c556102608290558015611291576000805461ff0019169055505050565b600081696d696e74546f6b656e7360b01b141561217157506000611252565b600081815261013060205260408120610a37906138e2565b6112a082826138ec565b60675460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526000916001600160a01b03169063bf40fac1906064015b60206040518083038186803b15801561260357600080fd5b505afa158015612617573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612065919061478a565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906125eb9060040161495e565b612672612ca7565b61025f546040516370a0823160e01b81526000916001600160a01b0316906370a08231906126a49030906004016143f1565b60206040518083038186803b1580156126bc57600080fd5b505afa1580156126d0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906126f49190614705565b11156128135761025f546066546040516370a0823160e01b81526001600160a01b039283169263a9059cbb92169083906370a08231906127389030906004016143f1565b60206040518083038186803b15801561275057600080fd5b505afa158015612764573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906127889190614705565b6040518363ffffffff1660e01b81526004016127a592919061471e565b602060405180830381600087803b1580156127bf57600080fd5b505af11580156127d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906127f79190614737565b6128135760405162461bcd60e51b8152600401610c0490614759565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906128429060040161495e565b60206040518083038186803b15801561285a57600080fd5b505afa15801561286e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612892919061478a565b6066546040516355138f0d60e11b81529192506001600160a01b038084169263aa271e1a926128c59216906004016143f1565b60206040518083038186803b1580156128dd57600080fd5b505afa1580156128f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906129159190614737565b61297e57606654604051634c1d96ab60e11b81526001600160a01b038381169263983b2d569261294b92909116906004016143f1565b600060405180830381600087803b15801561296557600080fd5b505af1158015612979573d6000803e3d6000fd5b505050505b60675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906129ac9060040161495e565b60206040518083038186803b1580156129c457600080fd5b505afa1580156129d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906129fc919061478a565b6001600160a01b031663986502756040518163ffffffff1660e01b8152600401600060405180830381600087803b158015612a3657600080fd5b505af1158015612a4a573d6000803e3d6000fd5b5050505050565b612a596125a1565b6001600160a01b031663d5dc7eda84836040518363ffffffff1660e01b8152600401612a8692919061471e565b600060405180830381600087803b158015612aa057600080fd5b505af1158015612ab4573d6000803e3d6000fd5b50505050612ac482826000612d79565b61129182826114ab565b612ad6612ca7565b61026280546001600160c01b031916600160201b6001600160a01b03851690810263ffffffff19169190911763ffffffff84169081179092556040805191825260208201929092527f0fa8d325f44a93da78a029607ba0c95db6a44fa32278f04de5396797a4306ead910160405180910390a15050565b60006001600160e01b03198216637965db0b60e01b1480610a3757506301ffc9a760e01b6001600160e01b0319831614610a37565b6001600160a01b038316612be45760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610c04565b6001600160a01b038216612c455760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610c04565b6001600160a01b038381166000818152610163602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b158015612ceb57600080fd5b505afa158015612cff573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612d23919061478a565b6001600160a01b0316146114385760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610c04565b6101c65460ff1615612d9d5760405162461bcd60e51b8152600401610c0490614915565b8080612e37575060675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190612dd29060040161482d565b60206040518083038186803b158015612dea57600080fd5b505afa158015612dfe573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612e22919061478a565b6001600160a01b0316336001600160a01b0316145b80612e555750612e55600080516020614a7183398151915233611f9e565b612e9d5760405162461bcd60e51b815260206004820152601960248201527823b7b7b22932b9b2b93b329d103737ba10309036b4b73a32b960391b6044820152606401610c04565b61025c5460675460405163bf40fac160e01b815284916001600160a01b03169063bf40fac190612ecf9060040161495e565b60206040518083038186803b158015612ee757600080fd5b505afa158015612efb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f1f919061478a565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b158015612f5757600080fd5b505afa158015612f6b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f8f9190614705565b612f9991906147d4565b1115612fe35760405162461bcd60e51b815260206004820152601960248201527811dbdbd914995cd95c9d994e8818d85c08195b999bdc98d959603a1b6044820152606401610c04565b60675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906130119060040161495e565b60206040518083038186803b15801561302957600080fd5b505afa15801561303d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613061919061478a565b6001600160a01b03166340c10f1984846040518363ffffffff1660e01b815260040161308e92919061471e565b602060405180830381600087803b1580156130a857600080fd5b505af11580156130bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906130e09190614705565b50505050565b6001600160a01b03831661314a5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610c04565b6001600160a01b0382166131ac5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610c04565b6131b7838383613909565b6001600160a01b03831660009081526101626020526040902054818110156132305760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610c04565b6001600160a01b03808516600090815261016260205260408082208585039055918516815290812080548492906132689084906147d4565b92505081905550826001600160a01b0316846001600160a01b0316600080516020614b38833981519152846040516132a291815260200190565b60405180910390a36130e0565b6132b882611259565b6132c28133613914565b6112918383613978565b6000611252836001600160a01b0384166139fe565b6001600160a01b03811633146133515760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b6064820152608401610c04565b6114b58282613a4d565b6000611252836001600160a01b038416613ab4565b600080516020614ab1833981519152546001600160a01b031690565b610c0d612ca7565b600061339e613370565b90506133a984613ba7565b6000835111806133b65750815b156133c7576133c58484613c3a565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16612a4a57805460ff191660011781556040516134429086906134139085906024016143f1565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b179052613c3a565b50805460ff19168155613453613370565b6001600160a01b0316826001600160a01b0316146134cb5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610c04565b612a4a85613d25565b6101c65460ff1661351e5760405162461bcd60e51b815260206004820152601460248201527314185d5cd8589b194e881b9bdd081c185d5cd95960621b6044820152606401610c04565b6101c6805460ff191690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b60405161355991906143f1565b60405180910390a1565b6001600160a01b0382166135b95760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610c04565b6135c560008383613909565b8061016460008282546135d891906147d4565b90915550506001600160a01b03821660009081526101626020526040812080548392906136069084906147d4565b90915550506040518181526001600160a01b03831690600090600080516020614b388339815191529060200160405180910390a35050565b6001600160a01b03821661369e5760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610c04565b6136aa82600083613909565b6001600160a01b038216600090815261016260205260409020548181101561371f5760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610c04565b6001600160a01b038316600090815261016260205260408120838303905561016480548492906137509084906147bd565b90915550506040518281526000906001600160a01b03851690600080516020614b388339815191529060200160405180910390a3505050565b600054610100900460ff16806137a2575060005460ff16155b6137be5760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff161580156137e0576000805461ffff19166101011790555b6137e8613d65565b6137f0613d65565b6137f8613d65565b613800613d65565b61380a8383613dd0565b613812613d65565b61381a613e67565b613822613d65565b6115248383613edd565b6101c65460ff16156138735760405162461bcd60e51b815260206004820152601060248201526f14185d5cd8589b194e881c185d5cd95960821b6044820152606401610c04565b6101c6805460ff191660011790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a25861354c3390565b60006112528383613f6f565b606780546001600160a01b0319166001600160a01b038316179055610c0d610c10565b6112788282613f99565b6000610a37825490565b6138f582611259565b6138ff8133613914565b6112918383613a4d565b611291838383613fa3565b61391e8282611f9e565b6114b557613936816001600160a01b0316601461400a565b61394183602061400a565b604051602001613952929190614982565b60408051601f198184030181529082905262461bcd60e51b8252610c04916004016142cd565b6139828282611f9e565b6114b557600082815260fe602090815260408083206001600160a01b03851684529091529020805460ff191660011790556139ba3390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b6000818152600183016020526040812054613a4557508154600181810184556000848152602080822090930184905584548482528286019093526040902091909155610a37565b506000610a37565b613a578282611f9e565b156114b557600082815260fe602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b60008181526001830160205260408120548015613b9d576000613ad86001836147bd565b8554909150600090613aec906001906147bd565b9050818114613b51576000866000018281548110613b0c57613b0c6149f1565b9060005260206000200154905080876000018481548110613b2f57613b2f6149f1565b6000918252602080832090910192909255918252600188019052604090208390555b8554869080613b6257613b62614a07565b600190038181906000526020600020016000905590558560010160008681526020019081526020016000206000905560019350505050610a37565b6000915050610a37565b803b613c0b5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610c04565b600080516020614ab183398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b613c995760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610c04565b600080846001600160a01b031684604051613cb49190614a1d565b600060405180830381855af49150503d8060008114613cef576040519150601f19603f3d011682016040523d82523d6000602084013e613cf4565b606091505b5091509150613d1c8282604051806060016040528060278152602001614af1602791396141a5565b95945050505050565b613d2e81613ba7565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b600054610100900460ff1680613d7e575060005460ff16155b613d9a5760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff16158015613dbc576000805461ffff19166101011790555b8015610c0d576000805461ff001916905550565b600054610100900460ff1680613de9575060005460ff16155b613e055760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff16158015613e27576000805461ffff19166101011790555b8251613e3b906101659060208601906141de565b508151613e50906101669060208501906141de565b508015611291576000805461ff0019169055505050565b600054610100900460ff1680613e80575060005460ff16155b613e9c5760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff16158015613ebe576000805461ffff19166101011790555b6101c6805460ff191690558015610c0d576000805461ff001916905550565b600054610100900460ff1680613ef6575060005460ff16155b613f125760405162461bcd60e51b8152600401610c04906148c7565b600054610100900460ff16158015613f34576000805461ffff19166101011790555b613f3f6000336138d8565b613f57600080516020614b18833981519152336138d8565b611524600080516020614ad1833981519152336138d8565b6000826000018281548110613f8657613f866149f1565b9060005260206000200154905092915050565b6114b58282613978565b6101c65460ff16156112915760405162461bcd60e51b815260206004820152602a60248201527f45524332305061757361626c653a20746f6b656e207472616e736665722077686044820152691a5b19481c185d5cd95960b21b6064820152608401610c04565b606060006140198360026147ec565b6140249060026147d4565b6001600160401b0381111561403b5761403b614435565b6040519080825280601f01601f191660200182016040528015614065576020820181803683370190505b509050600360fc1b81600081518110614080576140806149f1565b60200101906001600160f81b031916908160001a905350600f60fb1b816001815181106140af576140af6149f1565b60200101906001600160f81b031916908160001a90535060006140d38460026147ec565b6140de9060016147d4565b90505b6001811115614156576f181899199a1a9b1b9c1cb0b131b232b360811b85600f1660108110614112576141126149f1565b1a60f81b828281518110614128576141286149f1565b60200101906001600160f81b031916908160001a90535060049490941c9361414f81614a39565b90506140e1565b5083156112525760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610c04565b606083156141b4575081611252565b8251156141c45782518084602001fd5b8160405162461bcd60e51b8152600401610c0491906142cd565b8280546141ea906146ca565b90600052602060002090601f01602090048101928261420c5760008555614252565b82601f1061422557805160ff1916838001178555614252565b82800160010185558215614252579182015b82811115614252578251825591602001919060010190614237565b5061425e929150614262565b5090565b5b8082111561425e5760008155600101614263565b60006020828403121561428957600080fd5b81356001600160e01b03198116811461125257600080fd5b60005b838110156142bc5781810151838201526020016142a4565b838111156130e05750506000910152565b60208152600082518060208401526142ec8160408501602087016142a1565b601f01601f19169190910160400192915050565b6001600160a01b0381168114610c0d57600080fd5b6000806040838503121561432857600080fd5b823561433381614300565b946020939093013593505050565b60006020828403121561435357600080fd5b813561125281614300565b60008060006060848603121561437357600080fd5b8335925060208401359150604084013561438c81614300565b809150509250925092565b6000806000606084860312156143ac57600080fd5b83356143b781614300565b925060208401356143c781614300565b929592945050506040919091013590565b6000602082840312156143ea57600080fd5b5035919050565b6001600160a01b0391909116815260200190565b6000806040838503121561441857600080fd5b82359150602083013561442a81614300565b809150509250929050565b634e487b7160e01b600052604160045260246000fd5b60006001600160401b038084111561446557614465614435565b604051601f8501601f19908116603f0116810190828211818310171561448d5761448d614435565b816040528093508581528686860111156144a657600080fd5b858560208301376000602087830101525050509392505050565b600082601f8301126144d157600080fd5b6112528383356020850161444b565b600080604083850312156144f357600080fd5b82356001600160401b038082111561450a57600080fd5b614516868387016144c0565b9350602085013591508082111561452c57600080fd5b50614539858286016144c0565b9150509250929050565b6000806040838503121561455657600080fd5b823561456181614300565b915060208301356001600160401b0381111561457c57600080fd5b8301601f8101851361458d57600080fd5b6145398582356020840161444b565b600080600080608085870312156145b257600080fd5b843593506020850135925060408501356145cb81614300565b915060608501356145db81614300565b939692955090935050565b600080604083850312156145f957600080fd5b50508035926020909101359150565b60008060006060848603121561461d57600080fd5b833561462881614300565b95602085013595506040909401359392505050565b6000806040838503121561465057600080fd5b823561465b81614300565b9150602083013561442a81614300565b602081016003831061468d57634e487b7160e01b600052602160045260246000fd5b91905290565b600080604083850312156146a657600080fd5b82356146b181614300565b9150602083013563ffffffff8116811461442a57600080fd5b600181811c908216806146de57607f821691505b602082108114156146ff57634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561471757600080fd5b5051919050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561474957600080fd5b8151801515811461125257600080fd5b6020808252601790820152761c9958dbdd995c881d1c985b9cd9995c8819985a5b1959604a1b604082015260600190565b60006020828403121561479c57600080fd5b815161125281614300565b634e487b7160e01b600052601160045260246000fd5b6000828210156147cf576147cf6147a7565b500390565b600082198211156147e7576147e76147a7565b500190565b6000816000190483118215151615614806576148066147a7565b500290565b60008261482857634e487b7160e01b600052601260045260246000fd5b500490565b6020808252600c908201526b232aa7222fa6a0a720a3a2a960a11b604082015260600190565b6020808252602c90820152600080516020614a9183398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020614a9183398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b6020808252600690820152651c185d5cd95960d21b604082015260600190565b6020808252600f908201526e22ac21a420a723a2afa422a62822a960891b604082015260600190565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b8152600083516149b48160178501602088016142a1565b7001034b99036b4b9b9b4b733903937b6329607d1b60179184019182015283516149e58160288401602088016142a1565b01602801949350505050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fd5b60008251614a2f8184602087016142a1565b9190910192915050565b600081614a4857614a486147a7565b50600019019056fe45524332305072657365744d696e7465725061757365723a206d75737420686182ce2ced7fc86cde9b16f1f3a5508a82078c42c54a7cf0af011ce529199a18bb46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc65d7a28e3265b37a6474929f336521b332c1681b933f6cb9f3376673440d862a416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c65649f2df0fed2c77648de5860a4cc508cd0818c85b8b8a1ab4ceeef8d981c8956a6ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa2646970667358221220bc5cb011f15c9a3171e25174ee2d8190e912b03f9be37b3fa0401535217dd9ac64736f6c63430008080033";
1386
1386
 
1387
1387
  type GoodReserveCDaiConstructorParams =
1388
1388
  | [signer?: Signer]
package/types/factories/GovernanceStaking__factory.ts CHANGED
@@ -871,7 +871,7 @@ const _abi = [
871
871
  ];
872
872
 
873
873
  const _bytecode =
874
- "0x60a06040523060601b6080523480156200001857600080fd5b5060405162002f5238038062002f528339810160408190526200003b9162000564565b62000046816200018c565b6101045460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015620000a657600080fd5b505afa158015620000bb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000e1919062000564565b61016980546001600160a01b0319166001600160a01b0392909216919091179055604080518082018252601381527f4724205374616b696e6720466f7220474f4f4400000000000000000000000000602080830191909152825180840190935260038352621cd1c960ea1b908301526200015b91620001b5565b620001756207e9006a01a784379d99db420000006200058b565b306000908152606a60205260409020555062000639565b61010480546001600160a01b0319166001600160a01b038316179055620001b262000248565b50565b600054610100900460ff1680620001cf575060005460ff16155b620001f75760405162461bcd60e51b8152600401620001ee90620005ae565b60405180910390fd5b600054610100900460ff161580156200021a576000805461ffff19166101011790555b6200022462000398565b62000230838362000409565b801562000243576000805461ff00191690555b505050565b6101045460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015620002a857600080fd5b505afa158015620002bd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002e3919062000564565b61010280546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b1580156200033a57600080fd5b505afa1580156200034f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000375919062000564565b61010380546001600160a01b0319166001600160a01b0392909216919091179055565b600054610100900460ff1680620003b2575060005460ff16155b620003d15760405162461bcd60e51b8152600401620001ee90620005ae565b600054610100900460ff16158015620003f4576000805461ffff19166101011790555b8015620001b2576000805461ff001916905550565b600054610100900460ff168062000423575060005460ff16155b620004425760405162461bcd60e51b8152600401620001ee90620005ae565b600054610100900460ff1615801562000465576000805461ffff19166101011790555b82516200047a906036906020860190620004a8565b50815162000490906037906020850190620004a8565b50801562000243576000805461ff0019169055505050565b828054620004b690620005fc565b90600052602060002090601f016020900481019282620004da576000855562000525565b82601f10620004f557805160ff191683800117855562000525565b8280016001018555821562000525579182015b828111156200052557825182559160200191906001019062000508565b506200053392915062000537565b5090565b5b8082111562000533576000815560010162000538565b6001600160a01b0381168114620001b257600080fd5b6000602082840312156200057757600080fd5b815162000584816200054e565b9392505050565b600082620005a957634e487b7160e01b600052601260045260246000fd5b500490565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b600181811c908216806200061157607f821691505b602082108114156200063357634e487b7160e01b600052602260045260246000fd5b50919050565b60805160601c6128e56200066d60003960008181610cb301528181610cf301528181610eef0152610f2f01526128e56000f3fe6080604052600436106101aa5760003560e01c806306fdde03146101af578063095ea7b3146101da5780630c1cd7f31461020a57806318160ddd146102365780631b3c90a81461024b578063213b329e1461026257806322dec37b1461027857806323b872dd146102a557806325d5971f146102c557806328e964e9146102e55780632e42a8961461031a578063313ce567146103ac57806331903da1146103c85780633659cfe6146103f557806339509351146104155780633d9a12cc146104355780633e6326fc146104555780634162169f1461048357806347b3e7e8146104a45780634f1db7f6146104d15780634f1ef286146104f15780635aef7de61461050457806370a08231146105255780637bcbb9ff1461055b578063846141b31461057b57806395d89b41146105a8578063a457c2d7146105bd578063a694fc3a146105dd578063a87430ba146105fd578063a9059cbb146106eb578063b46aa5271461070b578063bf8e9b6e14610722578063c671062914610737578063c76279a214610757578063c7b8981c14610777578063dd62ed3e1461078c578063e1758bd8146107d2575b600080fd5b3480156101bb57600080fd5b506101c46107e7565b6040516101d191906123a9565b60405180910390f35b3480156101e657600080fd5b506101fa6101f53660046123f1565b610879565b60405190151581526020016101d1565b34801561021657600080fd5b50306000908152606a60205260409020545b6040519081526020016101d1565b34801561024257600080fd5b50603554610228565b34801561025757600080fd5b5061026061088f565b005b34801561026e57600080fd5b506207e900610228565b34801561028457600080fd5b5061022861029336600461241d565b60676020526000908152604090205481565b3480156102b157600080fd5b506101fa6102c036600461243a565b6109d7565b3480156102d157600080fd5b506102606102e036600461247b565b610a88565b3480156102f157600080fd5b5061030561030036600461241d565b610c92565b604080519283526020830191909152016101d1565b34801561032657600080fd5b50610379610335366004612494565b606b602090815260009283526040808420909152908252902080546001909101546001600160801b0380831692600160801b90819004821692808316929190041684565b604080516001600160801b03958616815293851660208501529184169183019190915290911660608201526080016101d1565b3480156103b857600080fd5b50604051600281526020016101d1565b3480156103d457600080fd5b506102286103e336600461241d565b60686020526000908152604090205481565b34801561040157600080fd5b5061026061041036600461241d565b610ca8565b34801561042157600080fd5b506101fa6104303660046123f1565b610d71565b34801561044157600080fd5b506102286104503660046124cd565b610dad565b34801561046157600080fd5b5061010454610476906001600160a01b031681565b6040516101d19190612517565b34801561048f57600080fd5b5061010254610476906001600160a01b031681565b3480156104b057600080fd5b506102286104bf36600461241d565b606a6020526000908152604090205481565b3480156104dd57600080fd5b506103056104ec366004612494565b610ea1565b6102606104ff366004612541565b610ee4565b34801561051057600080fd5b5061010354610476906001600160a01b031681565b34801561053157600080fd5b5061022861054036600461241d565b6001600160a01b031660009081526033602052604090205490565b34801561056757600080fd5b5061022861057636600461241d565b610f9e565b34801561058757600080fd5b5061022861059636600461241d565b60696020526000908152604090205481565b3480156105b457600080fd5b506101c4610fb9565b3480156105c957600080fd5b506101fa6105d83660046123f1565b610fc8565b3480156105e957600080fd5b506102606105f836600461247b565b611061565b34801561060957600080fd5b506106a861061836600461241d565b60408051608081018252600080825260208201819052918101829052606081019190915250306000908152606b602090815260408083206001600160a01b0394909416835292815290829020825160808101845281546001600160801b038082168352600160801b9182900481169483019490945260019092015480841694820194909452920416606082015290565b6040516101d1919081516001600160801b039081168252602080840151821690830152604080840151821690830152606092830151169181019190915260800190565b3480156106f757600080fd5b506101fa6107063660046123f1565b611226565b34801561071757600080fd5b506102286207e90081565b34801561072e57600080fd5b50610228611233565b34801561074357600080fd5b5061022861075236600461241d565b611243565b34801561076357600080fd5b5061026061077236600461247b565b611258565b34801561078357600080fd5b5061022861126a565b34801561079857600080fd5b506102286107a7366004612494565b6001600160a01b03918216600090815260346020908152604080832093909416825291909152205490565b3480156107de57600080fd5b506104766112aa565b6060603680546107f690612604565b80601f016020809104026020016040519081016040528092919081815260200182805461082290612604565b801561086f5780601f106108445761010080835404028352916020019161086f565b820191906000526020600020905b81548152906001019060200180831161085257829003601f168201915b5050505050905090565b6000610886338484611342565b50600192915050565b6101045460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156108ee57600080fd5b505afa158015610902573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610926919061263f565b61010280546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561097c57600080fd5b505afa158015610990573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109b4919061263f565b61010380546001600160a01b0319166001600160a01b0392909216919091179055565b60006109e4848484611466565b6001600160a01b038416600090815260346020908152604080832033845290915290205482811015610a6e5760405162461bcd60e51b815260206004820152602860248201527f45524332303a207472616e7366657220616d6f756e74206578636565647320616044820152676c6c6f77616e636560c01b60648201526084015b60405180910390fd5b610a7b8533858403611342565b60019150505b9392505050565b6002610137541415610aac5760405162461bcd60e51b8152600401610a659061265c565b6002610137556000610abe3033610ea1565b50905081610aca578091505b60008211610b1a5760405162461bcd60e51b815260206004820152601f60248201527f53686f756c6420776974686472617720706f73697469766520616d6f756e74006044820152606401610a65565b81811015610b645760405162461bcd60e51b8152602060048201526017602482015276139bdd08195b9bdd59da081d1bdad95b881cdd185ad959604a1b6044820152606401610a65565b81610b6f33846114a8565b610b7d3033856000436115e4565b50610b8733611681565b50610169546001600160a01b031663a9059cbb33836040518363ffffffff1660e01b8152600401610bb9929190612693565b602060405180830381600087803b158015610bd357600080fd5b505af1158015610be7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c0b91906126ac565b610c525760405162461bcd60e51b81526020600482015260186024820152771dda5d1a191c985dc81d1c985b9cd9995c8819985a5b195960421b6044820152606401610a65565b60405183815233907f1248d48e2de900a1010c7fce73506969ecec243600bfc08b641b158f26d857cd9060200160405180910390a2505060016101375550565b600080610c9f3084610ea1565b91509150915091565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610cf15760405162461bcd60e51b8152600401610a65906126ce565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610d236117eb565b6001600160a01b031614610d495760405162461bcd60e51b8152600401610a6590612708565b610d5281611807565b60408051600080825260208201909252610d6e9183919061180f565b50565b3360008181526034602090815260408083206001600160a01b03871684529091528120549091610886918590610da8908690612758565b611342565b6001600160a01b038085166000818152606b602090815260408083209486168352938152838220845160808101865281546001600160801b038082168352600160801b91829004811683860152600190930154808416838901520490911660608201529282526065905291822054829015610e97576000610e2f888888611956565b91505082604001516001600160801b0316915082602001516001600160801b0316676765c793fa10079d601b1b8285600001516001600160801b0316610e759190612770565b610e7f919061278f565b610e8991906127b1565b610e939083612758565b9150505b9695505050505050565b6001600160a01b039182166000818152606b60209081526040808320949095168252928352838120549181526065909252919020546001600160801b0390911691565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610f2d5760405162461bcd60e51b8152600401610a65906126ce565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610f5f6117eb565b6001600160a01b031614610f855760405162461bcd60e51b8152600401610a6590612708565b610f8e82611807565b610f9a8282600161180f565b5050565b6001600160a01b031660009081526066602052604090205490565b6060603780546107f690612604565b3360009081526034602090815260408083206001600160a01b03861684529091528120548281101561104a5760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610a65565b6110573385858403611342565b5060019392505050565b600081116110c35760405162461bcd60e51b815260206004820152602960248201527f596f75206e65656420746f207374616b65206120706f73697469766520746f6b604482015268195b88185b5bdd5b9d60ba1b6064820152608401610a65565b610169546001600160a01b03166323b872dd336040516001600160e01b031960e084901b1681526001600160a01b03909116600482015230602482015260448101849052606401602060405180830381600087803b15801561112457600080fd5b505af1158015611138573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061115c91906126ac565b6111cb5760405162461bcd60e51b815260206004820152603a60248201527f7472616e7366657246726f6d206661696c65642c206d616b652073757265207960448201527937ba9030b8383937bb32b2103a37b5b2b7103a3930b739b332b960311b6064820152608401610a65565b6111d9303383600043611a4e565b506111e43382611ac1565b6111ed33611681565b5060405181815233907f9e71bc8eea02a63969f509818f2dafb9254532904319f9dbda79b67bd34a5f3d9060200160405180910390a250565b6000610886338484611466565b600061123e30610f9e565b905090565b60006112523060004385610dad565b92915050565b611260611b8e565b610d6e3082611c63565b600060026101375414156112905760405162461bcd60e51b8152600401610a659061265c565b60026101375561129f33611681565b905060016101375590565b6101045460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561130a57600080fd5b505afa15801561131e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061123e919061263f565b6001600160a01b0383166113a45760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610a65565b6001600160a01b0382166114055760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610a65565b6001600160a01b0383811660008181526034602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b6114743084836000436115e4565b50611483308383600043611a4e565b5061148d83611681565b5061149782611681565b506114a3838383611c9c565b505050565b6001600160a01b0382166115085760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610a65565b6001600160a01b0382166000908152603360205260409020548181101561157c5760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610a65565b6001600160a01b03831660009081526033602052604081208383039055603580548492906115ab9084906127b1565b90915550506040518281526000906001600160a01b038516906000805160206128908339815191529060200160405180910390a3505050565b60006115f1868484611e5a565b6001600160a01b038087166000908152606b602090815260408083209389168352929052205461163890879087906116339088906001600160801b03166127b1565b611ed5565b6001600160a01b03861660009081526065602052604090205461165c9085906127b1565b6001600160a01b03871660009081526065602052604090205550600195945050505050565b6000806116913084600043612051565b90508015611252576101045460405163bf40fac160e01b815260206004820152600a6024820152692922a82aaa20aa24a7a760b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156116f857600080fd5b505afa15801561170c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611730919061263f565b6001600160a01b03166340c10f1984836040518363ffffffff1660e01b815260040161175d929190612693565b602060405180830381600087803b15801561177757600080fd5b505af115801561178b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117af91906127c8565b5060405181815233907f43848d0574703c28d68ae8958e0571521618f60c4bcacfb094cff2156eaae0f19060200160405180910390a292915050565b600080516020612849833981519152546001600160a01b031690565b610d6e611b8e565b60006118196117eb565b905061182484612186565b6000835111806118315750815b15611842576118408484612219565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661194f57805460ff191660011781556040516118bd90869061188e908590602401612517565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b179052612219565b50805460ff191681556118ce6117eb565b6001600160a01b0316826001600160a01b0316146119465760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610a65565b61194f85612304565b5050505050565b6001600160a01b03831660009081526066602090815260408083205460699092529091205490838210801561198b5750834310155b6119955781611997565b835b915060008343116119a857436119aa565b835b9050848110806119ba5750838310155b156119c55750611a46565b60006119d184836127b1565b6001600160a01b0388166000908152606a6020526040812054919250906119f89083612770565b6001600160a01b038916600090815260656020526040902054909150611a2982676765c793fa10079d601b1b612770565b611a33919061278f565b611a3d9085612758565b93508294505050505b935093915050565b6000611a5b868484611e5a565b6001600160a01b038087166000908152606b6020908152604080832093891683529290522054611a9d90879087906116339088906001600160801b0316612758565b6001600160a01b03861660009081526065602052604090205461165c908590612758565b6001600160a01b038216611b175760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610a65565b8060356000828254611b299190612758565b90915550506001600160a01b03821660009081526033602052604081208054839290611b56908490612758565b90915550506040518181526001600160a01b038316906000906000805160206128908339815191529060200160405180910390a35050565b6101025460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b158015611bd357600080fd5b505afa158015611be7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c0b919061263f565b6001600160a01b031614611c615760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610a65565b565b611c6f82600043611e5a565b611c7c6207e9008261278f565b6001600160a01b039092166000908152606a602052604090209190915550565b6001600160a01b038316611d005760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610a65565b6001600160a01b038216611d625760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610a65565b6001600160a01b03831660009081526033602052604090205481811015611dda5760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610a65565b6001600160a01b03808516600090815260336020526040808220858503905591851681529081208054849290611e11908490612758565b92505081905550826001600160a01b0316846001600160a01b031660008051602061289083398151915284604051611e4b91815260200190565b60405180910390a35b50505050565b6001600160a01b038316600090815260656020526040902054611e955750506001600160a01b03166000908152606960205260409020439055565b600080611ea3858585611956565b6001600160a01b0390961660009081526066602090815260408083209890985560699052959095209490945550505050565b6001600160a01b038084166000908152606b6020908152604080832093861683529290522080546001600160801b031615611fe15780546001600160a01b03851660009081526066602052604081205490916001600160801b03600160801b8204811692676765c793fa10079d601b1b92611f509216612770565b611f5a919061278f565b611f6491906127b1565b6001830154909150611f809082906001600160801b03166127e1565b6001830180546001600160801b0319166001600160801b03929092169190911790556001600160a01b038516600090815260686020526040902054611fc6908290612758565b6001600160a01b038616600090815260686020526040902055505b80546001600160801b0319166001600160801b0383161781556001600160a01b038416600090815260666020526040902054676765c793fa10079d601b1b9061202a9084612770565b612034919061278f565b81546001600160801b03918216600160801b029116179055505050565b600061205e858484611e5a565b6001600160a01b038086166000908152606b602090815260408083209388168352929052205461209a90869086906001600160801b0316611ed5565b6001600160a01b038581166000908152606b6020908152604080832093881683529290522060010180546001600160801b0380821692839290916010916120ea918591600160801b9004166127e1565b82546101009290920a6001600160801b038181021990931691831602179091556001600160a01b038881166000818152606b60209081526040808320948c16835293815283822060010180546001600160801b03191690559181526067909152205461215a925090831690612758565b6001600160a01b0387166000908152606760205260409020556001600160801b03169050949350505050565b803b6121ea5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610a65565b60008051602061284983398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6122785760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610a65565b600080846001600160a01b031684604051612293919061280c565b600060405180830381855af49150503d80600081146122ce576040519150601f19603f3d011682016040523d82523d6000602084013e6122d3565b606091505b50915091506122fb828260405180606001604052806027815260200161286960279139612344565b95945050505050565b61230d81612186565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60608315612353575081610a81565b8251156123635782518084602001fd5b8160405162461bcd60e51b8152600401610a6591906123a9565b60005b83811015612398578181015183820152602001612380565b83811115611e545750506000910152565b60208152600082518060208401526123c881604085016020870161237d565b601f01601f19169190910160400192915050565b6001600160a01b0381168114610d6e57600080fd5b6000806040838503121561240457600080fd5b823561240f816123dc565b946020939093013593505050565b60006020828403121561242f57600080fd5b8135610a81816123dc565b60008060006060848603121561244f57600080fd5b833561245a816123dc565b9250602084013561246a816123dc565b929592945050506040919091013590565b60006020828403121561248d57600080fd5b5035919050565b600080604083850312156124a757600080fd5b82356124b2816123dc565b915060208301356124c2816123dc565b809150509250929050565b600080600080608085870312156124e357600080fd5b84356124ee816123dc565b93506020850135925060408501359150606085013561250c816123dc565b939692955090935050565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561255457600080fd5b823561255f816123dc565b915060208301356001600160401b038082111561257b57600080fd5b818501915085601f83011261258f57600080fd5b8135818111156125a1576125a161252b565b604051601f8201601f19908116603f011681019083821181831017156125c9576125c961252b565b816040528281528860208487010111156125e257600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600181811c9082168061261857607f821691505b6020821081141561263957634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561265157600080fd5b8151610a81816123dc565b6020808252601f908201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604082015260600190565b6001600160a01b03929092168252602082015260400190565b6000602082840312156126be57600080fd5b81518015158114610a8157600080fd5b6020808252602c9082015260008051602061282983398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c9082015260008051602061282983398151915260408201526b6163746976652070726f787960a01b606082015260800190565b634e487b7160e01b600052601160045260246000fd5b6000821982111561276b5761276b612742565b500190565b600081600019048311821515161561278a5761278a612742565b500290565b6000826127ac57634e487b7160e01b600052601260045260246000fd5b500490565b6000828210156127c3576127c3612742565b500390565b6000602082840312156127da57600080fd5b5051919050565b60006001600160801b0382811684821680830382111561280357612803612742565b01949350505050565b6000825161281e81846020870161237d565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa2646970667358221220b88ad33eeaf2d7e7a3fb09beec29590e9c8d3c5d311bf7e7115e5c856b8431cc64736f6c63430008080033";
874
+ "0x60a06040523060601b6080523480156200001857600080fd5b5060405162002f5238038062002f528339810160408190526200003b9162000564565b62000046816200018c565b6101045460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015620000a657600080fd5b505afa158015620000bb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000e1919062000564565b61016980546001600160a01b0319166001600160a01b0392909216919091179055604080518082018252601381527f4724205374616b696e6720466f7220474f4f4400000000000000000000000000602080830191909152825180840190935260038352621cd1c960ea1b908301526200015b91620001b5565b620001756207e9006a01a784379d99db420000006200058b565b306000908152606a60205260409020555062000639565b61010480546001600160a01b0319166001600160a01b038316179055620001b262000248565b50565b600054610100900460ff1680620001cf575060005460ff16155b620001f75760405162461bcd60e51b8152600401620001ee90620005ae565b60405180910390fd5b600054610100900460ff161580156200021a576000805461ffff19166101011790555b6200022462000398565b62000230838362000409565b801562000243576000805461ff00191690555b505050565b6101045460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015620002a857600080fd5b505afa158015620002bd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002e3919062000564565b61010280546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b1580156200033a57600080fd5b505afa1580156200034f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000375919062000564565b61010380546001600160a01b0319166001600160a01b0392909216919091179055565b600054610100900460ff1680620003b2575060005460ff16155b620003d15760405162461bcd60e51b8152600401620001ee90620005ae565b600054610100900460ff16158015620003f4576000805461ffff19166101011790555b8015620001b2576000805461ff001916905550565b600054610100900460ff168062000423575060005460ff16155b620004425760405162461bcd60e51b8152600401620001ee90620005ae565b600054610100900460ff1615801562000465576000805461ffff19166101011790555b82516200047a906036906020860190620004a8565b50815162000490906037906020850190620004a8565b50801562000243576000805461ff0019169055505050565b828054620004b690620005fc565b90600052602060002090601f016020900481019282620004da576000855562000525565b82601f10620004f557805160ff191683800117855562000525565b8280016001018555821562000525579182015b828111156200052557825182559160200191906001019062000508565b506200053392915062000537565b5090565b5b8082111562000533576000815560010162000538565b6001600160a01b0381168114620001b257600080fd5b6000602082840312156200057757600080fd5b815162000584816200054e565b9392505050565b600082620005a957634e487b7160e01b600052601260045260246000fd5b500490565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b600181811c908216806200061157607f821691505b602082108114156200063357634e487b7160e01b600052602260045260246000fd5b50919050565b60805160601c6128e56200066d60003960008181610cb301528181610cf301528181610eef0152610f2f01526128e56000f3fe6080604052600436106101aa5760003560e01c806306fdde03146101af578063095ea7b3146101da5780630c1cd7f31461020a57806318160ddd146102365780631b3c90a81461024b578063213b329e1461026257806322dec37b1461027857806323b872dd146102a557806325d5971f146102c557806328e964e9146102e55780632e42a8961461031a578063313ce567146103ac57806331903da1146103c85780633659cfe6146103f557806339509351146104155780633d9a12cc146104355780633e6326fc146104555780634162169f1461048357806347b3e7e8146104a45780634f1db7f6146104d15780634f1ef286146104f15780635aef7de61461050457806370a08231146105255780637bcbb9ff1461055b578063846141b31461057b57806395d89b41146105a8578063a457c2d7146105bd578063a694fc3a146105dd578063a87430ba146105fd578063a9059cbb146106eb578063b46aa5271461070b578063bf8e9b6e14610722578063c671062914610737578063c76279a214610757578063c7b8981c14610777578063dd62ed3e1461078c578063e1758bd8146107d2575b600080fd5b3480156101bb57600080fd5b506101c46107e7565b6040516101d191906123a9565b60405180910390f35b3480156101e657600080fd5b506101fa6101f53660046123f1565b610879565b60405190151581526020016101d1565b34801561021657600080fd5b50306000908152606a60205260409020545b6040519081526020016101d1565b34801561024257600080fd5b50603554610228565b34801561025757600080fd5b5061026061088f565b005b34801561026e57600080fd5b506207e900610228565b34801561028457600080fd5b5061022861029336600461241d565b60676020526000908152604090205481565b3480156102b157600080fd5b506101fa6102c036600461243a565b6109d7565b3480156102d157600080fd5b506102606102e036600461247b565b610a88565b3480156102f157600080fd5b5061030561030036600461241d565b610c92565b604080519283526020830191909152016101d1565b34801561032657600080fd5b50610379610335366004612494565b606b602090815260009283526040808420909152908252902080546001909101546001600160801b0380831692600160801b90819004821692808316929190041684565b604080516001600160801b03958616815293851660208501529184169183019190915290911660608201526080016101d1565b3480156103b857600080fd5b50604051600281526020016101d1565b3480156103d457600080fd5b506102286103e336600461241d565b60686020526000908152604090205481565b34801561040157600080fd5b5061026061041036600461241d565b610ca8565b34801561042157600080fd5b506101fa6104303660046123f1565b610d71565b34801561044157600080fd5b506102286104503660046124cd565b610dad565b34801561046157600080fd5b5061010454610476906001600160a01b031681565b6040516101d19190612517565b34801561048f57600080fd5b5061010254610476906001600160a01b031681565b3480156104b057600080fd5b506102286104bf36600461241d565b606a6020526000908152604090205481565b3480156104dd57600080fd5b506103056104ec366004612494565b610ea1565b6102606104ff366004612541565b610ee4565b34801561051057600080fd5b5061010354610476906001600160a01b031681565b34801561053157600080fd5b5061022861054036600461241d565b6001600160a01b031660009081526033602052604090205490565b34801561056757600080fd5b5061022861057636600461241d565b610f9e565b34801561058757600080fd5b5061022861059636600461241d565b60696020526000908152604090205481565b3480156105b457600080fd5b506101c4610fb9565b3480156105c957600080fd5b506101fa6105d83660046123f1565b610fc8565b3480156105e957600080fd5b506102606105f836600461247b565b611061565b34801561060957600080fd5b506106a861061836600461241d565b60408051608081018252600080825260208201819052918101829052606081019190915250306000908152606b602090815260408083206001600160a01b0394909416835292815290829020825160808101845281546001600160801b038082168352600160801b9182900481169483019490945260019092015480841694820194909452920416606082015290565b6040516101d1919081516001600160801b039081168252602080840151821690830152604080840151821690830152606092830151169181019190915260800190565b3480156106f757600080fd5b506101fa6107063660046123f1565b611226565b34801561071757600080fd5b506102286207e90081565b34801561072e57600080fd5b50610228611233565b34801561074357600080fd5b5061022861075236600461241d565b611243565b34801561076357600080fd5b5061026061077236600461247b565b611258565b34801561078357600080fd5b5061022861126a565b34801561079857600080fd5b506102286107a7366004612494565b6001600160a01b03918216600090815260346020908152604080832093909416825291909152205490565b3480156107de57600080fd5b506104766112aa565b6060603680546107f690612604565b80601f016020809104026020016040519081016040528092919081815260200182805461082290612604565b801561086f5780601f106108445761010080835404028352916020019161086f565b820191906000526020600020905b81548152906001019060200180831161085257829003601f168201915b5050505050905090565b6000610886338484611342565b50600192915050565b6101045460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156108ee57600080fd5b505afa158015610902573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610926919061263f565b61010280546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561097c57600080fd5b505afa158015610990573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109b4919061263f565b61010380546001600160a01b0319166001600160a01b0392909216919091179055565b60006109e4848484611466565b6001600160a01b038416600090815260346020908152604080832033845290915290205482811015610a6e5760405162461bcd60e51b815260206004820152602860248201527f45524332303a207472616e7366657220616d6f756e74206578636565647320616044820152676c6c6f77616e636560c01b60648201526084015b60405180910390fd5b610a7b8533858403611342565b60019150505b9392505050565b6002610137541415610aac5760405162461bcd60e51b8152600401610a659061265c565b6002610137556000610abe3033610ea1565b50905081610aca578091505b60008211610b1a5760405162461bcd60e51b815260206004820152601f60248201527f53686f756c6420776974686472617720706f73697469766520616d6f756e74006044820152606401610a65565b81811015610b645760405162461bcd60e51b8152602060048201526017602482015276139bdd08195b9bdd59da081d1bdad95b881cdd185ad959604a1b6044820152606401610a65565b81610b6f33846114a8565b610b7d3033856000436115e4565b50610b8733611681565b50610169546001600160a01b031663a9059cbb33836040518363ffffffff1660e01b8152600401610bb9929190612693565b602060405180830381600087803b158015610bd357600080fd5b505af1158015610be7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c0b91906126ac565b610c525760405162461bcd60e51b81526020600482015260186024820152771dda5d1a191c985dc81d1c985b9cd9995c8819985a5b195960421b6044820152606401610a65565b60405183815233907f1248d48e2de900a1010c7fce73506969ecec243600bfc08b641b158f26d857cd9060200160405180910390a2505060016101375550565b600080610c9f3084610ea1565b91509150915091565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610cf15760405162461bcd60e51b8152600401610a65906126ce565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610d236117eb565b6001600160a01b031614610d495760405162461bcd60e51b8152600401610a6590612708565b610d5281611807565b60408051600080825260208201909252610d6e9183919061180f565b50565b3360008181526034602090815260408083206001600160a01b03871684529091528120549091610886918590610da8908690612758565b611342565b6001600160a01b038085166000818152606b602090815260408083209486168352938152838220845160808101865281546001600160801b038082168352600160801b91829004811683860152600190930154808416838901520490911660608201529282526065905291822054829015610e97576000610e2f888888611956565b91505082604001516001600160801b0316915082602001516001600160801b0316676765c793fa10079d601b1b8285600001516001600160801b0316610e759190612770565b610e7f919061278f565b610e8991906127b1565b610e939083612758565b9150505b9695505050505050565b6001600160a01b039182166000818152606b60209081526040808320949095168252928352838120549181526065909252919020546001600160801b0390911691565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610f2d5760405162461bcd60e51b8152600401610a65906126ce565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610f5f6117eb565b6001600160a01b031614610f855760405162461bcd60e51b8152600401610a6590612708565b610f8e82611807565b610f9a8282600161180f565b5050565b6001600160a01b031660009081526066602052604090205490565b6060603780546107f690612604565b3360009081526034602090815260408083206001600160a01b03861684529091528120548281101561104a5760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610a65565b6110573385858403611342565b5060019392505050565b600081116110c35760405162461bcd60e51b815260206004820152602960248201527f596f75206e65656420746f207374616b65206120706f73697469766520746f6b604482015268195b88185b5bdd5b9d60ba1b6064820152608401610a65565b610169546001600160a01b03166323b872dd336040516001600160e01b031960e084901b1681526001600160a01b03909116600482015230602482015260448101849052606401602060405180830381600087803b15801561112457600080fd5b505af1158015611138573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061115c91906126ac565b6111cb5760405162461bcd60e51b815260206004820152603a60248201527f7472616e7366657246726f6d206661696c65642c206d616b652073757265207960448201527937ba9030b8383937bb32b2103a37b5b2b7103a3930b739b332b960311b6064820152608401610a65565b6111d9303383600043611a4e565b506111e43382611ac1565b6111ed33611681565b5060405181815233907f9e71bc8eea02a63969f509818f2dafb9254532904319f9dbda79b67bd34a5f3d9060200160405180910390a250565b6000610886338484611466565b600061123e30610f9e565b905090565b60006112523060004385610dad565b92915050565b611260611b8e565b610d6e3082611c63565b600060026101375414156112905760405162461bcd60e51b8152600401610a659061265c565b60026101375561129f33611681565b905060016101375590565b6101045460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561130a57600080fd5b505afa15801561131e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061123e919061263f565b6001600160a01b0383166113a45760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610a65565b6001600160a01b0382166114055760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610a65565b6001600160a01b0383811660008181526034602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b6114743084836000436115e4565b50611483308383600043611a4e565b5061148d83611681565b5061149782611681565b506114a3838383611c9c565b505050565b6001600160a01b0382166115085760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610a65565b6001600160a01b0382166000908152603360205260409020548181101561157c5760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610a65565b6001600160a01b03831660009081526033602052604081208383039055603580548492906115ab9084906127b1565b90915550506040518281526000906001600160a01b038516906000805160206128908339815191529060200160405180910390a3505050565b60006115f1868484611e5a565b6001600160a01b038087166000908152606b602090815260408083209389168352929052205461163890879087906116339088906001600160801b03166127b1565b611ed5565b6001600160a01b03861660009081526065602052604090205461165c9085906127b1565b6001600160a01b03871660009081526065602052604090205550600195945050505050565b6000806116913084600043612051565b90508015611252576101045460405163bf40fac160e01b815260206004820152600a6024820152692922a82aaa20aa24a7a760b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156116f857600080fd5b505afa15801561170c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611730919061263f565b6001600160a01b03166340c10f1984836040518363ffffffff1660e01b815260040161175d929190612693565b602060405180830381600087803b15801561177757600080fd5b505af115801561178b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117af91906127c8565b5060405181815233907f43848d0574703c28d68ae8958e0571521618f60c4bcacfb094cff2156eaae0f19060200160405180910390a292915050565b600080516020612849833981519152546001600160a01b031690565b610d6e611b8e565b60006118196117eb565b905061182484612186565b6000835111806118315750815b15611842576118408484612219565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661194f57805460ff191660011781556040516118bd90869061188e908590602401612517565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b179052612219565b50805460ff191681556118ce6117eb565b6001600160a01b0316826001600160a01b0316146119465760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610a65565b61194f85612304565b5050505050565b6001600160a01b03831660009081526066602090815260408083205460699092529091205490838210801561198b5750834310155b6119955781611997565b835b915060008343116119a857436119aa565b835b9050848110806119ba5750838310155b156119c55750611a46565b60006119d184836127b1565b6001600160a01b0388166000908152606a6020526040812054919250906119f89083612770565b6001600160a01b038916600090815260656020526040902054909150611a2982676765c793fa10079d601b1b612770565b611a33919061278f565b611a3d9085612758565b93508294505050505b935093915050565b6000611a5b868484611e5a565b6001600160a01b038087166000908152606b6020908152604080832093891683529290522054611a9d90879087906116339088906001600160801b0316612758565b6001600160a01b03861660009081526065602052604090205461165c908590612758565b6001600160a01b038216611b175760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610a65565b8060356000828254611b299190612758565b90915550506001600160a01b03821660009081526033602052604081208054839290611b56908490612758565b90915550506040518181526001600160a01b038316906000906000805160206128908339815191529060200160405180910390a35050565b6101025460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b158015611bd357600080fd5b505afa158015611be7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c0b919061263f565b6001600160a01b031614611c615760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610a65565b565b611c6f82600043611e5a565b611c7c6207e9008261278f565b6001600160a01b039092166000908152606a602052604090209190915550565b6001600160a01b038316611d005760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610a65565b6001600160a01b038216611d625760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610a65565b6001600160a01b03831660009081526033602052604090205481811015611dda5760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610a65565b6001600160a01b03808516600090815260336020526040808220858503905591851681529081208054849290611e11908490612758565b92505081905550826001600160a01b0316846001600160a01b031660008051602061289083398151915284604051611e4b91815260200190565b60405180910390a35b50505050565b6001600160a01b038316600090815260656020526040902054611e955750506001600160a01b03166000908152606960205260409020439055565b600080611ea3858585611956565b6001600160a01b0390961660009081526066602090815260408083209890985560699052959095209490945550505050565b6001600160a01b038084166000908152606b6020908152604080832093861683529290522080546001600160801b031615611fe15780546001600160a01b03851660009081526066602052604081205490916001600160801b03600160801b8204811692676765c793fa10079d601b1b92611f509216612770565b611f5a919061278f565b611f6491906127b1565b6001830154909150611f809082906001600160801b03166127e1565b6001830180546001600160801b0319166001600160801b03929092169190911790556001600160a01b038516600090815260686020526040902054611fc6908290612758565b6001600160a01b038616600090815260686020526040902055505b80546001600160801b0319166001600160801b0383161781556001600160a01b038416600090815260666020526040902054676765c793fa10079d601b1b9061202a9084612770565b612034919061278f565b81546001600160801b03918216600160801b029116179055505050565b600061205e858484611e5a565b6001600160a01b038086166000908152606b602090815260408083209388168352929052205461209a90869086906001600160801b0316611ed5565b6001600160a01b038581166000908152606b6020908152604080832093881683529290522060010180546001600160801b0380821692839290916010916120ea918591600160801b9004166127e1565b82546101009290920a6001600160801b038181021990931691831602179091556001600160a01b038881166000818152606b60209081526040808320948c16835293815283822060010180546001600160801b03191690559181526067909152205461215a925090831690612758565b6001600160a01b0387166000908152606760205260409020556001600160801b03169050949350505050565b803b6121ea5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610a65565b60008051602061284983398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6122785760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610a65565b600080846001600160a01b031684604051612293919061280c565b600060405180830381855af49150503d80600081146122ce576040519150601f19603f3d011682016040523d82523d6000602084013e6122d3565b606091505b50915091506122fb828260405180606001604052806027815260200161286960279139612344565b95945050505050565b61230d81612186565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60608315612353575081610a81565b8251156123635782518084602001fd5b8160405162461bcd60e51b8152600401610a6591906123a9565b60005b83811015612398578181015183820152602001612380565b83811115611e545750506000910152565b60208152600082518060208401526123c881604085016020870161237d565b601f01601f19169190910160400192915050565b6001600160a01b0381168114610d6e57600080fd5b6000806040838503121561240457600080fd5b823561240f816123dc565b946020939093013593505050565b60006020828403121561242f57600080fd5b8135610a81816123dc565b60008060006060848603121561244f57600080fd5b833561245a816123dc565b9250602084013561246a816123dc565b929592945050506040919091013590565b60006020828403121561248d57600080fd5b5035919050565b600080604083850312156124a757600080fd5b82356124b2816123dc565b915060208301356124c2816123dc565b809150509250929050565b600080600080608085870312156124e357600080fd5b84356124ee816123dc565b93506020850135925060408501359150606085013561250c816123dc565b939692955090935050565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561255457600080fd5b823561255f816123dc565b915060208301356001600160401b038082111561257b57600080fd5b818501915085601f83011261258f57600080fd5b8135818111156125a1576125a161252b565b604051601f8201601f19908116603f011681019083821181831017156125c9576125c961252b565b816040528281528860208487010111156125e257600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600181811c9082168061261857607f821691505b6020821081141561263957634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561265157600080fd5b8151610a81816123dc565b6020808252601f908201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604082015260600190565b6001600160a01b03929092168252602082015260400190565b6000602082840312156126be57600080fd5b81518015158114610a8157600080fd5b6020808252602c9082015260008051602061282983398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c9082015260008051602061282983398151915260408201526b6163746976652070726f787960a01b606082015260800190565b634e487b7160e01b600052601160045260246000fd5b6000821982111561276b5761276b612742565b500190565b600081600019048311821515161561278a5761278a612742565b500290565b6000826127ac57634e487b7160e01b600052601260045260246000fd5b500490565b6000828210156127c3576127c3612742565b500390565b6000602082840312156127da57600080fd5b5051919050565b60006001600160801b0382811684821680830382111561280357612803612742565b01949350505050565b6000825161281e81846020870161237d565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa26469706673582212206847c6f769f30f0bc40025a5c0999d2331ac7c2f95048d342f6b51a3267eaf2164736f6c63430008080033";
875
875
 
876
876
  type GovernanceStakingConstructorParams =
877
877
  | [signer?: Signer]
package/types/factories/IGoodDollar__factory.ts CHANGED
@@ -224,19 +224,6 @@ const _abi = [
224
224
  stateMutability: "view",
225
225
  type: "function",
226
226
  },
227
- {
228
- inputs: [],
229
- name: "identity",
230
- outputs: [
231
- {
232
- internalType: "address",
233
- name: "",
234
- type: "address",
235
- },
236
- ],
237
- stateMutability: "view",
238
- type: "function",
239
- },
240
227
  {
241
228
  inputs: [
242
229
  {
@@ -293,19 +280,6 @@ const _abi = [
293
280
  stateMutability: "view",
294
281
  type: "function",
295
282
  },
296
- {
297
- inputs: [],
298
- name: "owner",
299
- outputs: [
300
- {
301
- internalType: "address",
302
- name: "",
303
- type: "address",
304
- },
305
- ],
306
- stateMutability: "view",
307
- type: "function",
308
- },
309
283
  {
310
284
  inputs: [],
311
285
  name: "renounceMinter",
@@ -313,19 +287,6 @@ const _abi = [
313
287
  stateMutability: "nonpayable",
314
288
  type: "function",
315
289
  },
316
- {
317
- inputs: [
318
- {
319
- internalType: "address",
320
- name: "identity",
321
- type: "address",
322
- },
323
- ],
324
- name: "setIdentity",
325
- outputs: [],
326
- stateMutability: "nonpayable",
327
- type: "function",
328
- },
329
290
  {
330
291
  inputs: [],
331
292
  name: "symbol",