@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/Reputation__factory.ts CHANGED
@@ -618,7 +618,7 @@ const _abi = [
618
618
  ];
619
619
 
620
620
  const _bytecode =
621
- "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c611e6f61004b60003960008181610780015281816107c00152818161086701526108a70152611e6f6000f3fe60806040526004361061013c5760003560e01c806301ffc9a71461014157806306fdde03146101765780631b3c90a814610198578063248a9ca3146101af5780632cff4382146101dd5780632f2ff15d146101f2578063313ce5671461021257806336568abe1461023f5780633659cfe61461025f5780633e6326fc1461027f57806340c10f19146102ac5780634162169f146102cc5780634f1ef286146102ec5780635aef7de6146102ff5780636641d9a01461031f578063798fc26b1461033f5780638392edca1461035f57806391d148541461037f57806395d89b411461039f5780639dc29fac146103b4578063a217fddf146103d4578063ae94c721146103e9578063c4d66de814610409578063cbf1304d14610429578063d539139314610449578063d547741f1461046b578063e1758bd81461048b575b600080fd5b34801561014d57600080fd5b5061016161015c366004611939565b6104a0565b60405190151581526020015b60405180910390f35b34801561018257600080fd5b5061018b6104d7565b60405161016d9190611993565b3480156101a457600080fd5b506101ad610566565b005b3480156101bb57600080fd5b506101cf6101ca3660046119c6565b6106ab565b60405190815260200161016d565b3480156101e957600080fd5b506101cf6106c0565b3480156101fe57600080fd5b506101ad61020d3660046119f4565b6106d0565b34801561021e57600080fd5b506101325461022d9060ff1681565b60405160ff909116815260200161016d565b34801561024b57600080fd5b506101ad61025a3660046119f4565b6106f2565b34801561026b57600080fd5b506101ad61027a366004611a24565b610775565b34801561028b57600080fd5b5060675461029f906001600160a01b031681565b60405161016d9190611a41565b3480156102b857600080fd5b506101616102c7366004611a55565b61083e565b3480156102d857600080fd5b5060655461029f906001600160a01b031681565b6101ad6102fa366004611a97565b61085c565b34801561030b57600080fd5b5060665461029f906001600160a01b031681565b34801561032b57600080fd5b506101cf61033a3660046119c6565b610912565b34801561034b57600080fd5b506101cf61035a366004611a55565b610934565b34801561036b57600080fd5b506101cf61037a3660046119c6565b6109cc565b34801561038b57600080fd5b5061016161039a3660046119f4565b610a1f565b3480156103ab57600080fd5b5061018b610a4a565b3480156103c057600080fd5b506101616103cf366004611a55565b610a58565b3480156103e057600080fd5b506101cf600081565b3480156103f557600080fd5b506101cf610404366004611a24565b610a7c565b34801561041557600080fd5b506101ad610424366004611a24565b610a88565b34801561043557600080fd5b506101cf610444366004611a55565b610afd565b34801561045557600080fd5b506101cf600080516020611e1a83398151915281565b34801561047757600080fd5b506101ad6104863660046119f4565b610b2f565b34801561049757600080fd5b5061029f610b4c565b60006001600160e01b03198216637965db0b60e01b14806104d157506301ffc9a760e01b6001600160e01b03198316145b92915050565b61013080546104e590611b5a565b80601f016020809104026020016040519081016040528092919081815260200182805461051190611b5a565b801561055e5780601f106105335761010080835404028352916020019161055e565b820191906000526020600020905b81548152906001019060200180831161054157829003601f168201915b505050505081565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156105c457600080fd5b505afa1580156105d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105fc9190611b95565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561065157600080fd5b505afa158015610665573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106899190611b95565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b600090815260fe602052604090206001015490565b60006106cb436109cc565b905090565b6106d9826106ab565b6106e38133610be3565b6106ed8383610c47565b505050565b6001600160a01b03811633146107675760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b60648201526084015b60405180910390fd5b6107718282610ccd565b5050565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156107be5760405162461bcd60e51b815260040161075e90611bb2565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166107f0610d34565b6001600160a01b0316146108165760405162461bcd60e51b815260040161075e90611bec565b61081f81610d50565b6040805160008082526020820190925261083b91839190610d58565b50565b6000610848610e9f565b6108528383610f04565b5060019392505050565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156108a55760405162461bcd60e51b815260040161075e90611bb2565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166108d7610d34565b6001600160a01b0316146108fd5760405162461bcd60e51b815260040161075e90611bec565b61090682610d50565b61077182826001610d58565b610134818154811061092357600080fd5b600091825260209091200154905081565b6001600160a01b03821660009081526101336020526040812054158061099557506001600160a01b038316600090815261013360205260408120805484929061097f5761097f611c26565b90600052602060002001546001600160801b0316115b156109a2575060006104d1565b6001600160a01b0383166000908152610133602052604090206109c59083610fa8565b90506104d1565b610134546000901580610a065750816101346000815481106109f0576109f0611c26565b90600052602060002001546001600160801b0316115b15610a1357506000919050565b6104d161013483610fa8565b600091825260fe602090815260408084206001600160a01b0393909316845291905290205460ff1690565b61013180546104e590611b5a565b60006001600160a01b0383163314610a7257610a72610e9f565b61085283836110ef565b60006104d18243610934565b600054610100900460ff1680610aa1575060005460ff16155b610abd5760405162461bcd60e51b815260040161075e90611c3c565b600054610100900460ff16158015610adf576000805461ffff19166101011790555b610ae88261119b565b8015610771576000805461ff00191690555050565b6101336020528160005260406000208181548110610b1a57600080fd5b90600052602060002001600091509150505481565b610b38826106ab565b610b428133610be3565b6106ed8383610ccd565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b158015610bab57600080fd5b505afa158015610bbf573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106cb9190611b95565b610bed8282610a1f565b61077157610c05816001600160a01b03166014611273565b610c10836020611273565b604051602001610c21929190611c8a565b60408051601f198184030181529082905262461bcd60e51b825261075e91600401611993565b610c518282610a1f565b61077157600082815260fe602090815260408083206001600160a01b03851684529091529020805460ff19166001179055610c893390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b610cd78282610a1f565b1561077157600082815260fe602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b600080516020611dd3833981519152546001600160a01b031690565b61083b611415565b6000610d62610d34565b9050610d6d846114e7565b600083511180610d7a5750815b15610d8b57610d89848461157a565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16610e9857805460ff19166001178155604051610e06908690610dd7908590602401611a41565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b17905261157a565b50805460ff19168155610e17610d34565b6001600160a01b0316826001600160a01b031614610e8f5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b606482015260840161075e565b610e9885611665565b5050505050565b610eb7600080516020611e1a83398151915233610a1f565b610f025760405162461bcd60e51b815260206004820152601c60248201527b52657075746174696f6e3a206e656564206d696e74657220726f6c6560201b604482015260640161075e565b565b600080610f10436109cc565b90506000610f1e8543610934565b9050610f35610134610f308685611d0f565b6116a5565b6001600160a01b038516600090815261013360205260409020610f5c90610f308684611d0f565b846001600160a01b03167f0f6798a560793a54c3bcfe86a93cde1e73087d944c0ea20544137d412139688585604051610f9791815260200190565b60405180910390a250919392505050565b815460009080610fbc5760009150506104d1565b600084610fca600184611d27565b81548110610fda57610fda611c26565b90600052602060002001549050806001600160801b031684106110035760801c91506104d19050565b8460008154811061101657611016611c26565b90600052602060002001546001600160801b031684101561103c576000925050506104d1565b60008061104a600185611d27565b90505b818111156110c257600060026110638484611d0f565b61106e906001611d0f565b6110789190611d3e565b90508688828154811061108d5761108d611c26565b90600052602060002001546001600160801b0316116110ae578092506110bc565b6110b9600182611d27565b91505b5061104d565b60808783815481106110d6576110d6611c26565b9060005260206000200154901c94505050505092915050565b6000806110fb436109cc565b905082600061110a8643610934565b905081811015611118578091505b611128610134610f308486611d27565b6001600160a01b03861660009081526101336020526040902061114f90610f308484611d27565b856001600160a01b03167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca58360405161118a91815260200190565b60405180910390a250949350505050565b610132805460ff1916601217905560408051808201909152600780825266476f6f6444414f60c81b60209092019182526111d891610130916118a0565b506040805180820190915260048082526311d3d3d160e21b602090920191825261120591610131916118a0565b5061120e6117cf565b6112166117cf565b61121e6117cf565b6001600160a01b0381161561083b576112368161183a565b60665461124e906000906001600160a01b031661185d565b60665461083b90600080516020611e1a833981519152906001600160a01b031661185d565b60606000611282836002611d60565b61128d906002611d0f565b6001600160401b038111156112a4576112a4611a81565b6040519080825280601f01601f1916602001820160405280156112ce576020820181803683370190505b509050600360fc1b816000815181106112e9576112e9611c26565b60200101906001600160f81b031916908160001a905350600f60fb1b8160018151811061131857611318611c26565b60200101906001600160f81b031916908160001a905350600061133c846002611d60565b611347906001611d0f565b90505b60018111156113bf576f181899199a1a9b1b9c1cb0b131b232b360811b85600f166010811061137b5761137b611c26565b1a60f81b82828151811061139157611391611c26565b60200101906001600160f81b031916908160001a90535060049490941c936113b881611d7f565b905061134a565b50831561140e5760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e74604482015260640161075e565b9392505050565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561145957600080fd5b505afa15801561146d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114919190611b95565b6001600160a01b031614610f025760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161075e565b803b61154b5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161075e565b600080516020611dd383398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6115d95760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161075e565b600080846001600160a01b0316846040516115f49190611d96565b600060405180830381855af49150503d806000811461162f576040519150601f19603f3d011682016040523d82523d6000602084013e611634565b606091505b509150915061165c8282604051806060016040528060278152602001611df360279139611867565b95945050505050565b61166e816114e7565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b80816001600160801b0316146116f35760405162461bcd60e51b815260206004820152601360248201527272657075746174696f6e206f766572666c6f7760681b604482015260640161075e565b81541580611734575081544390839061170e90600190611d27565b8154811061171e5761171e611c26565b90600052602060002001546001600160801b0316105b156117615781546001810183556000838152602090206001600160801b034316608084901b179101555050565b608081901b6001600160801b0383600185805490506117809190611d27565b8154811061179057611790611c26565b9060005260206000200154161782600184805490506117af9190611d27565b815481106117bf576117bf611c26565b6000918252602090912001555050565b600054610100900460ff16806117e8575060005460ff16155b6118045760405162461bcd60e51b815260040161075e90611c3c565b600054610100900460ff16158015611826576000805461ffff19166101011790555b801561083b576000805461ff001916905550565b606780546001600160a01b0319166001600160a01b03831617905561083b610566565b6107718282610c47565b6060831561187657508161140e565b8251156118865782518084602001fd5b8160405162461bcd60e51b815260040161075e9190611993565b8280546118ac90611b5a565b90600052602060002090601f0160209004810192826118ce5760008555611914565b82601f106118e757805160ff1916838001178555611914565b82800160010185558215611914579182015b828111156119145782518255916020019190600101906118f9565b50611920929150611924565b5090565b5b808211156119205760008155600101611925565b60006020828403121561194b57600080fd5b81356001600160e01b03198116811461140e57600080fd5b60005b8381101561197e578181015183820152602001611966565b8381111561198d576000848401525b50505050565b60208152600082518060208401526119b2816040850160208701611963565b601f01601f19169190910160400192915050565b6000602082840312156119d857600080fd5b5035919050565b6001600160a01b038116811461083b57600080fd5b60008060408385031215611a0757600080fd5b823591506020830135611a19816119df565b809150509250929050565b600060208284031215611a3657600080fd5b813561140e816119df565b6001600160a01b0391909116815260200190565b60008060408385031215611a6857600080fd5b8235611a73816119df565b946020939093013593505050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215611aaa57600080fd5b8235611ab5816119df565b915060208301356001600160401b0380821115611ad157600080fd5b818501915085601f830112611ae557600080fd5b813581811115611af757611af7611a81565b604051601f8201601f19908116603f01168101908382118183101715611b1f57611b1f611a81565b81604052828152886020848701011115611b3857600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600181811c90821680611b6e57607f821691505b60208210811415611b8f57634e487b7160e01b600052602260045260246000fd5b50919050565b600060208284031215611ba757600080fd5b815161140e816119df565b6020808252602c90820152600080516020611db383398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020611db383398151915260408201526b6163746976652070726f787960a01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b815260008351611cbc816017850160208801611963565b7001034b99036b4b9b9b4b733903937b6329607d1b6017918401918201528351611ced816028840160208801611963565b01602801949350505050565b634e487b7160e01b600052601160045260246000fd5b60008219821115611d2257611d22611cf9565b500190565b600082821015611d3957611d39611cf9565b500390565b600082611d5b57634e487b7160e01b600052601260045260246000fd5b500490565b6000816000190483118215151615611d7a57611d7a611cf9565b500290565b600081611d8e57611d8e611cf9565b506000190190565b60008251611da8818460208701611963565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c65649f2df0fed2c77648de5860a4cc508cd0818c85b8b8a1ab4ceeef8d981c8956a6a264697066735822122069de43a87b36aada5e29d987ed19db709511886f732a462fd0d0068b8a6b336964736f6c63430008080033";
621
+ "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c611e6f61004b60003960008181610780015281816107c00152818161086701526108a70152611e6f6000f3fe60806040526004361061013c5760003560e01c806301ffc9a71461014157806306fdde03146101765780631b3c90a814610198578063248a9ca3146101af5780632cff4382146101dd5780632f2ff15d146101f2578063313ce5671461021257806336568abe1461023f5780633659cfe61461025f5780633e6326fc1461027f57806340c10f19146102ac5780634162169f146102cc5780634f1ef286146102ec5780635aef7de6146102ff5780636641d9a01461031f578063798fc26b1461033f5780638392edca1461035f57806391d148541461037f57806395d89b411461039f5780639dc29fac146103b4578063a217fddf146103d4578063ae94c721146103e9578063c4d66de814610409578063cbf1304d14610429578063d539139314610449578063d547741f1461046b578063e1758bd81461048b575b600080fd5b34801561014d57600080fd5b5061016161015c366004611939565b6104a0565b60405190151581526020015b60405180910390f35b34801561018257600080fd5b5061018b6104d7565b60405161016d9190611993565b3480156101a457600080fd5b506101ad610566565b005b3480156101bb57600080fd5b506101cf6101ca3660046119c6565b6106ab565b60405190815260200161016d565b3480156101e957600080fd5b506101cf6106c0565b3480156101fe57600080fd5b506101ad61020d3660046119f4565b6106d0565b34801561021e57600080fd5b506101325461022d9060ff1681565b60405160ff909116815260200161016d565b34801561024b57600080fd5b506101ad61025a3660046119f4565b6106f2565b34801561026b57600080fd5b506101ad61027a366004611a24565b610775565b34801561028b57600080fd5b5060675461029f906001600160a01b031681565b60405161016d9190611a41565b3480156102b857600080fd5b506101616102c7366004611a55565b61083e565b3480156102d857600080fd5b5060655461029f906001600160a01b031681565b6101ad6102fa366004611a97565b61085c565b34801561030b57600080fd5b5060665461029f906001600160a01b031681565b34801561032b57600080fd5b506101cf61033a3660046119c6565b610912565b34801561034b57600080fd5b506101cf61035a366004611a55565b610934565b34801561036b57600080fd5b506101cf61037a3660046119c6565b6109cc565b34801561038b57600080fd5b5061016161039a3660046119f4565b610a1f565b3480156103ab57600080fd5b5061018b610a4a565b3480156103c057600080fd5b506101616103cf366004611a55565b610a58565b3480156103e057600080fd5b506101cf600081565b3480156103f557600080fd5b506101cf610404366004611a24565b610a7c565b34801561041557600080fd5b506101ad610424366004611a24565b610a88565b34801561043557600080fd5b506101cf610444366004611a55565b610afd565b34801561045557600080fd5b506101cf600080516020611e1a83398151915281565b34801561047757600080fd5b506101ad6104863660046119f4565b610b2f565b34801561049757600080fd5b5061029f610b4c565b60006001600160e01b03198216637965db0b60e01b14806104d157506301ffc9a760e01b6001600160e01b03198316145b92915050565b61013080546104e590611b5a565b80601f016020809104026020016040519081016040528092919081815260200182805461051190611b5a565b801561055e5780601f106105335761010080835404028352916020019161055e565b820191906000526020600020905b81548152906001019060200180831161054157829003601f168201915b505050505081565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156105c457600080fd5b505afa1580156105d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105fc9190611b95565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561065157600080fd5b505afa158015610665573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106899190611b95565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b600090815260fe602052604090206001015490565b60006106cb436109cc565b905090565b6106d9826106ab565b6106e38133610be3565b6106ed8383610c47565b505050565b6001600160a01b03811633146107675760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b60648201526084015b60405180910390fd5b6107718282610ccd565b5050565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156107be5760405162461bcd60e51b815260040161075e90611bb2565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166107f0610d34565b6001600160a01b0316146108165760405162461bcd60e51b815260040161075e90611bec565b61081f81610d50565b6040805160008082526020820190925261083b91839190610d58565b50565b6000610848610e9f565b6108528383610f04565b5060019392505050565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156108a55760405162461bcd60e51b815260040161075e90611bb2565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166108d7610d34565b6001600160a01b0316146108fd5760405162461bcd60e51b815260040161075e90611bec565b61090682610d50565b61077182826001610d58565b610134818154811061092357600080fd5b600091825260209091200154905081565b6001600160a01b03821660009081526101336020526040812054158061099557506001600160a01b038316600090815261013360205260408120805484929061097f5761097f611c26565b90600052602060002001546001600160801b0316115b156109a2575060006104d1565b6001600160a01b0383166000908152610133602052604090206109c59083610fa8565b90506104d1565b610134546000901580610a065750816101346000815481106109f0576109f0611c26565b90600052602060002001546001600160801b0316115b15610a1357506000919050565b6104d161013483610fa8565b600091825260fe602090815260408084206001600160a01b0393909316845291905290205460ff1690565b61013180546104e590611b5a565b60006001600160a01b0383163314610a7257610a72610e9f565b61085283836110ef565b60006104d18243610934565b600054610100900460ff1680610aa1575060005460ff16155b610abd5760405162461bcd60e51b815260040161075e90611c3c565b600054610100900460ff16158015610adf576000805461ffff19166101011790555b610ae88261119b565b8015610771576000805461ff00191690555050565b6101336020528160005260406000208181548110610b1a57600080fd5b90600052602060002001600091509150505481565b610b38826106ab565b610b428133610be3565b6106ed8383610ccd565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b158015610bab57600080fd5b505afa158015610bbf573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106cb9190611b95565b610bed8282610a1f565b61077157610c05816001600160a01b03166014611273565b610c10836020611273565b604051602001610c21929190611c8a565b60408051601f198184030181529082905262461bcd60e51b825261075e91600401611993565b610c518282610a1f565b61077157600082815260fe602090815260408083206001600160a01b03851684529091529020805460ff19166001179055610c893390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b610cd78282610a1f565b1561077157600082815260fe602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b600080516020611dd3833981519152546001600160a01b031690565b61083b611415565b6000610d62610d34565b9050610d6d846114e7565b600083511180610d7a5750815b15610d8b57610d89848461157a565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16610e9857805460ff19166001178155604051610e06908690610dd7908590602401611a41565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b17905261157a565b50805460ff19168155610e17610d34565b6001600160a01b0316826001600160a01b031614610e8f5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b606482015260840161075e565b610e9885611665565b5050505050565b610eb7600080516020611e1a83398151915233610a1f565b610f025760405162461bcd60e51b815260206004820152601c60248201527b52657075746174696f6e3a206e656564206d696e74657220726f6c6560201b604482015260640161075e565b565b600080610f10436109cc565b90506000610f1e8543610934565b9050610f35610134610f308685611d0f565b6116a5565b6001600160a01b038516600090815261013360205260409020610f5c90610f308684611d0f565b846001600160a01b03167f0f6798a560793a54c3bcfe86a93cde1e73087d944c0ea20544137d412139688585604051610f9791815260200190565b60405180910390a250919392505050565b815460009080610fbc5760009150506104d1565b600084610fca600184611d27565b81548110610fda57610fda611c26565b90600052602060002001549050806001600160801b031684106110035760801c91506104d19050565b8460008154811061101657611016611c26565b90600052602060002001546001600160801b031684101561103c576000925050506104d1565b60008061104a600185611d27565b90505b818111156110c257600060026110638484611d0f565b61106e906001611d0f565b6110789190611d3e565b90508688828154811061108d5761108d611c26565b90600052602060002001546001600160801b0316116110ae578092506110bc565b6110b9600182611d27565b91505b5061104d565b60808783815481106110d6576110d6611c26565b9060005260206000200154901c94505050505092915050565b6000806110fb436109cc565b905082600061110a8643610934565b905081811015611118578091505b611128610134610f308486611d27565b6001600160a01b03861660009081526101336020526040902061114f90610f308484611d27565b856001600160a01b03167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca58360405161118a91815260200190565b60405180910390a250949350505050565b610132805460ff1916601217905560408051808201909152600780825266476f6f6444414f60c81b60209092019182526111d891610130916118a0565b506040805180820190915260048082526311d3d3d160e21b602090920191825261120591610131916118a0565b5061120e6117cf565b6112166117cf565b61121e6117cf565b6001600160a01b0381161561083b576112368161183a565b60665461124e906000906001600160a01b031661185d565b60665461083b90600080516020611e1a833981519152906001600160a01b031661185d565b60606000611282836002611d60565b61128d906002611d0f565b6001600160401b038111156112a4576112a4611a81565b6040519080825280601f01601f1916602001820160405280156112ce576020820181803683370190505b509050600360fc1b816000815181106112e9576112e9611c26565b60200101906001600160f81b031916908160001a905350600f60fb1b8160018151811061131857611318611c26565b60200101906001600160f81b031916908160001a905350600061133c846002611d60565b611347906001611d0f565b90505b60018111156113bf576f181899199a1a9b1b9c1cb0b131b232b360811b85600f166010811061137b5761137b611c26565b1a60f81b82828151811061139157611391611c26565b60200101906001600160f81b031916908160001a90535060049490941c936113b881611d7f565b905061134a565b50831561140e5760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e74604482015260640161075e565b9392505050565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561145957600080fd5b505afa15801561146d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114919190611b95565b6001600160a01b031614610f025760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161075e565b803b61154b5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161075e565b600080516020611dd383398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6115d95760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161075e565b600080846001600160a01b0316846040516115f49190611d96565b600060405180830381855af49150503d806000811461162f576040519150601f19603f3d011682016040523d82523d6000602084013e611634565b606091505b509150915061165c8282604051806060016040528060278152602001611df360279139611867565b95945050505050565b61166e816114e7565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b80816001600160801b0316146116f35760405162461bcd60e51b815260206004820152601360248201527272657075746174696f6e206f766572666c6f7760681b604482015260640161075e565b81541580611734575081544390839061170e90600190611d27565b8154811061171e5761171e611c26565b90600052602060002001546001600160801b0316105b156117615781546001810183556000838152602090206001600160801b034316608084901b179101555050565b608081901b6001600160801b0383600185805490506117809190611d27565b8154811061179057611790611c26565b9060005260206000200154161782600184805490506117af9190611d27565b815481106117bf576117bf611c26565b6000918252602090912001555050565b600054610100900460ff16806117e8575060005460ff16155b6118045760405162461bcd60e51b815260040161075e90611c3c565b600054610100900460ff16158015611826576000805461ffff19166101011790555b801561083b576000805461ff001916905550565b606780546001600160a01b0319166001600160a01b03831617905561083b610566565b6107718282610c47565b6060831561187657508161140e565b8251156118865782518084602001fd5b8160405162461bcd60e51b815260040161075e9190611993565b8280546118ac90611b5a565b90600052602060002090601f0160209004810192826118ce5760008555611914565b82601f106118e757805160ff1916838001178555611914565b82800160010185558215611914579182015b828111156119145782518255916020019190600101906118f9565b50611920929150611924565b5090565b5b808211156119205760008155600101611925565b60006020828403121561194b57600080fd5b81356001600160e01b03198116811461140e57600080fd5b60005b8381101561197e578181015183820152602001611966565b8381111561198d576000848401525b50505050565b60208152600082518060208401526119b2816040850160208701611963565b601f01601f19169190910160400192915050565b6000602082840312156119d857600080fd5b5035919050565b6001600160a01b038116811461083b57600080fd5b60008060408385031215611a0757600080fd5b823591506020830135611a19816119df565b809150509250929050565b600060208284031215611a3657600080fd5b813561140e816119df565b6001600160a01b0391909116815260200190565b60008060408385031215611a6857600080fd5b8235611a73816119df565b946020939093013593505050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215611aaa57600080fd5b8235611ab5816119df565b915060208301356001600160401b0380821115611ad157600080fd5b818501915085601f830112611ae557600080fd5b813581811115611af757611af7611a81565b604051601f8201601f19908116603f01168101908382118183101715611b1f57611b1f611a81565b81604052828152886020848701011115611b3857600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600181811c90821680611b6e57607f821691505b60208210811415611b8f57634e487b7160e01b600052602260045260246000fd5b50919050565b600060208284031215611ba757600080fd5b815161140e816119df565b6020808252602c90820152600080516020611db383398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020611db383398151915260408201526b6163746976652070726f787960a01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b815260008351611cbc816017850160208801611963565b7001034b99036b4b9b9b4b733903937b6329607d1b6017918401918201528351611ced816028840160208801611963565b01602801949350505050565b634e487b7160e01b600052601160045260246000fd5b60008219821115611d2257611d22611cf9565b500190565b600082821015611d3957611d39611cf9565b500390565b600082611d5b57634e487b7160e01b600052601260045260246000fd5b500490565b6000816000190483118215151615611d7a57611d7a611cf9565b500290565b600081611d8e57611d8e611cf9565b506000190190565b60008251611da8818460208701611963565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c65649f2df0fed2c77648de5860a4cc508cd0818c85b8b8a1ab4ceeef8d981c8956a6a2646970667358221220029da3b1778ead45106b3d81ab51dc79ad869909f89eef9ed19f37971f4cfb7064736f6c63430008080033";
622
622
 
623
623
  type ReputationConstructorParams =
624
624
  | [signer?: Signer]
package/types/factories/StakersDistribution__factory.ts CHANGED
@@ -542,7 +542,7 @@ const _abi = [
542
542
  ];
543
543
 
544
544
  const _bytecode =
545
- "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c6128e161004b600039600081816107390152818161078201528181610aa70152610ae701526128e16000f3fe6080604052600436106101265760003560e01c806305a6aafa1461012b5780631b3c90a81461014d578063213b329e1461016257806322dec37b146101875780632d36bd88146101b45780632e42a896146101e957806331903da11461027b5780633659cfe6146102a85780633c8c043a146102c85780633d9a12cc146102de5780633e458a8e146102fe5780633e6326fc1461031e5780634162169f1461034b57806347b3e7e81461036b5780634f1db7f6146103985780634f1ef286146103f657806352e62ac2146104095780635aef7de6146104295780637bcbb9ff14610449578063846141b31461047f578063862a4d47146104ac5780638aaa31de146104c2578063a39b2153146104e2578063c4d66de814610502578063e1758bd814610522575b600080fd5b34801561013757600080fd5b5061014b6101463660046121bc565b610537565b005b34801561015957600080fd5b5061014b610544565b34801561016e57600080fd5b506202a3005b6040519081526020015b60405180910390f35b34801561019357600080fd5b506101746101a23660046121fa565b609c6020526000908152604090205481565b3480156101c057600080fd5b506101d46101cf36600461225d565b610689565b6040805192835260208301919091520161017e565b3480156101f557600080fd5b50610248610204366004612320565b60a0602090815260009283526040808420909152908252902080546001909101546001600160801b0380831692600160801b90819004821692808316929190041684565b604080516001600160801b039586168152938516602085015291841691830191909152909116606082015260800161017e565b34801561028757600080fd5b506101746102963660046121fa565b609d6020526000908152604090205481565b3480156102b457600080fd5b5061014b6102c33660046121fa565b61072e565b3480156102d457600080fd5b5061017460d35481565b3480156102ea57600080fd5b506101746102f9366004612359565b610800565b34801561030a57600080fd5b5061014b6103193660046123a3565b6108f4565b34801561032a57600080fd5b5060675461033e906001600160a01b031681565b60405161017e91906123cf565b34801561035757600080fd5b5060655461033e906001600160a01b031681565b34801561037757600080fd5b506101746103863660046121fa565b609f6020526000908152604090205481565b3480156103a457600080fd5b506101d46103b3366004612320565b6001600160a01b03918216600081815260a06020908152604080832094909516825292835283812054918152609a909252919020546001600160801b0390911691565b61014b6104043660046123e3565b610a9c565b34801561041557600080fd5b5061017461042436600461225d565b610b56565b34801561043557600080fd5b5060665461033e906001600160a01b031681565b34801561045557600080fd5b506101746104643660046121fa565b6001600160a01b03166000908152609b602052604090205490565b34801561048b57600080fd5b5061017461049a3660046121fa565b609e6020526000908152604090205481565b3480156104b857600080fd5b5061017460d45481565b3480156104ce57600080fd5b5061014b6104dd36600461248a565b610ceb565b3480156104ee57600080fd5b5061014b6104fd3660046123a3565b610d2d565b34801561050e57600080fd5b5061014b61051d3660046121fa565b610e63565b34801561052e57600080fd5b5061033e610f2d565b61053f610fc9565b60d355565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156105a257600080fd5b505afa1580156105b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105da9190612511565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561062f57600080fd5b505afa158015610643573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106679190612511565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60008060006106988585610b56565b90506000805b86518110156107235760a060008883815181106106bd576106bd61252e565b6020908102919091018101516001600160a01b0390811683528282019390935260409182016000908120938a16815292905290206001015461070f90600160801b90046001600160801b03168361255a565b91508061071b81612572565b91505061069e565b509590945092505050565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156107805760405162461bcd60e51b81526004016107779061258d565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166107b261109d565b6001600160a01b0316146107d85760405162461bcd60e51b8152600401610777906125c7565b6107e1816110b9565b604080516000808252602082019092526107fd918391906110c1565b50565b6001600160a01b03808516600081815260a0602090815260408083209486168352938152838220845160808101865281546001600160801b038082168352600160801b9182900481168386015260019093015480841683890152049091166060820152928252609a9052918220548290156108ea576000610882888888611208565b91505082604001516001600160801b0316915082602001516001600160801b0316676765c793fa10079d601b1b8285600001516001600160801b03166108c89190612601565b6108d29190612620565b6108dc9190612642565b6108e6908361255a565b9150505b9695505050505050565b60675460405163bf40fac160e01b81523391600091829182916001600160a01b039091169063bf40fac19061092b90600401612659565b60206040518083038186803b15801561094357600080fd5b505afa158015610957573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061097b9190612511565b6001600160a01b031663d0250144856040518263ffffffff1660e01b81526004016109a691906123cf565b60806040518083038186803b1580156109be57600080fd5b505afa1580156109d2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f691906126a6565b935093509350508015610a0b57505050505050565b610a2a848787866001600160401b0316866001600160401b0316611300565b50604080516001808252818301909252600091602080830190803683370190505090508481600081518110610a6157610a6161252e565b60200260200101906001600160a01b031690816001600160a01b031681525050610a8b878261139d565b610a93611693565b50505050505050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610ae55760405162461bcd60e51b81526004016107779061258d565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610b1761109d565b6001600160a01b031614610b3d5760405162461bcd60e51b8152600401610777906125c7565b610b46826110b9565b610b52828260016110c1565b5050565b60008060005b8451811015610ce35760675460405163bf40fac160e01b8152600091829182916001600160a01b03169063bf40fac190610b9890600401612659565b60206040518083038186803b158015610bb057600080fd5b505afa158015610bc4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610be89190612511565b6001600160a01b031663d0250144898681518110610c0857610c0861252e565b60200260200101516040518263ffffffff1660e01b8152600401610c2c91906123cf565b60806040518083038186803b158015610c4457600080fd5b505afa158015610c58573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7c91906126a6565b919550935091505080610ccd57610cc0888581518110610c9e57610c9e61252e565b6020026020010151846001600160401b0316846001600160401b03168a610800565b610cca908661255a565b94505b5050508080610cdb90612572565b915050610b5c565b509392505050565b610d288383838080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525061139d92505050565b505050565b60675460405163bf40fac160e01b81523391600091829182916001600160a01b039091169063bf40fac190610d6490600401612659565b60206040518083038186803b158015610d7c57600080fd5b505afa158015610d90573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610db49190612511565b6001600160a01b031663d0250144856040518263ffffffff1660e01b8152600401610ddf91906123cf565b60806040518083038186803b158015610df757600080fd5b505afa158015610e0b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e2f91906126a6565b935093509350508015610e4457505050505050565b610a2a848787866001600160401b0316866001600160401b0316611bc3565b600054610100900460ff1680610e7c575060005460ff16155b610edf5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610777565b600054610100900460ff16158015610f01576000805461ffff19166101011790555b66d3c21bcecceda160191b60d355610f1882611c36565b8015610b52576000805461ff00191690555050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b158015610f8c57600080fd5b505afa158015610fa0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fc49190612511565b905090565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561100d57600080fd5b505afa158015611021573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110459190612511565b6001600160a01b03161461109b5760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610777565b565b600080516020612865833981519152546001600160a01b031690565b6107fd610fc9565b60006110cb61109d565b90506110d684611c59565b6000835111806110e35750815b156110f4576110f28484611cec565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661120157805460ff1916600117815560405161116f9086906111409085906024016123cf565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b179052611cec565b50805460ff1916815561118061109d565b6001600160a01b0316826001600160a01b0316146111f85760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610777565b61120185611dd7565b5050505050565b6001600160a01b0383166000908152609b6020908152604080832054609e9092529091205490838210801561123d5750834310155b6112475781611249565b835b9150600083431161125a574361125c565b835b90508481108061126c5750838310155b1561127757506112f8565b60006112838483612642565b6001600160a01b0388166000908152609f6020526040812054919250906112aa9083612601565b6001600160a01b0389166000908152609a60205260409020549091506112db82676765c793fa10079d601b1b612601565b6112e59190612620565b6112ef908561255a565b93508294505050505b935093915050565b600061130d868484611e17565b6001600160a01b03808716600090815260a06020908152604080832093891683529290522054611354908790879061134f9088906001600160801b0316612642565b611e92565b6001600160a01b0386166000908152609a6020526040902054611378908590612642565b6001600160a01b0387166000908152609a602052604090205550600195945050505050565b60675460405163bf40fac160e01b815260009182916001600160a01b039091169063bf40fac1906113d090600401612659565b60206040518083038186803b1580156113e857600080fd5b505afa1580156113fc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114209190612511565b905060005b835181101561152f576000806000846001600160a01b031663d02501448886815181106114545761145461252e565b60200260200101516040518263ffffffff1660e01b815260040161147891906123cf565b60806040518083038186803b15801561149057600080fd5b505afa1580156114a4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114c891906126a6565b9195509350915050806115195761150c8785815181106114ea576114ea61252e565b602002602001015189856001600160401b0316856001600160401b031661200e565b611516908761255a565b95505b505050808061152790612572565b915050611425565b50811561168d5760675460405163bf40fac160e01b815260206004820152600a6024820152692922a82aaa20aa24a7a760b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561159457600080fd5b505afa1580156115a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115cc9190612511565b6040516340c10f1960e01b81526001600160a01b0386811660048301526024820185905291909116906340c10f1990604401602060405180830381600087803b15801561161857600080fd5b505af115801561162c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116509190612705565b507fb5bb6cf2a7d73ab2167d87f348feea953c3e405a4ece2a262cd92cdce829f6d284848460405161168493929190612720565b60405180910390a15b50505050565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906116c290600401612659565b60206040518083038186803b1580156116da57600080fd5b505afa1580156116ee573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117129190612511565b6001600160a01b03161461109b5760675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac19061174f90600401612659565b60206040518083038186803b15801561176757600080fd5b505afa15801561177b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061179f9190612511565b90506000816001600160a01b0316630e47dbd96040518163ffffffff1660e01b815260040160206040518083038186803b1580156117dc57600080fd5b505afa1580156117f0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118149190612785565b90506000816001600160401b0381111561183057611830612217565b604051908082528060200260200182016040528015611859578160200160208202803683370190505b5090506000826001600160401b0381111561187657611876612217565b60405190808252806020026020018201604052801561189f578160200160208202803683370190505b5090506000805b84811015611b07576040516372d00e9f60e01b8152600481018290526001600160a01b038716906372d00e9f9060240160206040518083038186803b1580156118ee57600080fd5b505afa158015611902573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119269190612511565b8482815181106119385761193861252e565b60200260200101906001600160a01b031690816001600160a01b031681525050600080876001600160a01b031663d025014487858151811061197c5761197c61252e565b60200260200101516040518263ffffffff1660e01b81526004016119a091906123cf565b60806040518083038186803b1580156119b857600080fd5b505afa1580156119cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119f091906126a6565b50925092505043826001600160401b031611158015611a17575043816001600160401b0316115b15611af2576000868481518110611a3057611a3061252e565b60200260200101516001600160a01b031663e99b5d3d6040518163ffffffff1660e01b815260040160206040518083038186803b158015611a7057600080fd5b505afa158015611a84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611aa89190612785565b905080868581518110611abd57611abd61252e565b602002602001018181525050858481518110611adb57611adb61252e565b602002602001015185611aee919061255a565b9450505b50508080611aff90612572565b9150506118a6565b5060005b84811015611bbb576000808311611b2f578560d354611b2a9190612620565b611b61565b82848381518110611b4257611b4261252e565b602002602001015160d354611b579190612601565b611b619190612620565b90506000848381518110611b7757611b7761252e565b60200260200101511115611ba857611ba8858381518110611b9a57611b9a61252e565b602002602001015182612143565b5080611bb381612572565b915050611b0b565b505050505050565b6000611bd0868484611e17565b6001600160a01b03808716600090815260a06020908152604080832093891683529290522054611c12908790879061134f9088906001600160801b031661255a565b6001600160a01b0386166000908152609a602052604090205461137890859061255a565b606780546001600160a01b0319166001600160a01b0383161790556107fd610544565b803b611cbd5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610777565b60008051602061286583398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b611d4b5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610777565b600080846001600160a01b031684604051611d6691906127ca565b600060405180830381855af49150503d8060008114611da1576040519150601f19603f3d011682016040523d82523d6000602084013e611da6565b606091505b5091509150611dce82826040518060600160405280602781526020016128856027913961217c565b95945050505050565b611de081611c59565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6001600160a01b0383166000908152609a6020526040902054611e525750506001600160a01b03166000908152609e60205260409020439055565b600080611e60858585611208565b6001600160a01b039096166000908152609b6020908152604080832098909855609e9052959095209490945550505050565b6001600160a01b03808416600090815260a06020908152604080832093861683529290522080546001600160801b031615611f9e5780546001600160a01b0385166000908152609b602052604081205490916001600160801b03600160801b8204811692676765c793fa10079d601b1b92611f0d9216612601565b611f179190612620565b611f219190612642565b6001830154909150611f3d9082906001600160801b03166127e6565b6001830180546001600160801b0319166001600160801b03929092169190911790556001600160a01b0385166000908152609d6020526040902054611f8390829061255a565b6001600160a01b0386166000908152609d6020526040902055505b80546001600160801b0319166001600160801b0383161781556001600160a01b0384166000908152609b6020526040902054676765c793fa10079d601b1b90611fe79084612601565b611ff19190612620565b81546001600160801b03918216600160801b029116179055505050565b600061201b858484611e17565b6001600160a01b03808616600090815260a0602090815260408083209388168352929052205461205790869086906001600160801b0316611e92565b6001600160a01b03858116600090815260a06020908152604080832093881683529290522060010180546001600160801b0380821692839290916010916120a7918591600160801b9004166127e6565b82546101009290920a6001600160801b038181021990931691831602179091556001600160a01b03888116600081815260a060209081526040808320948c16835293815283822060010180546001600160801b0319169055918152609c909152205461211792509083169061255a565b6001600160a01b0387166000908152609c60205260409020556001600160801b03169050949350505050565b61214f82600043611e17565b61215c6202a30082612620565b6001600160a01b039092166000908152609f602052604090209190915550565b6060831561218b5750816121b5565b82511561219b5782518084602001fd5b8160405162461bcd60e51b81526004016107779190612811565b9392505050565b6000602082840312156121ce57600080fd5b5035919050565b6001600160a01b03811681146107fd57600080fd5b80356121f5816121d5565b919050565b60006020828403121561220c57600080fd5b81356121b5816121d5565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561225557612255612217565b604052919050565b6000806040838503121561227057600080fd5b82356001600160401b038082111561228757600080fd5b818501915085601f83011261229b57600080fd5b81356020828211156122af576122af612217565b8160051b92506122c081840161222d565b82815292840181019281810190898511156122da57600080fd5b948201945b8486101561230457853593506122f4846121d5565b83825294820194908201906122df565b965061231390508782016121ea565b9450505050509250929050565b6000806040838503121561233357600080fd5b823561233e816121d5565b9150602083013561234e816121d5565b809150509250929050565b6000806000806080858703121561236f57600080fd5b843561237a816121d5565b935060208501359250604085013591506060850135612398816121d5565b939692955090935050565b600080604083850312156123b657600080fd5b82356123c1816121d5565b946020939093013593505050565b6001600160a01b0391909116815260200190565b600080604083850312156123f657600080fd5b8235612401816121d5565b91506020838101356001600160401b038082111561241e57600080fd5b818601915086601f83011261243257600080fd5b81358181111561244457612444612217565b612456601f8201601f1916850161222d565b9150808252878482850101111561246c57600080fd5b80848401858401376000848284010152508093505050509250929050565b60008060006040848603121561249f57600080fd5b83356124aa816121d5565b925060208401356001600160401b03808211156124c657600080fd5b818601915086601f8301126124da57600080fd5b8135818111156124e957600080fd5b8760208260051b85010111156124fe57600080fd5b6020830194508093505050509250925092565b60006020828403121561252357600080fd5b81516121b5816121d5565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b6000821982111561256d5761256d612544565b500190565b600060001982141561258657612586612544565b5060010190565b6020808252602c9082015260008051602061284583398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c9082015260008051602061284583398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600081600019048311821515161561261b5761261b612544565b500290565b60008261263d57634e487b7160e01b600052601260045260246000fd5b500490565b60008282101561265457612654612544565b500390565b6020808252600c908201526b232aa7222fa6a0a720a3a2a960a11b604082015260600190565b80516001600160401b03811681146121f557600080fd5b805180151581146121f557600080fd5b600080600080608085870312156126bc57600080fd5b845163ffffffff811681146126d057600080fd5b93506126de6020860161267f565b92506126ec6040860161267f565b91506126fa60608601612696565b905092959194509250565b60006020828403121561271757600080fd5b6121b582612696565b6001600160a01b038481168252606060208084018290528551918401829052600092868201929091906080860190855b8181101561276e578551851683529483019491830191600101612750565b505080945050505050826040830152949350505050565b60006020828403121561279757600080fd5b5051919050565b60005b838110156127b95781810151838201526020016127a1565b8381111561168d5750506000910152565b600082516127dc81846020870161279e565b9190910192915050565b60006001600160801b0382811684821680830382111561280857612808612544565b01949350505050565b602081526000825180602084015261283081604085016020870161279e565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212204253ab2793bf3b94e0486554448d95969351794c42e0dfe7939ee62708c5dbde64736f6c63430008080033";
545
+ "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c6128e161004b600039600081816107390152818161078201528181610aa70152610ae701526128e16000f3fe6080604052600436106101265760003560e01c806305a6aafa1461012b5780631b3c90a81461014d578063213b329e1461016257806322dec37b146101875780632d36bd88146101b45780632e42a896146101e957806331903da11461027b5780633659cfe6146102a85780633c8c043a146102c85780633d9a12cc146102de5780633e458a8e146102fe5780633e6326fc1461031e5780634162169f1461034b57806347b3e7e81461036b5780634f1db7f6146103985780634f1ef286146103f657806352e62ac2146104095780635aef7de6146104295780637bcbb9ff14610449578063846141b31461047f578063862a4d47146104ac5780638aaa31de146104c2578063a39b2153146104e2578063c4d66de814610502578063e1758bd814610522575b600080fd5b34801561013757600080fd5b5061014b6101463660046121bc565b610537565b005b34801561015957600080fd5b5061014b610544565b34801561016e57600080fd5b506202a3005b6040519081526020015b60405180910390f35b34801561019357600080fd5b506101746101a23660046121fa565b609c6020526000908152604090205481565b3480156101c057600080fd5b506101d46101cf36600461225d565b610689565b6040805192835260208301919091520161017e565b3480156101f557600080fd5b50610248610204366004612320565b60a0602090815260009283526040808420909152908252902080546001909101546001600160801b0380831692600160801b90819004821692808316929190041684565b604080516001600160801b039586168152938516602085015291841691830191909152909116606082015260800161017e565b34801561028757600080fd5b506101746102963660046121fa565b609d6020526000908152604090205481565b3480156102b457600080fd5b5061014b6102c33660046121fa565b61072e565b3480156102d457600080fd5b5061017460d35481565b3480156102ea57600080fd5b506101746102f9366004612359565b610800565b34801561030a57600080fd5b5061014b6103193660046123a3565b6108f4565b34801561032a57600080fd5b5060675461033e906001600160a01b031681565b60405161017e91906123cf565b34801561035757600080fd5b5060655461033e906001600160a01b031681565b34801561037757600080fd5b506101746103863660046121fa565b609f6020526000908152604090205481565b3480156103a457600080fd5b506101d46103b3366004612320565b6001600160a01b03918216600081815260a06020908152604080832094909516825292835283812054918152609a909252919020546001600160801b0390911691565b61014b6104043660046123e3565b610a9c565b34801561041557600080fd5b5061017461042436600461225d565b610b56565b34801561043557600080fd5b5060665461033e906001600160a01b031681565b34801561045557600080fd5b506101746104643660046121fa565b6001600160a01b03166000908152609b602052604090205490565b34801561048b57600080fd5b5061017461049a3660046121fa565b609e6020526000908152604090205481565b3480156104b857600080fd5b5061017460d45481565b3480156104ce57600080fd5b5061014b6104dd36600461248a565b610ceb565b3480156104ee57600080fd5b5061014b6104fd3660046123a3565b610d2d565b34801561050e57600080fd5b5061014b61051d3660046121fa565b610e63565b34801561052e57600080fd5b5061033e610f2d565b61053f610fc9565b60d355565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156105a257600080fd5b505afa1580156105b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105da9190612511565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561062f57600080fd5b505afa158015610643573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106679190612511565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60008060006106988585610b56565b90506000805b86518110156107235760a060008883815181106106bd576106bd61252e565b6020908102919091018101516001600160a01b0390811683528282019390935260409182016000908120938a16815292905290206001015461070f90600160801b90046001600160801b03168361255a565b91508061071b81612572565b91505061069e565b509590945092505050565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156107805760405162461bcd60e51b81526004016107779061258d565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166107b261109d565b6001600160a01b0316146107d85760405162461bcd60e51b8152600401610777906125c7565b6107e1816110b9565b604080516000808252602082019092526107fd918391906110c1565b50565b6001600160a01b03808516600081815260a0602090815260408083209486168352938152838220845160808101865281546001600160801b038082168352600160801b9182900481168386015260019093015480841683890152049091166060820152928252609a9052918220548290156108ea576000610882888888611208565b91505082604001516001600160801b0316915082602001516001600160801b0316676765c793fa10079d601b1b8285600001516001600160801b03166108c89190612601565b6108d29190612620565b6108dc9190612642565b6108e6908361255a565b9150505b9695505050505050565b60675460405163bf40fac160e01b81523391600091829182916001600160a01b039091169063bf40fac19061092b90600401612659565b60206040518083038186803b15801561094357600080fd5b505afa158015610957573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061097b9190612511565b6001600160a01b031663d0250144856040518263ffffffff1660e01b81526004016109a691906123cf565b60806040518083038186803b1580156109be57600080fd5b505afa1580156109d2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f691906126a6565b935093509350508015610a0b57505050505050565b610a2a848787866001600160401b0316866001600160401b0316611300565b50604080516001808252818301909252600091602080830190803683370190505090508481600081518110610a6157610a6161252e565b60200260200101906001600160a01b031690816001600160a01b031681525050610a8b878261139d565b610a93611693565b50505050505050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610ae55760405162461bcd60e51b81526004016107779061258d565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610b1761109d565b6001600160a01b031614610b3d5760405162461bcd60e51b8152600401610777906125c7565b610b46826110b9565b610b52828260016110c1565b5050565b60008060005b8451811015610ce35760675460405163bf40fac160e01b8152600091829182916001600160a01b03169063bf40fac190610b9890600401612659565b60206040518083038186803b158015610bb057600080fd5b505afa158015610bc4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610be89190612511565b6001600160a01b031663d0250144898681518110610c0857610c0861252e565b60200260200101516040518263ffffffff1660e01b8152600401610c2c91906123cf565b60806040518083038186803b158015610c4457600080fd5b505afa158015610c58573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7c91906126a6565b919550935091505080610ccd57610cc0888581518110610c9e57610c9e61252e565b6020026020010151846001600160401b0316846001600160401b03168a610800565b610cca908661255a565b94505b5050508080610cdb90612572565b915050610b5c565b509392505050565b610d288383838080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525061139d92505050565b505050565b60675460405163bf40fac160e01b81523391600091829182916001600160a01b039091169063bf40fac190610d6490600401612659565b60206040518083038186803b158015610d7c57600080fd5b505afa158015610d90573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610db49190612511565b6001600160a01b031663d0250144856040518263ffffffff1660e01b8152600401610ddf91906123cf565b60806040518083038186803b158015610df757600080fd5b505afa158015610e0b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e2f91906126a6565b935093509350508015610e4457505050505050565b610a2a848787866001600160401b0316866001600160401b0316611bc3565b600054610100900460ff1680610e7c575060005460ff16155b610edf5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610777565b600054610100900460ff16158015610f01576000805461ffff19166101011790555b66d3c21bcecceda160191b60d355610f1882611c36565b8015610b52576000805461ff00191690555050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b158015610f8c57600080fd5b505afa158015610fa0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fc49190612511565b905090565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561100d57600080fd5b505afa158015611021573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110459190612511565b6001600160a01b03161461109b5760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610777565b565b600080516020612865833981519152546001600160a01b031690565b6107fd610fc9565b60006110cb61109d565b90506110d684611c59565b6000835111806110e35750815b156110f4576110f28484611cec565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661120157805460ff1916600117815560405161116f9086906111409085906024016123cf565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b179052611cec565b50805460ff1916815561118061109d565b6001600160a01b0316826001600160a01b0316146111f85760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610777565b61120185611dd7565b5050505050565b6001600160a01b0383166000908152609b6020908152604080832054609e9092529091205490838210801561123d5750834310155b6112475781611249565b835b9150600083431161125a574361125c565b835b90508481108061126c5750838310155b1561127757506112f8565b60006112838483612642565b6001600160a01b0388166000908152609f6020526040812054919250906112aa9083612601565b6001600160a01b0389166000908152609a60205260409020549091506112db82676765c793fa10079d601b1b612601565b6112e59190612620565b6112ef908561255a565b93508294505050505b935093915050565b600061130d868484611e17565b6001600160a01b03808716600090815260a06020908152604080832093891683529290522054611354908790879061134f9088906001600160801b0316612642565b611e92565b6001600160a01b0386166000908152609a6020526040902054611378908590612642565b6001600160a01b0387166000908152609a602052604090205550600195945050505050565b60675460405163bf40fac160e01b815260009182916001600160a01b039091169063bf40fac1906113d090600401612659565b60206040518083038186803b1580156113e857600080fd5b505afa1580156113fc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114209190612511565b905060005b835181101561152f576000806000846001600160a01b031663d02501448886815181106114545761145461252e565b60200260200101516040518263ffffffff1660e01b815260040161147891906123cf565b60806040518083038186803b15801561149057600080fd5b505afa1580156114a4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114c891906126a6565b9195509350915050806115195761150c8785815181106114ea576114ea61252e565b602002602001015189856001600160401b0316856001600160401b031661200e565b611516908761255a565b95505b505050808061152790612572565b915050611425565b50811561168d5760675460405163bf40fac160e01b815260206004820152600a6024820152692922a82aaa20aa24a7a760b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561159457600080fd5b505afa1580156115a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115cc9190612511565b6040516340c10f1960e01b81526001600160a01b0386811660048301526024820185905291909116906340c10f1990604401602060405180830381600087803b15801561161857600080fd5b505af115801561162c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116509190612705565b507fb5bb6cf2a7d73ab2167d87f348feea953c3e405a4ece2a262cd92cdce829f6d284848460405161168493929190612720565b60405180910390a15b50505050565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906116c290600401612659565b60206040518083038186803b1580156116da57600080fd5b505afa1580156116ee573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117129190612511565b6001600160a01b03161461109b5760675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac19061174f90600401612659565b60206040518083038186803b15801561176757600080fd5b505afa15801561177b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061179f9190612511565b90506000816001600160a01b0316630e47dbd96040518163ffffffff1660e01b815260040160206040518083038186803b1580156117dc57600080fd5b505afa1580156117f0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118149190612785565b90506000816001600160401b0381111561183057611830612217565b604051908082528060200260200182016040528015611859578160200160208202803683370190505b5090506000826001600160401b0381111561187657611876612217565b60405190808252806020026020018201604052801561189f578160200160208202803683370190505b5090506000805b84811015611b07576040516372d00e9f60e01b8152600481018290526001600160a01b038716906372d00e9f9060240160206040518083038186803b1580156118ee57600080fd5b505afa158015611902573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119269190612511565b8482815181106119385761193861252e565b60200260200101906001600160a01b031690816001600160a01b031681525050600080876001600160a01b031663d025014487858151811061197c5761197c61252e565b60200260200101516040518263ffffffff1660e01b81526004016119a091906123cf565b60806040518083038186803b1580156119b857600080fd5b505afa1580156119cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119f091906126a6565b50925092505043826001600160401b031611158015611a17575043816001600160401b0316115b15611af2576000868481518110611a3057611a3061252e565b60200260200101516001600160a01b031663e99b5d3d6040518163ffffffff1660e01b815260040160206040518083038186803b158015611a7057600080fd5b505afa158015611a84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611aa89190612785565b905080868581518110611abd57611abd61252e565b602002602001018181525050858481518110611adb57611adb61252e565b602002602001015185611aee919061255a565b9450505b50508080611aff90612572565b9150506118a6565b5060005b84811015611bbb576000808311611b2f578560d354611b2a9190612620565b611b61565b82848381518110611b4257611b4261252e565b602002602001015160d354611b579190612601565b611b619190612620565b90506000848381518110611b7757611b7761252e565b60200260200101511115611ba857611ba8858381518110611b9a57611b9a61252e565b602002602001015182612143565b5080611bb381612572565b915050611b0b565b505050505050565b6000611bd0868484611e17565b6001600160a01b03808716600090815260a06020908152604080832093891683529290522054611c12908790879061134f9088906001600160801b031661255a565b6001600160a01b0386166000908152609a602052604090205461137890859061255a565b606780546001600160a01b0319166001600160a01b0383161790556107fd610544565b803b611cbd5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610777565b60008051602061286583398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b611d4b5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610777565b600080846001600160a01b031684604051611d6691906127ca565b600060405180830381855af49150503d8060008114611da1576040519150601f19603f3d011682016040523d82523d6000602084013e611da6565b606091505b5091509150611dce82826040518060600160405280602781526020016128856027913961217c565b95945050505050565b611de081611c59565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6001600160a01b0383166000908152609a6020526040902054611e525750506001600160a01b03166000908152609e60205260409020439055565b600080611e60858585611208565b6001600160a01b039096166000908152609b6020908152604080832098909855609e9052959095209490945550505050565b6001600160a01b03808416600090815260a06020908152604080832093861683529290522080546001600160801b031615611f9e5780546001600160a01b0385166000908152609b602052604081205490916001600160801b03600160801b8204811692676765c793fa10079d601b1b92611f0d9216612601565b611f179190612620565b611f219190612642565b6001830154909150611f3d9082906001600160801b03166127e6565b6001830180546001600160801b0319166001600160801b03929092169190911790556001600160a01b0385166000908152609d6020526040902054611f8390829061255a565b6001600160a01b0386166000908152609d6020526040902055505b80546001600160801b0319166001600160801b0383161781556001600160a01b0384166000908152609b6020526040902054676765c793fa10079d601b1b90611fe79084612601565b611ff19190612620565b81546001600160801b03918216600160801b029116179055505050565b600061201b858484611e17565b6001600160a01b03808616600090815260a0602090815260408083209388168352929052205461205790869086906001600160801b0316611e92565b6001600160a01b03858116600090815260a06020908152604080832093881683529290522060010180546001600160801b0380821692839290916010916120a7918591600160801b9004166127e6565b82546101009290920a6001600160801b038181021990931691831602179091556001600160a01b03888116600081815260a060209081526040808320948c16835293815283822060010180546001600160801b0319169055918152609c909152205461211792509083169061255a565b6001600160a01b0387166000908152609c60205260409020556001600160801b03169050949350505050565b61214f82600043611e17565b61215c6202a30082612620565b6001600160a01b039092166000908152609f602052604090209190915550565b6060831561218b5750816121b5565b82511561219b5782518084602001fd5b8160405162461bcd60e51b81526004016107779190612811565b9392505050565b6000602082840312156121ce57600080fd5b5035919050565b6001600160a01b03811681146107fd57600080fd5b80356121f5816121d5565b919050565b60006020828403121561220c57600080fd5b81356121b5816121d5565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561225557612255612217565b604052919050565b6000806040838503121561227057600080fd5b82356001600160401b038082111561228757600080fd5b818501915085601f83011261229b57600080fd5b81356020828211156122af576122af612217565b8160051b92506122c081840161222d565b82815292840181019281810190898511156122da57600080fd5b948201945b8486101561230457853593506122f4846121d5565b83825294820194908201906122df565b965061231390508782016121ea565b9450505050509250929050565b6000806040838503121561233357600080fd5b823561233e816121d5565b9150602083013561234e816121d5565b809150509250929050565b6000806000806080858703121561236f57600080fd5b843561237a816121d5565b935060208501359250604085013591506060850135612398816121d5565b939692955090935050565b600080604083850312156123b657600080fd5b82356123c1816121d5565b946020939093013593505050565b6001600160a01b0391909116815260200190565b600080604083850312156123f657600080fd5b8235612401816121d5565b91506020838101356001600160401b038082111561241e57600080fd5b818601915086601f83011261243257600080fd5b81358181111561244457612444612217565b612456601f8201601f1916850161222d565b9150808252878482850101111561246c57600080fd5b80848401858401376000848284010152508093505050509250929050565b60008060006040848603121561249f57600080fd5b83356124aa816121d5565b925060208401356001600160401b03808211156124c657600080fd5b818601915086601f8301126124da57600080fd5b8135818111156124e957600080fd5b8760208260051b85010111156124fe57600080fd5b6020830194508093505050509250925092565b60006020828403121561252357600080fd5b81516121b5816121d5565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b6000821982111561256d5761256d612544565b500190565b600060001982141561258657612586612544565b5060010190565b6020808252602c9082015260008051602061284583398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c9082015260008051602061284583398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600081600019048311821515161561261b5761261b612544565b500290565b60008261263d57634e487b7160e01b600052601260045260246000fd5b500490565b60008282101561265457612654612544565b500390565b6020808252600c908201526b232aa7222fa6a0a720a3a2a960a11b604082015260600190565b80516001600160401b03811681146121f557600080fd5b805180151581146121f557600080fd5b600080600080608085870312156126bc57600080fd5b845163ffffffff811681146126d057600080fd5b93506126de6020860161267f565b92506126ec6040860161267f565b91506126fa60608601612696565b905092959194509250565b60006020828403121561271757600080fd5b6121b582612696565b6001600160a01b038481168252606060208084018290528551918401829052600092868201929091906080860190855b8181101561276e578551851683529483019491830191600101612750565b505080945050505050826040830152949350505050565b60006020828403121561279757600080fd5b5051919050565b60005b838110156127b95781810151838201526020016127a1565b8381111561168d5750506000910152565b600082516127dc81846020870161279e565b9190910192915050565b60006001600160801b0382811684821680830382111561280857612808612544565b01949350505050565b602081526000825180602084015261283081604085016020870161279e565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220de7f0b294892342852bd367dbcb51aeeb6065446142d9596300e9c43a7a2036564736f6c63430008080033";
546
546
 
547
547
  type StakersDistributionConstructorParams =
548
548
  | [signer?: Signer]
package/types/factories/SwapHelperTest__factory.ts CHANGED
@@ -47,7 +47,7 @@ const _abi = [
47
47
  ];
48
48
 
49
49
  const _bytecode =
50
- "0x608060405234801561001057600080fd5b506103fd806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80633274946114610030575b600080fd5b61004361003e36600461031d565b61005c565b6040805192835260208301919091520160405180910390f35b600080600061006b8585610135565b50905060008061007c888888610232565b6001600160a01b0316630902f1ac6040518163ffffffff1660e01b815260040160606040518083038186803b1580156100b457600080fd5b505afa1580156100c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100ec9190610377565b506001600160701b031691506001600160701b03169150826001600160a01b0316876001600160a01b031614610123578082610126565b81815b90999098509650505050505050565b600080826001600160a01b0316846001600160a01b031614156101ad5760405162461bcd60e51b815260206004820152602560248201527f556e697377617056324c6962726172793a204944454e544943414c5f41444452604482015264455353455360d81b60648201526084015b60405180910390fd5b826001600160a01b0316846001600160a01b0316106101cd5782846101d0565b83835b90925090506001600160a01b03821661022b5760405162461bcd60e51b815260206004820152601e60248201527f556e697377617056324c6962726172793a205a45524f5f41444452455353000060448201526064016101a4565b9250929050565b60008060006102418585610135565b6040516001600160601b0319606084811b8216602084015283901b16603482015291935091508690604801604051602081830303815290604052805190602001206040516020016102df9291906001600160f81b0319815260609290921b6001600160601b031916600183015260158201527f96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f603582015260550190565b60408051601f1981840301815291905280516020909101209695505050505050565b80356001600160a01b038116811461031857600080fd5b919050565b60008060006060848603121561033257600080fd5b61033b84610301565b925061034960208501610301565b915061035760408501610301565b90509250925092565b80516001600160701b038116811461031857600080fd5b60008060006060848603121561038c57600080fd5b61039584610360565b92506103a360208501610360565b9150604084015163ffffffff811681146103bc57600080fd5b80915050925092509256fea26469706673582212207659e3dbfe727a389fcf4ae38f77186b85108c2e42fd019b1c98cdd681233a0b64736f6c63430008080033";
50
+ "0x608060405234801561001057600080fd5b506103fd806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80633274946114610030575b600080fd5b61004361003e36600461031d565b61005c565b6040805192835260208301919091520160405180910390f35b600080600061006b8585610135565b50905060008061007c888888610232565b6001600160a01b0316630902f1ac6040518163ffffffff1660e01b815260040160606040518083038186803b1580156100b457600080fd5b505afa1580156100c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100ec9190610377565b506001600160701b031691506001600160701b03169150826001600160a01b0316876001600160a01b031614610123578082610126565b81815b90999098509650505050505050565b600080826001600160a01b0316846001600160a01b031614156101ad5760405162461bcd60e51b815260206004820152602560248201527f556e697377617056324c6962726172793a204944454e544943414c5f41444452604482015264455353455360d81b60648201526084015b60405180910390fd5b826001600160a01b0316846001600160a01b0316106101cd5782846101d0565b83835b90925090506001600160a01b03821661022b5760405162461bcd60e51b815260206004820152601e60248201527f556e697377617056324c6962726172793a205a45524f5f41444452455353000060448201526064016101a4565b9250929050565b60008060006102418585610135565b6040516001600160601b0319606084811b8216602084015283901b16603482015291935091508690604801604051602081830303815290604052805190602001206040516020016102df9291906001600160f81b0319815260609290921b6001600160601b031916600183015260158201527f96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f603582015260550190565b60408051601f1981840301815291905280516020909101209695505050505050565b80356001600160a01b038116811461031857600080fd5b919050565b60008060006060848603121561033257600080fd5b61033b84610301565b925061034960208501610301565b915061035760408501610301565b90509250925092565b80516001600160701b038116811461031857600080fd5b60008060006060848603121561038c57600080fd5b61039584610360565b92506103a360208501610360565b9150604084015163ffffffff811681146103bc57600080fd5b80915050925092509256fea2646970667358221220ed56d020ccc7f2080151a68c21cb14de90a29efd3a24aaa8815d98ea4f6454ed64736f6c63430008080033";
51
51
 
52
52
  type SwapHelperTestConstructorParams =
53
53
  | [signer?: Signer]
package/types/factories/UBIScheme__factory.ts CHANGED
@@ -446,6 +446,19 @@ const _abi = [
446
446
  stateMutability: "view",
447
447
  type: "function",
448
448
  },
449
+ {
450
+ inputs: [],
451
+ name: "defaultDailyUbi",
452
+ outputs: [
453
+ {
454
+ internalType: "uint256",
455
+ name: "",
456
+ type: "uint256",
457
+ },
458
+ ],
459
+ stateMutability: "view",
460
+ type: "function",
461
+ },
449
462
  {
450
463
  inputs: [],
451
464
  name: "estimateNextDailyUBI",
@@ -723,19 +736,6 @@ const _abi = [
723
736
  stateMutability: "view",
724
737
  type: "function",
725
738
  },
726
- {
727
- inputs: [],
728
- name: "minActiveUsers",
729
- outputs: [
730
- {
731
- internalType: "uint256",
732
- name: "",
733
- type: "uint256",
734
- },
735
- ],
736
- stateMutability: "view",
737
- type: "function",
738
- },
739
739
  {
740
740
  inputs: [],
741
741
  name: "nameService",
@@ -912,6 +912,13 @@ const _abi = [
912
912
  stateMutability: "nonpayable",
913
913
  type: "function",
914
914
  },
915
+ {
916
+ inputs: [],
917
+ name: "upgrade",
918
+ outputs: [],
919
+ stateMutability: "nonpayable",
920
+ type: "function",
921
+ },
915
922
  {
916
923
  inputs: [
917
924
  {
@@ -959,7 +966,7 @@ const _abi = [
959
966
  ];
960
967
 
961
968
  const _bytecode =
962
- "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c612c9d61004b60003960008181610e2d01528181610e6d015281816112cf015261130f0152612c9d6000f3fe6080604052600436106102235760003560e01c8063013eba921461022857806302329a2914610268578063069786ea1461028a5780630ce82d67146102b45780631248b101146102c95780631794bb3c146103005780631a787f2e146103205780631b3c90a8146103405780631bbc644c146103555780631d8f5ea91461038557806322b457271461039b5780633659cfe6146103b157806337658574146103d15780633d84ceca146103e75780633e6326fc146104075780634162169f146104345780634202d21414610454578063456ac1c2146104745780634b4c71801461048e5780634e71d92d146104a85780634f1ef286146104bd5780635231e2f0146104d0578063560796d1146105005780635aef7de6146105515780635c9302c9146105715780635c975abb1461058757806373b2e80e146105a1578063741470ac146105c15780638081cbbd146105d75780638fd247d2146105f757806398d6621b146106175780639dc2c0331461062c578063a21f698a14610642578063b656223d14610662578063ba07541014610678578063c033abf21461068e578063c1337508146106a4578063c7713870146106c4578063c7a76adf146106d9578063cc054dfc146106f9578063cef6360014610726578063d6a9f61814610746578063d7c4cbb814610766578063dddc36161461077c578063de1de3a014610791578063e1758bd8146107b1578063eac471a0146107c6578063eda4e6d6146107dc575b600080fd5b34801561023457600080fd5b50610255610243366004612645565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027457600080fd5b50610288610283366004612670565b6107f2565b005b34801561029657600080fd5b5061029f61080d565b6040805192835260208301919091520161025f565b3480156102c057600080fd5b5061025561084b565b3480156102d557600080fd5b5061029f6102e436600461268d565b609a602052600090815260409020600181015460029091015482565b34801561030c57600080fd5b5061028861031b3660046126a6565b61086e565b34801561032c57600080fd5b5061025561033b366004612645565b610a03565b34801561034c57600080fd5b50610288610b3a565b34801561036157600080fd5b50610375610370366004612645565b610c7f565b604051901515815260200161025f565b34801561039157600080fd5b50610255609e5481565b3480156103a757600080fd5b5061025560a05481565b3480156103bd57600080fd5b506102886103cc366004612645565b610e22565b3480156103dd57600080fd5b5061025560a95481565b3480156103f357600080fd5b5061028861040236600461268d565b610eeb565b34801561041357600080fd5b50606754610427906001600160a01b031681565b60405161025f91906126e7565b34801561044057600080fd5b50606554610427906001600160a01b031681565b34801561046057600080fd5b5061037561046f366004612645565b610f8e565b34801561048057600080fd5b5060a3546103759060ff1681565b34801561049a57600080fd5b5060a8546103759060ff1681565b3480156104b457600080fd5b50610375610ff0565b6102886104cb366004612768565b6112c4565b3480156104dc57600080fd5b506103756104eb366004612645565b60ac6020526000908152604090205460ff1681565b34801561050c57600080fd5b5061053a61051b36600461268d565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161025f565b34801561055d57600080fd5b50606654610427906001600160a01b031681565b34801561057d57600080fd5b50610255609c5481565b34801561059357600080fd5b5060ae546103759060ff1681565b3480156105ad57600080fd5b506103756105bc366004612645565b61137e565b3480156105cd57600080fd5b5061025560a75481565b3480156105e357600080fd5b5060aa54610427906001600160a01b031681565b34801561060357600080fd5b5061028861061236600461268d565b6113aa565b34801561062357600080fd5b506102556113b7565b34801561063857600080fd5b5061025560a55481565b34801561064e57600080fd5b5061037561065d366004612645565b6113c2565b34801561066e57600080fd5b5061025560a25481565b34801561068457600080fd5b5061025560a65481565b34801561069a57600080fd5b50610255609f5481565b3480156106b057600080fd5b506102556106bf3660046127fa565b6113e8565b3480156106d057600080fd5b5061025561159d565b3480156106e557600080fd5b506102556106f436600461268d565b61168f565b34801561070557600080fd5b50610255610714366004612645565b60ad6020526000908152604090205481565b34801561073257600080fd5b5061025561074136600461268d565b6116a4565b34801561075257600080fd5b50610288610761366004612670565b6116b9565b34801561077257600080fd5b5061025560a15481565b34801561078857600080fd5b506102886116d4565b34801561079d57600080fd5b506102886107ac366004612670565b611733565b3480156107bd57600080fd5b50610427611782565b3480156107d257600080fd5b5061025560a45481565b3480156107e857600080fd5b50610255609d5481565b6107fa611819565b60ae805460ff1916911515919091179055565b600080600062015180609d544261082491906128c1565b61082e91906128d8565b90506108398161168f565b610842826116a4565b92509250509091565b60006201518060a6544261085f91906128c1565b61086991906128d8565b905090565b600054610100900460ff1680610887575060005460ff16155b6108ef5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b600054610100900460ff16158015610911576000805461ffff19166101011790555b600082116109615760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f60448201526064016108e6565b61096a846118ed565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055605a60a455620249f0609f556109ad62015180426128d8565b6109ba90620151806128fa565b6109c69061a8c0612919565b609d81905560a65560a8805460ff19166001600160a01b03851615151790556103e860a95580156109fd576000805461ff00191690555b50505050565b6000609d54421015610a1757506000919050565b60a85460ff168015610a515750610a2d826113c2565b1580610a5157506001600160a01b038216600090815260ac602052604090205460ff165b15610ae25760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b815260040160206040518083038186803b158015610aa457600080fd5b505afa158015610ab8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610adc9190612931565b92915050565b62015180609d5442610af491906128c1565b610afe91906128d8565b609c54148015610b1057506000609e54115b15610b3257610b1e8261137e565b610b2a57609e54610adc565b600092915050565b610adc61159d565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610b9857600080fd5b505afa158015610bac573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bd0919061294a565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610c2557600080fd5b505afa158015610c39573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c5d919061294a565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610c9757506000609d54115b8015610ca55750609d544210155b610cc15760405162461bcd60e51b81526004016108e690612967565b610cca826113c2565b8015610cdc5750610cda82610f8e565b155b610d225760405162461bcd60e51b815260206004820152601760248201527634b9903737ba1030b71034b730b1ba34bb32903ab9b2b960491b60448201526064016108e6565b6001600160a01b038216600090815260ac602052604090205460ff1615610d7c5760405162461bcd60e51b815260206004820152600e60248201526d185b1c9958591e48199a5cda195960921b60448201526064016108e6565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055610da7611910565b60a05490915015610dcb57600160a06000828254610dc591906128c1565b90915550505b610dd9333383600080611bc0565b6040518181526001600160a01b0384169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a350600192915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610e6b5760405162461bcd60e51b81526004016108e69061299e565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610e9d611e77565b6001600160a01b031614610ec35760405162461bcd60e51b81526004016108e6906129d8565b610ecc81611e93565b60408051600080825260208201909252610ee891839190611e9b565b50565b610ef3611819565b60008111610f4d5760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b60648201526084016108e6565b60a4819055600060a7556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610fb0836113c2565b15610fe757600062015180610fc583426128c1565b610fcf91906128d8565b905060a254811015610fe5575060019392505050565b505b50600092915050565b60ae5460009060ff1615801561100857506000609d54115b80156110165750609d544210155b6110325760405162461bcd60e51b81526004016108e690612967565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561108f57600080fd5b505afa1580156110a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110c7919061294a565b6001600160a01b0316632d0e9b46336040518263ffffffff1660e01b81526004016110f291906126e7565b60206040518083038186803b15801561110a57600080fd5b505afa15801561111e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611142919061294a565b90506001600160a01b0381166111975760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b60448201526064016108e6565b60006111a38233611fdb565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561120a57600080fd5b505afa15801561121e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611242919061294a565b905081801561125957506001600160a01b03811615155b156112bd5760405163748abee960e11b81526001600160a01b0382169063e9157dd29061128a9086906004016126e7565b600060405180830381600087803b1580156112a457600080fd5b505af11580156112b8573d6000803e3d6000fd5b505050505b5091505090565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561130d5760405162461bcd60e51b81526004016108e69061299e565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661133f611e77565b6001600160a01b0316146113655760405162461bcd60e51b81526004016108e6906129d8565b61136e82611e93565b61137a82826001611e9b565b5050565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b6113b2611819565b60a055565b600061086933610a03565b6001600160a01b0381166000908152609b602052604081205415610b2a57506001919050565b60ae5460009060ff1615801561140057506000609d54115b801561140e5750609d544210155b61142a5760405162461bcd60e51b81526004016108e690612967565b60005b825181101561156f57609f545a101561146757604051818152600080516020612c488339815191529060200160405180910390a192915050565b61148983828151811061147c5761147c612a12565b60200260200101516113c2565b80156114b457506114b28382815181106114a5576114a5612a12565b6020026020010151610f8e565b155b80156114fa575060ac60008483815181106114d1576114d1612a12565b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff16155b1561155f5761152183828151811061151457611514612a12565b6020026020010151610c7f565b61155f5760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b60448201526064016108e6565b61156881612a28565b905061142d565b50600080516020612c48833981519152825160405161159091815260200190565b60405180910390a1505190565b6000806115a8611782565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016115d391906126e7565b60206040518083038186803b1580156115eb57600080fd5b505afa1580156115ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116239190612931565b9050600060a55460a4548361163891906128d8565b119050600060a5549050600060a75461164f61084b565b1015806116595750825b1561166e5760a45461166b90856128d8565b91505b61167c60a05460a954612126565b61168690836128d8565b95945050505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b6116c1611819565b60a8805460ff1916911515919091179055565b600062015180609d54426116e891906128c1565b6116f291906128d8565b9050609c54811115610ee857609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610f83565b61173b611819565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610f83565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b1580156117e157600080fd5b505afa1580156117f5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610869919061294a565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561185d57600080fd5b505afa158015611871573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611895919061294a565b6001600160a01b0316146118eb5760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f6460448201526064016108e6565b565b606780546001600160a01b0319166001600160a01b038316179055610ee8610b3a565b600061191a6116d4565b60a154609c5414158061192d5750609e54155b15611bb957600061193c611782565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161196c91906126e7565b60206040518083038186803b15801561198457600080fd5b505afa158015611998573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119bc9190612931565b9050600060a55460a454836119d191906128d8565b11905060a7546119df61084b565b1015806119e95750805b15611b015760a35460ff1615611a0157611a0161213f565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611a2d9030906004016126e7565b60206040518083038186803b158015611a4557600080fd5b505afa158015611a59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a7d9190612931565b915060a45482611a8d91906128d8565b60a55560a45460a755611aa2610e10426128d8565b611aae90610e106128fa565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05460a954611b419190612126565b60a554611b4e91906128d8565b609e5560a054611b6c90611b64906002906128d8565b60a954612126565b60a955609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b8180611bc95750805b15611c57576001609a6000609c5481526020019081526020016000206001016000828254611bf79190612919565b9091555050609c546000908152609a602090815260408083206001600160a01b03891684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611c51908490612919565b90915550505b8015611d415760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611c8e9088906004016126e7565b602060405180830381600087803b158015611ca857600080fd5b505af1158015611cbc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ce09190612931565b905080609a6000609c5481526020019081526020016000206002016000828254611d0a9190612919565b90915550506040518181526001600160a01b03871690600080516020612be18339815191529060200160405180910390a250611e70565b8115611d9d57609c546000908152609a602052604081206002018054859290611d6b908490612919565b90915550506040518381526001600160a01b03861690600080516020612be18339815191529060200160405180910390a25b6000611da7611782565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611dd89088908890600401612a43565b602060405180830381600087803b158015611df257600080fd5b505af1158015611e06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e2a9190612a5c565b611e6e5760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b60448201526064016108e6565b505b5050505050565b600080516020612c01833981519152546001600160a01b031690565b610ee8611819565b6000611ea5611e77565b9050611eb084612442565b600083511180611ebd5750815b15611ece57611ecc84846124d5565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16611e7057805460ff19166001178155604051611f49908690611f1a9085906024016126e7565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526124d5565b50805460ff19168155611f5a611e77565b6001600160a01b0316826001600160a01b031614611fd25760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b60648201526084016108e6565b611e70856125b7565b600080611fe6611910565b9050611ff1846113c2565b801561201657506001600160a01b038416600090815260ac602052604090205460ff16155b801561202857506120268461137e565b155b156120465761203c84848360016000611bc0565b6001915050610adc565b61204f846113c2565b158061207357506001600160a01b038416600090815260ac602052604090205460ff165b1561211c57600160a0600082825461208b9190612919565b90915550506001600160a01b038416600090815260ac60205260409020805460ff1916905560a85460ff16156120cf576120ca84846000806001611bc0565b6120de565b6120de84848360016000611bc0565b6040516001600160a01b038516907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a26001915050610adc565b5060009392505050565b6000818310156121365781612138565b825b9392505050565b6000612149611782565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161217991906126e7565b60206040518083038186803b15801561219157600080fd5b505afa1580156121a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121c99190612931565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a082319261220192909116906004016126e7565b60206040518083038186803b15801561221957600080fd5b505afa15801561222d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122519190612931565b6065546040519192506001600160a01b03169063d1b7089a90859061227c9030908690602401612a43565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526122d79392916001600160a01b031690600090600401612ad1565b600060405180830381600087803b1580156122f157600080fd5b505af1158015612305573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261232d9190810190612b05565b506000905061233c8284612919565b6040516370a0823160e01b81529091506001600160a01b038516906370a082319061236b9030906004016126e7565b60206040518083038186803b15801561238357600080fd5b505afa158015612397573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123bb9190612931565b81146124035760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b60448201526064016108e6565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba910160405180910390a150505050565b803b6124a65760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016108e6565b600080516020612c0183398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6125345760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016108e6565b600080846001600160a01b03168460405161254f9190612b91565b600060405180830381855af49150503d806000811461258a576040519150601f19603f3d011682016040523d82523d6000602084013e61258f565b606091505b50915091506116868282604051806060016040528060278152602001612c21602791396125f7565b6125c081612442565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60608315612606575081612138565b8251156126165782518084602001fd5b8160405162461bcd60e51b81526004016108e69190612bad565b6001600160a01b0381168114610ee857600080fd5b60006020828403121561265757600080fd5b813561213881612630565b8015158114610ee857600080fd5b60006020828403121561268257600080fd5b813561213881612662565b60006020828403121561269f57600080fd5b5035919050565b6000806000606084860312156126bb57600080fd5b83356126c681612630565b925060208401356126d681612630565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715612739576127396126fb565b604052919050565b60006001600160401b0382111561275a5761275a6126fb565b50601f01601f191660200190565b6000806040838503121561277b57600080fd5b823561278681612630565b915060208301356001600160401b038111156127a157600080fd5b8301601f810185136127b257600080fd5b80356127c56127c082612741565b612711565b8181528660208385010111156127da57600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561280d57600080fd5b82356001600160401b038082111561282457600080fd5b818501915085601f83011261283857600080fd5b81358181111561284a5761284a6126fb565b8060051b915061285b848301612711565b818152918301840191848101908884111561287557600080fd5b938501935b8385101561289f578435925061288f83612630565b828252938501939085019061287a565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b6000828210156128d3576128d36128ab565b500390565b6000826128f557634e487b7160e01b600052601260045260246000fd5b500490565b6000816000190483118215151615612914576129146128ab565b500290565b6000821982111561292c5761292c6128ab565b500190565b60006020828403121561294357600080fd5b5051919050565b60006020828403121561295c57600080fd5b815161213881612630565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612bc183398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612bc183398151915260408201526b6163746976652070726f787960a01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b6000600019821415612a3c57612a3c6128ab565b5060010190565b6001600160a01b03929092168252602082015260400190565b600060208284031215612a6e57600080fd5b815161213881612662565b60005b83811015612a94578181015183820152602001612a7c565b838111156109fd5750506000910152565b60008151808452612abd816020860160208601612a79565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612af36080840187612aa5565b94166040830152506060015292915050565b60008060408385031215612b1857600080fd5b8251612b2381612662565b60208401519092506001600160401b03811115612b3f57600080fd5b8301601f81018513612b5057600080fd5b8051612b5e6127c082612741565b818152866020838501011115612b7357600080fd5b612b84826020830160208601612a79565b8093505050509250929050565b60008251612ba3818460208701612a79565b9190910192915050565b6020815260006121386020830184612aa556fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c656472b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540fa264697066735822122004bacb20aca118d7ff80104cf4242321b653b930ad028290593d70b6ab76318764736f6c63430008080033";
969
+ "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c612d1261004b60003960008181610e4201528181610e82015281816112c301526113030152612d126000f3fe60806040526004361061022e5760003560e01c8063013eba921461023357806302329a2914610273578063069786ea146102955780630ce82d67146102bf5780631099da4f146102d45780631248b101146102ea5780631794bb3c146103215780631a787f2e146103415780631b3c90a8146103615780631bbc644c146103765780631d8f5ea9146103a657806322b45727146103bc5780633659cfe6146103d25780633d84ceca146103f25780633e6326fc146104125780634162169f1461043f5780634202d2141461045f578063456ac1c21461047f5780634b4c7180146104995780634e71d92d146104b35780634f1ef286146104c85780635231e2f0146104db578063560796d11461050b5780635aef7de61461055c5780635c9302c91461057c5780635c975abb1461059257806373b2e80e146105ac578063741470ac146105cc5780638081cbbd146105e25780638fd247d21461060257806398d6621b146106225780639dc2c03314610637578063a21f698a1461064d578063b656223d1461066d578063ba07541014610683578063c033abf214610699578063c1337508146106af578063c7713870146106cf578063c7a76adf146106e4578063cc054dfc14610704578063cef6360014610731578063d55ec69714610751578063d6a9f61814610766578063d7c4cbb814610786578063dddc36161461079c578063de1de3a0146107b1578063e1758bd8146107d1578063eac471a0146107e6578063eda4e6d6146107fc575b600080fd5b34801561023f57600080fd5b5061026061024e36600461269a565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027f57600080fd5b5061029361028e3660046126c5565b610812565b005b3480156102a157600080fd5b506102aa61082d565b6040805192835260208301919091520161026a565b3480156102cb57600080fd5b5061026061086b565b3480156102e057600080fd5b5061026060a95481565b3480156102f657600080fd5b506102aa6103053660046126e2565b609a602052600090815260409020600181015460029091015482565b34801561032d57600080fd5b5061029361033c3660046126fb565b61088e565b34801561034d57600080fd5b5061026061035c36600461269a565b610a19565b34801561036d57600080fd5b50610293610b50565b34801561038257600080fd5b5061039661039136600461269a565b610c95565b604051901515815260200161026a565b3480156103b257600080fd5b50610260609e5481565b3480156103c857600080fd5b5061026060a05481565b3480156103de57600080fd5b506102936103ed36600461269a565b610e37565b3480156103fe57600080fd5b5061029361040d3660046126e2565b610f00565b34801561041e57600080fd5b50606754610432906001600160a01b031681565b60405161026a919061273c565b34801561044b57600080fd5b50606554610432906001600160a01b031681565b34801561046b57600080fd5b5061039661047a36600461269a565b610f91565b34801561048b57600080fd5b5060a3546103969060ff1681565b3480156104a557600080fd5b5060a8546103969060ff1681565b3480156104bf57600080fd5b50610396610ff3565b6102936104d63660046127bd565b6112b8565b3480156104e757600080fd5b506103966104f636600461269a565b60ac6020526000908152604090205460ff1681565b34801561051757600080fd5b506105456105263660046126e2565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161026a565b34801561056857600080fd5b50606654610432906001600160a01b031681565b34801561058857600080fd5b50610260609c5481565b34801561059e57600080fd5b5060ae546103969060ff1681565b3480156105b857600080fd5b506103966105c736600461269a565b611372565b3480156105d857600080fd5b5061026060a75481565b3480156105ee57600080fd5b5060aa54610432906001600160a01b031681565b34801561060e57600080fd5b5061029361061d3660046126e2565b61139e565b34801561062e57600080fd5b506102606113ab565b34801561064357600080fd5b5061026060a55481565b34801561065957600080fd5b5061039661066836600461269a565b6113b6565b34801561067957600080fd5b5061026060a25481565b34801561068f57600080fd5b5061026060a65481565b3480156106a557600080fd5b50610260609f5481565b3480156106bb57600080fd5b506102606106ca36600461284f565b6113dc565b3480156106db57600080fd5b50610260611591565b3480156106f057600080fd5b506102606106ff3660046126e2565b611695565b34801561071057600080fd5b5061026061071f36600461269a565b60ad6020526000908152604090205481565b34801561073d57600080fd5b5061026061074c3660046126e2565b6116aa565b34801561075d57600080fd5b506102936116bf565b34801561077257600080fd5b506102936107813660046126c5565b611735565b34801561079257600080fd5b5061026060a15481565b3480156107a857600080fd5b50610293611750565b3480156107bd57600080fd5b506102936107cc3660046126c5565b6117af565b3480156107dd57600080fd5b506104326117fe565b3480156107f257600080fd5b5061026060a45481565b34801561080857600080fd5b50610260609d5481565b61081a611895565b60ae805460ff1916911515919091179055565b600080600062015180609d54426108449190612916565b61084e919061292d565b905061085981611695565b610862826116aa565b92509250509091565b60006201518060a6544261087f9190612916565b610889919061292d565b905090565b600054610100900460ff16806108a7575060005460ff16155b61090f5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b600054610100900460ff16158015610931576000805461ffff19166101011790555b600082116109815760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f6044820152606401610906565b61098a84611969565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055605a60a455620249f0609f556109cd620151804261292d565b6109da906201518061294f565b6109e69061a8c061296e565b609d81905560a65560a8805460ff1916600117905561138860a9558015610a13576000805461ff00191690555b50505050565b6000609d54421015610a2d57506000919050565b60a85460ff168015610a675750610a43826113b6565b1580610a6757506001600160a01b038216600090815260ac602052604090205460ff165b15610af85760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b815260040160206040518083038186803b158015610aba57600080fd5b505afa158015610ace573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610af29190612986565b92915050565b62015180609d5442610b0a9190612916565b610b14919061292d565b609c54148015610b2657506000609e54115b15610b4857610b3482611372565b610b4057609e54610af2565b600092915050565b610af2611591565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610bae57600080fd5b505afa158015610bc2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610be6919061299f565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610c3b57600080fd5b505afa158015610c4f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c73919061299f565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610cad57506000609d54115b8015610cbb5750609d544210155b610cd75760405162461bcd60e51b8152600401610906906129bc565b610ce0826113b6565b8015610cf25750610cf082610f91565b155b610d385760405162461bcd60e51b815260206004820152601760248201527634b9903737ba1030b71034b730b1ba34bb32903ab9b2b960491b6044820152606401610906565b6001600160a01b038216600090815260ac602052604090205460ff1615610d925760405162461bcd60e51b815260206004820152600e60248201526d185b1c9958591e48199a5cda195960921b6044820152606401610906565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055610dbd61198c565b60a05490915015610de157600160a06000828254610ddb9190612916565b90915550505b610dee3382600080611c2f565b6040518181526001600160a01b0384169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a350600192915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610e805760405162461bcd60e51b8152600401610906906129f3565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610eb2611ee4565b6001600160a01b031614610ed85760405162461bcd60e51b815260040161090690612a2d565b610ee181611f00565b60408051600080825260208201909252610efd91839190611f08565b50565b610f08611895565b60008111610f625760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b6064820152608401610906565b60a4819055600060a755604051818152600080516020612c56833981519152906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610fb3836113b6565b15610fea57600062015180610fc88342612916565b610fd2919061292d565b905060a254811015610fe8575060019392505050565b505b50600092915050565b60ae5460009060ff1615801561100b57506000609d54115b80156110195750609d544210155b6110355760405162461bcd60e51b8152600401610906906129bc565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561109157600080fd5b505afa1580156110a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110c9919061299f565b6001600160a01b0316633af32abf336040518263ffffffff1660e01b81526004016110f4919061273c565b60206040518083038186803b15801561110c57600080fd5b505afa158015611120573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111449190612a67565b61118d5760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b6044820152606401610906565b600061119833612048565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156111ff57600080fd5b505afa158015611213573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611237919061299f565b905081801561124e57506001600160a01b03811615155b156112b25760405163748abee960e11b81526001600160a01b0382169063e9157dd29061127f90339060040161273c565b600060405180830381600087803b15801561129957600080fd5b505af11580156112ad573d6000803e3d6000fd5b505050505b50905090565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156113015760405162461bcd60e51b8152600401610906906129f3565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316611333611ee4565b6001600160a01b0316146113595760405162461bcd60e51b815260040161090690612a2d565b61136282611f00565b61136e82826001611f08565b5050565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b6113a6611895565b60a055565b600061088933610a19565b6001600160a01b0381166000908152609b602052604081205415610b4057506001919050565b60ae5460009060ff161580156113f457506000609d54115b80156114025750609d544210155b61141e5760405162461bcd60e51b8152600401610906906129bc565b60005b825181101561156357609f545a101561145b57604051818152600080516020612cbd8339815191529060200160405180910390a192915050565b61147d83828151811061147057611470612a84565b60200260200101516113b6565b80156114a857506114a683828151811061149957611499612a84565b6020026020010151610f91565b155b80156114ee575060ac60008483815181106114c5576114c5612a84565b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff16155b156115535761151583828151811061150857611508612a84565b6020026020010151610c95565b6115535760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b6044820152606401610906565b61155c81612a9a565b9050611421565b50600080516020612cbd833981519152825160405161158491815260200190565b60405180910390a1505190565b60008061159c6117fe565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016115c7919061273c565b60206040518083038186803b1580156115df57600080fd5b505afa1580156115f3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116179190612986565b9050600060a55460a4548361162c919061292d565b119050600060a5549050600060a75461164361086b565b10158061164d5750825b156116625760a45461165f908561292d565b91505b60a0541561167e5760a054611677908361292d565b905061168d565b60a85460ff1661168d575060a9545b949350505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b6116c7611895565b60ae805460ff1916600117905561c35060a0556000609e819055601e60a45560a7556116f66277f88042612916565b60a65563621e0ac0609d5561170961198c565b50600080516020612c5683398151915260a45460405161172b91815260200190565b60405180910390a1565b61173d611895565b60a8805460ff1916911515919091179055565b600062015180609d54426117649190612916565b61176e919061292d565b9050609c54811115610efd57609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610f86565b6117b7611895565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610f86565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561185d57600080fd5b505afa158015611871573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610889919061299f565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b1580156118d957600080fd5b505afa1580156118ed573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611911919061299f565b6001600160a01b0316146119675760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610906565b565b606780546001600160a01b0319166001600160a01b038316179055610efd610b50565b6000611996611750565b60a154609c541415806119a95750609e54155b15611c285760006119b86117fe565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016119e8919061273c565b60206040518083038186803b158015611a0057600080fd5b505afa158015611a14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a389190612986565b9050600060a55460a45483611a4d919061292d565b11905060a754611a5b61086b565b101580611a655750805b15611b7d5760a35460ff1615611a7d57611a7d612184565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611aa990309060040161273c565b60206040518083038186803b158015611ac157600080fd5b505afa158015611ad5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611af99190612986565b915060a45482611b09919061292d565b60a55560a45460a755611b1e610e104261292d565b611b2a90610e1061294f565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05415611bcd5760a05460a554611bc5919061292d565b609e55611bde565b60a85460ff16611bde5760a954609e555b609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b8180611c385750805b15611cc6576001609a6000609c5481526020019081526020016000206001016000828254611c66919061296e565b9091555050609c546000908152609a602090815260408083206001600160a01b03881684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611cc090849061296e565b90915550505b8015611db05760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611cfd90889060040161273c565b602060405180830381600087803b158015611d1757600080fd5b505af1158015611d2b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d4f9190612986565b905080609a6000609c5481526020019081526020016000206002016000828254611d79919061296e565b90915550506040518181526001600160a01b03861690600080516020612c368339815191529060200160405180910390a250610a13565b8115611e0c57609c546000908152609a602052604081206002018054859290611dda90849061296e565b90915550506040518381526001600160a01b03851690600080516020612c368339815191529060200160405180910390a25b6000611e166117fe565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611e479088908890600401612ab5565b602060405180830381600087803b158015611e6157600080fd5b505af1158015611e75573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e999190612a67565b611edd5760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b6044820152606401610906565b5050505050565b600080516020612c76833981519152546001600160a01b031690565b610efd611895565b6000611f12611ee4565b9050611f1d84612487565b600083511180611f2a5750815b15611f3b57611f39848461251a565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16611edd57805460ff19166001178155604051611fb6908690611f8790859060240161273c565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b17905261251a565b50805460ff19168155611fc7611ee4565b6001600160a01b0316826001600160a01b03161461203f5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610906565b611edd85612605565b60008061205361198c565b905061205e836113b6565b801561208357506001600160a01b038316600090815260ac602052604090205460ff16155b8015612095575061209383611372565b155b156120b1576120a8838260016000611c2f565b50600192915050565b6120ba836113b6565b15806120de57506001600160a01b038316600090815260ac602052604090205460ff165b15610fea57600160a060008282546120f6919061296e565b90915550506001600160a01b038316600090815260ac60205260409020805460ff1916905560a85460ff161561213957612134836000806001611c2f565b612147565b612147838260016000611c2f565b6040516001600160a01b038416907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a250600192915050565b600061218e6117fe565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016121be919061273c565b60206040518083038186803b1580156121d657600080fd5b505afa1580156121ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061220e9190612986565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a0823192612246929091169060040161273c565b60206040518083038186803b15801561225e57600080fd5b505afa158015612272573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122969190612986565b6065546040519192506001600160a01b03169063d1b7089a9085906122c19030908690602401612ab5565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b031916815261231c9392916001600160a01b031690600090600401612b26565b600060405180830381600087803b15801561233657600080fd5b505af115801561234a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526123729190810190612b5a565b5060009050612381828461296e565b6040516370a0823160e01b81529091506001600160a01b038516906370a08231906123b090309060040161273c565b60206040518083038186803b1580156123c857600080fd5b505afa1580156123dc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124009190612986565b81146124485760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b6044820152606401610906565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba910160405180910390a150505050565b803b6124eb5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610906565b600080516020612c7683398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6125795760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610906565b600080846001600160a01b0316846040516125949190612be6565b600060405180830381855af49150503d80600081146125cf576040519150601f19603f3d011682016040523d82523d6000602084013e6125d4565b606091505b50915091506125fc8282604051806060016040528060278152602001612c9660279139612645565b95945050505050565b61260e81612487565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060831561265457508161267e565b8251156126645782518084602001fd5b8160405162461bcd60e51b81526004016109069190612c02565b9392505050565b6001600160a01b0381168114610efd57600080fd5b6000602082840312156126ac57600080fd5b813561267e81612685565b8015158114610efd57600080fd5b6000602082840312156126d757600080fd5b813561267e816126b7565b6000602082840312156126f457600080fd5b5035919050565b60008060006060848603121561271057600080fd5b833561271b81612685565b9250602084013561272b81612685565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561278e5761278e612750565b604052919050565b60006001600160401b038211156127af576127af612750565b50601f01601f191660200190565b600080604083850312156127d057600080fd5b82356127db81612685565b915060208301356001600160401b038111156127f657600080fd5b8301601f8101851361280757600080fd5b803561281a61281582612796565b612766565b81815286602083850101111561282f57600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561286257600080fd5b82356001600160401b038082111561287957600080fd5b818501915085601f83011261288d57600080fd5b81358181111561289f5761289f612750565b8060051b91506128b0848301612766565b81815291830184019184810190888411156128ca57600080fd5b938501935b838510156128f457843592506128e483612685565b82825293850193908501906128cf565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b60008282101561292857612928612900565b500390565b60008261294a57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561296957612969612900565b500290565b6000821982111561298157612981612900565b500190565b60006020828403121561299857600080fd5b5051919050565b6000602082840312156129b157600080fd5b815161267e81612685565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612c1683398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612c1683398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215612a7957600080fd5b815161267e816126b7565b634e487b7160e01b600052603260045260246000fd5b6000600019821415612aae57612aae612900565b5060010190565b6001600160a01b03929092168252602082015260400190565b60005b83811015612ae9578181015183820152602001612ad1565b83811115610a135750506000910152565b60008151808452612b12816020860160208601612ace565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612b486080840187612afa565b94166040830152506060015292915050565b60008060408385031215612b6d57600080fd5b8251612b78816126b7565b60208401519092506001600160401b03811115612b9457600080fd5b8301601f81018513612ba557600080fd5b8051612bb361281582612796565b818152866020838501011115612bc857600080fd5b612bd9826020830160208601612ace565b8093505050509250929050565b60008251612bf8818460208701612ace565b9190910192915050565b60208152600061267e6020830184612afa56fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304a61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c656472b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540fa26469706673582212205588e598cec0483bb5460f3f712f37e45385d5447b996f604d6e69906bee4a9c64736f6c63430008080033";
963
970
 
964
971
  type UBISchemeConstructorParams =
965
972
  | [signer?: Signer]
package/types/factories/UniswapV2SwapHelper__factory.ts CHANGED
@@ -52,7 +52,7 @@ const _abi = [
52
52
  ];
53
53
 
54
54
  const _bytecode =
55
- "0x61054961003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100355760003560e01c8063f10a60ab1461003a575b600080fd5b61004d6100483660046103d9565b61005f565b60405190815260200160405180910390f35b600080866001600160a01b031663b0f479a16040518163ffffffff1660e01b815260040160206040518083038186803b15801561009b57600080fd5b505afa1580156100af573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100d39190610434565b90506000816001600160a01b031663ad5c46486040518163ffffffff1660e01b815260040160206040518083038186803b15801561011057600080fd5b505afa158015610124573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101489190610434565b90506001600160a01b0387161561015f5786610161565b805b96506001600160a01b03861615610178578561017a565b805b95506000826001600160a01b031663c45a01556040518163ffffffff1660e01b815260040160206040518083038186803b1580156101b757600080fd5b505afa1580156101cb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ef9190610434565b60405163e6a4390560e01b81526001600160a01b038a811660048301528981166024830152919091169063e6a439059060440160206040518083038186803b15801561023a57600080fd5b505afa15801561024e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102729190610434565b9050600080826001600160a01b0316630902f1ac6040518163ffffffff1660e01b815260040160606040518083038186803b1580156102b057600080fd5b505afa1580156102c4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102e89190610474565b50915091506000829050836001600160a01b031663d21220a76040518163ffffffff1660e01b815260040160206040518083038186803b15801561032b57600080fd5b505afa15801561033f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103639190610434565b6001600160a01b03168b6001600160a01b0316141561037f5750805b620186a0610396896001600160701b0384166104c4565b6103a091906104f1565b96508887106103af57886103b1565b865b9c9b505050505050505050505050565b6001600160a01b03811681146103d657600080fd5b50565b600080600080600060a086880312156103f157600080fd5b85356103fc816103c1565b9450602086013561040c816103c1565b9350604086013561041c816103c1565b94979396509394606081013594506080013592915050565b60006020828403121561044657600080fd5b8151610451816103c1565b9392505050565b80516001600160701b038116811461046f57600080fd5b919050565b60008060006060848603121561048957600080fd5b61049284610458565b92506104a060208501610458565b9150604084015163ffffffff811681146104b957600080fd5b809150509250925092565b60008160001904831182151516156104ec57634e487b7160e01b600052601160045260246000fd5b500290565b60008261050e57634e487b7160e01b600052601260045260246000fd5b50049056fea264697066735822122087b9824dfb3fe3072c34b186eb9a592be6071419e7152ab7fac4dd0384b0ddd664736f6c63430008080033";
55
+ "0x61054961003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100355760003560e01c8063f10a60ab1461003a575b600080fd5b61004d6100483660046103d9565b61005f565b60405190815260200160405180910390f35b600080866001600160a01b031663b0f479a16040518163ffffffff1660e01b815260040160206040518083038186803b15801561009b57600080fd5b505afa1580156100af573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100d39190610434565b90506000816001600160a01b031663ad5c46486040518163ffffffff1660e01b815260040160206040518083038186803b15801561011057600080fd5b505afa158015610124573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101489190610434565b90506001600160a01b0387161561015f5786610161565b805b96506001600160a01b03861615610178578561017a565b805b95506000826001600160a01b031663c45a01556040518163ffffffff1660e01b815260040160206040518083038186803b1580156101b757600080fd5b505afa1580156101cb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ef9190610434565b60405163e6a4390560e01b81526001600160a01b038a811660048301528981166024830152919091169063e6a439059060440160206040518083038186803b15801561023a57600080fd5b505afa15801561024e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102729190610434565b9050600080826001600160a01b0316630902f1ac6040518163ffffffff1660e01b815260040160606040518083038186803b1580156102b057600080fd5b505afa1580156102c4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102e89190610474565b50915091506000829050836001600160a01b031663d21220a76040518163ffffffff1660e01b815260040160206040518083038186803b15801561032b57600080fd5b505afa15801561033f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103639190610434565b6001600160a01b03168b6001600160a01b0316141561037f5750805b620186a0610396896001600160701b0384166104c4565b6103a091906104f1565b96508887106103af57886103b1565b865b9c9b505050505050505050505050565b6001600160a01b03811681146103d657600080fd5b50565b600080600080600060a086880312156103f157600080fd5b85356103fc816103c1565b9450602086013561040c816103c1565b9350604086013561041c816103c1565b94979396509394606081013594506080013592915050565b60006020828403121561044657600080fd5b8151610451816103c1565b9392505050565b80516001600160701b038116811461046f57600080fd5b919050565b60008060006060848603121561048957600080fd5b61049284610458565b92506104a060208501610458565b9150604084015163ffffffff811681146104b957600080fd5b809150509250925092565b60008160001904831182151516156104ec57634e487b7160e01b600052601160045260246000fd5b500290565b60008261050e57634e487b7160e01b600052601260045260246000fd5b50049056fea2646970667358221220961523efeac4b4588a4de48e7787b8e036925e52fa72cd76691cc445db5568f264736f6c63430008080033";
56
56
 
57
57
  type UniswapV2SwapHelperConstructorParams =
58
58
  | [signer?: Signer]
package/types/factories/UpgradableMock2__factory.ts CHANGED
@@ -161,7 +161,7 @@ const _abi = [
161
161
  ];
162
162
 
163
163
  const _bytecode =
164
- "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c610b5661004b600039600081816102ad015281816102f60152818161037f01526103bf0152610b566000f3fe60806040526004361061006b5760003560e01c80631b3c90a814610070578063313ce567146100875780633659cfe6146100a85780633e6326fc146100c85780634162169f146100f55780634f1ef286146101155780635aef7de614610128578063e1758bd814610148575b600080fd5b34801561007c57600080fd5b5061008561015d565b005b34801561009357600080fd5b50604051601281526020015b60405180910390f35b3480156100b457600080fd5b506100856100c336600461089f565b6102a2565b3480156100d457600080fd5b506067546100e8906001600160a01b031681565b60405161009f91906108bc565b34801561010157600080fd5b506065546100e8906001600160a01b031681565b6100856101233660046108e6565b610374565b34801561013457600080fd5b506066546100e8906001600160a01b031681565b34801561015457600080fd5b506100e861042e565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156101bb57600080fd5b505afa1580156101cf573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101f391906109a9565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561024857600080fd5b505afa15801561025c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028091906109a9565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156102f45760405162461bcd60e51b81526004016102eb906109c6565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103266104ca565b6001600160a01b03161461034c5760405162461bcd60e51b81526004016102eb90610a00565b610355816104e6565b6040805160008082526020820190925261037191839190610545565b50565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156103bd5760405162461bcd60e51b81526004016102eb906109c6565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103ef6104ca565b6001600160a01b0316146104155760405162461bcd60e51b81526004016102eb90610a00565b61041e826104e6565b61042a82826001610545565b5050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561048d57600080fd5b505afa1580156104a1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c591906109a9565b905090565b600080516020610ada833981519152546001600160a01b031690565b3373f39fd6e51aad88f6f4ce6ab8827279cfffb92266146103715760405162461bcd60e51b81526020600482015260196024820152786e6f7420617574686f72697a656420746f207570677261646560381b60448201526064016102eb565b600061054f6104ca565b905061055a8461068c565b6000835111806105675750815b1561057857610576848461071f565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661068557805460ff191660011781556040516105f39086906105c49085906024016108bc565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b17905261071f565b50805460ff191681556106046104ca565b6001600160a01b0316826001600160a01b03161461067c5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b60648201526084016102eb565b6106858561080a565b5050505050565b803b6106f05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016102eb565b600080516020610ada83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b61077e5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016102eb565b600080846001600160a01b0316846040516107999190610a6a565b600060405180830381855af49150503d80600081146107d4576040519150601f19603f3d011682016040523d82523d6000602084013e6107d9565b606091505b50915091506108018282604051806060016040528060278152602001610afa6027913961084a565b95945050505050565b6108138161068c565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60608315610859575081610883565b8251156108695782518084602001fd5b8160405162461bcd60e51b81526004016102eb9190610a86565b9392505050565b6001600160a01b038116811461037157600080fd5b6000602082840312156108b157600080fd5b81356108838161088a565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156108f957600080fd5b82356109048161088a565b915060208301356001600160401b038082111561092057600080fd5b818501915085601f83011261093457600080fd5b813581811115610946576109466108d0565b604051601f8201601f19908116603f0116810190838211818310171561096e5761096e6108d0565b8160405282815288602084870101111561098757600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000602082840312156109bb57600080fd5b81516108838161088a565b6020808252602c90820152600080516020610aba83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610aba83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60005b83811015610a55578181015183820152602001610a3d565b83811115610a64576000848401525b50505050565b60008251610a7c818460208701610a3a565b9190910192915050565b6020815260008251806020840152610aa5816040850160208701610a3a565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212207f0e91a6eca23f21744660374491dfdfdb9129a9edbe3a71a3116b82ad5a729764736f6c63430008080033";
164
+ "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c610b5661004b600039600081816102ad015281816102f60152818161037f01526103bf0152610b566000f3fe60806040526004361061006b5760003560e01c80631b3c90a814610070578063313ce567146100875780633659cfe6146100a85780633e6326fc146100c85780634162169f146100f55780634f1ef286146101155780635aef7de614610128578063e1758bd814610148575b600080fd5b34801561007c57600080fd5b5061008561015d565b005b34801561009357600080fd5b50604051601281526020015b60405180910390f35b3480156100b457600080fd5b506100856100c336600461089f565b6102a2565b3480156100d457600080fd5b506067546100e8906001600160a01b031681565b60405161009f91906108bc565b34801561010157600080fd5b506065546100e8906001600160a01b031681565b6100856101233660046108e6565b610374565b34801561013457600080fd5b506066546100e8906001600160a01b031681565b34801561015457600080fd5b506100e861042e565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156101bb57600080fd5b505afa1580156101cf573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101f391906109a9565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561024857600080fd5b505afa15801561025c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028091906109a9565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156102f45760405162461bcd60e51b81526004016102eb906109c6565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103266104ca565b6001600160a01b03161461034c5760405162461bcd60e51b81526004016102eb90610a00565b610355816104e6565b6040805160008082526020820190925261037191839190610545565b50565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156103bd5760405162461bcd60e51b81526004016102eb906109c6565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103ef6104ca565b6001600160a01b0316146104155760405162461bcd60e51b81526004016102eb90610a00565b61041e826104e6565b61042a82826001610545565b5050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561048d57600080fd5b505afa1580156104a1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c591906109a9565b905090565b600080516020610ada833981519152546001600160a01b031690565b3373f39fd6e51aad88f6f4ce6ab8827279cfffb92266146103715760405162461bcd60e51b81526020600482015260196024820152786e6f7420617574686f72697a656420746f207570677261646560381b60448201526064016102eb565b600061054f6104ca565b905061055a8461068c565b6000835111806105675750815b1561057857610576848461071f565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661068557805460ff191660011781556040516105f39086906105c49085906024016108bc565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b17905261071f565b50805460ff191681556106046104ca565b6001600160a01b0316826001600160a01b03161461067c5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b60648201526084016102eb565b6106858561080a565b5050505050565b803b6106f05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016102eb565b600080516020610ada83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b61077e5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016102eb565b600080846001600160a01b0316846040516107999190610a6a565b600060405180830381855af49150503d80600081146107d4576040519150601f19603f3d011682016040523d82523d6000602084013e6107d9565b606091505b50915091506108018282604051806060016040528060278152602001610afa6027913961084a565b95945050505050565b6108138161068c565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60608315610859575081610883565b8251156108695782518084602001fd5b8160405162461bcd60e51b81526004016102eb9190610a86565b9392505050565b6001600160a01b038116811461037157600080fd5b6000602082840312156108b157600080fd5b81356108838161088a565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156108f957600080fd5b82356109048161088a565b915060208301356001600160401b038082111561092057600080fd5b818501915085601f83011261093457600080fd5b813581811115610946576109466108d0565b604051601f8201601f19908116603f0116810190838211818310171561096e5761096e6108d0565b8160405282815288602084870101111561098757600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000602082840312156109bb57600080fd5b81516108838161088a565b6020808252602c90820152600080516020610aba83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610aba83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60005b83811015610a55578181015183820152602001610a3d565b83811115610a64576000848401525b50505050565b60008251610a7c818460208701610a3a565b9190910192915050565b6020815260008251806020840152610aa5816040850160208701610a3a565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212206ac292b04306e95f90b3143fbdfd34e4b2213bed61cbad7f3ca16bdc37b0b4f664736f6c63430008080033";
165
165
 
166
166
  type UpgradableMock2ConstructorParams =
167
167
  | [signer?: Signer]
package/types/factories/UpgradableMock3__factory.ts CHANGED
@@ -174,7 +174,7 @@ const _abi = [
174
174
  ];
175
175
 
176
176
  const _bytecode =
177
- "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c610cdd61004b600039600081816102d801528181610321015281816103aa01526103ea0152610cdd6000f3fe6080604052600436106100765760003560e01c80631b3c90a81461007b578063313ce567146100925780633659cfe6146100b35780633e6326fc146100d35780634162169f146101005780634f1ef286146101205780635aef7de614610133578063c4d66de814610153578063e1758bd814610173575b600080fd5b34801561008757600080fd5b50610090610188565b005b34801561009e57600080fd5b50604051600381526020015b60405180910390f35b3480156100bf57600080fd5b506100906100ce366004610a26565b6102cd565b3480156100df57600080fd5b506067546100f3906001600160a01b031681565b6040516100aa9190610a43565b34801561010c57600080fd5b506065546100f3906001600160a01b031681565b61009061012e366004610a6d565b61039f565b34801561013f57600080fd5b506066546100f3906001600160a01b031681565b34801561015f57600080fd5b5061009061016e366004610a26565b610459565b34801561017f57600080fd5b506100f3610515565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156101e657600080fd5b505afa1580156101fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021e9190610b30565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561027357600080fd5b505afa158015610287573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ab9190610b30565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561031f5760405162461bcd60e51b815260040161031690610b4d565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103516105b1565b6001600160a01b0316146103775760405162461bcd60e51b815260040161031690610b87565b610380816105cd565b6040805160008082526020820190925261039c918391906105d5565b50565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156103e85760405162461bcd60e51b815260040161031690610b4d565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661041a6105b1565b6001600160a01b0316146104405760405162461bcd60e51b815260040161031690610b87565b610449826105cd565b610455828260016105d5565b5050565b600054610100900460ff1680610472575060005460ff16155b6104d55760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610316565b600054610100900460ff161580156104f7576000805461ffff19166101011790555b6105008261071c565b8015610455576000805461ff00191690555050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561057457600080fd5b505afa158015610588573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ac9190610b30565b905090565b600080516020610c61833981519152546001600160a01b031690565b61039c61073f565b60006105df6105b1565b90506105ea84610813565b6000835111806105f75750815b156106085761060684846108a6565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661071557805460ff19166001178155604051610683908690610654908590602401610a43565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526108a6565b50805460ff191681556106946105b1565b6001600160a01b0316826001600160a01b03161461070c5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610316565b61071585610991565b5050505050565b606780546001600160a01b0319166001600160a01b03831617905561039c610188565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561078357600080fd5b505afa158015610797573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107bb9190610b30565b6001600160a01b0316146108115760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610316565b565b803b6108775760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610316565b600080516020610c6183398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6109055760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610316565b600080846001600160a01b0316846040516109209190610bf1565b600060405180830381855af49150503d806000811461095b576040519150601f19603f3d011682016040523d82523d6000602084013e610960565b606091505b50915091506109888282604051806060016040528060278152602001610c81602791396109d1565b95945050505050565b61099a81610813565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606083156109e0575081610a0a565b8251156109f05782518084602001fd5b8160405162461bcd60e51b81526004016103169190610c0d565b9392505050565b6001600160a01b038116811461039c57600080fd5b600060208284031215610a3857600080fd5b8135610a0a81610a11565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610a8057600080fd5b8235610a8b81610a11565b915060208301356001600160401b0380821115610aa757600080fd5b818501915085601f830112610abb57600080fd5b813581811115610acd57610acd610a57565b604051601f8201601f19908116603f01168101908382118183101715610af557610af5610a57565b81604052828152886020848701011115610b0e57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610b4257600080fd5b8151610a0a81610a11565b6020808252602c90820152600080516020610c4183398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610c4183398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60005b83811015610bdc578181015183820152602001610bc4565b83811115610beb576000848401525b50505050565b60008251610c03818460208701610bc1565b9190910192915050565b6020815260008251806020840152610c2c816040850160208701610bc1565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220a41cc8dd934a60e5668715249a1cbb7f1c8ecef1e789e4c5ff573f0df7fee42864736f6c63430008080033";
177
+ "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c610cdd61004b600039600081816102d801528181610321015281816103aa01526103ea0152610cdd6000f3fe6080604052600436106100765760003560e01c80631b3c90a81461007b578063313ce567146100925780633659cfe6146100b35780633e6326fc146100d35780634162169f146101005780634f1ef286146101205780635aef7de614610133578063c4d66de814610153578063e1758bd814610173575b600080fd5b34801561008757600080fd5b50610090610188565b005b34801561009e57600080fd5b50604051600381526020015b60405180910390f35b3480156100bf57600080fd5b506100906100ce366004610a26565b6102cd565b3480156100df57600080fd5b506067546100f3906001600160a01b031681565b6040516100aa9190610a43565b34801561010c57600080fd5b506065546100f3906001600160a01b031681565b61009061012e366004610a6d565b61039f565b34801561013f57600080fd5b506066546100f3906001600160a01b031681565b34801561015f57600080fd5b5061009061016e366004610a26565b610459565b34801561017f57600080fd5b506100f3610515565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156101e657600080fd5b505afa1580156101fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021e9190610b30565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561027357600080fd5b505afa158015610287573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ab9190610b30565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561031f5760405162461bcd60e51b815260040161031690610b4d565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103516105b1565b6001600160a01b0316146103775760405162461bcd60e51b815260040161031690610b87565b610380816105cd565b6040805160008082526020820190925261039c918391906105d5565b50565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156103e85760405162461bcd60e51b815260040161031690610b4d565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661041a6105b1565b6001600160a01b0316146104405760405162461bcd60e51b815260040161031690610b87565b610449826105cd565b610455828260016105d5565b5050565b600054610100900460ff1680610472575060005460ff16155b6104d55760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610316565b600054610100900460ff161580156104f7576000805461ffff19166101011790555b6105008261071c565b8015610455576000805461ff00191690555050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561057457600080fd5b505afa158015610588573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ac9190610b30565b905090565b600080516020610c61833981519152546001600160a01b031690565b61039c61073f565b60006105df6105b1565b90506105ea84610813565b6000835111806105f75750815b156106085761060684846108a6565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661071557805460ff19166001178155604051610683908690610654908590602401610a43565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526108a6565b50805460ff191681556106946105b1565b6001600160a01b0316826001600160a01b03161461070c5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610316565b61071585610991565b5050505050565b606780546001600160a01b0319166001600160a01b03831617905561039c610188565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561078357600080fd5b505afa158015610797573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107bb9190610b30565b6001600160a01b0316146108115760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610316565b565b803b6108775760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610316565b600080516020610c6183398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6109055760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610316565b600080846001600160a01b0316846040516109209190610bf1565b600060405180830381855af49150503d806000811461095b576040519150601f19603f3d011682016040523d82523d6000602084013e610960565b606091505b50915091506109888282604051806060016040528060278152602001610c81602791396109d1565b95945050505050565b61099a81610813565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606083156109e0575081610a0a565b8251156109f05782518084602001fd5b8160405162461bcd60e51b81526004016103169190610c0d565b9392505050565b6001600160a01b038116811461039c57600080fd5b600060208284031215610a3857600080fd5b8135610a0a81610a11565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610a8057600080fd5b8235610a8b81610a11565b915060208301356001600160401b0380821115610aa757600080fd5b818501915085601f830112610abb57600080fd5b813581811115610acd57610acd610a57565b604051601f8201601f19908116603f01168101908382118183101715610af557610af5610a57565b81604052828152886020848701011115610b0e57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610b4257600080fd5b8151610a0a81610a11565b6020808252602c90820152600080516020610c4183398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610c4183398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60005b83811015610bdc578181015183820152602001610bc4565b83811115610beb576000848401525b50505050565b60008251610c03818460208701610bc1565b9190910192915050565b6020815260008251806020840152610c2c816040850160208701610bc1565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212202aa38442e1f1d5c3f980e05e1b7654eea6ac3113ff2d9e75f6f008f0ee824ed664736f6c63430008080033";
178
178
 
179
179
  type UpgradableMock3ConstructorParams =
180
180
  | [signer?: Signer]
package/types/factories/UpgradableMock4__factory.ts CHANGED
@@ -174,7 +174,7 @@ const _abi = [
174
174
  ];
175
175
 
176
176
  const _bytecode =
177
- "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c610cdd61004b600039600081816102d801528181610321015281816103aa01526103ea0152610cdd6000f3fe6080604052600436106100765760003560e01c80631b3c90a81461007b578063313ce567146100925780633659cfe6146100b35780633e6326fc146100d35780634162169f146101005780634f1ef286146101205780635aef7de614610133578063c4d66de814610153578063e1758bd814610173575b600080fd5b34801561008757600080fd5b50610090610188565b005b34801561009e57600080fd5b50604051600481526020015b60405180910390f35b3480156100bf57600080fd5b506100906100ce366004610a26565b6102cd565b3480156100df57600080fd5b506067546100f3906001600160a01b031681565b6040516100aa9190610a43565b34801561010c57600080fd5b506065546100f3906001600160a01b031681565b61009061012e366004610a6d565b61039f565b34801561013f57600080fd5b506066546100f3906001600160a01b031681565b34801561015f57600080fd5b5061009061016e366004610a26565b610459565b34801561017f57600080fd5b506100f3610515565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156101e657600080fd5b505afa1580156101fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021e9190610b30565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561027357600080fd5b505afa158015610287573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ab9190610b30565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561031f5760405162461bcd60e51b815260040161031690610b4d565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103516105b1565b6001600160a01b0316146103775760405162461bcd60e51b815260040161031690610b87565b610380816105cd565b6040805160008082526020820190925261039c918391906105d5565b50565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156103e85760405162461bcd60e51b815260040161031690610b4d565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661041a6105b1565b6001600160a01b0316146104405760405162461bcd60e51b815260040161031690610b87565b610449826105cd565b610455828260016105d5565b5050565b600054610100900460ff1680610472575060005460ff16155b6104d55760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610316565b600054610100900460ff161580156104f7576000805461ffff19166101011790555b6105008261071c565b8015610455576000805461ff00191690555050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561057457600080fd5b505afa158015610588573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ac9190610b30565b905090565b600080516020610c61833981519152546001600160a01b031690565b61039c61073f565b60006105df6105b1565b90506105ea84610813565b6000835111806105f75750815b156106085761060684846108a6565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661071557805460ff19166001178155604051610683908690610654908590602401610a43565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526108a6565b50805460ff191681556106946105b1565b6001600160a01b0316826001600160a01b03161461070c5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610316565b61071585610991565b5050505050565b606780546001600160a01b0319166001600160a01b03831617905561039c610188565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561078357600080fd5b505afa158015610797573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107bb9190610b30565b6001600160a01b0316146108115760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610316565b565b803b6108775760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610316565b600080516020610c6183398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6109055760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610316565b600080846001600160a01b0316846040516109209190610bf1565b600060405180830381855af49150503d806000811461095b576040519150601f19603f3d011682016040523d82523d6000602084013e610960565b606091505b50915091506109888282604051806060016040528060278152602001610c81602791396109d1565b95945050505050565b61099a81610813565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606083156109e0575081610a0a565b8251156109f05782518084602001fd5b8160405162461bcd60e51b81526004016103169190610c0d565b9392505050565b6001600160a01b038116811461039c57600080fd5b600060208284031215610a3857600080fd5b8135610a0a81610a11565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610a8057600080fd5b8235610a8b81610a11565b915060208301356001600160401b0380821115610aa757600080fd5b818501915085601f830112610abb57600080fd5b813581811115610acd57610acd610a57565b604051601f8201601f19908116603f01168101908382118183101715610af557610af5610a57565b81604052828152886020848701011115610b0e57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610b4257600080fd5b8151610a0a81610a11565b6020808252602c90820152600080516020610c4183398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610c4183398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60005b83811015610bdc578181015183820152602001610bc4565b83811115610beb576000848401525b50505050565b60008251610c03818460208701610bc1565b9190910192915050565b6020815260008251806020840152610c2c816040850160208701610bc1565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220d300f1bf2dd0bd138868b1a84ccb1a0407e32ff9ab613db09925b857225b576e64736f6c63430008080033";
177
+ "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c610cdd61004b600039600081816102d801528181610321015281816103aa01526103ea0152610cdd6000f3fe6080604052600436106100765760003560e01c80631b3c90a81461007b578063313ce567146100925780633659cfe6146100b35780633e6326fc146100d35780634162169f146101005780634f1ef286146101205780635aef7de614610133578063c4d66de814610153578063e1758bd814610173575b600080fd5b34801561008757600080fd5b50610090610188565b005b34801561009e57600080fd5b50604051600481526020015b60405180910390f35b3480156100bf57600080fd5b506100906100ce366004610a26565b6102cd565b3480156100df57600080fd5b506067546100f3906001600160a01b031681565b6040516100aa9190610a43565b34801561010c57600080fd5b506065546100f3906001600160a01b031681565b61009061012e366004610a6d565b61039f565b34801561013f57600080fd5b506066546100f3906001600160a01b031681565b34801561015f57600080fd5b5061009061016e366004610a26565b610459565b34801561017f57600080fd5b506100f3610515565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156101e657600080fd5b505afa1580156101fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021e9190610b30565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561027357600080fd5b505afa158015610287573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ab9190610b30565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561031f5760405162461bcd60e51b815260040161031690610b4d565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103516105b1565b6001600160a01b0316146103775760405162461bcd60e51b815260040161031690610b87565b610380816105cd565b6040805160008082526020820190925261039c918391906105d5565b50565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156103e85760405162461bcd60e51b815260040161031690610b4d565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661041a6105b1565b6001600160a01b0316146104405760405162461bcd60e51b815260040161031690610b87565b610449826105cd565b610455828260016105d5565b5050565b600054610100900460ff1680610472575060005460ff16155b6104d55760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610316565b600054610100900460ff161580156104f7576000805461ffff19166101011790555b6105008261071c565b8015610455576000805461ff00191690555050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561057457600080fd5b505afa158015610588573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ac9190610b30565b905090565b600080516020610c61833981519152546001600160a01b031690565b61039c61073f565b60006105df6105b1565b90506105ea84610813565b6000835111806105f75750815b156106085761060684846108a6565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661071557805460ff19166001178155604051610683908690610654908590602401610a43565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526108a6565b50805460ff191681556106946105b1565b6001600160a01b0316826001600160a01b03161461070c5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610316565b61071585610991565b5050505050565b606780546001600160a01b0319166001600160a01b03831617905561039c610188565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b15801561078357600080fd5b505afa158015610797573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107bb9190610b30565b6001600160a01b0316146108115760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610316565b565b803b6108775760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610316565b600080516020610c6183398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6109055760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610316565b600080846001600160a01b0316846040516109209190610bf1565b600060405180830381855af49150503d806000811461095b576040519150601f19603f3d011682016040523d82523d6000602084013e610960565b606091505b50915091506109888282604051806060016040528060278152602001610c81602791396109d1565b95945050505050565b61099a81610813565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606083156109e0575081610a0a565b8251156109f05782518084602001fd5b8160405162461bcd60e51b81526004016103169190610c0d565b9392505050565b6001600160a01b038116811461039c57600080fd5b600060208284031215610a3857600080fd5b8135610a0a81610a11565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610a8057600080fd5b8235610a8b81610a11565b915060208301356001600160401b0380821115610aa757600080fd5b818501915085601f830112610abb57600080fd5b813581811115610acd57610acd610a57565b604051601f8201601f19908116603f01168101908382118183101715610af557610af5610a57565b81604052828152886020848701011115610b0e57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610b4257600080fd5b8151610a0a81610a11565b6020808252602c90820152600080516020610c4183398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610c4183398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60005b83811015610bdc578181015183820152602001610bc4565b83811115610beb576000848401525b50505050565b60008251610c03818460208701610bc1565b9190910192915050565b6020815260008251806020840152610c2c816040850160208701610bc1565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122072391da6e113d5c036b95af88314cc807778e7d240e6713a269ef39d5c3eead264736f6c63430008080033";
178
178
 
179
179
  type UpgradableMock4ConstructorParams =
180
180
  | [signer?: Signer]
package/types/factories/UpgradableMock__factory.ts CHANGED
@@ -187,7 +187,7 @@ const _abi = [
187
187
  ];
188
188
 
189
189
  const _bytecode =
190
- "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c610c0961004b600039600081816103030152818161034c015281816103cc015261040c0152610c096000f3fe6080604052600436106100815760003560e01c80631b3c90a814610086578063313ce5671461009d5780633659cfe6146100be5780633e6326fc146100de5780634162169f1461010b5780634f1ef2861461012b5780635aef7de61461013e5780638da5cb5b1461015e578063c4d66de81461017e578063e1758bd81461019e575b600080fd5b34801561009257600080fd5b5061009b6101b3565b005b3480156100a957600080fd5b50604051600881526020015b60405180910390f35b3480156100ca57600080fd5b5061009b6100d9366004610952565b6102f8565b3480156100ea57600080fd5b506067546100fe906001600160a01b031681565b6040516100b5919061096f565b34801561011757600080fd5b506065546100fe906001600160a01b031681565b61009b610139366004610999565b6103c1565b34801561014a57600080fd5b506066546100fe906001600160a01b031681565b34801561016a57600080fd5b50609a546100fe906001600160a01b031681565b34801561018a57600080fd5b5061009b610199366004610952565b610472565b3480156101aa57600080fd5b506100fe610540565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561021157600080fd5b505afa158015610225573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102499190610a5c565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561029e57600080fd5b505afa1580156102b2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d69190610a5c565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561034a5760405162461bcd60e51b815260040161034190610a79565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661037c6105dc565b6001600160a01b0316146103a25760405162461bcd60e51b815260040161034190610ab3565b604080516000808252602082019092526103be918391906105f8565b50565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561040a5760405162461bcd60e51b815260040161034190610a79565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661043c6105dc565b6001600160a01b0316146104625760405162461bcd60e51b815260040161034190610ab3565b61046e828260016105f8565b5050565b600054610100900460ff168061048b575060005460ff16155b6104ee5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610341565b600054610100900460ff16158015610510576000805461ffff19166101011790555b609a80546001600160a01b0319166001600160a01b038416179055801561046e576000805461ff00191690555050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561059f57600080fd5b505afa1580156105b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d79190610a5c565b905090565b600080516020610b8d833981519152546001600160a01b031690565b60006106026105dc565b905061060d8461073f565b60008351118061061a5750815b1561062b5761062984846107d2565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661073857805460ff191660011781556040516106a690869061067790859060240161096f565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526107d2565b50805460ff191681556106b76105dc565b6001600160a01b0316826001600160a01b03161461072f5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610341565b610738856108bd565b5050505050565b803b6107a35760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610341565b600080516020610b8d83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6108315760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610341565b600080846001600160a01b03168460405161084c9190610b1d565b600060405180830381855af49150503d8060008114610887576040519150601f19603f3d011682016040523d82523d6000602084013e61088c565b606091505b50915091506108b48282604051806060016040528060278152602001610bad602791396108fd565b95945050505050565b6108c68161073f565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060831561090c575081610936565b82511561091c5782518084602001fd5b8160405162461bcd60e51b81526004016103419190610b39565b9392505050565b6001600160a01b03811681146103be57600080fd5b60006020828403121561096457600080fd5b81356109368161093d565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156109ac57600080fd5b82356109b78161093d565b915060208301356001600160401b03808211156109d357600080fd5b818501915085601f8301126109e757600080fd5b8135818111156109f9576109f9610983565b604051601f8201601f19908116603f01168101908382118183101715610a2157610a21610983565b81604052828152886020848701011115610a3a57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610a6e57600080fd5b81516109368161093d565b6020808252602c90820152600080516020610b6d83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610b6d83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60005b83811015610b08578181015183820152602001610af0565b83811115610b17576000848401525b50505050565b60008251610b2f818460208701610aed565b9190910192915050565b6020815260008251806020840152610b58816040850160208701610aed565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122001621cc92d25ee50f82c049a6ec7fbd6cd8959a9ac765bbcaae574a6fc1e291f64736f6c63430008080033";
190
+ "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c610c0961004b600039600081816103030152818161034c015281816103cc015261040c0152610c096000f3fe6080604052600436106100815760003560e01c80631b3c90a814610086578063313ce5671461009d5780633659cfe6146100be5780633e6326fc146100de5780634162169f1461010b5780634f1ef2861461012b5780635aef7de61461013e5780638da5cb5b1461015e578063c4d66de81461017e578063e1758bd81461019e575b600080fd5b34801561009257600080fd5b5061009b6101b3565b005b3480156100a957600080fd5b50604051600881526020015b60405180910390f35b3480156100ca57600080fd5b5061009b6100d9366004610952565b6102f8565b3480156100ea57600080fd5b506067546100fe906001600160a01b031681565b6040516100b5919061096f565b34801561011757600080fd5b506065546100fe906001600160a01b031681565b61009b610139366004610999565b6103c1565b34801561014a57600080fd5b506066546100fe906001600160a01b031681565b34801561016a57600080fd5b50609a546100fe906001600160a01b031681565b34801561018a57600080fd5b5061009b610199366004610952565b610472565b3480156101aa57600080fd5b506100fe610540565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561021157600080fd5b505afa158015610225573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102499190610a5c565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561029e57600080fd5b505afa1580156102b2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d69190610a5c565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561034a5760405162461bcd60e51b815260040161034190610a79565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661037c6105dc565b6001600160a01b0316146103a25760405162461bcd60e51b815260040161034190610ab3565b604080516000808252602082019092526103be918391906105f8565b50565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561040a5760405162461bcd60e51b815260040161034190610a79565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661043c6105dc565b6001600160a01b0316146104625760405162461bcd60e51b815260040161034190610ab3565b61046e828260016105f8565b5050565b600054610100900460ff168061048b575060005460ff16155b6104ee5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610341565b600054610100900460ff16158015610510576000805461ffff19166101011790555b609a80546001600160a01b0319166001600160a01b038416179055801561046e576000805461ff00191690555050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561059f57600080fd5b505afa1580156105b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d79190610a5c565b905090565b600080516020610b8d833981519152546001600160a01b031690565b60006106026105dc565b905061060d8461073f565b60008351118061061a5750815b1561062b5761062984846107d2565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661073857805460ff191660011781556040516106a690869061067790859060240161096f565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526107d2565b50805460ff191681556106b76105dc565b6001600160a01b0316826001600160a01b03161461072f5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610341565b610738856108bd565b5050505050565b803b6107a35760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610341565b600080516020610b8d83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6108315760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610341565b600080846001600160a01b03168460405161084c9190610b1d565b600060405180830381855af49150503d8060008114610887576040519150601f19603f3d011682016040523d82523d6000602084013e61088c565b606091505b50915091506108b48282604051806060016040528060278152602001610bad602791396108fd565b95945050505050565b6108c68161073f565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060831561090c575081610936565b82511561091c5782518084602001fd5b8160405162461bcd60e51b81526004016103419190610b39565b9392505050565b6001600160a01b03811681146103be57600080fd5b60006020828403121561096457600080fd5b81356109368161093d565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156109ac57600080fd5b82356109b78161093d565b915060208301356001600160401b03808211156109d357600080fd5b818501915085601f8301126109e757600080fd5b8135818111156109f9576109f9610983565b604051601f8201601f19908116603f01168101908382118183101715610a2157610a21610983565b81604052828152886020848701011115610a3a57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610a6e57600080fd5b81516109368161093d565b6020808252602c90820152600080516020610b6d83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610b6d83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60005b83811015610b08578181015183820152602001610af0565b83811115610b17576000848401525b50505050565b60008251610b2f818460208701610aed565b9190910192915050565b6020815260008251806020840152610b58816040850160208701610aed565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212205c69460b30cf6de0aec6401772b688f6af6427169895c8e5e5845adcdf69e63964736f6c63430008080033";
191
191
 
192
192
  type UpgradableMockConstructorParams =
193
193
  | [signer?: Signer]