@gooddollar/goodprotocol 2.0.5-beta.5 → 2.0.5-beta.7

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 (304) hide show
  1. package/artifacts/abis/Faucet.min.json +1 -1
  2. package/artifacts/abis/FuseFaucetV2.min.json +1 -1
  3. package/artifacts/abis/IFirstClaimPool.min.json +1 -1
  4. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  5. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  6. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  7. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  8. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  9. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  10. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  11. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  12. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  13. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  14. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  15. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  16. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  17. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.json +7 -0
  18. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  19. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  20. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  21. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  22. package/artifacts/contracts/Interfaces.sol/IIdentityV2.dbg.json +1 -1
  23. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  24. package/artifacts/contracts/Interfaces.sol/IMultichainRouter.dbg.json +1 -1
  25. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  26. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  27. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  28. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  29. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  30. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  31. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  32. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  33. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  34. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.dbg.json +1 -1
  35. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.json +28 -9
  36. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  37. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.json +2 -2
  38. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.dbg.json +1 -1
  39. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.json +28 -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 -2
  48. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.dbg.json +1 -1
  49. package/artifacts/contracts/governance/GoodDollarStaking.sol/IStakingUpgrade.dbg.json +1 -1
  50. package/artifacts/contracts/governance/GoodDollarStaking.sol/RewardsMinter.dbg.json +1 -1
  51. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  52. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.json +2 -2
  53. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  54. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  55. package/artifacts/contracts/governance/Reputation.sol/Reputation.json +2 -2
  56. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  57. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.json +2 -2
  58. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.dbg.json +1 -1
  59. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json +2 -2
  60. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.dbg.json +1 -1
  61. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.json +2 -2
  62. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  63. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.json +2 -2
  64. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.dbg.json +1 -1
  65. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.json +2 -2
  66. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  67. package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.dbg.json +1 -1
  68. package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.dbg.json +1 -1
  69. package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.dbg.json +1 -1
  70. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  71. package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.dbg.json +1 -1
  72. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  73. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.dbg.json +1 -1
  74. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.json +2 -2
  75. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.dbg.json +1 -1
  76. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.json +2 -2
  77. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.dbg.json +1 -1
  78. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.json +2 -2
  79. package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.dbg.json +1 -1
  80. package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.dbg.json +1 -1
  81. package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.dbg.json +1 -1
  82. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  83. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +2 -2
  84. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.dbg.json +1 -1
  85. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.json +2 -2
  86. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  87. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.json +2 -2
  88. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.dbg.json +1 -1
  89. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.json +2 -2
  90. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  91. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  92. package/artifacts/contracts/mocks/MultichainRouterMock.sol/IWrapper.dbg.json +1 -1
  93. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.dbg.json +1 -1
  94. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.json +2 -2
  95. package/artifacts/contracts/mocks/OverMintTester.sol/IGoodDollarStakingTest.dbg.json +1 -1
  96. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  97. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.json +2 -2
  98. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  99. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
  100. package/artifacts/contracts/mocks/PayableMock.sol/PayableMock.dbg.json +1 -1
  101. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  102. package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.dbg.json +1 -1
  103. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  104. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.json +2 -2
  105. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  106. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  107. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.json +2 -2
  108. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  109. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.json +2 -2
  110. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
  111. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.json +2 -2
  112. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
  113. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.json +2 -2
  114. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  115. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  116. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  117. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  118. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  119. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  120. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  121. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  122. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.dbg.json +1 -1
  123. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.json +2 -2
  124. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  125. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.json +2 -2
  126. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  127. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.json +2 -2
  128. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  129. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  130. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.json +2 -2
  131. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  132. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.json +2 -2
  133. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  134. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.json +2 -2
  135. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  136. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +2 -2
  137. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.dbg.json +1 -1
  138. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.json +2 -2
  139. package/artifacts/contracts/staking/FuseStakingV3.sol/IConsensus.dbg.json +1 -1
  140. package/artifacts/contracts/staking/FuseStakingV3.sol/PegSwap.dbg.json +1 -1
  141. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  142. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.json +2 -2
  143. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  144. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  145. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  146. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.json +2 -2
  147. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  148. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +2 -2
  149. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  150. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +2 -2
  151. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  152. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.json +2 -2
  153. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  154. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +2 -2
  155. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  156. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +2 -2
  157. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  158. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.json +2 -2
  159. package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.dbg.json +1 -1
  160. package/artifacts/contracts/staking/utils/StakingRewardsFixedAPY.sol/StakingRewardsFixedAPY.dbg.json +1 -1
  161. package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.dbg.json +1 -1
  162. package/artifacts/contracts/token/ERC677.sol/ERC677.dbg.json +1 -1
  163. package/artifacts/contracts/token/ERC677.sol/ERC677Receiver.dbg.json +1 -1
  164. package/artifacts/contracts/token/FeesFormula.sol/IFeesFormula.dbg.json +1 -1
  165. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.dbg.json +1 -1
  166. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.json +2 -2
  167. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/ERC20Permit.dbg.json +1 -1
  168. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/SelfApprove.dbg.json +1 -1
  169. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/IGoodDollarCustom.dbg.json +1 -1
  170. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/ISuperGoodDollar.dbg.json +1 -1
  171. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.dbg.json +1 -1
  172. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json +2 -2
  173. package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.dbg.json +1 -1
  174. package/artifacts/contracts/token/superfluid/SuperfluidToken.sol/SuperfluidToken.dbg.json +1 -1
  175. package/artifacts/contracts/token/superfluid/UUPSProxiable.sol/UUPSProxiable.dbg.json +1 -1
  176. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/Proxy.dbg.json +1 -1
  177. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.dbg.json +1 -1
  178. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.json +2 -2
  179. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.dbg.json +1 -1
  180. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.json +2 -2
  181. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  182. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +2 -2
  183. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +1 -1
  184. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.json +2 -2
  185. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.dbg.json +1 -1
  186. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.json +2 -2
  187. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  188. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
  189. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.json +2 -2
  190. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.dbg.json +1 -1
  191. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.json +2 -2
  192. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  193. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.json +2 -2
  194. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  195. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.json +2 -2
  196. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  197. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  198. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json +1 -1
  199. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.json +2 -2
  200. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json +1 -1
  201. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json +1 -1
  202. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json +1 -1
  203. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.json +2 -2
  204. package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json +1 -1
  205. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json +1 -1
  206. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.json +2 -2
  207. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  208. package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.dbg.json +1 -1
  209. package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.json +2 -2
  210. package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.dbg.json +1 -1
  211. package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.json +2 -2
  212. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  213. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  214. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.json +2 -2
  215. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  216. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.json +2 -2
  217. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
  218. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json +2 -2
  219. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
  220. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json +2 -2
  221. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
  222. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
  223. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  224. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json +2 -2
  225. package/contracts/Interfaces.sol +46 -61
  226. package/contracts/fuseFaucet/Faucet.sol +9 -8
  227. package/contracts/fuseFaucet/FuseFaucetV2.sol +16 -9
  228. package/contracts/invite/InvitesFuseV2.sol +1 -1
  229. package/contracts/invite/InvitesV2.sol +20 -30
  230. package/contracts/token/superfluid/UUPSProxy.sol +1 -1
  231. package/package.json +2 -2
  232. package/releases/deployment.json +4 -2
  233. package/scripts/multichain-deploy/helpers.ts +13 -2
  234. package/scripts/proposals/gip-14_1.ts +255 -0
  235. package/scripts/proposals/gips-14_1.md +29 -0
  236. package/test/faucet/Faucet.test.ts +166 -130
  237. package/types/Faucet.ts +50 -21
  238. package/types/FuseFaucetV2.ts +50 -0
  239. package/types/IFirstClaimPool.ts +21 -0
  240. package/types/factories/AaveStakingFactory__factory.ts +1 -1
  241. package/types/factories/AdminWalletFuse__factory.ts +1 -1
  242. package/types/factories/AdminWallet__factory.ts +1 -1
  243. package/types/factories/BaseShareFieldV2__factory.ts +1 -1
  244. package/types/factories/BaseShareField__factory.ts +1 -1
  245. package/types/factories/BuyAndBridgeHelper__factory.ts +1 -1
  246. package/types/factories/ClaimersDistribution__factory.ts +1 -1
  247. package/types/factories/CompoundStakingFactory__factory.ts +1 -1
  248. package/types/factories/CompoundVotingMachine__factory.ts +1 -1
  249. package/types/factories/DAOContract__factory.ts +1 -1
  250. package/types/factories/DAOUpgradeableContract__factory.ts +1 -1
  251. package/types/factories/DistributionBridgeMock__factory.ts +1 -1
  252. package/types/factories/DistributionHelperTestHelper__factory.ts +1 -1
  253. package/types/factories/DistributionHelperTest__factory.ts +1 -1
  254. package/types/factories/DistributionHelper__factory.ts +1 -1
  255. package/types/factories/DonationsStaking__factory.ts +1 -1
  256. package/types/factories/ExchangeHelper__factory.ts +1 -1
  257. package/types/factories/Faucet__factory.ts +27 -8
  258. package/types/factories/FuseFaucetV2__factory.ts +27 -1
  259. package/types/factories/FuseFaucet__factory.ts +1 -1
  260. package/types/factories/FuseStakingV3__factory.ts +1 -1
  261. package/types/factories/GReputation__factory.ts +1 -1
  262. package/types/factories/GoodAaveStakingV2__factory.ts +1 -1
  263. package/types/factories/GoodAaveStaking__factory.ts +1 -1
  264. package/types/factories/GoodCompoundStakingTest__factory.ts +1 -1
  265. package/types/factories/GoodCompoundStakingV2__factory.ts +1 -1
  266. package/types/factories/GoodCompoundStaking__factory.ts +1 -1
  267. package/types/factories/GoodDollarMintBurnWrapper__factory.ts +1 -1
  268. package/types/factories/GoodDollarStakingMock__factory.ts +1 -1
  269. package/types/factories/GoodDollarStaking__factory.ts +1 -1
  270. package/types/factories/GoodDollar__factory.ts +1 -1
  271. package/types/factories/GoodFundManagerTest__factory.ts +1 -1
  272. package/types/factories/GoodFundManager__factory.ts +1 -1
  273. package/types/factories/GoodMarketMaker__factory.ts +1 -1
  274. package/types/factories/GoodReserveCDai__factory.ts +1 -1
  275. package/types/factories/GovernanceStaking__factory.ts +1 -1
  276. package/types/factories/IFirstClaimPool__factory.ts +7 -0
  277. package/types/factories/IdentityMock__factory.ts +1 -1
  278. package/types/factories/IdentityV2__factory.ts +1 -1
  279. package/types/factories/InvitesFuseV2__factory.ts +1 -1
  280. package/types/factories/InvitesV1__factory.ts +1 -1
  281. package/types/factories/InvitesV2__factory.ts +1 -1
  282. package/types/factories/MultichainBridgeHelper__factory.ts +1 -1
  283. package/types/factories/MultichainRouterMock__factory.ts +1 -1
  284. package/types/factories/OneTimePaymentsV2__factory.ts +1 -1
  285. package/types/factories/OneTimePayments__factory.ts +1 -1
  286. package/types/factories/OverMintTesterRegularStake__factory.ts +1 -1
  287. package/types/factories/OverMintTester__factory.ts +1 -1
  288. package/types/factories/ProtocolUpgradeFuseRecover__factory.ts +1 -1
  289. package/types/factories/ProtocolUpgradeFuse__factory.ts +1 -1
  290. package/types/factories/ProtocolUpgradeRecover__factory.ts +1 -1
  291. package/types/factories/ProtocolUpgrade__factory.ts +1 -1
  292. package/types/factories/ReputationTestHelper__factory.ts +1 -1
  293. package/types/factories/Reputation__factory.ts +1 -1
  294. package/types/factories/StakersDistribution__factory.ts +1 -1
  295. package/types/factories/SuperGoodDollar__factory.ts +1 -1
  296. package/types/factories/SwapHelperTest__factory.ts +1 -1
  297. package/types/factories/UBIScheme__factory.ts +1 -1
  298. package/types/factories/UUPSProxy__factory.ts +1 -1
  299. package/types/factories/UniswapV2SwapHelper__factory.ts +1 -1
  300. package/types/factories/UpgradableMock2__factory.ts +1 -1
  301. package/types/factories/UpgradableMock3__factory.ts +1 -1
  302. package/types/factories/UpgradableMock4__factory.ts +1 -1
  303. package/types/factories/UpgradableMock__factory.ts +1 -1
  304. package/yarn.lock +4 -4
package/types/factories/SuperGoodDollar__factory.ts CHANGED
@@ -2629,7 +2629,7 @@ const _abi = [
2629
2629
  ];
2630
2630
 
2631
2631
  const _bytecode =
2632
- "0x60a06040523480156200001157600080fd5b5060405162005d1f38038062005d1f833981016040819052620000349162000046565b6001600160a01b031660805262000078565b6000602082840312156200005957600080fd5b81516001600160a01b03811681146200007157600080fd5b9392505050565b608051615c30620000ef6000396000818161050401528181610d3301528181610db60152818161105e01528181611170015281816112e3015281816118c701528181611a6b01528181611f4c0152818161203401528181612afb01528181612ba20152818161464b015261488d0152615c306000f3fe608060405234801561001057600080fd5b506004361061042a5760003560e01c806301ffc9a71461042f57806306e485381461045757806306fdde031461046c578063090c415e14610481578063095ea7b31461049657806311bcc81e146104a957806312a6a3f8146104b757806316d055d6146104ca57806318160ddd146104dd5780631863e809146104ef57806320bc44251461050257806323b872dd14610531578063245887fc14610544578063248a9ca314610557578063270483971461056a5780632c159a1a1461057d5780632ec8eec7146105915780632f2ff15d146105c4578063313ce567146105d7578063355274ea146105e65780633644e515146105f057806336568abe146105f8578063386fa2211461060b57806339364fd71461061e57806339509351146106465780633f4ba83a146106595780634000aea01461066157806340c10f191461067457806341b706be1461068757806342966c681461069a57806342fe0980146106ad5780634414744f146106c057806345977d03146104a957806346904840146106ce57806346951954146106e257806346fbf68e146106f55780634b61cc33146107085780634b75f54f1461072857806350d75d251461073c57806352d1902d14610744578063556f0dc71461074c5780635b9d09cc146107535780635c975abb146107615780635d5bf1781461076c57806362aa52871461077f57806362ad1b831461079257806366a12fb6146107a55780636c2d9f2f146107b857806370a08231146107cb57806379359f6f146107de57806379cc6790146107f15780637ecebe001461080457806382dc1ec41461082e5780638456cb59146108415780638da5cb5b146108495780639010d07c1461085157806391d1485414610864578063959b8c3f1461087757806395d89b411461088a578063983b2d561461089257806398650275146108a55780639903ad38146108ad5780639bd9bbc6146108b55780639d876741146108c8578063a1b2bf8b146108d6578063a217fddf146108e9578063a3a7e7f3146108f1578063a457c2d714610904578063a9059cbb14610917578063aa271e1a1461092a578063b84cdd4a1461093d578063bb0d196e14610950578063c3187f6214610963578063c68d4283146108c8578063ca15c87314610976578063ca78946414610544578063cf97256d14610989578063d505accf1461099c578063d5391393146109af578063d547741f146109c4578063d5a06d4c146109d7578063d95b6371146109ea578063d9d078d6146109fd578063dd62ed3e14610a10578063dea7f11214610a49578063e63ab1e914610a5c578063e74b981b14610a71578063eb3537cc14610a84578063ecc06c7614610ab2578063ee719bc814610ac5578063f2fde38b14610ad6578063fad8b32a14610ae9578063fc673c4f14610afc578063fe9d930314610b0f575b600080fd5b61044261043d366004614971565b610b22565b60405190151581526020015b60405180910390f35b61045f610b4d565b60405161044e919061499b565b610474610b5e565b60405161044e9190614a38565b61049461048f366004614aab565b610bf0565b005b6104426104a4366004614b06565b610ca4565b61049461042a366004614b32565b6104946104c5366004614b4b565b610cba565b6104946104d8366004614b96565b610d31565b6003545b60405190815260200161044e565b6104946104fd366004614caa565b610d9f565b7f00000000000000000000000000000000000000000000000000000000000000005b60405161044e9190614d3c565b61044261053f366004614d50565b611044565b610494610552366004614b06565b61105c565b6104e1610565366004614b32565b6110b7565b610494610578366004614d91565b6110cc565b61015254610524906001600160a01b031681565b6105a461059f366004614db3565b611168565b60408051948552602085019390935291830152606082015260800161044e565b6104946105d2366004614dd0565b61120b565b6040516012815260200161044e565b6104e16101535481565b6104e1611227565b610494610606366004614dd0565b611231565b61045f610619366004614db3565b6112af565b61063161062c366004614e00565b611352565b6040805192835290151560208301520161044e565b610442610654366004614b06565b6113d8565b610494611414565b61044261066f366004614e83565b611452565b610442610682366004614b06565b611584565b610494610695366004614b96565b61169b565b6104946106a8366004614b32565b6116bb565b6104946106bb366004614ee8565b611725565b610154546104429060ff1681565b61015054610524906001600160a01b031681565b6104946106f0366004614db3565b6117c8565b610442610703366004614db3565b6117f8565b61071b610716366004614f7a565b611812565b60405161044e9190614fc0565b61015154610524906001600160a01b031681565b61052461184d565b6104e1611857565b60016104e1565b61049461042a366004614e83565b60e85460ff16610442565b61049461077a366004614db3565b61187b565b61049461078d366004614d50565b6118c5565b6104946107a0366004614ff8565b61192b565b6104946107b3366004614d50565b6119d9565b61071b6107c6366004615096565b6119f9565b6104e16107d9366004614db3565b611a3b565b6104426107ec366004614db3565b611a63565b6104946107ff366004614b06565b611aeb565b6104e1610812366004614db3565b6001600160a01b0316600090815261014e602052604090205490565b61049461083c366004614db3565b611b6f565b610494611b87565b610524611bc3565b61052461085f366004614d91565b611bcb565b610442610872366004614dd0565b611be3565b610494610885366004614db3565b611c0e565b610474611c5f565b6104946108a0366004614db3565b611c6e565b610494611c86565b610494611c9e565b6104946108c3366004614e83565b611d55565b6104946106953660046150cb565b6104946108e4366004614b4b565b611daf565b6104e1600081565b6104946108ff366004614db3565b611e68565b610442610912366004614b06565b611e7c565b610442610925366004614b06565b611ecb565b610442610938366004614db3565b611ed9565b61044261094b366004614b06565b611ef3565b61044261095e366004614db3565b611f44565b610494610971366004615123565b611fcc565b6104e1610984366004614b32565b612006565b610494610997366004614b06565b61201d565b6104946109aa366004615140565b61210b565b6104e1600080516020615b8e83398151915281565b6104946109d2366004614dd0565b6122a0565b6106316109e5366004614b32565b6122bc565b6104426109f83660046151ae565b61233f565b610442610a0b366004614b06565b61234d565b6104e1610a1e3660046151ae565b6001600160a01b03918216600090815260116020908152604080832093909416825291909152205490565b610494610a573660046151dc565b612367565b6104e1600080516020615b6e83398151915281565b610494610a7f366004614db3565b612507565b610a97610a92366004614b06565b612551565b6040805193845260208401929092529082015260600161044e565b610494610ac0366004614db3565b612680565b600e546001600160a01b0316610524565b610494610ae4366004614db3565b6126ca565b610494610af7366004614db3565b612707565b610494610b0a36600461529f565b612758565b610494610b1d3660046152e6565b612801565b60006001600160e01b03198216635a05180f60e01b1480610b475750610b4782612843565b92915050565b6060610b596012612878565b905090565b6060600f8054610b6d90615324565b80601f0160208091040260200160405190810160405280929190818152602001828054610b9990615324565b8015610be65780601f10610bbb57610100808354040283529160200191610be6565b820191906000526020600020905b815481529060010190602001808311610bc957829003601f168201915b5050505050905090565b6000338585604051602001610c079392919061535e565b604051602081830303815290604052805190602001209050610c5c818484808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152506128de92505050565b6040518481526001600160a01b0386169033907f30f416fa68fca014a0f334464c64b000ba53e99b6d2afdea9d5ca756372d5985906020015b60405180910390a35050505050565b6000610cb133848461291f565b50600192915050565b60e85460ff1615610d215760405162461bcd60e51b815260206004820152602660248201527f5061757361626c653a2063726561746541677265656d656e74207768696c65206044820152651c185d5cd95960d21b60648201526084015b60405180910390fd5b610d2c8383836129cf565b505050565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633141580610d6e57506101545460ff1615155b15610d8c5760405163c51efddd60e01b815260040160405180910390fd5b610d9884848484612aa3565b5050505050565b604051632329212160e21b81526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690638ca4848490610deb903390600401614d3c565b602060405180830381865afa158015610e08573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e2c91906153a7565b610e495760405163327fd99160e21b815260040160405180910390fd5b6000610e53612af6565b90506001600160a01b038116610e665750845b600085610e735786610e75565b815b905060008313610f1257610e88836153da565b610e9185612c35565b14610e9e57610e9e6153f6565b610ea784612c35565b6001600160a01b03821660009081526002602052604081208054909190610ecf90849061540c565b90915550506001600160a01b03851660009081526002602052604081208054859290610efc90849061540c565b90915550610f0d9050858286612ca3565b610fdc565b8515610f2057610f206153f6565b82610f2a85612c35565b610f34919061540c565b6001600160a01b03831660009081526002602052604081208054909190610f5c908490615434565b90915550610f6b905084612c35565b6001600160a01b03881660009081526002602052604081208054909190610f9390849061540c565b90915550506001600160a01b03851660009081526002602052604081208054859290610fc090849061540c565b90915550610fd19050828886612ca3565b610fdc828685612ca3565b846001600160a01b0316876001600160a01b0316336001600160a01b03167fb8381a3ce157650e06186e3e8f4dd4dc29236f2688b6eed1893d0a60d7c6386f8c8589898f604051611031959493929190615454565b60405180910390a4505050505050505050565b600061105233858585612aa3565b90505b9392505050565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03163314158061109957506101545460ff1615155b1561042a5760405163c51efddd60e01b815260040160405180910390fd5b60009081526084602052604090206001015490565b60405133906000906110e49083908690602001615492565b6040516020818303038152906040528051906020012090506111068184612cd6565b6111235760405163dae1880960e01b815260040160405180910390fd5b61112d8184612d12565b60405184815233907f71a63dc095de07aa5512ad57a7596a39516317e316981a1cd71000057be1537b9060200160405180910390a250505050565b6000806000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bbe4fd506040518163ffffffff1660e01b8152600401602060405180830381865afa1580156111cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111f091906154cf565b90506111fc8582612551565b91979096509094509092509050565b611214826110b7565b61121d81612d33565b610d2c8383612d3d565b6000610b59612d5f565b6001600160a01b03811633146112a15760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b6064820152608401610d18565b6112ab8282612ddc565b5050565b6001600160a01b038181166000908152600160205260409081902054905163c56a069d60e01b8152901960048201526060917f0000000000000000000000000000000000000000000000000000000000000000169063c56a069d90602401600060405180830381865afa15801561132a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610b4791908101906154e8565b61015154604051631eed540360e11b815260009182916001600160a01b0390911690633ddaa8069061138c90889088908890600401615599565b6040805180830381865afa1580156113a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113cc91906155b8565b91509150935093915050565b3360008181526011602090815260408083206001600160a01b03871684529091528120549091610cb191859061140f9086906155dd565b61291f565b61142c600080516020615b6e83398151915233611be3565b6114485760405162461bcd60e51b8152600401610d18906155f0565b611450612dfe565b565b600061146060e85460ff1690565b1561147d5760405162461bcd60e51b8152600401610d1890615614565b600061148a338787612e4a565b9050600061149a33338985612feb565b9050866001600160a01b0316336001600160a01b03167fe19260aff97b920c7df27010903aeb9c8d2be5d310a2c67824cf3f15396e4c168488886040516114e393929190615659565b60405180910390a3863b1561157a57611533878387878080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061310b92505050565b61157a5760405162461bcd60e51b815260206004820152601860248201527710dbdb9d1c9858dd0819985b1b189858dac819985a5b195960421b6044820152606401610d18565b9695505050505050565b600061159e600080516020615b8e83398151915233611be3565b6115d75760405162461bcd60e51b815260206004820152600a6024820152693737ba1036b4b73a32b960b11b6044820152606401610d18565b60e85460ff16156115fa5760405162461bcd60e51b8152600401610d1890615614565b610153541561167357610153548261161160035490565b61161b91906155dd565b11156116735760405162461bcd60e51b815260206004820152602160248201527f43616e6e6f7420696e63726561736520737570706c79206265796f6e642063616044820152600760fc1b6064820152608401610d18565b60408051600080825260208201818152828401909352610cb1923392879287929091906131d5565b33301461042a57604051630fff4cc960e31b815260040160405180910390fd5b61172233808360005b6040519080825280601f01601f1916602001820160405280156116ee576020820181803683370190505b5060005b6040519080825280601f01601f19166020018201604052801561171c576020820181803683370190505b50613291565b50565b600054610100900460ff1661174c5760405162461bcd60e51b8152600401610d189061568f565b600e805460ff8716600160a01b026001600160a81b03199091166001600160a01b03891617179055600f611781848683615728565b50601061178f828483615728565b50611799306132c1565b6040516000808252908190600080516020615bae833981519152906020015b60405180910390a3505050505050565b6117d3600033611be3565b6117ef5760405162461bcd60e51b8152600401610d18906157e7565b611722816133d7565b6000610b47600080516020615b6e83398151915283611be3565b6060600085858560405160200161182b9392919061535e565b60405160208183030381529060405280519060200120905061157a81846135a9565b6000610b59613638565b7f596aa569dfde75b0375e5ba62bcfe0e1ce76eaca6130ef1c259fade04cb78b6890565b611886600033611be3565b6118a25760405162461bcd60e51b8152600401610d18906157e7565b61015280546001600160a01b0319166001600160a01b0392909216919091179055565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03163314158061190257506101545460ff1615155b156119205760405163c51efddd60e01b815260040160405180910390fd5b610d2c83838361291f565b336119386012828a61364b565b6119555760405163f7f0222760e01b815260040160405180910390fd5b6119cf8189898989898080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525050604080516020601f8d018190048102820181019092528b815292508b91508a9081908401838280828437600092019190915250600192506136f4915050565b5050505050505050565b33301461192057604051630fff4cc960e31b815260040160405180910390fd5b606060008484604051602001611a10929190615492565b604051602081830303815290604052805190602001209050611a3281846135a9565b95945050505050565b600080611a4783611168565b505050905060008112611a5a5780611055565b60009392505050565b6000610b47827f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bbe4fd506040518163ffffffff1660e01b8152600401602060405180830381865afa158015611ac7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a0b91906154cf565b6000611af78333610a1e565b905081811015611b555760405162461bcd60e51b8152602060048201526024808201527f45524332303a206275726e20616d6f756e74206578636565647320616c6c6f77604482015263616e636560e01b6064820152608401610d18565b611b62833384840361291f565b610d2c33848460006116c4565b611722600080516020615b6e8339815191528261120b565b611b9f600080516020615b6e83398151915233611be3565b611bbb5760405162461bcd60e51b8152600401610d18906155f0565b611450613735565b6000610b5981805b600082815260b6602052604081206110559083613772565b60009182526084602090815260408084206001600160a01b0393909316845291905290205460ff1690565b33611c1b6012828461377e565b806001600160a01b0316826001600160a01b03167ff4caeb2d6ca8932a215a353d0703c326ec2d81fc68170f320eb2ab49e9df61f960405160405180910390a35050565b606060108054610b6d90615324565b611722600080516020615b8e8339815191528261120b565b611450600080516020615b8e83398151915233611231565b600054610100900460ff1615808015611cbe5750600054600160ff909116105b80611cdf5750611ccd30613882565b158015611cdf575060005460ff166001145b611cfb5760405162461bcd60e51b8152600401610d189061580a565b6000805460ff191660011790558015611d1e576000805461ff0019166101001790555b8015611722576000805461ff001916905560405160018152600080516020615b4e833981519152906020015b60405180910390a150565b611da93333868686868080601f016020809104026020016040519081016040528093929190818152602001838380828437600092018290525060408051602081019091529081529250600191506136f49050565b50505050565b6040513390600090611dc79083908790602001615492565b604051602081830303815290604052805190602001209050611e1c818585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152506128de92505050565b336001600160a01b03167f0c4c547b3a4fcaa5be8353b3111472b124155bccc86de811d4a481c9e6e9faca868686604051611e5993929190615858565b60405180910390a25050505050565b6112ab333383611e7733611a3b565b612aa3565b6000610cb1338461140f856040518060600160405280602a8152602001615b24602a91393360009081526011602090815260408083206001600160a01b038d1684529091529020549190613891565b600061105533338585612aa3565b6000610b47600080516020615b8e83398151915283611be3565b600080600080611f038686612551565b9250925092506000611f2b828411611f1c576000612c35565b611f268385615899565b612c35565b611f35908561540c565b60001315979650505050505050565b6000610b47827f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bbe4fd506040518163ffffffff1660e01b8152600401602060405180830381865afa158015611fa8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061094b91906154cf565b611fd7600033611be3565b611ff35760405162461bcd60e51b8152600401610d18906157e7565b610154805460ff19169115919091179055565b600081815260b660205260408120610b47906138bd565b604051632329212160e21b81526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690638ca4848490612069903390600401614d3c565b602060405180830381865afa158015612086573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120aa91906153a7565b6120c75760405163327fd99160e21b815260040160405180910390fd5b6001600160a01b0382166000908152600260205260409020546120eb90829061540c565b6001600160a01b0390921660009081526002602052604090209190915550565b8342111561215b5760405162461bcd60e51b815260206004820152601d60248201527f45524332305065726d69743a206578706972656420646561646c696e650000006044820152606401610d18565b600061014f5488888861216d8c6138c7565b6040805160208101969096526001600160a01b0394851690860152929091166060840152608083015260a082015260c0810186905260e00160405160208183030381529060405280519060200120905060006121c8826138f9565b905060006121d882878787613947565b9050896001600160a01b0316816001600160a01b03161461223b5760405162461bcd60e51b815260206004820152601e60248201527f45524332305065726d69743a20696e76616c6964207369676e617475726500006044820152606401610d18565b60405163335097db60e11b815230906366a12fb690612262908d908d908d906004016158ac565b600060405180830381600087803b15801561227c57600080fd5b505af1158015612290573d6000803e3d6000fd5b5050505050505050505050505050565b6122a9826110b7565b6122b281612d33565b610d2c8383612ddc565b61015154604051631eed540360e11b815260009182916001600160a01b0390911690633ddaa806906122f690869085908190600401615599565b6040805180830381865afa158015612312573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061233691906155b8565b91509150915091565b60006110556012848461364b565b60008061235a8484612551565b5050600013949350505050565b600054610100900460ff16158080156123875750600054600160ff909116105b806123a8575061239630613882565b1580156123a8575060005460ff166001145b6123c45760405162461bcd60e51b8152600401610d189061580a565b6000805460ff1916600117905580156123e7576000805461ff0019166101001790555b6123f7600060128c8c8c8c611725565b6123ff61396f565b612407613996565b6124468a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506139c992505050565b612451600083613a1c565b612469600080516020615b8e83398151915283613a1c565b612481600080516020615b6e83398151915283613a1c565b61015080546001600160a01b038086166001600160a01b031992831617909255610152805487841690831617905561015180549288169290911691909117905561015386905580156124fb576000805461ff001916905560405160018152600080516020615b4e8339815191529060200160405180910390a15b50505050505050505050565b612512600033611be3565b61252e5760405162461bcd60e51b8152600401610d18906157e7565b61015080546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b038216600090815260026020526040812054908080612576866112af565b905060005b815181101561267757600080600084848151811061259b5761259b6158d0565b60200260200101516001600160a01b0316639b2e48bc308c8c6040518463ffffffff1660e01b81526004016125d2939291906158ac565b606060405180830381865afa1580156125ef573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061261391906158e6565b9194509250905061262482886155dd565b965061263081876155dd565b955061264d818311612643576000612c35565b611f268284615899565b612657848a61540c565b6126619190615434565b97505050508061267090615914565b905061257b565b50509250925092565b61268b600033611be3565b6126a75760405162461bcd60e51b8152600401610d18906157e7565b61015180546001600160a01b0319166001600160a01b0392909216919091179055565b6126d5600033611be3565b6126f15760405162461bcd60e51b8152600401610d18906157e7565b6126fc60008261120b565b611722600033611231565b3361271460128284613a26565b806001600160a01b0316826001600160a01b03167f50546e66e5f44d728365dc3908c63bc5cfeeab470722c1677e3073a6ac294aa160405160405180910390a35050565b336127656012828961364b565b6127825760405163f7f0222760e01b815260040160405180910390fd5b6127f881888888888080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525050604080516020601f8c018190048102820181019092528a815292508a915089908190840183828082843760009201919091525061329192505050565b50505050505050565b610d2c33338585858080601f016020809104026020016040519081016040528093929190818152602001838380828437600092018290525092506116f2915050565b60006001600160e01b03198216637965db0b60e01b1480610b4757506301ffc9a760e01b6001600160e01b0319831614610b47565b6060816000018054806020026020016040519081016040528092919081815260200182805480156128d257602002820191906000526020600020905b81546001600160a01b031681526001909101906020018083116128b4575b50505050509050919050565b60005b8151811015610d2c5760008282815181106128fe576128fe6158d0565b602002602001015190508082850155508061291890615914565b90506128e1565b6001600160a01b03831661294657604051638163862760e01b815260040160405180910390fd5b6001600160a01b03821661296d576040516337c1c09d60e21b815260040160405180910390fd5b6001600160a01b0383811660008181526011602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b60405133906000906129e79083908790602001615492565b60408051601f1981840301815291905280516020909101209050612a0b8184612cd6565b15612a295760405163782a90fb60e11b815260040160405180910390fd5b612a66818585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152506128de92505050565b816001600160a01b03167f770ea40a13a4644573ed785e5c7116890709947918747febc5add46feb531e2d868686604051611e5993929190615858565b6000612ab160e85460ff1690565b15612ace5760405162461bcd60e51b8152600401610d1890615614565b6000612adb858585612e4a565b9050612ae986868684612feb565b5060019695505050505050565b6000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663289b3c0d6040518163ffffffff1660e01b8152600401602060405180830381865afa158015612b57573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612b7b919061592d565b604051638369a0f160e01b81529091506001600160a01b03821690638369a0f190612bee907f00000000000000000000000000000000000000000000000000000000000000009030907f9f60ae461adf056670e03ae602566409933242392cb06744f5747c9f38b05d09906004016158ac565b602060405180830381865afa158015612c0b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612c2f919061592d565b91505090565b60006001600160ff1b03821115612c9f5760405162461bcd60e51b815260206004820152602860248201527f53616665436173743a2076616c756520646f65736e27742066697420696e2061604482015267371034b73a191a9b60c11b6064820152608401610d18565b5090565b816001600160a01b0316836001600160a01b0316600080516020615bae833981519152836040516129c291815260200190565b6000805b82811015612d0857838101548015612cf757600192505050610b47565b50612d0181615914565b9050612cda565b5060009392505050565b60005b81811015610d2c57600083820155612d2c81615914565b9050612d15565b6117228133613b1e565b612d478282613b77565b600082815260b660205260409020610d2c9082613bfd565b6000610b597f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f612d8f61011a5490565b61011b546040805160208101859052908101839052606081018290524660808201523060a082015260009060c0016040516020818303038152906040528051906020012090509392505050565b612de68282613c12565b600082815260b660205260409020610d2c9082613c79565b612e06613c8e565b60e8805460ff191690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b604051612e409190614d3c565b60405180910390a1565b6000806000612e5a848787611352565b91509150600082118015612edd57506101525460405163639e625760e11b81526001600160a01b039091169063c73cc4ae90612e9a903390600401614d3c565b602060405180830381865afa158015612eb7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612edb91906153a7565b155b15612fe157801580612f005750612ef386611a3b565b612efd83866155dd565b11155b612f4c5760405162461bcd60e51b815260206004820181905260248201527f4e6f7420656e6f7567682062616c616e636520746f20706179205458206665656044820152606401610d18565b61015054612f6790879081906001600160a01b031685612feb565b50604080516001600160a01b038089168252871660208201529081018590526060810183905281151560808201527f3eba86eb3c0ea121e35980d4acae6eb9f1cdf0bf7c0c08443798cfd6e5299de39060a00160405180910390a180612fd657612fd18285615899565b612fd8565b835b92505050611055565b5091949350505050565b60006001600160a01b0384166130145760405163eecd6c9b60e01b815260040160405180910390fd5b6001600160a01b03831661303b5760405163e219bd3960e01b815260040160405180910390fd5b600033905061306c818686866040518060200160405280600081525060405180602001604052806000815250613cd7565b846001600160a01b0316866001600160a01b0316146130ff576130ff858761140f866040518060600160405280602d8152602001615bce602d9139601160008c6001600160a01b03166001600160a01b0316815260200190815260200160002060008d6001600160a01b03166001600160a01b03168152602001908152602001600020546138919092919063ffffffff16565b50600195945050505050565b604051635260769b60e11b815260009084906001600160a01b0382169063a4c0ed36906131409033908890889060040161594a565b6020604051808303816000875af115801561315f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061318391906153a7565b6131ca5760405162461bcd60e51b815260206004820152601860248201527710dbdb9d1c9858dd0811985b1b189858dac819985a5b195960421b6044820152606401610d18565b506001949350505050565b6001600160a01b0385166131fc57604051630d24315760e01b815260040160405180910390fd5b6132068585613d76565b6132168660008787868689613dd0565b846001600160a01b0316866001600160a01b03167f2fe5be0146f74c5bce36c0b80911af6c7d86ff27e89d5cfa61fc681327954e5d86858560405161325d93929190615971565b60405180910390a36040518481526001600160a01b03861690600090600080516020615bae833981519152906020016117b8565b60e85460ff16156132b45760405162461bcd60e51b8152600401610d1890615614565b610d988585858585613f1f565b6040516329965a1d60e01b8152731820a4b7618bde71dce8cdc73aab6c95905fad24906329965a1d9061331c9084907fac7fbab5f54a3ca8194167523c6753bfeb96a445279294b6125b68cce217705490309060040161599c565b600060405180830381600087803b15801561333657600080fd5b505af115801561334a573d6000803e3d6000fd5b50506040516329965a1d60e01b8152731820a4b7618bde71dce8cdc73aab6c95905fad2492506329965a1d91506133a99084907faea199e31a596269b42cdafd93407f14436db6e4cad65417994c2eb37381e05a90309060040161599c565b600060405180830381600087803b1580156133c357600080fd5b505af1158015610d98573d6000803e3d6000fd5b60006133e1613638565b6001600160a01b0316036134375760405162461bcd60e51b815260206004820152601d60248201527f5555505350726f786961626c653a206e6f742075706772616461626c650000006044820152606401610d18565b806001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa158015613475573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061349991906154cf565b6134a1611857565b146134fa5760405162461bcd60e51b815260206004820152602360248201527f5555505350726f786961626c653a206e6f7420636f6d70617469626c65206c6f60448201526267696360e81b6064820152608401610d18565b6001600160a01b038116300361354e5760405162461bcd60e51b815260206004820152601960248201527805555505350726f786961626c653a2070726f7879206c6f6f7603c1b6044820152606401610d18565b61356481600080516020615b0483398151915255565b7fe011bc04c286c344a8fcbb8de77f953da762c3e25d8cdea984147fc4168a5dcc61358d611857565b604080519182526001600160a01b038416602083015201611d4a565b6060816001600160401b038111156135c3576135c3614be7565b6040519080825280602002602001820160405280156135ec578160200160208202803683370190505b50905060005b8281101561363157600081850154905080838381518110613615576136156158d0565b60209081029190910101525061362a81615914565b90506135f2565b5092915050565b600080516020615b048339815191525490565b6000816001600160a01b0316836001600160a01b031614806136ba57506001600160a01b038316600090815260018501602052604090205460ff1680156136ba57506001600160a01b03808316600090815260038601602090815260408083209387168352929052205460ff16155b8061105257506001600160a01b03808316600090815260028601602090815260408083209387168352929052205460ff1690509392505050565b60e85460ff16156137175760405162461bcd60e51b8152600401610d1890615614565b6000613724878787612e4a565b90506119cf88888884888888613fda565b61373d614053565b60e8805460ff191660011790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a258612e333390565b60006110558383614099565b806001600160a01b0316826001600160a01b0316036137f55760405162461bcd60e51b815260206004820152602d60248201527f4552433737374f70657261746f72733a20617574686f72697a696e672073656c60448201526c331030b99037b832b930ba37b960991b6064820152608401610d18565b6001600160a01b038116600090815260018401602052604090205460ff161561384b576001600160a01b03918216600090815260039390930160209081526040808520929093168452529020805460ff19169055565b6001600160a01b0380831660009081526002850160209081526040808320938516835292905220805460ff19166001179055505050565b6001600160a01b03163b151590565b600081848411156138b55760405162461bcd60e51b8152600401610d189190614a38565b505050900390565b6000610b47825490565b6001600160a01b038116600090815261014e602052604081208054918291906138ef83615914565b9190505550919050565b6000610b47613906612d5f565b8360405161190160f01b6020820152602281018390526042810182905260009060620160405160208183030381529060405280519060200120905092915050565b6000806000613958878787876140c3565b915091506139658161417d565b5095945050505050565b600054610100900460ff166114505760405162461bcd60e51b8152600401610d189061568f565b600054610100900460ff166139bd5760405162461bcd60e51b8152600401610d189061568f565b60e8805460ff19169055565b600054610100900460ff166139f05760405162461bcd60e51b8152600401610d189061568f565b613a1381604051806040016040528060018152602001603160f81b8152506142c2565b61172281614305565b6112ab8282612d3d565b336001600160a01b03821603613a915760405162461bcd60e51b815260206004820152602a60248201527f4552433737374f70657261746f72733a207265766f6b696e672073656c662061604482015269399037b832b930ba37b960b11b6064820152608401610d18565b6001600160a01b038116600090815260018401602052604090205460ff1615613aeb576001600160a01b0380831660009081526003850160209081526040808320938516835292905220805460ff19166001179055505050565b6001600160a01b03918216600090815260029390930160209081526040808520929093168452529020805460ff19169055565b613b288282611be3565b6112ab57613b3581614354565b613b40836020614366565b604051602001613b519291906159bf565b60408051601f198184030181529082905262461bcd60e51b8252610d1891600401614a38565b613b818282611be3565b6112ab5760008281526084602090815260408083206001600160a01b03851684529091529020805460ff19166001179055613bb93390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b6000611055836001600160a01b038416614501565b613c1c8282611be3565b156112ab5760008281526084602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b6000611055836001600160a01b038416614550565b60e85460ff166114505760405162461bcd60e51b815260206004820152601460248201527314185d5cd8589b194e881b9bdd081c185d5cd95960621b6044820152606401610d18565b613cea8585613ce586612c35565b614643565b836001600160a01b0316856001600160a01b0316876001600160a01b03167f06b541ddaa720db2b10a4d0cdac39b8d360425fc073085fac19bc82614677987868686604051613d3b93929190615971565b60405180910390a4836001600160a01b0316856001600160a01b0316600080516020615bae833981519152856040516117b891815260200190565b613d7f81612c35565b6001600160a01b038316600090815260026020526040902054613da2919061540c565b6001600160a01b038316600090815260026020526040902055600354613dc99082906155dd565b6003555050565b60405163555ddc6560e11b8152600090731820a4b7618bde71dce8cdc73aab6c95905fad249063aabbb8ca90613e2c9089907fb281fc8c12954d22544db45de3159a39272895b169a852b314f9cc762e44c53b90600401615a2e565b602060405180830381865afa158015613e49573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613e6d919061592d565b90506001600160a01b03811615613ee9576040516223de2960e01b81526001600160a01b038216906223de2990613eb2908b908b908b908b908b908b90600401615a47565b600060405180830381600087803b158015613ecc57600080fd5b505af1158015613ee0573d6000803e3d6000fd5b505050506119cf565b81156119cf57613f01866001600160a01b0316613882565b156119cf5760405163fe737d0560e01b815260040160405180910390fd5b6001600160a01b038416613f4657604051632e8aac6160e21b815260040160405180910390fd5b613f5585856000868686614766565b613f5f8484614885565b836001600160a01b0316856001600160a01b03167fa78a9be3a7b862d26933ad85fb11d80ef66b8f972d7cbba06621d583943a4098858585604051613fa693929190615971565b60405180910390a36040518381526000906001600160a01b03861690600080516020615bae83398151915290602001610c95565b6001600160a01b0386166140015760405163eecd6c9b60e01b815260040160405180910390fd5b6001600160a01b0385166140285760405163e219bd3960e01b815260040160405180910390fd5b614036878787878787614766565b614044878787878787613cd7565b6127f887878787878787613dd0565b60e85460ff16156114505760405162461bcd60e51b815260206004820152601060248201526f14185d5cd8589b194e881c185d5cd95960821b6044820152606401610d18565b60008260000182815481106140b0576140b06158d0565b9060005260206000200154905092915050565b6000806fa2a8918ca85bafe22016d0b997e4df60600160ff1b038311156140f05750600090506003614174565b6040805160008082526020820180845289905260ff881692820192909252606081018690526080810185905260019060a0016020604051602081039080840390855afa158015614144573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b03811661416d57600060019250925050614174565b9150600090505b94509492505050565b600081600481111561419157614191615aa1565b036141995750565b60018160048111156141ad576141ad615aa1565b036141f55760405162461bcd60e51b815260206004820152601860248201527745434453413a20696e76616c6964207369676e617475726560401b6044820152606401610d18565b600281600481111561420957614209615aa1565b036142565760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e677468006044820152606401610d18565b600381600481111561426a5761426a615aa1565b036117225760405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b6064820152608401610d18565b600054610100900460ff166142e95760405162461bcd60e51b8152600401610d189061568f565b81516020928301208151919092012061011a9190915561011b55565b600054610100900460ff1661432c5760405162461bcd60e51b8152600401610d189061568f565b507f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c961014f55565b6060610b476001600160a01b03831660145b60606000614375836002615ab7565b6143809060026155dd565b6001600160401b0381111561439757614397614be7565b6040519080825280601f01601f1916602001820160405280156143c1576020820181803683370190505b509050600360fc1b816000815181106143dc576143dc6158d0565b60200101906001600160f81b031916908160001a905350600f60fb1b8160018151811061440b5761440b6158d0565b60200101906001600160f81b031916908160001a905350600061442f846002615ab7565b61443a9060016155dd565b90505b60018111156144b2576f181899199a1a9b1b9c1cb0b131b232b360811b85600f166010811061446e5761446e6158d0565b1a60f81b828281518110614484576144846158d0565b60200101906001600160f81b031916908160001a90535060049490941c936144ab81615ad6565b905061443d565b5083156110555760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610d18565b600081815260018301602052604081205461454857508154600181810184556000848152602080822090930184905584548482528286019093526040902091909155610b47565b506000610b47565b60008181526001830160205260408120548015614639576000614574600183615899565b855490915060009061458890600190615899565b90508181146145ed5760008660000182815481106145a8576145a86158d0565b90600052602060002001549050808760000184815481106145cb576145cb6158d0565b6000918252602080832090910192909255918252600188019052604090208390555b85548690806145fe576145fe615aed565b600190038181906000526020600020016000905590558560010160008681526020019081526020016000206000905560019350505050610b47565b6000915050610b47565b60006146cb847f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bbe4fd506040518163ffffffff1660e01b8152600401602060405180830381865afa1580156146a7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a9291906154cf565b50509050818112156146f057604051632f4cb94160e01b815260040160405180910390fd5b6001600160a01b038416600090815260026020526040902054614714908390615434565b6001600160a01b03808616600090815260026020526040808220939093559085168152205461474490839061540c565b6001600160a01b03909316600090815260026020526040902092909255505050565b60405163555ddc6560e11b8152600090731820a4b7618bde71dce8cdc73aab6c95905fad249063aabbb8ca906147c29089907f29ddb589b1fb5fc7cf394961c1adf5f8c6454761adf795e67fe149f658abe89590600401615a2e565b602060405180830381865afa1580156147df573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190614803919061592d565b90506001600160a01b038116156127f857604051633ad5cbc160e11b81526001600160a01b038216906375ab97829061484a908a908a908a908a908a908a90600401615a47565b600060405180830381600087803b15801561486457600080fd5b505af1158015614878573d6000803e3d6000fd5b5050505050505050505050565b60006148e9837f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bbe4fd506040518163ffffffff1660e01b8152600401602060405180830381865afa1580156146a7573d6000803e3d6000fd5b505090506148f682612c35565b8112156149165760405163043b37d160e21b815260040160405180910390fd5b61491f82612c35565b6001600160a01b0384166000908152600260205260409020546149429190615434565b6001600160a01b038416600090815260026020526040902055600354614969908390615899565b600355505050565b60006020828403121561498357600080fd5b81356001600160e01b03198116811461105557600080fd5b6020808252825182820181905260009190848201906040850190845b818110156149dc5783516001600160a01b0316835292840192918401916001016149b7565b50909695505050505050565b60005b83811015614a035781810151838201526020016149eb565b50506000910152565b60008151808452614a248160208601602086016149e8565b601f01601f19169290920160200192915050565b6020815260006110556020830184614a0c565b6001600160a01b038116811461172257600080fd5b60008083601f840112614a7257600080fd5b5081356001600160401b03811115614a8957600080fd5b6020830191508360208260051b8501011115614aa457600080fd5b9250929050565b60008060008060608587031215614ac157600080fd5b8435614acc81614a4b565b93506020850135925060408501356001600160401b03811115614aee57600080fd5b614afa87828801614a60565b95989497509550505050565b60008060408385031215614b1957600080fd5b8235614b2481614a4b565b946020939093013593505050565b600060208284031215614b4457600080fd5b5035919050565b600080600060408486031215614b6057600080fd5b8335925060208401356001600160401b03811115614b7d57600080fd5b614b8986828701614a60565b9497909650939450505050565b60008060008060808587031215614bac57600080fd5b8435614bb781614a4b565b93506020850135614bc781614a4b565b92506040850135614bd781614a4b565b9396929550929360600135925050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715614c2557614c25614be7565b604052919050565b600082601f830112614c3e57600080fd5b81356001600160401b03811115614c5757614c57614be7565b614c6a601f8201601f1916602001614bfd565b818152846020838601011115614c7f57600080fd5b816020850160208301376000918101602001919091529392505050565b801515811461172257600080fd5b600080600080600080600060e0888a031215614cc557600080fd5b8735965060208801356001600160401b03811115614ce257600080fd5b614cee8a828b01614c2d565b9650506040880135614cff81614a4b565b94506060880135614d0f81614c9c565b93506080880135614d1f81614a4b565b9699959850939692959460a0840135945060c09093013592915050565b6001600160a01b0391909116815260200190565b600080600060608486031215614d6557600080fd5b8335614d7081614a4b565b92506020840135614d8081614a4b565b929592945050506040919091013590565b60008060408385031215614da457600080fd5b50508035926020909101359150565b600060208284031215614dc557600080fd5b813561105581614a4b565b60008060408385031215614de357600080fd5b823591506020830135614df581614a4b565b809150509250929050565b600080600060608486031215614e1557600080fd5b833592506020840135614e2781614a4b565b91506040840135614e3781614a4b565b809150509250925092565b60008083601f840112614e5457600080fd5b5081356001600160401b03811115614e6b57600080fd5b602083019150836020828501011115614aa457600080fd5b60008060008060608587031215614e9957600080fd5b8435614ea481614a4b565b93506020850135925060408501356001600160401b03811115614ec657600080fd5b614afa87828801614e42565b803560ff81168114614ee357600080fd5b919050565b60008060008060008060808789031215614f0157600080fd5b8635614f0c81614a4b565b9550614f1a60208801614ed2565b945060408701356001600160401b0380821115614f3657600080fd5b614f428a838b01614e42565b90965094506060890135915080821115614f5b57600080fd5b50614f6889828a01614e42565b979a9699509497509295939492505050565b60008060008060808587031215614f9057600080fd5b8435614f9b81614a4b565b93506020850135614fab81614a4b565b93969395505050506040820135916060013590565b6020808252825182820181905260009190848201906040850190845b818110156149dc57835183529284019291840191600101614fdc565b600080600080600080600060a0888a03121561501357600080fd5b873561501e81614a4b565b9650602088013561502e81614a4b565b95506040880135945060608801356001600160401b038082111561505157600080fd5b61505d8b838c01614e42565b909650945060808a013591508082111561507657600080fd5b506150838a828b01614e42565b989b979a50959850939692959293505050565b6000806000606084860312156150ab57600080fd5b83356150b681614a4b565b95602085013595506040909401359392505050565b6000806000606084860312156150e057600080fd5b83356150eb81614a4b565b92506020840135915060408401356001600160401b0381111561510d57600080fd5b61511986828701614c2d565b9150509250925092565b60006020828403121561513557600080fd5b813561105581614c9c565b600080600080600080600060e0888a03121561515b57600080fd5b873561516681614a4b565b9650602088013561517681614a4b565b9550604088013594506060880135935061519260808901614ed2565b925060a0880135915060c0880135905092959891949750929550565b600080604083850312156151c157600080fd5b82356151cc81614a4b565b91506020830135614df581614a4b565b600080600080600080600080600060e08a8c0312156151fa57600080fd5b89356001600160401b038082111561521157600080fd5b61521d8d838e01614e42565b909b50995060208c013591508082111561523657600080fd5b506152438c828d01614e42565b90985096505060408a0135945060608a013561525e81614a4b565b935060808a013561526e81614a4b565b925060a08a013561527e81614a4b565b915060c08a013561528e81614a4b565b809150509295985092959850929598565b600080600080600080608087890312156152b857600080fd5b86356152c381614a4b565b95506020870135945060408701356001600160401b0380821115614f3657600080fd5b6000806000604084860312156152fb57600080fd5b8335925060208401356001600160401b0381111561531857600080fd5b614b8986828701614e42565b600181811c9082168061533857607f821691505b60208210810361535857634e487b7160e01b600052602260045260246000fd5b50919050565b6080808252600e908201526d41677265656d656e74537461746560901b60a08201526001600160a01b039384166020820152919092166040820152606081019190915260c00190565b6000602082840312156153b957600080fd5b815161105581614c9c565b634e487b7160e01b600052601160045260246000fd5b6000600160ff1b82016153ef576153ef6153c4565b5060000390565b634e487b7160e01b600052600160045260246000fd5b808201828112600083128015821682158216171561542c5761542c6153c4565b505092915050565b8181036000831280158383131683831282161715613631576136316153c4565b85815260018060a01b038516602082015283604082015282606082015260a06080820152600061548760a0830184614a0c565b979650505050505050565b6060808252600d908201526c41677265656d656e744461746160981b60808201526001600160a01b03929092166020830152604082015260a00190565b6000602082840312156154e157600080fd5b5051919050565b600060208083850312156154fb57600080fd5b82516001600160401b038082111561551257600080fd5b818501915085601f83011261552657600080fd5b81518181111561553857615538614be7565b8060051b9150615549848301614bfd565b818152918301840191848101908884111561556357600080fd5b938501935b8385101561558d578451925061557d83614a4b565b8282529385019390850190615568565b98975050505050505050565b9283526001600160a01b03918216602084015216604082015260600190565b600080604083850312156155cb57600080fd5b825191506020830151614df581614c9c565b80820180821115610b4757610b476153c4565b6020808252600a90820152693737ba103830bab9b2b960b11b604082015260600190565b60208082526025908201527f5061757361626c653a20746f6b656e207472616e73666572207768696c652070604082015264185d5cd95960da1b606082015260800190565b83815260406020820152816040820152818360608301376000818301606090810191909152601f909201601f1916010192915050565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b601f821115610d2c57600081815260208120601f850160051c810160208610156157015750805b601f850160051c820191505b818110156157205782815560010161570d565b505050505050565b6001600160401b0383111561573f5761573f614be7565b6157538361574d8354615324565b836156da565b6000601f841160018114615787576000851561576f5750838201355b600019600387901b1c1916600186901b178355610d98565b600083815260209020601f19861690835b828110156157b85786850135825560209485019460019092019101615798565b50868210156157d55760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b6020808252600990820152683737ba1037bbb732b960b91b604082015260600190565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b838152604060208201819052810182905260006001600160fb1b0383111561587f57600080fd5b8260051b8085606085013791909101606001949350505050565b81810381811115610b4757610b476153c4565b6001600160a01b039384168152919092166020820152604081019190915260600190565b634e487b7160e01b600052603260045260246000fd5b6000806000606084860312156158fb57600080fd5b8351925060208401519150604084015190509250925092565b600060018201615926576159266153c4565b5060010190565b60006020828403121561593f57600080fd5b815161105581614a4b565b60018060a01b0384168152826020820152606060408201526000611a326060830184614a0c565b83815260606020820152600061598a6060830185614a0c565b828103604084015261157a8185614a0c565b6001600160a01b0393841681526020810192909252909116604082015260600190565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b8152600083516159f18160178501602088016149e8565b7001034b99036b4b9b9b4b733903937b6329607d1b6017918401918201528351615a228160288401602088016149e8565b01602801949350505050565b6001600160a01b03929092168252602082015260400190565b6001600160a01b0387811682528681166020830152851660408201526060810184905260c060808201819052600090615a8290830185614a0c565b82810360a0840152615a948185614a0c565b9998505050505050505050565b634e487b7160e01b600052602160045260246000fd5b6000816000190483118215151615615ad157615ad16153c4565b500290565b600081615ae557615ae56153c4565b506000190190565b634e487b7160e01b600052603160045260246000fdfe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5375706572546f6b656e3a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249865d7a28e3265b37a6474929f336521b332c1681b933f6cb9f3376673440d862a9f2df0fed2c77648de5860a4cc508cd0818c85b8b8a1ab4ceeef8d981c8956a6ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef5375706572546f6b656e3a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e6365a26469706673582212209417d2b437fc113859461c6b0717ce3df48d9fc36870a88dd79964d52d338f6864736f6c63430008100033";
2632
+ "0x60a06040523480156200001157600080fd5b5060405162005d1f38038062005d1f833981016040819052620000349162000046565b6001600160a01b031660805262000078565b6000602082840312156200005957600080fd5b81516001600160a01b03811681146200007157600080fd5b9392505050565b608051615c30620000ef6000396000818161050401528181610d3301528181610db60152818161105e01528181611170015281816112e3015281816118c701528181611a6b01528181611f4c0152818161203401528181612afb01528181612ba20152818161464b015261488d0152615c306000f3fe608060405234801561001057600080fd5b506004361061042a5760003560e01c806301ffc9a71461042f57806306e485381461045757806306fdde031461046c578063090c415e14610481578063095ea7b31461049657806311bcc81e146104a957806312a6a3f8146104b757806316d055d6146104ca57806318160ddd146104dd5780631863e809146104ef57806320bc44251461050257806323b872dd14610531578063245887fc14610544578063248a9ca314610557578063270483971461056a5780632c159a1a1461057d5780632ec8eec7146105915780632f2ff15d146105c4578063313ce567146105d7578063355274ea146105e65780633644e515146105f057806336568abe146105f8578063386fa2211461060b57806339364fd71461061e57806339509351146106465780633f4ba83a146106595780634000aea01461066157806340c10f191461067457806341b706be1461068757806342966c681461069a57806342fe0980146106ad5780634414744f146106c057806345977d03146104a957806346904840146106ce57806346951954146106e257806346fbf68e146106f55780634b61cc33146107085780634b75f54f1461072857806350d75d251461073c57806352d1902d14610744578063556f0dc71461074c5780635b9d09cc146107535780635c975abb146107615780635d5bf1781461076c57806362aa52871461077f57806362ad1b831461079257806366a12fb6146107a55780636c2d9f2f146107b857806370a08231146107cb57806379359f6f146107de57806379cc6790146107f15780637ecebe001461080457806382dc1ec41461082e5780638456cb59146108415780638da5cb5b146108495780639010d07c1461085157806391d1485414610864578063959b8c3f1461087757806395d89b411461088a578063983b2d561461089257806398650275146108a55780639903ad38146108ad5780639bd9bbc6146108b55780639d876741146108c8578063a1b2bf8b146108d6578063a217fddf146108e9578063a3a7e7f3146108f1578063a457c2d714610904578063a9059cbb14610917578063aa271e1a1461092a578063b84cdd4a1461093d578063bb0d196e14610950578063c3187f6214610963578063c68d4283146108c8578063ca15c87314610976578063ca78946414610544578063cf97256d14610989578063d505accf1461099c578063d5391393146109af578063d547741f146109c4578063d5a06d4c146109d7578063d95b6371146109ea578063d9d078d6146109fd578063dd62ed3e14610a10578063dea7f11214610a49578063e63ab1e914610a5c578063e74b981b14610a71578063eb3537cc14610a84578063ecc06c7614610ab2578063ee719bc814610ac5578063f2fde38b14610ad6578063fad8b32a14610ae9578063fc673c4f14610afc578063fe9d930314610b0f575b600080fd5b61044261043d366004614971565b610b22565b60405190151581526020015b60405180910390f35b61045f610b4d565b60405161044e919061499b565b610474610b5e565b60405161044e9190614a38565b61049461048f366004614aab565b610bf0565b005b6104426104a4366004614b06565b610ca4565b61049461042a366004614b32565b6104946104c5366004614b4b565b610cba565b6104946104d8366004614b96565b610d31565b6003545b60405190815260200161044e565b6104946104fd366004614caa565b610d9f565b7f00000000000000000000000000000000000000000000000000000000000000005b60405161044e9190614d3c565b61044261053f366004614d50565b611044565b610494610552366004614b06565b61105c565b6104e1610565366004614b32565b6110b7565b610494610578366004614d91565b6110cc565b61015254610524906001600160a01b031681565b6105a461059f366004614db3565b611168565b60408051948552602085019390935291830152606082015260800161044e565b6104946105d2366004614dd0565b61120b565b6040516012815260200161044e565b6104e16101535481565b6104e1611227565b610494610606366004614dd0565b611231565b61045f610619366004614db3565b6112af565b61063161062c366004614e00565b611352565b6040805192835290151560208301520161044e565b610442610654366004614b06565b6113d8565b610494611414565b61044261066f366004614e83565b611452565b610442610682366004614b06565b611584565b610494610695366004614b96565b61169b565b6104946106a8366004614b32565b6116bb565b6104946106bb366004614ee8565b611725565b610154546104429060ff1681565b61015054610524906001600160a01b031681565b6104946106f0366004614db3565b6117c8565b610442610703366004614db3565b6117f8565b61071b610716366004614f7a565b611812565b60405161044e9190614fc0565b61015154610524906001600160a01b031681565b61052461184d565b6104e1611857565b60016104e1565b61049461042a366004614e83565b60e85460ff16610442565b61049461077a366004614db3565b61187b565b61049461078d366004614d50565b6118c5565b6104946107a0366004614ff8565b61192b565b6104946107b3366004614d50565b6119d9565b61071b6107c6366004615096565b6119f9565b6104e16107d9366004614db3565b611a3b565b6104426107ec366004614db3565b611a63565b6104946107ff366004614b06565b611aeb565b6104e1610812366004614db3565b6001600160a01b0316600090815261014e602052604090205490565b61049461083c366004614db3565b611b6f565b610494611b87565b610524611bc3565b61052461085f366004614d91565b611bcb565b610442610872366004614dd0565b611be3565b610494610885366004614db3565b611c0e565b610474611c5f565b6104946108a0366004614db3565b611c6e565b610494611c86565b610494611c9e565b6104946108c3366004614e83565b611d55565b6104946106953660046150cb565b6104946108e4366004614b4b565b611daf565b6104e1600081565b6104946108ff366004614db3565b611e68565b610442610912366004614b06565b611e7c565b610442610925366004614b06565b611ecb565b610442610938366004614db3565b611ed9565b61044261094b366004614b06565b611ef3565b61044261095e366004614db3565b611f44565b610494610971366004615123565b611fcc565b6104e1610984366004614b32565b612006565b610494610997366004614b06565b61201d565b6104946109aa366004615140565b61210b565b6104e1600080516020615b8e83398151915281565b6104946109d2366004614dd0565b6122a0565b6106316109e5366004614b32565b6122bc565b6104426109f83660046151ae565b61233f565b610442610a0b366004614b06565b61234d565b6104e1610a1e3660046151ae565b6001600160a01b03918216600090815260116020908152604080832093909416825291909152205490565b610494610a573660046151dc565b612367565b6104e1600080516020615b6e83398151915281565b610494610a7f366004614db3565b612507565b610a97610a92366004614b06565b612551565b6040805193845260208401929092529082015260600161044e565b610494610ac0366004614db3565b612680565b600e546001600160a01b0316610524565b610494610ae4366004614db3565b6126ca565b610494610af7366004614db3565b612707565b610494610b0a36600461529f565b612758565b610494610b1d3660046152e6565b612801565b60006001600160e01b03198216635a05180f60e01b1480610b475750610b4782612843565b92915050565b6060610b596012612878565b905090565b6060600f8054610b6d90615324565b80601f0160208091040260200160405190810160405280929190818152602001828054610b9990615324565b8015610be65780601f10610bbb57610100808354040283529160200191610be6565b820191906000526020600020905b815481529060010190602001808311610bc957829003601f168201915b5050505050905090565b6000338585604051602001610c079392919061535e565b604051602081830303815290604052805190602001209050610c5c818484808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152506128de92505050565b6040518481526001600160a01b0386169033907f30f416fa68fca014a0f334464c64b000ba53e99b6d2afdea9d5ca756372d5985906020015b60405180910390a35050505050565b6000610cb133848461291f565b50600192915050565b60e85460ff1615610d215760405162461bcd60e51b815260206004820152602660248201527f5061757361626c653a2063726561746541677265656d656e74207768696c65206044820152651c185d5cd95960d21b60648201526084015b60405180910390fd5b610d2c8383836129cf565b505050565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633141580610d6e57506101545460ff1615155b15610d8c5760405163c51efddd60e01b815260040160405180910390fd5b610d9884848484612aa3565b5050505050565b604051632329212160e21b81526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690638ca4848490610deb903390600401614d3c565b602060405180830381865afa158015610e08573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e2c91906153a7565b610e495760405163327fd99160e21b815260040160405180910390fd5b6000610e53612af6565b90506001600160a01b038116610e665750845b600085610e735786610e75565b815b905060008313610f1257610e88836153da565b610e9185612c35565b14610e9e57610e9e6153f6565b610ea784612c35565b6001600160a01b03821660009081526002602052604081208054909190610ecf90849061540c565b90915550506001600160a01b03851660009081526002602052604081208054859290610efc90849061540c565b90915550610f0d9050858286612ca3565b610fdc565b8515610f2057610f206153f6565b82610f2a85612c35565b610f34919061540c565b6001600160a01b03831660009081526002602052604081208054909190610f5c908490615434565b90915550610f6b905084612c35565b6001600160a01b03881660009081526002602052604081208054909190610f9390849061540c565b90915550506001600160a01b03851660009081526002602052604081208054859290610fc090849061540c565b90915550610fd19050828886612ca3565b610fdc828685612ca3565b846001600160a01b0316876001600160a01b0316336001600160a01b03167fb8381a3ce157650e06186e3e8f4dd4dc29236f2688b6eed1893d0a60d7c6386f8c8589898f604051611031959493929190615454565b60405180910390a4505050505050505050565b600061105233858585612aa3565b90505b9392505050565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03163314158061109957506101545460ff1615155b1561042a5760405163c51efddd60e01b815260040160405180910390fd5b60009081526084602052604090206001015490565b60405133906000906110e49083908690602001615492565b6040516020818303038152906040528051906020012090506111068184612cd6565b6111235760405163dae1880960e01b815260040160405180910390fd5b61112d8184612d12565b60405184815233907f71a63dc095de07aa5512ad57a7596a39516317e316981a1cd71000057be1537b9060200160405180910390a250505050565b6000806000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bbe4fd506040518163ffffffff1660e01b8152600401602060405180830381865afa1580156111cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111f091906154cf565b90506111fc8582612551565b91979096509094509092509050565b611214826110b7565b61121d81612d33565b610d2c8383612d3d565b6000610b59612d5f565b6001600160a01b03811633146112a15760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b6064820152608401610d18565b6112ab8282612ddc565b5050565b6001600160a01b038181166000908152600160205260409081902054905163c56a069d60e01b8152901960048201526060917f0000000000000000000000000000000000000000000000000000000000000000169063c56a069d90602401600060405180830381865afa15801561132a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610b4791908101906154e8565b61015154604051631eed540360e11b815260009182916001600160a01b0390911690633ddaa8069061138c90889088908890600401615599565b6040805180830381865afa1580156113a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113cc91906155b8565b91509150935093915050565b3360008181526011602090815260408083206001600160a01b03871684529091528120549091610cb191859061140f9086906155dd565b61291f565b61142c600080516020615b6e83398151915233611be3565b6114485760405162461bcd60e51b8152600401610d18906155f0565b611450612dfe565b565b600061146060e85460ff1690565b1561147d5760405162461bcd60e51b8152600401610d1890615614565b600061148a338787612e4a565b9050600061149a33338985612feb565b9050866001600160a01b0316336001600160a01b03167fe19260aff97b920c7df27010903aeb9c8d2be5d310a2c67824cf3f15396e4c168488886040516114e393929190615659565b60405180910390a3863b1561157a57611533878387878080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061310b92505050565b61157a5760405162461bcd60e51b815260206004820152601860248201527710dbdb9d1c9858dd0819985b1b189858dac819985a5b195960421b6044820152606401610d18565b9695505050505050565b600061159e600080516020615b8e83398151915233611be3565b6115d75760405162461bcd60e51b815260206004820152600a6024820152693737ba1036b4b73a32b960b11b6044820152606401610d18565b60e85460ff16156115fa5760405162461bcd60e51b8152600401610d1890615614565b610153541561167357610153548261161160035490565b61161b91906155dd565b11156116735760405162461bcd60e51b815260206004820152602160248201527f43616e6e6f7420696e63726561736520737570706c79206265796f6e642063616044820152600760fc1b6064820152608401610d18565b60408051600080825260208201818152828401909352610cb1923392879287929091906131d5565b33301461042a57604051630fff4cc960e31b815260040160405180910390fd5b61172233808360005b6040519080825280601f01601f1916602001820160405280156116ee576020820181803683370190505b5060005b6040519080825280601f01601f19166020018201604052801561171c576020820181803683370190505b50613291565b50565b600054610100900460ff1661174c5760405162461bcd60e51b8152600401610d189061568f565b600e805460ff8716600160a01b026001600160a81b03199091166001600160a01b03891617179055600f611781848683615728565b50601061178f828483615728565b50611799306132c1565b6040516000808252908190600080516020615bae833981519152906020015b60405180910390a3505050505050565b6117d3600033611be3565b6117ef5760405162461bcd60e51b8152600401610d18906157e7565b611722816133d7565b6000610b47600080516020615b6e83398151915283611be3565b6060600085858560405160200161182b9392919061535e565b60405160208183030381529060405280519060200120905061157a81846135a9565b6000610b59613638565b7f596aa569dfde75b0375e5ba62bcfe0e1ce76eaca6130ef1c259fade04cb78b6890565b611886600033611be3565b6118a25760405162461bcd60e51b8152600401610d18906157e7565b61015280546001600160a01b0319166001600160a01b0392909216919091179055565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03163314158061190257506101545460ff1615155b156119205760405163c51efddd60e01b815260040160405180910390fd5b610d2c83838361291f565b336119386012828a61364b565b6119555760405163f7f0222760e01b815260040160405180910390fd5b6119cf8189898989898080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525050604080516020601f8d018190048102820181019092528b815292508b91508a9081908401838280828437600092019190915250600192506136f4915050565b5050505050505050565b33301461192057604051630fff4cc960e31b815260040160405180910390fd5b606060008484604051602001611a10929190615492565b604051602081830303815290604052805190602001209050611a3281846135a9565b95945050505050565b600080611a4783611168565b505050905060008112611a5a5780611055565b60009392505050565b6000610b47827f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bbe4fd506040518163ffffffff1660e01b8152600401602060405180830381865afa158015611ac7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a0b91906154cf565b6000611af78333610a1e565b905081811015611b555760405162461bcd60e51b8152602060048201526024808201527f45524332303a206275726e20616d6f756e74206578636565647320616c6c6f77604482015263616e636560e01b6064820152608401610d18565b611b62833384840361291f565b610d2c33848460006116c4565b611722600080516020615b6e8339815191528261120b565b611b9f600080516020615b6e83398151915233611be3565b611bbb5760405162461bcd60e51b8152600401610d18906155f0565b611450613735565b6000610b5981805b600082815260b6602052604081206110559083613772565b60009182526084602090815260408084206001600160a01b0393909316845291905290205460ff1690565b33611c1b6012828461377e565b806001600160a01b0316826001600160a01b03167ff4caeb2d6ca8932a215a353d0703c326ec2d81fc68170f320eb2ab49e9df61f960405160405180910390a35050565b606060108054610b6d90615324565b611722600080516020615b8e8339815191528261120b565b611450600080516020615b8e83398151915233611231565b600054610100900460ff1615808015611cbe5750600054600160ff909116105b80611cdf5750611ccd30613882565b158015611cdf575060005460ff166001145b611cfb5760405162461bcd60e51b8152600401610d189061580a565b6000805460ff191660011790558015611d1e576000805461ff0019166101001790555b8015611722576000805461ff001916905560405160018152600080516020615b4e833981519152906020015b60405180910390a150565b611da93333868686868080601f016020809104026020016040519081016040528093929190818152602001838380828437600092018290525060408051602081019091529081529250600191506136f49050565b50505050565b6040513390600090611dc79083908790602001615492565b604051602081830303815290604052805190602001209050611e1c818585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152506128de92505050565b336001600160a01b03167f0c4c547b3a4fcaa5be8353b3111472b124155bccc86de811d4a481c9e6e9faca868686604051611e5993929190615858565b60405180910390a25050505050565b6112ab333383611e7733611a3b565b612aa3565b6000610cb1338461140f856040518060600160405280602a8152602001615b24602a91393360009081526011602090815260408083206001600160a01b038d1684529091529020549190613891565b600061105533338585612aa3565b6000610b47600080516020615b8e83398151915283611be3565b600080600080611f038686612551565b9250925092506000611f2b828411611f1c576000612c35565b611f268385615899565b612c35565b611f35908561540c565b60001315979650505050505050565b6000610b47827f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bbe4fd506040518163ffffffff1660e01b8152600401602060405180830381865afa158015611fa8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061094b91906154cf565b611fd7600033611be3565b611ff35760405162461bcd60e51b8152600401610d18906157e7565b610154805460ff19169115919091179055565b600081815260b660205260408120610b47906138bd565b604051632329212160e21b81526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690638ca4848490612069903390600401614d3c565b602060405180830381865afa158015612086573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120aa91906153a7565b6120c75760405163327fd99160e21b815260040160405180910390fd5b6001600160a01b0382166000908152600260205260409020546120eb90829061540c565b6001600160a01b0390921660009081526002602052604090209190915550565b8342111561215b5760405162461bcd60e51b815260206004820152601d60248201527f45524332305065726d69743a206578706972656420646561646c696e650000006044820152606401610d18565b600061014f5488888861216d8c6138c7565b6040805160208101969096526001600160a01b0394851690860152929091166060840152608083015260a082015260c0810186905260e00160405160208183030381529060405280519060200120905060006121c8826138f9565b905060006121d882878787613947565b9050896001600160a01b0316816001600160a01b03161461223b5760405162461bcd60e51b815260206004820152601e60248201527f45524332305065726d69743a20696e76616c6964207369676e617475726500006044820152606401610d18565b60405163335097db60e11b815230906366a12fb690612262908d908d908d906004016158ac565b600060405180830381600087803b15801561227c57600080fd5b505af1158015612290573d6000803e3d6000fd5b5050505050505050505050505050565b6122a9826110b7565b6122b281612d33565b610d2c8383612ddc565b61015154604051631eed540360e11b815260009182916001600160a01b0390911690633ddaa806906122f690869085908190600401615599565b6040805180830381865afa158015612312573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061233691906155b8565b91509150915091565b60006110556012848461364b565b60008061235a8484612551565b5050600013949350505050565b600054610100900460ff16158080156123875750600054600160ff909116105b806123a8575061239630613882565b1580156123a8575060005460ff166001145b6123c45760405162461bcd60e51b8152600401610d189061580a565b6000805460ff1916600117905580156123e7576000805461ff0019166101001790555b6123f7600060128c8c8c8c611725565b6123ff61396f565b612407613996565b6124468a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506139c992505050565b612451600083613a1c565b612469600080516020615b8e83398151915283613a1c565b612481600080516020615b6e83398151915283613a1c565b61015080546001600160a01b038086166001600160a01b031992831617909255610152805487841690831617905561015180549288169290911691909117905561015386905580156124fb576000805461ff001916905560405160018152600080516020615b4e8339815191529060200160405180910390a15b50505050505050505050565b612512600033611be3565b61252e5760405162461bcd60e51b8152600401610d18906157e7565b61015080546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b038216600090815260026020526040812054908080612576866112af565b905060005b815181101561267757600080600084848151811061259b5761259b6158d0565b60200260200101516001600160a01b0316639b2e48bc308c8c6040518463ffffffff1660e01b81526004016125d2939291906158ac565b606060405180830381865afa1580156125ef573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061261391906158e6565b9194509250905061262482886155dd565b965061263081876155dd565b955061264d818311612643576000612c35565b611f268284615899565b612657848a61540c565b6126619190615434565b97505050508061267090615914565b905061257b565b50509250925092565b61268b600033611be3565b6126a75760405162461bcd60e51b8152600401610d18906157e7565b61015180546001600160a01b0319166001600160a01b0392909216919091179055565b6126d5600033611be3565b6126f15760405162461bcd60e51b8152600401610d18906157e7565b6126fc60008261120b565b611722600033611231565b3361271460128284613a26565b806001600160a01b0316826001600160a01b03167f50546e66e5f44d728365dc3908c63bc5cfeeab470722c1677e3073a6ac294aa160405160405180910390a35050565b336127656012828961364b565b6127825760405163f7f0222760e01b815260040160405180910390fd5b6127f881888888888080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525050604080516020601f8c018190048102820181019092528a815292508a915089908190840183828082843760009201919091525061329192505050565b50505050505050565b610d2c33338585858080601f016020809104026020016040519081016040528093929190818152602001838380828437600092018290525092506116f2915050565b60006001600160e01b03198216637965db0b60e01b1480610b4757506301ffc9a760e01b6001600160e01b0319831614610b47565b6060816000018054806020026020016040519081016040528092919081815260200182805480156128d257602002820191906000526020600020905b81546001600160a01b031681526001909101906020018083116128b4575b50505050509050919050565b60005b8151811015610d2c5760008282815181106128fe576128fe6158d0565b602002602001015190508082850155508061291890615914565b90506128e1565b6001600160a01b03831661294657604051638163862760e01b815260040160405180910390fd5b6001600160a01b03821661296d576040516337c1c09d60e21b815260040160405180910390fd5b6001600160a01b0383811660008181526011602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b60405133906000906129e79083908790602001615492565b60408051601f1981840301815291905280516020909101209050612a0b8184612cd6565b15612a295760405163782a90fb60e11b815260040160405180910390fd5b612a66818585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152506128de92505050565b816001600160a01b03167f770ea40a13a4644573ed785e5c7116890709947918747febc5add46feb531e2d868686604051611e5993929190615858565b6000612ab160e85460ff1690565b15612ace5760405162461bcd60e51b8152600401610d1890615614565b6000612adb858585612e4a565b9050612ae986868684612feb565b5060019695505050505050565b6000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663289b3c0d6040518163ffffffff1660e01b8152600401602060405180830381865afa158015612b57573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612b7b919061592d565b604051638369a0f160e01b81529091506001600160a01b03821690638369a0f190612bee907f00000000000000000000000000000000000000000000000000000000000000009030907f9f60ae461adf056670e03ae602566409933242392cb06744f5747c9f38b05d09906004016158ac565b602060405180830381865afa158015612c0b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612c2f919061592d565b91505090565b60006001600160ff1b03821115612c9f5760405162461bcd60e51b815260206004820152602860248201527f53616665436173743a2076616c756520646f65736e27742066697420696e2061604482015267371034b73a191a9b60c11b6064820152608401610d18565b5090565b816001600160a01b0316836001600160a01b0316600080516020615bae833981519152836040516129c291815260200190565b6000805b82811015612d0857838101548015612cf757600192505050610b47565b50612d0181615914565b9050612cda565b5060009392505050565b60005b81811015610d2c57600083820155612d2c81615914565b9050612d15565b6117228133613b1e565b612d478282613b77565b600082815260b660205260409020610d2c9082613bfd565b6000610b597f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f612d8f61011a5490565b61011b546040805160208101859052908101839052606081018290524660808201523060a082015260009060c0016040516020818303038152906040528051906020012090509392505050565b612de68282613c12565b600082815260b660205260409020610d2c9082613c79565b612e06613c8e565b60e8805460ff191690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b604051612e409190614d3c565b60405180910390a1565b6000806000612e5a848787611352565b91509150600082118015612edd57506101525460405163639e625760e11b81526001600160a01b039091169063c73cc4ae90612e9a903390600401614d3c565b602060405180830381865afa158015612eb7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612edb91906153a7565b155b15612fe157801580612f005750612ef386611a3b565b612efd83866155dd565b11155b612f4c5760405162461bcd60e51b815260206004820181905260248201527f4e6f7420656e6f7567682062616c616e636520746f20706179205458206665656044820152606401610d18565b61015054612f6790879081906001600160a01b031685612feb565b50604080516001600160a01b038089168252871660208201529081018590526060810183905281151560808201527f3eba86eb3c0ea121e35980d4acae6eb9f1cdf0bf7c0c08443798cfd6e5299de39060a00160405180910390a180612fd657612fd18285615899565b612fd8565b835b92505050611055565b5091949350505050565b60006001600160a01b0384166130145760405163eecd6c9b60e01b815260040160405180910390fd5b6001600160a01b03831661303b5760405163e219bd3960e01b815260040160405180910390fd5b600033905061306c818686866040518060200160405280600081525060405180602001604052806000815250613cd7565b846001600160a01b0316866001600160a01b0316146130ff576130ff858761140f866040518060600160405280602d8152602001615bce602d9139601160008c6001600160a01b03166001600160a01b0316815260200190815260200160002060008d6001600160a01b03166001600160a01b03168152602001908152602001600020546138919092919063ffffffff16565b50600195945050505050565b604051635260769b60e11b815260009084906001600160a01b0382169063a4c0ed36906131409033908890889060040161594a565b6020604051808303816000875af115801561315f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061318391906153a7565b6131ca5760405162461bcd60e51b815260206004820152601860248201527710dbdb9d1c9858dd0811985b1b189858dac819985a5b195960421b6044820152606401610d18565b506001949350505050565b6001600160a01b0385166131fc57604051630d24315760e01b815260040160405180910390fd5b6132068585613d76565b6132168660008787868689613dd0565b846001600160a01b0316866001600160a01b03167f2fe5be0146f74c5bce36c0b80911af6c7d86ff27e89d5cfa61fc681327954e5d86858560405161325d93929190615971565b60405180910390a36040518481526001600160a01b03861690600090600080516020615bae833981519152906020016117b8565b60e85460ff16156132b45760405162461bcd60e51b8152600401610d1890615614565b610d988585858585613f1f565b6040516329965a1d60e01b8152731820a4b7618bde71dce8cdc73aab6c95905fad24906329965a1d9061331c9084907fac7fbab5f54a3ca8194167523c6753bfeb96a445279294b6125b68cce217705490309060040161599c565b600060405180830381600087803b15801561333657600080fd5b505af115801561334a573d6000803e3d6000fd5b50506040516329965a1d60e01b8152731820a4b7618bde71dce8cdc73aab6c95905fad2492506329965a1d91506133a99084907faea199e31a596269b42cdafd93407f14436db6e4cad65417994c2eb37381e05a90309060040161599c565b600060405180830381600087803b1580156133c357600080fd5b505af1158015610d98573d6000803e3d6000fd5b60006133e1613638565b6001600160a01b0316036134375760405162461bcd60e51b815260206004820152601d60248201527f5555505350726f786961626c653a206e6f742075706772616461626c650000006044820152606401610d18565b806001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa158015613475573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061349991906154cf565b6134a1611857565b146134fa5760405162461bcd60e51b815260206004820152602360248201527f5555505350726f786961626c653a206e6f7420636f6d70617469626c65206c6f60448201526267696360e81b6064820152608401610d18565b6001600160a01b038116300361354e5760405162461bcd60e51b815260206004820152601960248201527805555505350726f786961626c653a2070726f7879206c6f6f7603c1b6044820152606401610d18565b61356481600080516020615b0483398151915255565b7fe011bc04c286c344a8fcbb8de77f953da762c3e25d8cdea984147fc4168a5dcc61358d611857565b604080519182526001600160a01b038416602083015201611d4a565b6060816001600160401b038111156135c3576135c3614be7565b6040519080825280602002602001820160405280156135ec578160200160208202803683370190505b50905060005b8281101561363157600081850154905080838381518110613615576136156158d0565b60209081029190910101525061362a81615914565b90506135f2565b5092915050565b600080516020615b048339815191525490565b6000816001600160a01b0316836001600160a01b031614806136ba57506001600160a01b038316600090815260018501602052604090205460ff1680156136ba57506001600160a01b03808316600090815260038601602090815260408083209387168352929052205460ff16155b8061105257506001600160a01b03808316600090815260028601602090815260408083209387168352929052205460ff1690509392505050565b60e85460ff16156137175760405162461bcd60e51b8152600401610d1890615614565b6000613724878787612e4a565b90506119cf88888884888888613fda565b61373d614053565b60e8805460ff191660011790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a258612e333390565b60006110558383614099565b806001600160a01b0316826001600160a01b0316036137f55760405162461bcd60e51b815260206004820152602d60248201527f4552433737374f70657261746f72733a20617574686f72697a696e672073656c60448201526c331030b99037b832b930ba37b960991b6064820152608401610d18565b6001600160a01b038116600090815260018401602052604090205460ff161561384b576001600160a01b03918216600090815260039390930160209081526040808520929093168452529020805460ff19169055565b6001600160a01b0380831660009081526002850160209081526040808320938516835292905220805460ff19166001179055505050565b6001600160a01b03163b151590565b600081848411156138b55760405162461bcd60e51b8152600401610d189190614a38565b505050900390565b6000610b47825490565b6001600160a01b038116600090815261014e602052604081208054918291906138ef83615914565b9190505550919050565b6000610b47613906612d5f565b8360405161190160f01b6020820152602281018390526042810182905260009060620160405160208183030381529060405280519060200120905092915050565b6000806000613958878787876140c3565b915091506139658161417d565b5095945050505050565b600054610100900460ff166114505760405162461bcd60e51b8152600401610d189061568f565b600054610100900460ff166139bd5760405162461bcd60e51b8152600401610d189061568f565b60e8805460ff19169055565b600054610100900460ff166139f05760405162461bcd60e51b8152600401610d189061568f565b613a1381604051806040016040528060018152602001603160f81b8152506142c2565b61172281614305565b6112ab8282612d3d565b336001600160a01b03821603613a915760405162461bcd60e51b815260206004820152602a60248201527f4552433737374f70657261746f72733a207265766f6b696e672073656c662061604482015269399037b832b930ba37b960b11b6064820152608401610d18565b6001600160a01b038116600090815260018401602052604090205460ff1615613aeb576001600160a01b0380831660009081526003850160209081526040808320938516835292905220805460ff19166001179055505050565b6001600160a01b03918216600090815260029390930160209081526040808520929093168452529020805460ff19169055565b613b288282611be3565b6112ab57613b3581614354565b613b40836020614366565b604051602001613b519291906159bf565b60408051601f198184030181529082905262461bcd60e51b8252610d1891600401614a38565b613b818282611be3565b6112ab5760008281526084602090815260408083206001600160a01b03851684529091529020805460ff19166001179055613bb93390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b6000611055836001600160a01b038416614501565b613c1c8282611be3565b156112ab5760008281526084602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b6000611055836001600160a01b038416614550565b60e85460ff166114505760405162461bcd60e51b815260206004820152601460248201527314185d5cd8589b194e881b9bdd081c185d5cd95960621b6044820152606401610d18565b613cea8585613ce586612c35565b614643565b836001600160a01b0316856001600160a01b0316876001600160a01b03167f06b541ddaa720db2b10a4d0cdac39b8d360425fc073085fac19bc82614677987868686604051613d3b93929190615971565b60405180910390a4836001600160a01b0316856001600160a01b0316600080516020615bae833981519152856040516117b891815260200190565b613d7f81612c35565b6001600160a01b038316600090815260026020526040902054613da2919061540c565b6001600160a01b038316600090815260026020526040902055600354613dc99082906155dd565b6003555050565b60405163555ddc6560e11b8152600090731820a4b7618bde71dce8cdc73aab6c95905fad249063aabbb8ca90613e2c9089907fb281fc8c12954d22544db45de3159a39272895b169a852b314f9cc762e44c53b90600401615a2e565b602060405180830381865afa158015613e49573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613e6d919061592d565b90506001600160a01b03811615613ee9576040516223de2960e01b81526001600160a01b038216906223de2990613eb2908b908b908b908b908b908b90600401615a47565b600060405180830381600087803b158015613ecc57600080fd5b505af1158015613ee0573d6000803e3d6000fd5b505050506119cf565b81156119cf57613f01866001600160a01b0316613882565b156119cf5760405163fe737d0560e01b815260040160405180910390fd5b6001600160a01b038416613f4657604051632e8aac6160e21b815260040160405180910390fd5b613f5585856000868686614766565b613f5f8484614885565b836001600160a01b0316856001600160a01b03167fa78a9be3a7b862d26933ad85fb11d80ef66b8f972d7cbba06621d583943a4098858585604051613fa693929190615971565b60405180910390a36040518381526000906001600160a01b03861690600080516020615bae83398151915290602001610c95565b6001600160a01b0386166140015760405163eecd6c9b60e01b815260040160405180910390fd5b6001600160a01b0385166140285760405163e219bd3960e01b815260040160405180910390fd5b614036878787878787614766565b614044878787878787613cd7565b6127f887878787878787613dd0565b60e85460ff16156114505760405162461bcd60e51b815260206004820152601060248201526f14185d5cd8589b194e881c185d5cd95960821b6044820152606401610d18565b60008260000182815481106140b0576140b06158d0565b9060005260206000200154905092915050565b6000806fa2a8918ca85bafe22016d0b997e4df60600160ff1b038311156140f05750600090506003614174565b6040805160008082526020820180845289905260ff881692820192909252606081018690526080810185905260019060a0016020604051602081039080840390855afa158015614144573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b03811661416d57600060019250925050614174565b9150600090505b94509492505050565b600081600481111561419157614191615aa1565b036141995750565b60018160048111156141ad576141ad615aa1565b036141f55760405162461bcd60e51b815260206004820152601860248201527745434453413a20696e76616c6964207369676e617475726560401b6044820152606401610d18565b600281600481111561420957614209615aa1565b036142565760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e677468006044820152606401610d18565b600381600481111561426a5761426a615aa1565b036117225760405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b6064820152608401610d18565b600054610100900460ff166142e95760405162461bcd60e51b8152600401610d189061568f565b81516020928301208151919092012061011a9190915561011b55565b600054610100900460ff1661432c5760405162461bcd60e51b8152600401610d189061568f565b507f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c961014f55565b6060610b476001600160a01b03831660145b60606000614375836002615ab7565b6143809060026155dd565b6001600160401b0381111561439757614397614be7565b6040519080825280601f01601f1916602001820160405280156143c1576020820181803683370190505b509050600360fc1b816000815181106143dc576143dc6158d0565b60200101906001600160f81b031916908160001a905350600f60fb1b8160018151811061440b5761440b6158d0565b60200101906001600160f81b031916908160001a905350600061442f846002615ab7565b61443a9060016155dd565b90505b60018111156144b2576f181899199a1a9b1b9c1cb0b131b232b360811b85600f166010811061446e5761446e6158d0565b1a60f81b828281518110614484576144846158d0565b60200101906001600160f81b031916908160001a90535060049490941c936144ab81615ad6565b905061443d565b5083156110555760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610d18565b600081815260018301602052604081205461454857508154600181810184556000848152602080822090930184905584548482528286019093526040902091909155610b47565b506000610b47565b60008181526001830160205260408120548015614639576000614574600183615899565b855490915060009061458890600190615899565b90508181146145ed5760008660000182815481106145a8576145a86158d0565b90600052602060002001549050808760000184815481106145cb576145cb6158d0565b6000918252602080832090910192909255918252600188019052604090208390555b85548690806145fe576145fe615aed565b600190038181906000526020600020016000905590558560010160008681526020019081526020016000206000905560019350505050610b47565b6000915050610b47565b60006146cb847f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bbe4fd506040518163ffffffff1660e01b8152600401602060405180830381865afa1580156146a7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a9291906154cf565b50509050818112156146f057604051632f4cb94160e01b815260040160405180910390fd5b6001600160a01b038416600090815260026020526040902054614714908390615434565b6001600160a01b03808616600090815260026020526040808220939093559085168152205461474490839061540c565b6001600160a01b03909316600090815260026020526040902092909255505050565b60405163555ddc6560e11b8152600090731820a4b7618bde71dce8cdc73aab6c95905fad249063aabbb8ca906147c29089907f29ddb589b1fb5fc7cf394961c1adf5f8c6454761adf795e67fe149f658abe89590600401615a2e565b602060405180830381865afa1580156147df573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190614803919061592d565b90506001600160a01b038116156127f857604051633ad5cbc160e11b81526001600160a01b038216906375ab97829061484a908a908a908a908a908a908a90600401615a47565b600060405180830381600087803b15801561486457600080fd5b505af1158015614878573d6000803e3d6000fd5b5050505050505050505050565b60006148e9837f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663bbe4fd506040518163ffffffff1660e01b8152600401602060405180830381865afa1580156146a7573d6000803e3d6000fd5b505090506148f682612c35565b8112156149165760405163043b37d160e21b815260040160405180910390fd5b61491f82612c35565b6001600160a01b0384166000908152600260205260409020546149429190615434565b6001600160a01b038416600090815260026020526040902055600354614969908390615899565b600355505050565b60006020828403121561498357600080fd5b81356001600160e01b03198116811461105557600080fd5b6020808252825182820181905260009190848201906040850190845b818110156149dc5783516001600160a01b0316835292840192918401916001016149b7565b50909695505050505050565b60005b83811015614a035781810151838201526020016149eb565b50506000910152565b60008151808452614a248160208601602086016149e8565b601f01601f19169290920160200192915050565b6020815260006110556020830184614a0c565b6001600160a01b038116811461172257600080fd5b60008083601f840112614a7257600080fd5b5081356001600160401b03811115614a8957600080fd5b6020830191508360208260051b8501011115614aa457600080fd5b9250929050565b60008060008060608587031215614ac157600080fd5b8435614acc81614a4b565b93506020850135925060408501356001600160401b03811115614aee57600080fd5b614afa87828801614a60565b95989497509550505050565b60008060408385031215614b1957600080fd5b8235614b2481614a4b565b946020939093013593505050565b600060208284031215614b4457600080fd5b5035919050565b600080600060408486031215614b6057600080fd5b8335925060208401356001600160401b03811115614b7d57600080fd5b614b8986828701614a60565b9497909650939450505050565b60008060008060808587031215614bac57600080fd5b8435614bb781614a4b565b93506020850135614bc781614a4b565b92506040850135614bd781614a4b565b9396929550929360600135925050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715614c2557614c25614be7565b604052919050565b600082601f830112614c3e57600080fd5b81356001600160401b03811115614c5757614c57614be7565b614c6a601f8201601f1916602001614bfd565b818152846020838601011115614c7f57600080fd5b816020850160208301376000918101602001919091529392505050565b801515811461172257600080fd5b600080600080600080600060e0888a031215614cc557600080fd5b8735965060208801356001600160401b03811115614ce257600080fd5b614cee8a828b01614c2d565b9650506040880135614cff81614a4b565b94506060880135614d0f81614c9c565b93506080880135614d1f81614a4b565b9699959850939692959460a0840135945060c09093013592915050565b6001600160a01b0391909116815260200190565b600080600060608486031215614d6557600080fd5b8335614d7081614a4b565b92506020840135614d8081614a4b565b929592945050506040919091013590565b60008060408385031215614da457600080fd5b50508035926020909101359150565b600060208284031215614dc557600080fd5b813561105581614a4b565b60008060408385031215614de357600080fd5b823591506020830135614df581614a4b565b809150509250929050565b600080600060608486031215614e1557600080fd5b833592506020840135614e2781614a4b565b91506040840135614e3781614a4b565b809150509250925092565b60008083601f840112614e5457600080fd5b5081356001600160401b03811115614e6b57600080fd5b602083019150836020828501011115614aa457600080fd5b60008060008060608587031215614e9957600080fd5b8435614ea481614a4b565b93506020850135925060408501356001600160401b03811115614ec657600080fd5b614afa87828801614e42565b803560ff81168114614ee357600080fd5b919050565b60008060008060008060808789031215614f0157600080fd5b8635614f0c81614a4b565b9550614f1a60208801614ed2565b945060408701356001600160401b0380821115614f3657600080fd5b614f428a838b01614e42565b90965094506060890135915080821115614f5b57600080fd5b50614f6889828a01614e42565b979a9699509497509295939492505050565b60008060008060808587031215614f9057600080fd5b8435614f9b81614a4b565b93506020850135614fab81614a4b565b93969395505050506040820135916060013590565b6020808252825182820181905260009190848201906040850190845b818110156149dc57835183529284019291840191600101614fdc565b600080600080600080600060a0888a03121561501357600080fd5b873561501e81614a4b565b9650602088013561502e81614a4b565b95506040880135945060608801356001600160401b038082111561505157600080fd5b61505d8b838c01614e42565b909650945060808a013591508082111561507657600080fd5b506150838a828b01614e42565b989b979a50959850939692959293505050565b6000806000606084860312156150ab57600080fd5b83356150b681614a4b565b95602085013595506040909401359392505050565b6000806000606084860312156150e057600080fd5b83356150eb81614a4b565b92506020840135915060408401356001600160401b0381111561510d57600080fd5b61511986828701614c2d565b9150509250925092565b60006020828403121561513557600080fd5b813561105581614c9c565b600080600080600080600060e0888a03121561515b57600080fd5b873561516681614a4b565b9650602088013561517681614a4b565b9550604088013594506060880135935061519260808901614ed2565b925060a0880135915060c0880135905092959891949750929550565b600080604083850312156151c157600080fd5b82356151cc81614a4b565b91506020830135614df581614a4b565b600080600080600080600080600060e08a8c0312156151fa57600080fd5b89356001600160401b038082111561521157600080fd5b61521d8d838e01614e42565b909b50995060208c013591508082111561523657600080fd5b506152438c828d01614e42565b90985096505060408a0135945060608a013561525e81614a4b565b935060808a013561526e81614a4b565b925060a08a013561527e81614a4b565b915060c08a013561528e81614a4b565b809150509295985092959850929598565b600080600080600080608087890312156152b857600080fd5b86356152c381614a4b565b95506020870135945060408701356001600160401b0380821115614f3657600080fd5b6000806000604084860312156152fb57600080fd5b8335925060208401356001600160401b0381111561531857600080fd5b614b8986828701614e42565b600181811c9082168061533857607f821691505b60208210810361535857634e487b7160e01b600052602260045260246000fd5b50919050565b6080808252600e908201526d41677265656d656e74537461746560901b60a08201526001600160a01b039384166020820152919092166040820152606081019190915260c00190565b6000602082840312156153b957600080fd5b815161105581614c9c565b634e487b7160e01b600052601160045260246000fd5b6000600160ff1b82016153ef576153ef6153c4565b5060000390565b634e487b7160e01b600052600160045260246000fd5b808201828112600083128015821682158216171561542c5761542c6153c4565b505092915050565b8181036000831280158383131683831282161715613631576136316153c4565b85815260018060a01b038516602082015283604082015282606082015260a06080820152600061548760a0830184614a0c565b979650505050505050565b6060808252600d908201526c41677265656d656e744461746160981b60808201526001600160a01b03929092166020830152604082015260a00190565b6000602082840312156154e157600080fd5b5051919050565b600060208083850312156154fb57600080fd5b82516001600160401b038082111561551257600080fd5b818501915085601f83011261552657600080fd5b81518181111561553857615538614be7565b8060051b9150615549848301614bfd565b818152918301840191848101908884111561556357600080fd5b938501935b8385101561558d578451925061557d83614a4b565b8282529385019390850190615568565b98975050505050505050565b9283526001600160a01b03918216602084015216604082015260600190565b600080604083850312156155cb57600080fd5b825191506020830151614df581614c9c565b80820180821115610b4757610b476153c4565b6020808252600a90820152693737ba103830bab9b2b960b11b604082015260600190565b60208082526025908201527f5061757361626c653a20746f6b656e207472616e73666572207768696c652070604082015264185d5cd95960da1b606082015260800190565b83815260406020820152816040820152818360608301376000818301606090810191909152601f909201601f1916010192915050565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b601f821115610d2c57600081815260208120601f850160051c810160208610156157015750805b601f850160051c820191505b818110156157205782815560010161570d565b505050505050565b6001600160401b0383111561573f5761573f614be7565b6157538361574d8354615324565b836156da565b6000601f841160018114615787576000851561576f5750838201355b600019600387901b1c1916600186901b178355610d98565b600083815260209020601f19861690835b828110156157b85786850135825560209485019460019092019101615798565b50868210156157d55760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b6020808252600990820152683737ba1037bbb732b960b91b604082015260600190565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b838152604060208201819052810182905260006001600160fb1b0383111561587f57600080fd5b8260051b8085606085013791909101606001949350505050565b81810381811115610b4757610b476153c4565b6001600160a01b039384168152919092166020820152604081019190915260600190565b634e487b7160e01b600052603260045260246000fd5b6000806000606084860312156158fb57600080fd5b8351925060208401519150604084015190509250925092565b600060018201615926576159266153c4565b5060010190565b60006020828403121561593f57600080fd5b815161105581614a4b565b60018060a01b0384168152826020820152606060408201526000611a326060830184614a0c565b83815260606020820152600061598a6060830185614a0c565b828103604084015261157a8185614a0c565b6001600160a01b0393841681526020810192909252909116604082015260600190565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b8152600083516159f18160178501602088016149e8565b7001034b99036b4b9b9b4b733903937b6329607d1b6017918401918201528351615a228160288401602088016149e8565b01602801949350505050565b6001600160a01b03929092168252602082015260400190565b6001600160a01b0387811682528681166020830152851660408201526060810184905260c060808201819052600090615a8290830185614a0c565b82810360a0840152615a948185614a0c565b9998505050505050505050565b634e487b7160e01b600052602160045260246000fd5b6000816000190483118215151615615ad157615ad16153c4565b500290565b600081615ae557615ae56153c4565b506000190190565b634e487b7160e01b600052603160045260246000fdfe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5375706572546f6b656e3a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249865d7a28e3265b37a6474929f336521b332c1681b933f6cb9f3376673440d862a9f2df0fed2c77648de5860a4cc508cd0818c85b8b8a1ab4ceeef8d981c8956a6ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef5375706572546f6b656e3a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e6365a26469706673582212204523708d5d70e2d7e6c238123f81cf32bf5e031d43527021e070b5c2144b99a364736f6c63430008100033";
2633
2633
 
2634
2634
  type SuperGoodDollarConstructorParams =
2635
2635
  | [signer?: Signer]
package/types/factories/SwapHelperTest__factory.ts CHANGED
@@ -47,7 +47,7 @@ const _abi = [
47
47
  ];
48
48
 
49
49
  const _bytecode =
50
- "0x608060405234801561001057600080fd5b506103ed806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80633274946114610030575b600080fd5b61004361003e36600461030d565b61005c565b6040805192835260208301919091520160405180910390f35b600080600061006b8585610126565b50905060008061007c888888610222565b6001600160a01b0316630902f1ac6040518163ffffffff1660e01b8152600401606060405180830381865afa1580156100b9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100dd9190610367565b506001600160701b031691506001600160701b03169150826001600160a01b0316876001600160a01b031614610114578082610117565b81815b90999098509650505050505050565b600080826001600160a01b0316846001600160a01b03160361019d5760405162461bcd60e51b815260206004820152602560248201527f556e697377617056324c6962726172793a204944454e544943414c5f41444452604482015264455353455360d81b60648201526084015b60405180910390fd5b826001600160a01b0316846001600160a01b0316106101bd5782846101c0565b83835b90925090506001600160a01b03821661021b5760405162461bcd60e51b815260206004820152601e60248201527f556e697377617056324c6962726172793a205a45524f5f4144445245535300006044820152606401610194565b9250929050565b60008060006102318585610126565b6040516001600160601b0319606084811b8216602084015283901b16603482015291935091508690604801604051602081830303815290604052805190602001206040516020016102cf9291906001600160f81b0319815260609290921b6001600160601b031916600183015260158201527f96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f603582015260550190565b60408051601f1981840301815291905280516020909101209695505050505050565b80356001600160a01b038116811461030857600080fd5b919050565b60008060006060848603121561032257600080fd5b61032b846102f1565b9250610339602085016102f1565b9150610347604085016102f1565b90509250925092565b80516001600160701b038116811461030857600080fd5b60008060006060848603121561037c57600080fd5b61038584610350565b925061039360208501610350565b9150604084015163ffffffff811681146103ac57600080fd5b80915050925092509256fea2646970667358221220bcd9b4fc2df5b73b8ba6046194749b4dd5cd5c2661a66081362f21dbffb24c8e64736f6c63430008100033";
50
+ "0x608060405234801561001057600080fd5b506103ed806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80633274946114610030575b600080fd5b61004361003e36600461030d565b61005c565b6040805192835260208301919091520160405180910390f35b600080600061006b8585610126565b50905060008061007c888888610222565b6001600160a01b0316630902f1ac6040518163ffffffff1660e01b8152600401606060405180830381865afa1580156100b9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100dd9190610367565b506001600160701b031691506001600160701b03169150826001600160a01b0316876001600160a01b031614610114578082610117565b81815b90999098509650505050505050565b600080826001600160a01b0316846001600160a01b03160361019d5760405162461bcd60e51b815260206004820152602560248201527f556e697377617056324c6962726172793a204944454e544943414c5f41444452604482015264455353455360d81b60648201526084015b60405180910390fd5b826001600160a01b0316846001600160a01b0316106101bd5782846101c0565b83835b90925090506001600160a01b03821661021b5760405162461bcd60e51b815260206004820152601e60248201527f556e697377617056324c6962726172793a205a45524f5f4144445245535300006044820152606401610194565b9250929050565b60008060006102318585610126565b6040516001600160601b0319606084811b8216602084015283901b16603482015291935091508690604801604051602081830303815290604052805190602001206040516020016102cf9291906001600160f81b0319815260609290921b6001600160601b031916600183015260158201527f96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f603582015260550190565b60408051601f1981840301815291905280516020909101209695505050505050565b80356001600160a01b038116811461030857600080fd5b919050565b60008060006060848603121561032257600080fd5b61032b846102f1565b9250610339602085016102f1565b9150610347604085016102f1565b90509250925092565b80516001600160701b038116811461030857600080fd5b60008060006060848603121561037c57600080fd5b61038584610350565b925061039360208501610350565b9150604084015163ffffffff811681146103ac57600080fd5b80915050925092509256fea2646970667358221220808dfdea7756a60d93f6372505ef9c2a783989dbb6bf4d8d9b2d1b3ac69406be64736f6c63430008100033";
51
51
 
52
52
  type SwapHelperTestConstructorParams =
53
53
  | [signer?: Signer]
package/types/factories/UBIScheme__factory.ts CHANGED
@@ -985,7 +985,7 @@ const _abi = [
985
985
  ];
986
986
 
987
987
  const _bytecode =
988
- "0x60a06040523060805234801561001457600080fd5b50608051612c7661004c60003960008181610d6901528181610da9015281816111dd0152818161121d01526112990152612c766000f3fe60806040526004361061022e5760003560e01c8063013eba921461023357806302329a2914610273578063069786ea146102955780630ce82d67146102bf5780631248b101146102d45780631794bb3c1461030b5780631a787f2e1461032b5780631b3c90a81461034b5780631bbc644c146103605780631d8f5ea91461039057806322b45727146103a65780633659cfe6146103bc57806337658574146103dc5780633d84ceca146103f25780633e6326fc146104125780634162169f1461043f5780634202d2141461045f578063456ac1c21461047f5780634b4c7180146104995780634e71d92d146104b35780634f1ef286146104c85780635231e2f0146104db57806352d1902d1461050b578063560796d1146105205780635aef7de6146105715780635c9302c9146105915780635c975abb146105a757806373b2e80e146105c1578063741470ac146105e15780638081cbbd146105f75780638fd247d21461061757806398d6621b146106375780639dc2c0331461064c578063a21f698a14610662578063b656223d14610682578063ba07541014610698578063c033abf2146106ae578063c1337508146106c4578063c7713870146106e4578063c7a76adf146106f9578063cc054dfc14610719578063cef6360014610746578063d6a9f61814610766578063d7c4cbb814610786578063dddc36161461079c578063de1de3a0146107b1578063e1758bd8146107d1578063eac471a0146107e6578063eda4e6d6146107fc575b600080fd5b34801561023f57600080fd5b5061026061024e366004612651565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027f57600080fd5b5061029361028e36600461267c565b610812565b005b3480156102a157600080fd5b506102aa61082d565b6040805192835260208301919091520161026a565b3480156102cb57600080fd5b5061026061086b565b3480156102e057600080fd5b506102aa6102ef366004612699565b609a602052600090815260409020600181015460029091015482565b34801561031757600080fd5b506102936103263660046126b2565b61088e565b34801561033757600080fd5b50610260610346366004612651565b610a81565b34801561035757600080fd5b50610293610ba9565b34801561036c57600080fd5b5061038061037b366004612651565b610cd0565b604051901515815260200161026a565b34801561039c57600080fd5b50610260609e5481565b3480156103b257600080fd5b5061026060a05481565b3480156103c857600080fd5b506102936103d7366004612651565b610d5f565b3480156103e857600080fd5b5061026060a95481565b3480156103fe57600080fd5b5061029361040d366004612699565b610e27565b34801561041e57600080fd5b50606754610432906001600160a01b031681565b60405161026a91906126f3565b34801561044b57600080fd5b50606554610432906001600160a01b031681565b34801561046b57600080fd5b5061038061047a366004612651565b610eca565b34801561048b57600080fd5b5060a3546103809060ff1681565b3480156104a557600080fd5b5060a8546103809060ff1681565b3480156104bf57600080fd5b50610380610f2c565b6102936104d6366004612774565b6111d3565b3480156104e757600080fd5b506103806104f6366004612651565b60ac6020526000908152604090205460ff1681565b34801561051757600080fd5b5061026061128c565b34801561052c57600080fd5b5061055a61053b366004612699565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161026a565b34801561057d57600080fd5b50606654610432906001600160a01b031681565b34801561059d57600080fd5b50610260609c5481565b3480156105b357600080fd5b5060ae546103809060ff1681565b3480156105cd57600080fd5b506103806105dc366004612651565b61133a565b3480156105ed57600080fd5b5061026060a75481565b34801561060357600080fd5b5060aa54610432906001600160a01b031681565b34801561062357600080fd5b50610293610632366004612699565b611366565b34801561064357600080fd5b50610260611373565b34801561065857600080fd5b5061026060a55481565b34801561066e57600080fd5b5061038061067d366004612651565b61137e565b34801561068e57600080fd5b5061026060a25481565b3480156106a457600080fd5b5061026060a65481565b3480156106ba57600080fd5b50610260609f5481565b3480156106d057600080fd5b506102606106df366004612806565b6113a4565b3480156106f057600080fd5b506102606114f3565b34801561070557600080fd5b50610260610714366004612699565b6115d6565b34801561072557600080fd5b50610260610734366004612651565b60ad6020526000908152604090205481565b34801561075257600080fd5b50610260610761366004612699565b6115eb565b34801561077257600080fd5b5061029361078136600461267c565b611600565b34801561079257600080fd5b5061026060a15481565b3480156107a857600080fd5b5061029361161b565b3480156107bd57600080fd5b506102936107cc36600461267c565b61167a565b3480156107dd57600080fd5b506104326116c9565b3480156107f257600080fd5b5061026060a45481565b34801561080857600080fd5b50610260609d5481565b61081a611751565b60ae805460ff1916911515919091179055565b600080600062015180609d544261084491906128cd565b61084e91906128e0565b9050610859816115d6565b610862826115eb565b92509250509091565b60006201518060a6544261087f91906128cd565b61088991906128e0565b905090565b600054610100900460ff16158080156108ae5750600054600160ff909116105b806108cf57506108bd30611816565b1580156108cf575060005460ff166001145b6109375760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff19166001179055801561095a576000805461ff0019166101001790555b600082116109aa5760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f604482015260640161092e565b6109b384611825565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055601e60a4556202d2a8609f556109f662015180426128e0565b610a039062015180612902565b610a0f9061a8c0612921565b609d81905560a65560a8805460ff19166001600160a01b03851615151790556103e860a9558015610a7b576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498906020015b60405180910390a15b50505050565b6000609d54421015610a9557506000919050565b60a85460ff168015610acf5750610aab8261137e565b1580610acf57506001600160a01b038216600090815260ac602052604090205460ff165b15610b515760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b27573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b4b9190612934565b92915050565b62015180609d5442610b6391906128cd565b610b6d91906128e0565b609c54148015610b7f57506000609e54115b15610ba157610b8d8261133a565b610b9957609e54610b4b565b600092915050565b610b4b6114f3565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610c0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c30919061294d565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610c8a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cae919061294d565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610ce857506000609d54115b8015610cf65750609d544210155b610d125760405162461bcd60e51b815260040161092e9061296a565b610d1b82611848565b610d545760405162461bcd60e51b815260206004820152600a6024820152690c6c2dc4ee840ccd2e6d60b31b604482015260640161092e565b610b4b82600161188c565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610da75760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610dd961193a565b6001600160a01b031614610dff5760405162461bcd60e51b815260040161092e906129db565b610e0881611956565b60408051600080825260208201909252610e249183919061195e565b50565b610e2f611751565b60008111610e895760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b606482015260840161092e565b60a4819055600060a7556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610eec8361137e565b15610f2357600062015180610f0183426128cd565b610f0b91906128e0565b905060a254811015610f21575060019392505050565b505b50600092915050565b60ae5460009060ff16158015610f4457506000609d54115b8015610f525750609d544210155b610f6e5760405162461bcd60e51b815260040161092e9061296a565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610fd0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ff4919061294d565b6001600160a01b0316632d0e9b46336040518263ffffffff1660e01b815260040161101f91906126f3565b602060405180830381865afa15801561103c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611060919061294d565b90506001600160a01b0381166110b55760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b604482015260640161092e565b60006110c18233611ace565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac190606401602060405180830381865afa15801561112d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611151919061294d565b905081801561116857506001600160a01b03811615155b156111cc5760405163748abee960e11b81526001600160a01b0382169063e9157dd2906111999086906004016126f3565b600060405180830381600087803b1580156111b357600080fd5b505af11580156111c7573d6000803e3d6000fd5b505050505b5091505090565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361121b5760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661124d61193a565b6001600160a01b0316146112735760405162461bcd60e51b815260040161092e906129db565b61127c82611956565b6112888282600161195e565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146113275760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161092e565b50600080516020612bfa83398151915290565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b61136e611751565b60a055565b600061088933610a81565b6001600160a01b0381166000908152609b602052604081205415610b9957506001919050565b60ae5460009060ff161580156113bc57506000609d54115b80156113ca5750609d544210155b6113e65760405162461bcd60e51b815260040161092e9061296a565b6000805b83518210156114a557609f545a106114a55761141e84838151811061141157611411612a15565b6020026020010151611848565b156114955761144784838151811061143857611438612a15565b6020026020010151600061188c565b6114855760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b604482015260640161092e565b609e546114929082612921565b90505b61149e82612a2b565b91506113ea565b80156114b9576114b9333383600080611c19565b6040518281527f72b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540f9060200160405180910390a15092915050565b6000806114fe6116c9565b6001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161152991906126f3565b602060405180830381865afa158015611546573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061156a9190612934565b9050600060a55460a4548361157f91906128e0565b119050600060a5549050600060a75461159661086b565b1015806115a05750825b156115b55760a4546115b290856128e0565b91505b6115c360a05460a954611eb2565b6115cd90836128e0565b95945050505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b611608611751565b60a8805460ff1916911515919091179055565b600062015180609d544261162f91906128cd565b61163991906128e0565b9050609c54811115610e2457609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610ebf565b611682611751565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610ebf565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561172d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610889919061294d565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa15801561179a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117be919061294d565b6001600160a01b0316146118145760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161092e565b565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b038316179055610e24610ba9565b60006118538261137e565b8015611865575061186382610eca565b155b8015610b4b5750506001600160a01b0316600090815260ac602052604090205460ff161590565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055806118b8611ecb565b60a054909150156118dc57600160a060008282546118d691906128cd565b90915550505b82156118f0576118f0333383600080611c19565b6040518181526001600160a01b0385169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a35060019392505050565b600080516020612bfa833981519152546001600160a01b031690565b610e24611751565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615611996576119918361215d565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156119f0575060408051601f3d908101601f191682019092526119ed91810190612934565b60015b611a535760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161092e565b600080516020612bfa8339815191528114611ac25760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161092e565b506119918383836121f7565b600080611ad9611ecb565b9050611ae48461137e565b8015611b0957506001600160a01b038416600090815260ac602052604090205460ff16155b8015611b1b5750611b198461133a565b155b15611b3957611b2f84848360016000611c19565b6001915050610b4b565b611b428461137e565b1580611b6657506001600160a01b038416600090815260ac602052604090205460ff165b15611c0f57600160a06000828254611b7e9190612921565b90915550506001600160a01b038416600090815260ac60205260409020805460ff1916905560a85460ff1615611bc257611bbd84846000806001611c19565b611bd1565b611bd184848360016000611c19565b6040516001600160a01b038516907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a26001915050610b4b565b5060009392505050565b8180611c225750805b15611cb0576001609a6000609c5481526020019081526020016000206001016000828254611c509190612921565b9091555050609c546000908152609a602090815260408083206001600160a01b03891684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611caa908490612921565b90915550505b8015611d8b5760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611ce79088906004016126f3565b6020604051808303816000875af1158015611d06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d2a9190612934565b905080609a6000609c5481526020019081526020016000206002016000828254611d549190612921565b90915550506040518181526001600160a01b03871690600080516020612bda8339815191529060200160405180910390a250611eab565b8115611de757609c546000908152609a602052604081206002018054859290611db5908490612921565b90915550506040518381526001600160a01b03861690600080516020612bda8339815191529060200160405180910390a25b6000611df16116c9565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611e229088908890600401612a44565b6020604051808303816000875af1158015611e41573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e659190612a5d565b611ea95760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b604482015260640161092e565b505b5050505050565b600081831015611ec25781611ec4565b825b9392505050565b6000611ed561161b565b60a154609c54141580611ee85750609e54155b15612156576000611ef76116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b8152600401611f2791906126f3565b602060405180830381865afa158015611f44573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611f689190612934565b9050600060a55460a45483611f7d91906128e0565b11905060a754611f8b61086b565b101580611f955750805b1561209e5760a35460ff161561201d57611fad61221c565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611fd99030906004016126f3565b602060405180830381865afa158015611ff6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061201a9190612934565b91505b60a45461202a90836128e0565b60a55560a45460a75561203f610e10426128e0565b61204b90610e10612902565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05460a9546120de9190611eb2565b60a5546120eb91906128e0565b609e5560a05461210990612101906002906128e0565b60a954611eb2565b60a955609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b61216681611816565b6121c85760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161092e565b600080516020612bfa83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b612200836124da565b60008251118061220d5750805b1561199157610a7b838361251a565b60006122266116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161225691906126f3565b602060405180830381865afa158015612273573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122979190612934565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a08231926122cf92909116906004016126f3565b602060405180830381865afa1580156122ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123109190612934565b6065546040519192506001600160a01b03169063d1b7089a90859061233b9030908690602401612a44565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526123969392916001600160a01b031690600090600401612aca565b6000604051808303816000875af11580156123b5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526123dd9190810190612afe565b50600090506123ec8284612921565b6040516370a0823160e01b81529091506001600160a01b038516906370a082319061241b9030906004016126f3565b602060405180830381865afa158015612438573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061245c9190612934565b81146124a45760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b604482015260640161092e565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba9101610a72565b6124e38161215d565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061252583611816565b6125805760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161092e565b600080846001600160a01b03168460405161259b9190612b8a565b600060405180830381855af49150503d80600081146125d6576040519150601f19603f3d011682016040523d82523d6000602084013e6125db565b606091505b50915091506115cd8282604051806060016040528060278152602001612c1a602791396060831561260d575081611ec4565b611ec483838151156126225781518083602001fd5b8060405162461bcd60e51b815260040161092e9190612ba6565b6001600160a01b0381168114610e2457600080fd5b60006020828403121561266357600080fd5b8135611ec48161263c565b8015158114610e2457600080fd5b60006020828403121561268e57600080fd5b8135611ec48161266e565b6000602082840312156126ab57600080fd5b5035919050565b6000806000606084860312156126c757600080fd5b83356126d28161263c565b925060208401356126e28161263c565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561274557612745612707565b604052919050565b60006001600160401b0382111561276657612766612707565b50601f01601f191660200190565b6000806040838503121561278757600080fd5b82356127928161263c565b915060208301356001600160401b038111156127ad57600080fd5b8301601f810185136127be57600080fd5b80356127d16127cc8261274d565b61271d565b8181528660208385010111156127e657600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561281957600080fd5b82356001600160401b038082111561283057600080fd5b818501915085601f83011261284457600080fd5b81358181111561285657612856612707565b8060051b915061286784830161271d565b818152918301840191848101908884111561288157600080fd5b938501935b838510156128ab578435925061289b8361263c565b8282529385019390850190612886565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b81810381811115610b4b57610b4b6128b7565b6000826128fd57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561291c5761291c6128b7565b500290565b80820180821115610b4b57610b4b6128b7565b60006020828403121561294657600080fd5b5051919050565b60006020828403121561295f57600080fd5b8151611ec48161263c565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612bba83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612bba83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b600060018201612a3d57612a3d6128b7565b5060010190565b6001600160a01b03929092168252602082015260400190565b600060208284031215612a6f57600080fd5b8151611ec48161266e565b60005b83811015612a95578181015183820152602001612a7d565b50506000910152565b60008151808452612ab6816020860160208601612a7a565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612aec6080840187612a9e565b94166040830152506060015292915050565b60008060408385031215612b1157600080fd5b8251612b1c8161266e565b60208401519092506001600160401b03811115612b3857600080fd5b8301601f81018513612b4957600080fd5b8051612b576127cc8261274d565b818152866020838501011115612b6c57600080fd5b612b7d826020830160208601612a7a565b8093505050509250929050565b60008251612b9c818460208701612a7a565b9190910192915050565b602081526000611ec46020830184612a9e56fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122063e7244b7d5607d81e70f53dbb5e20873435c85aa9d11aefabf4a1174757a82a64736f6c63430008100033";
988
+ "0x60a06040523060805234801561001457600080fd5b50608051612c7661004c60003960008181610d6901528181610da9015281816111dd0152818161121d01526112990152612c766000f3fe60806040526004361061022e5760003560e01c8063013eba921461023357806302329a2914610273578063069786ea146102955780630ce82d67146102bf5780631248b101146102d45780631794bb3c1461030b5780631a787f2e1461032b5780631b3c90a81461034b5780631bbc644c146103605780631d8f5ea91461039057806322b45727146103a65780633659cfe6146103bc57806337658574146103dc5780633d84ceca146103f25780633e6326fc146104125780634162169f1461043f5780634202d2141461045f578063456ac1c21461047f5780634b4c7180146104995780634e71d92d146104b35780634f1ef286146104c85780635231e2f0146104db57806352d1902d1461050b578063560796d1146105205780635aef7de6146105715780635c9302c9146105915780635c975abb146105a757806373b2e80e146105c1578063741470ac146105e15780638081cbbd146105f75780638fd247d21461061757806398d6621b146106375780639dc2c0331461064c578063a21f698a14610662578063b656223d14610682578063ba07541014610698578063c033abf2146106ae578063c1337508146106c4578063c7713870146106e4578063c7a76adf146106f9578063cc054dfc14610719578063cef6360014610746578063d6a9f61814610766578063d7c4cbb814610786578063dddc36161461079c578063de1de3a0146107b1578063e1758bd8146107d1578063eac471a0146107e6578063eda4e6d6146107fc575b600080fd5b34801561023f57600080fd5b5061026061024e366004612651565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027f57600080fd5b5061029361028e36600461267c565b610812565b005b3480156102a157600080fd5b506102aa61082d565b6040805192835260208301919091520161026a565b3480156102cb57600080fd5b5061026061086b565b3480156102e057600080fd5b506102aa6102ef366004612699565b609a602052600090815260409020600181015460029091015482565b34801561031757600080fd5b506102936103263660046126b2565b61088e565b34801561033757600080fd5b50610260610346366004612651565b610a81565b34801561035757600080fd5b50610293610ba9565b34801561036c57600080fd5b5061038061037b366004612651565b610cd0565b604051901515815260200161026a565b34801561039c57600080fd5b50610260609e5481565b3480156103b257600080fd5b5061026060a05481565b3480156103c857600080fd5b506102936103d7366004612651565b610d5f565b3480156103e857600080fd5b5061026060a95481565b3480156103fe57600080fd5b5061029361040d366004612699565b610e27565b34801561041e57600080fd5b50606754610432906001600160a01b031681565b60405161026a91906126f3565b34801561044b57600080fd5b50606554610432906001600160a01b031681565b34801561046b57600080fd5b5061038061047a366004612651565b610eca565b34801561048b57600080fd5b5060a3546103809060ff1681565b3480156104a557600080fd5b5060a8546103809060ff1681565b3480156104bf57600080fd5b50610380610f2c565b6102936104d6366004612774565b6111d3565b3480156104e757600080fd5b506103806104f6366004612651565b60ac6020526000908152604090205460ff1681565b34801561051757600080fd5b5061026061128c565b34801561052c57600080fd5b5061055a61053b366004612699565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161026a565b34801561057d57600080fd5b50606654610432906001600160a01b031681565b34801561059d57600080fd5b50610260609c5481565b3480156105b357600080fd5b5060ae546103809060ff1681565b3480156105cd57600080fd5b506103806105dc366004612651565b61133a565b3480156105ed57600080fd5b5061026060a75481565b34801561060357600080fd5b5060aa54610432906001600160a01b031681565b34801561062357600080fd5b50610293610632366004612699565b611366565b34801561064357600080fd5b50610260611373565b34801561065857600080fd5b5061026060a55481565b34801561066e57600080fd5b5061038061067d366004612651565b61137e565b34801561068e57600080fd5b5061026060a25481565b3480156106a457600080fd5b5061026060a65481565b3480156106ba57600080fd5b50610260609f5481565b3480156106d057600080fd5b506102606106df366004612806565b6113a4565b3480156106f057600080fd5b506102606114f3565b34801561070557600080fd5b50610260610714366004612699565b6115d6565b34801561072557600080fd5b50610260610734366004612651565b60ad6020526000908152604090205481565b34801561075257600080fd5b50610260610761366004612699565b6115eb565b34801561077257600080fd5b5061029361078136600461267c565b611600565b34801561079257600080fd5b5061026060a15481565b3480156107a857600080fd5b5061029361161b565b3480156107bd57600080fd5b506102936107cc36600461267c565b61167a565b3480156107dd57600080fd5b506104326116c9565b3480156107f257600080fd5b5061026060a45481565b34801561080857600080fd5b50610260609d5481565b61081a611751565b60ae805460ff1916911515919091179055565b600080600062015180609d544261084491906128cd565b61084e91906128e0565b9050610859816115d6565b610862826115eb565b92509250509091565b60006201518060a6544261087f91906128cd565b61088991906128e0565b905090565b600054610100900460ff16158080156108ae5750600054600160ff909116105b806108cf57506108bd30611816565b1580156108cf575060005460ff166001145b6109375760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff19166001179055801561095a576000805461ff0019166101001790555b600082116109aa5760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f604482015260640161092e565b6109b384611825565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055601e60a4556202d2a8609f556109f662015180426128e0565b610a039062015180612902565b610a0f9061a8c0612921565b609d81905560a65560a8805460ff19166001600160a01b03851615151790556103e860a9558015610a7b576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498906020015b60405180910390a15b50505050565b6000609d54421015610a9557506000919050565b60a85460ff168015610acf5750610aab8261137e565b1580610acf57506001600160a01b038216600090815260ac602052604090205460ff165b15610b515760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b27573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b4b9190612934565b92915050565b62015180609d5442610b6391906128cd565b610b6d91906128e0565b609c54148015610b7f57506000609e54115b15610ba157610b8d8261133a565b610b9957609e54610b4b565b600092915050565b610b4b6114f3565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610c0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c30919061294d565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610c8a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cae919061294d565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610ce857506000609d54115b8015610cf65750609d544210155b610d125760405162461bcd60e51b815260040161092e9061296a565b610d1b82611848565b610d545760405162461bcd60e51b815260206004820152600a6024820152690c6c2dc4ee840ccd2e6d60b31b604482015260640161092e565b610b4b82600161188c565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610da75760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610dd961193a565b6001600160a01b031614610dff5760405162461bcd60e51b815260040161092e906129db565b610e0881611956565b60408051600080825260208201909252610e249183919061195e565b50565b610e2f611751565b60008111610e895760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b606482015260840161092e565b60a4819055600060a7556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610eec8361137e565b15610f2357600062015180610f0183426128cd565b610f0b91906128e0565b905060a254811015610f21575060019392505050565b505b50600092915050565b60ae5460009060ff16158015610f4457506000609d54115b8015610f525750609d544210155b610f6e5760405162461bcd60e51b815260040161092e9061296a565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610fd0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ff4919061294d565b6001600160a01b0316632d0e9b46336040518263ffffffff1660e01b815260040161101f91906126f3565b602060405180830381865afa15801561103c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611060919061294d565b90506001600160a01b0381166110b55760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b604482015260640161092e565b60006110c18233611ace565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac190606401602060405180830381865afa15801561112d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611151919061294d565b905081801561116857506001600160a01b03811615155b156111cc5760405163748abee960e11b81526001600160a01b0382169063e9157dd2906111999086906004016126f3565b600060405180830381600087803b1580156111b357600080fd5b505af11580156111c7573d6000803e3d6000fd5b505050505b5091505090565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361121b5760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661124d61193a565b6001600160a01b0316146112735760405162461bcd60e51b815260040161092e906129db565b61127c82611956565b6112888282600161195e565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146113275760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161092e565b50600080516020612bfa83398151915290565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b61136e611751565b60a055565b600061088933610a81565b6001600160a01b0381166000908152609b602052604081205415610b9957506001919050565b60ae5460009060ff161580156113bc57506000609d54115b80156113ca5750609d544210155b6113e65760405162461bcd60e51b815260040161092e9061296a565b6000805b83518210156114a557609f545a106114a55761141e84838151811061141157611411612a15565b6020026020010151611848565b156114955761144784838151811061143857611438612a15565b6020026020010151600061188c565b6114855760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b604482015260640161092e565b609e546114929082612921565b90505b61149e82612a2b565b91506113ea565b80156114b9576114b9333383600080611c19565b6040518281527f72b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540f9060200160405180910390a15092915050565b6000806114fe6116c9565b6001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161152991906126f3565b602060405180830381865afa158015611546573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061156a9190612934565b9050600060a55460a4548361157f91906128e0565b119050600060a5549050600060a75461159661086b565b1015806115a05750825b156115b55760a4546115b290856128e0565b91505b6115c360a05460a954611eb2565b6115cd90836128e0565b95945050505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b611608611751565b60a8805460ff1916911515919091179055565b600062015180609d544261162f91906128cd565b61163991906128e0565b9050609c54811115610e2457609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610ebf565b611682611751565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610ebf565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561172d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610889919061294d565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa15801561179a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117be919061294d565b6001600160a01b0316146118145760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161092e565b565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b038316179055610e24610ba9565b60006118538261137e565b8015611865575061186382610eca565b155b8015610b4b5750506001600160a01b0316600090815260ac602052604090205460ff161590565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055806118b8611ecb565b60a054909150156118dc57600160a060008282546118d691906128cd565b90915550505b82156118f0576118f0333383600080611c19565b6040518181526001600160a01b0385169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a35060019392505050565b600080516020612bfa833981519152546001600160a01b031690565b610e24611751565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615611996576119918361215d565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156119f0575060408051601f3d908101601f191682019092526119ed91810190612934565b60015b611a535760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161092e565b600080516020612bfa8339815191528114611ac25760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161092e565b506119918383836121f7565b600080611ad9611ecb565b9050611ae48461137e565b8015611b0957506001600160a01b038416600090815260ac602052604090205460ff16155b8015611b1b5750611b198461133a565b155b15611b3957611b2f84848360016000611c19565b6001915050610b4b565b611b428461137e565b1580611b6657506001600160a01b038416600090815260ac602052604090205460ff165b15611c0f57600160a06000828254611b7e9190612921565b90915550506001600160a01b038416600090815260ac60205260409020805460ff1916905560a85460ff1615611bc257611bbd84846000806001611c19565b611bd1565b611bd184848360016000611c19565b6040516001600160a01b038516907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a26001915050610b4b565b5060009392505050565b8180611c225750805b15611cb0576001609a6000609c5481526020019081526020016000206001016000828254611c509190612921565b9091555050609c546000908152609a602090815260408083206001600160a01b03891684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611caa908490612921565b90915550505b8015611d8b5760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611ce79088906004016126f3565b6020604051808303816000875af1158015611d06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d2a9190612934565b905080609a6000609c5481526020019081526020016000206002016000828254611d549190612921565b90915550506040518181526001600160a01b03871690600080516020612bda8339815191529060200160405180910390a250611eab565b8115611de757609c546000908152609a602052604081206002018054859290611db5908490612921565b90915550506040518381526001600160a01b03861690600080516020612bda8339815191529060200160405180910390a25b6000611df16116c9565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611e229088908890600401612a44565b6020604051808303816000875af1158015611e41573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e659190612a5d565b611ea95760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b604482015260640161092e565b505b5050505050565b600081831015611ec25781611ec4565b825b9392505050565b6000611ed561161b565b60a154609c54141580611ee85750609e54155b15612156576000611ef76116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b8152600401611f2791906126f3565b602060405180830381865afa158015611f44573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611f689190612934565b9050600060a55460a45483611f7d91906128e0565b11905060a754611f8b61086b565b101580611f955750805b1561209e5760a35460ff161561201d57611fad61221c565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611fd99030906004016126f3565b602060405180830381865afa158015611ff6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061201a9190612934565b91505b60a45461202a90836128e0565b60a55560a45460a75561203f610e10426128e0565b61204b90610e10612902565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05460a9546120de9190611eb2565b60a5546120eb91906128e0565b609e5560a05461210990612101906002906128e0565b60a954611eb2565b60a955609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b61216681611816565b6121c85760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161092e565b600080516020612bfa83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b612200836124da565b60008251118061220d5750805b1561199157610a7b838361251a565b60006122266116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161225691906126f3565b602060405180830381865afa158015612273573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122979190612934565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a08231926122cf92909116906004016126f3565b602060405180830381865afa1580156122ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123109190612934565b6065546040519192506001600160a01b03169063d1b7089a90859061233b9030908690602401612a44565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526123969392916001600160a01b031690600090600401612aca565b6000604051808303816000875af11580156123b5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526123dd9190810190612afe565b50600090506123ec8284612921565b6040516370a0823160e01b81529091506001600160a01b038516906370a082319061241b9030906004016126f3565b602060405180830381865afa158015612438573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061245c9190612934565b81146124a45760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b604482015260640161092e565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba9101610a72565b6124e38161215d565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061252583611816565b6125805760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161092e565b600080846001600160a01b03168460405161259b9190612b8a565b600060405180830381855af49150503d80600081146125d6576040519150601f19603f3d011682016040523d82523d6000602084013e6125db565b606091505b50915091506115cd8282604051806060016040528060278152602001612c1a602791396060831561260d575081611ec4565b611ec483838151156126225781518083602001fd5b8060405162461bcd60e51b815260040161092e9190612ba6565b6001600160a01b0381168114610e2457600080fd5b60006020828403121561266357600080fd5b8135611ec48161263c565b8015158114610e2457600080fd5b60006020828403121561268e57600080fd5b8135611ec48161266e565b6000602082840312156126ab57600080fd5b5035919050565b6000806000606084860312156126c757600080fd5b83356126d28161263c565b925060208401356126e28161263c565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561274557612745612707565b604052919050565b60006001600160401b0382111561276657612766612707565b50601f01601f191660200190565b6000806040838503121561278757600080fd5b82356127928161263c565b915060208301356001600160401b038111156127ad57600080fd5b8301601f810185136127be57600080fd5b80356127d16127cc8261274d565b61271d565b8181528660208385010111156127e657600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561281957600080fd5b82356001600160401b038082111561283057600080fd5b818501915085601f83011261284457600080fd5b81358181111561285657612856612707565b8060051b915061286784830161271d565b818152918301840191848101908884111561288157600080fd5b938501935b838510156128ab578435925061289b8361263c565b8282529385019390850190612886565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b81810381811115610b4b57610b4b6128b7565b6000826128fd57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561291c5761291c6128b7565b500290565b80820180821115610b4b57610b4b6128b7565b60006020828403121561294657600080fd5b5051919050565b60006020828403121561295f57600080fd5b8151611ec48161263c565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612bba83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612bba83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b600060018201612a3d57612a3d6128b7565b5060010190565b6001600160a01b03929092168252602082015260400190565b600060208284031215612a6f57600080fd5b8151611ec48161266e565b60005b83811015612a95578181015183820152602001612a7d565b50506000910152565b60008151808452612ab6816020860160208601612a7a565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612aec6080840187612a9e565b94166040830152506060015292915050565b60008060408385031215612b1157600080fd5b8251612b1c8161266e565b60208401519092506001600160401b03811115612b3857600080fd5b8301601f81018513612b4957600080fd5b8051612b576127cc8261274d565b818152866020838501011115612b6c57600080fd5b612b7d826020830160208601612a7a565b8093505050509250929050565b60008251612b9c818460208701612a7a565b9190910192915050565b602081526000611ec46020830184612a9e56fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122015a938857224dd3fcb12c2eb31abce79b863bed2b094b02e86bc452b0c94676f64736f6c63430008100033";
989
989
 
990
990
  type UBISchemeConstructorParams =
991
991
  | [signer?: Signer]
package/types/factories/UUPSProxy__factory.ts CHANGED
@@ -31,7 +31,7 @@ const _abi = [
31
31
  ];
32
32
 
33
33
  const _bytecode =
34
- "0x608060405234801561001057600080fd5b50610205806100206000396000f3fe6080604052600436106100225760003560e01c80634a0687ef1461003957610031565b366100315761002f610059565b005b61002f610059565b34801561004557600080fd5b5061002f61005436600461017f565b61006b565b610069610064610139565b610148565b565b6001600160a01b0381166100c05760405162461bcd60e51b81526020600482015260176024820152765555505350726f78793a207a65726f206164647265737360481b60448201526064015b60405180910390fd5b60006100ca61016c565b6001600160a01b0316146101205760405162461bcd60e51b815260206004820152601e60248201527f5555505350726f78793a20616c726561647920696e697469616c697a6564000060448201526064016100b7565b610136816000805160206101b083398151915255565b50565b600061014361016c565b905090565b3660008037600080366000845af43d6000803e808015610167573d6000f35b3d6000fd5b6000805160206101b08339815191525490565b60006020828403121561019157600080fd5b81356001600160a01b03811681146101a857600080fd5b939250505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca26469706673582212207c33c3974a940a4eeeb4a7bd07086a7abf0876a8f9ebb856a5a88983d041b07064736f6c63430008100033";
34
+ "0x608060405234801561001057600080fd5b50610205806100206000396000f3fe6080604052600436106100225760003560e01c80634a0687ef1461003957610031565b366100315761002f610059565b005b61002f610059565b34801561004557600080fd5b5061002f61005436600461017f565b61006b565b610069610064610139565b610148565b565b6001600160a01b0381166100c05760405162461bcd60e51b81526020600482015260176024820152765555505350726f78793a207a65726f206164647265737360481b60448201526064015b60405180910390fd5b60006100ca61016c565b6001600160a01b0316146101205760405162461bcd60e51b815260206004820152601e60248201527f5555505350726f78793a20616c726561647920696e697469616c697a6564000060448201526064016100b7565b610136816000805160206101b083398151915255565b50565b600061014361016c565b905090565b3660008037600080366000845af43d6000803e808015610167573d6000f35b3d6000fd5b6000805160206101b08339815191525490565b60006020828403121561019157600080fd5b81356001600160a01b03811681146101a857600080fd5b939250505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca264697066735822122054303c95e3083467af14f8e45d0e4948671519cda9ee34d9041f82134179ec4464736f6c63430008100033";
35
35
 
36
36
  type UUPSProxyConstructorParams =
37
37
  | [signer?: Signer]
package/types/factories/UniswapV2SwapHelper__factory.ts CHANGED
@@ -52,7 +52,7 @@ const _abi = [
52
52
  ];
53
53
 
54
54
  const _bytecode =
55
- "0x6104ee61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100355760003560e01c8063f10a60ab1461003a575b600080fd5b61004d61004836600461037e565b61005f565b60405190815260200160405180910390f35b600080866001600160a01b031663b0f479a16040518163ffffffff1660e01b8152600401602060405180830381865afa1580156100a0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906103d9565b90506000816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015610106573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012a91906103d9565b90506001600160a01b038716156101415786610143565b805b96506001600160a01b0386161561015a578561015c565b805b95506000826001600160a01b031663c45a01556040518163ffffffff1660e01b8152600401602060405180830381865afa15801561019e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101c291906103d9565b60405163e6a4390560e01b81526001600160a01b038a811660048301528981166024830152919091169063e6a4390590604401602060405180830381865afa158015610212573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023691906103d9565b9050600080826001600160a01b0316630902f1ac6040518163ffffffff1660e01b8152600401606060405180830381865afa158015610279573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029d9190610419565b50915091506000829050836001600160a01b031663d21220a76040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030991906103d9565b6001600160a01b03168b6001600160a01b0316036103245750805b620186a061033b896001600160701b038416610469565b6103459190610496565b96508887106103545788610356565b865b9c9b505050505050505050505050565b6001600160a01b038116811461037b57600080fd5b50565b600080600080600060a0868803121561039657600080fd5b85356103a181610366565b945060208601356103b181610366565b935060408601356103c181610366565b94979396509394606081013594506080013592915050565b6000602082840312156103eb57600080fd5b81516103f681610366565b9392505050565b80516001600160701b038116811461041457600080fd5b919050565b60008060006060848603121561042e57600080fd5b610437846103fd565b9250610445602085016103fd565b9150604084015163ffffffff8116811461045e57600080fd5b809150509250925092565b600081600019048311821515161561049157634e487b7160e01b600052601160045260246000fd5b500290565b6000826104b357634e487b7160e01b600052601260045260246000fd5b50049056fea26469706673582212205296a87b50fc464dc1f995672d75735ca502ecbf73887917f19eb43618c3b00964736f6c63430008100033";
55
+ "0x6104ee61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100355760003560e01c8063f10a60ab1461003a575b600080fd5b61004d61004836600461037e565b61005f565b60405190815260200160405180910390f35b600080866001600160a01b031663b0f479a16040518163ffffffff1660e01b8152600401602060405180830381865afa1580156100a0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906103d9565b90506000816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015610106573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012a91906103d9565b90506001600160a01b038716156101415786610143565b805b96506001600160a01b0386161561015a578561015c565b805b95506000826001600160a01b031663c45a01556040518163ffffffff1660e01b8152600401602060405180830381865afa15801561019e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101c291906103d9565b60405163e6a4390560e01b81526001600160a01b038a811660048301528981166024830152919091169063e6a4390590604401602060405180830381865afa158015610212573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023691906103d9565b9050600080826001600160a01b0316630902f1ac6040518163ffffffff1660e01b8152600401606060405180830381865afa158015610279573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029d9190610419565b50915091506000829050836001600160a01b031663d21220a76040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030991906103d9565b6001600160a01b03168b6001600160a01b0316036103245750805b620186a061033b896001600160701b038416610469565b6103459190610496565b96508887106103545788610356565b865b9c9b505050505050505050505050565b6001600160a01b038116811461037b57600080fd5b50565b600080600080600060a0868803121561039657600080fd5b85356103a181610366565b945060208601356103b181610366565b935060408601356103c181610366565b94979396509394606081013594506080013592915050565b6000602082840312156103eb57600080fd5b81516103f681610366565b9392505050565b80516001600160701b038116811461041457600080fd5b919050565b60008060006060848603121561042e57600080fd5b610437846103fd565b9250610445602085016103fd565b9150604084015163ffffffff8116811461045e57600080fd5b809150509250925092565b600081600019048311821515161561049157634e487b7160e01b600052601160045260246000fd5b500290565b6000826104b357634e487b7160e01b600052601260045260246000fd5b50049056fea2646970667358221220f122dd215ecbcb032ad1395958ce0ae95c9754742f2d8a90bd85bf21e1f878b764736f6c63430008100033";
56
56
 
57
57
  type UniswapV2SwapHelperConstructorParams =
58
58
  | [signer?: Signer]
package/types/factories/UpgradableMock2__factory.ts CHANGED
@@ -187,7 +187,7 @@ const _abi = [
187
187
  ];
188
188
 
189
189
  const _bytecode =
190
- "0x60a06040523060805234801561001457600080fd5b50608051610c7661004c600039600081816102bb015281816103040152818161038c015281816103cc01526104480152610c766000f3fe6080604052600436106100765760003560e01c80631b3c90a81461007b578063313ce567146100925780633659cfe6146100b55780633e6326fc146100d55780634162169f1461010d5780634f1ef2861461012d57806352d1902d146101405780635aef7de614610155578063e1758bd814610175575b600080fd5b34801561008757600080fd5b5061009061018a565b005b34801561009e57600080fd5b5060125b6040519081526020015b60405180910390f35b3480156100c157600080fd5b506100906100d03660046109c6565b6102b1565b3480156100e157600080fd5b506067546100f5906001600160a01b031681565b6040516001600160a01b0390911681526020016100ac565b34801561011957600080fd5b506065546100f5906001600160a01b031681565b61009061013b3660046109f9565b610382565b34801561014c57600080fd5b506100a261043b565b34801561016157600080fd5b506066546100f5906001600160a01b031681565b34801561018157600080fd5b506100f56104e9565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156101ed573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102119190610abc565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa15801561026b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028f9190610abc565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103025760405162461bcd60e51b81526004016102f990610ad9565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610334610576565b6001600160a01b03161461035a5760405162461bcd60e51b81526004016102f990610b13565b61036381610592565b6040805160008082526020820190925261037f918391906105f1565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103ca5760405162461bcd60e51b81526004016102f990610ad9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103fc610576565b6001600160a01b0316146104225760405162461bcd60e51b81526004016102f990610b13565b61042b82610592565b610437828260016105f1565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146104d65760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b60648201526084016102f9565b50600080516020610bfa83398151915290565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561054d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105719190610abc565b905090565b600080516020610bfa833981519152546001600160a01b031690565b3373f39fd6e51aad88f6f4ce6ab8827279cfffb922661461037f5760405162461bcd60e51b81526020600482015260196024820152786e6f7420617574686f72697a656420746f207570677261646560381b60448201526064016102f9565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156106295761062483610761565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610683575060408051601f3d908101601f1916820190925261068091810190610b4d565b60015b6106e65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b60648201526084016102f9565b600080516020610bfa83398151915281146107555760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b60648201526084016102f9565b506106248383836107fb565b61076a81610826565b6107cc5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016102f9565b600080516020610bfa83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61080483610835565b6000825111806108115750805b15610624576108208383610875565b50505050565b6001600160a01b03163b151590565b61083e81610761565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061088083610826565b6108db5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016102f9565b600080846001600160a01b0316846040516108f69190610b8a565b600060405180830381855af49150503d8060008114610931576040519150601f19603f3d011682016040523d82523d6000602084013e610936565b606091505b509150915061095e8282604051806060016040528060278152602001610c1a60279139610967565b95945050505050565b60608315610976575081610980565b6109808383610987565b9392505050565b8151156109975781518083602001fd5b8060405162461bcd60e51b81526004016102f99190610ba6565b6001600160a01b038116811461037f57600080fd5b6000602082840312156109d857600080fd5b8135610980816109b1565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610a0c57600080fd5b8235610a17816109b1565b915060208301356001600160401b0380821115610a3357600080fd5b818501915085601f830112610a4757600080fd5b813581811115610a5957610a596109e3565b604051601f8201601f19908116603f01168101908382118183101715610a8157610a816109e3565b81604052828152886020848701011115610a9a57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ace57600080fd5b8151610980816109b1565b6020808252602c90820152600080516020610bda83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610bda83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610b5f57600080fd5b5051919050565b60005b83811015610b81578181015183820152602001610b69565b50506000910152565b60008251610b9c818460208701610b66565b9190910192915050565b6020815260008251806020840152610bc5816040850160208701610b66565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122040c603addf4ae185722be9344437899e78f91b0a101d5573a3f1b40c4a76d9e864736f6c63430008100033";
190
+ "0x60a06040523060805234801561001457600080fd5b50608051610c7661004c600039600081816102bb015281816103040152818161038c015281816103cc01526104480152610c766000f3fe6080604052600436106100765760003560e01c80631b3c90a81461007b578063313ce567146100925780633659cfe6146100b55780633e6326fc146100d55780634162169f1461010d5780634f1ef2861461012d57806352d1902d146101405780635aef7de614610155578063e1758bd814610175575b600080fd5b34801561008757600080fd5b5061009061018a565b005b34801561009e57600080fd5b5060125b6040519081526020015b60405180910390f35b3480156100c157600080fd5b506100906100d03660046109c6565b6102b1565b3480156100e157600080fd5b506067546100f5906001600160a01b031681565b6040516001600160a01b0390911681526020016100ac565b34801561011957600080fd5b506065546100f5906001600160a01b031681565b61009061013b3660046109f9565b610382565b34801561014c57600080fd5b506100a261043b565b34801561016157600080fd5b506066546100f5906001600160a01b031681565b34801561018157600080fd5b506100f56104e9565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156101ed573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102119190610abc565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa15801561026b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028f9190610abc565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103025760405162461bcd60e51b81526004016102f990610ad9565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610334610576565b6001600160a01b03161461035a5760405162461bcd60e51b81526004016102f990610b13565b61036381610592565b6040805160008082526020820190925261037f918391906105f1565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103ca5760405162461bcd60e51b81526004016102f990610ad9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103fc610576565b6001600160a01b0316146104225760405162461bcd60e51b81526004016102f990610b13565b61042b82610592565b610437828260016105f1565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146104d65760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b60648201526084016102f9565b50600080516020610bfa83398151915290565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561054d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105719190610abc565b905090565b600080516020610bfa833981519152546001600160a01b031690565b3373f39fd6e51aad88f6f4ce6ab8827279cfffb922661461037f5760405162461bcd60e51b81526020600482015260196024820152786e6f7420617574686f72697a656420746f207570677261646560381b60448201526064016102f9565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156106295761062483610761565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610683575060408051601f3d908101601f1916820190925261068091810190610b4d565b60015b6106e65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b60648201526084016102f9565b600080516020610bfa83398151915281146107555760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b60648201526084016102f9565b506106248383836107fb565b61076a81610826565b6107cc5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016102f9565b600080516020610bfa83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61080483610835565b6000825111806108115750805b15610624576108208383610875565b50505050565b6001600160a01b03163b151590565b61083e81610761565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061088083610826565b6108db5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016102f9565b600080846001600160a01b0316846040516108f69190610b8a565b600060405180830381855af49150503d8060008114610931576040519150601f19603f3d011682016040523d82523d6000602084013e610936565b606091505b509150915061095e8282604051806060016040528060278152602001610c1a60279139610967565b95945050505050565b60608315610976575081610980565b6109808383610987565b9392505050565b8151156109975781518083602001fd5b8060405162461bcd60e51b81526004016102f99190610ba6565b6001600160a01b038116811461037f57600080fd5b6000602082840312156109d857600080fd5b8135610980816109b1565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610a0c57600080fd5b8235610a17816109b1565b915060208301356001600160401b0380821115610a3357600080fd5b818501915085601f830112610a4757600080fd5b813581811115610a5957610a596109e3565b604051601f8201601f19908116603f01168101908382118183101715610a8157610a816109e3565b81604052828152886020848701011115610a9a57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ace57600080fd5b8151610980816109b1565b6020808252602c90820152600080516020610bda83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610bda83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610b5f57600080fd5b5051919050565b60005b83811015610b81578181015183820152602001610b69565b50506000910152565b60008251610b9c818460208701610b66565b9190910192915050565b6020815260008251806020840152610bc5816040850160208701610b66565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220964c38588cc3065f2fa5abe6260bc327762c89e65a982ab8dbfb68f09e9858fd64736f6c63430008100033";
191
191
 
192
192
  type UpgradableMock2ConstructorParams =
193
193
  | [signer?: Signer]
package/types/factories/UpgradableMock3__factory.ts CHANGED
@@ -200,7 +200,7 @@ const _abi = [
200
200
  ];
201
201
 
202
202
  const _bytecode =
203
- "0x60a06040523060805234801561001457600080fd5b50608051610e4b61004c600039600081816102e60152818161032f015281816103b7015281816103f701526104730152610e4b6000f3fe6080604052600436106100815760003560e01c80631b3c90a814610086578063313ce5671461009d5780633659cfe6146100c05780633e6326fc146100e05780634162169f146101185780634f1ef2861461013857806352d1902d1461014b5780635aef7de614610160578063c4d66de814610180578063e1758bd8146101a0575b600080fd5b34801561009257600080fd5b5061009b6101b5565b005b3480156100a957600080fd5b5060035b6040519081526020015b60405180910390f35b3480156100cc57600080fd5b5061009b6100db366004610b9b565b6102dc565b3480156100ec57600080fd5b50606754610100906001600160a01b031681565b6040516001600160a01b0390911681526020016100b7565b34801561012457600080fd5b50606554610100906001600160a01b031681565b61009b610146366004610bce565b6103ad565b34801561015757600080fd5b506100ad610466565b34801561016c57600080fd5b50606654610100906001600160a01b031681565b34801561018c57600080fd5b5061009b61019b366004610b9b565b610514565b3480156101ac57600080fd5b5061010061062d565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610218573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023c9190610c91565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610296573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ba9190610c91565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361032d5760405162461bcd60e51b815260040161032490610cae565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661035f6106ba565b6001600160a01b0316146103855760405162461bcd60e51b815260040161032490610ce8565b61038e816106d6565b604080516000808252602082019092526103aa918391906106de565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103f55760405162461bcd60e51b815260040161032490610cae565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104276106ba565b6001600160a01b03161461044d5760405162461bcd60e51b815260040161032490610ce8565b610456826106d6565b610462828260016106de565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105015760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610324565b50600080516020610dcf83398151915290565b600054610100900460ff16158080156105345750600054600160ff909116105b8061055557506105433061084e565b158015610555575060005460ff166001145b6105b85760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610324565b6000805460ff1916600117905580156105db576000805461ff0019166101001790555b6105e48261085d565b8015610462576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610691573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b59190610c91565b905090565b600080516020610dcf833981519152546001600160a01b031690565b6103aa610880565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107165761071183610945565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610770575060408051601f3d908101601f1916820190925261076d91810190610d22565b60015b6107d35760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610324565b600080516020610dcf83398151915281146108425760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610324565b506107118383836109df565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b0383161790556103aa6101b5565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa1580156108c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ed9190610c91565b6001600160a01b0316146109435760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610324565b565b61094e8161084e565b6109b05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610324565b600080516020610dcf83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6109e883610a0a565b6000825111806109f55750805b1561071157610a048383610a4a565b50505050565b610a1381610945565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060610a558361084e565b610ab05760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610324565b600080846001600160a01b031684604051610acb9190610d5f565b600060405180830381855af49150503d8060008114610b06576040519150601f19603f3d011682016040523d82523d6000602084013e610b0b565b606091505b5091509150610b338282604051806060016040528060278152602001610def60279139610b3c565b95945050505050565b60608315610b4b575081610b55565b610b558383610b5c565b9392505050565b815115610b6c5781518083602001fd5b8060405162461bcd60e51b81526004016103249190610d7b565b6001600160a01b03811681146103aa57600080fd5b600060208284031215610bad57600080fd5b8135610b5581610b86565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610be157600080fd5b8235610bec81610b86565b915060208301356001600160401b0380821115610c0857600080fd5b818501915085601f830112610c1c57600080fd5b813581811115610c2e57610c2e610bb8565b604051601f8201601f19908116603f01168101908382118183101715610c5657610c56610bb8565b81604052828152886020848701011115610c6f57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ca357600080fd5b8151610b5581610b86565b6020808252602c90820152600080516020610daf83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610daf83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610d3457600080fd5b5051919050565b60005b83811015610d56578181015183820152602001610d3e565b50506000910152565b60008251610d71818460208701610d3b565b9190910192915050565b6020815260008251806020840152610d9a816040850160208701610d3b565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220baedd908eb068cbccdcce5146d38a3982f3b35da545f4d85294a5eb8242374f164736f6c63430008100033";
203
+ "0x60a06040523060805234801561001457600080fd5b50608051610e4b61004c600039600081816102e60152818161032f015281816103b7015281816103f701526104730152610e4b6000f3fe6080604052600436106100815760003560e01c80631b3c90a814610086578063313ce5671461009d5780633659cfe6146100c05780633e6326fc146100e05780634162169f146101185780634f1ef2861461013857806352d1902d1461014b5780635aef7de614610160578063c4d66de814610180578063e1758bd8146101a0575b600080fd5b34801561009257600080fd5b5061009b6101b5565b005b3480156100a957600080fd5b5060035b6040519081526020015b60405180910390f35b3480156100cc57600080fd5b5061009b6100db366004610b9b565b6102dc565b3480156100ec57600080fd5b50606754610100906001600160a01b031681565b6040516001600160a01b0390911681526020016100b7565b34801561012457600080fd5b50606554610100906001600160a01b031681565b61009b610146366004610bce565b6103ad565b34801561015757600080fd5b506100ad610466565b34801561016c57600080fd5b50606654610100906001600160a01b031681565b34801561018c57600080fd5b5061009b61019b366004610b9b565b610514565b3480156101ac57600080fd5b5061010061062d565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610218573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023c9190610c91565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610296573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ba9190610c91565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361032d5760405162461bcd60e51b815260040161032490610cae565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661035f6106ba565b6001600160a01b0316146103855760405162461bcd60e51b815260040161032490610ce8565b61038e816106d6565b604080516000808252602082019092526103aa918391906106de565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103f55760405162461bcd60e51b815260040161032490610cae565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104276106ba565b6001600160a01b03161461044d5760405162461bcd60e51b815260040161032490610ce8565b610456826106d6565b610462828260016106de565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105015760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610324565b50600080516020610dcf83398151915290565b600054610100900460ff16158080156105345750600054600160ff909116105b8061055557506105433061084e565b158015610555575060005460ff166001145b6105b85760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610324565b6000805460ff1916600117905580156105db576000805461ff0019166101001790555b6105e48261085d565b8015610462576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610691573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b59190610c91565b905090565b600080516020610dcf833981519152546001600160a01b031690565b6103aa610880565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107165761071183610945565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610770575060408051601f3d908101601f1916820190925261076d91810190610d22565b60015b6107d35760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610324565b600080516020610dcf83398151915281146108425760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610324565b506107118383836109df565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b0383161790556103aa6101b5565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa1580156108c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ed9190610c91565b6001600160a01b0316146109435760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610324565b565b61094e8161084e565b6109b05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610324565b600080516020610dcf83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6109e883610a0a565b6000825111806109f55750805b1561071157610a048383610a4a565b50505050565b610a1381610945565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060610a558361084e565b610ab05760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610324565b600080846001600160a01b031684604051610acb9190610d5f565b600060405180830381855af49150503d8060008114610b06576040519150601f19603f3d011682016040523d82523d6000602084013e610b0b565b606091505b5091509150610b338282604051806060016040528060278152602001610def60279139610b3c565b95945050505050565b60608315610b4b575081610b55565b610b558383610b5c565b9392505050565b815115610b6c5781518083602001fd5b8060405162461bcd60e51b81526004016103249190610d7b565b6001600160a01b03811681146103aa57600080fd5b600060208284031215610bad57600080fd5b8135610b5581610b86565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610be157600080fd5b8235610bec81610b86565b915060208301356001600160401b0380821115610c0857600080fd5b818501915085601f830112610c1c57600080fd5b813581811115610c2e57610c2e610bb8565b604051601f8201601f19908116603f01168101908382118183101715610c5657610c56610bb8565b81604052828152886020848701011115610c6f57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ca357600080fd5b8151610b5581610b86565b6020808252602c90820152600080516020610daf83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610daf83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610d3457600080fd5b5051919050565b60005b83811015610d56578181015183820152602001610d3e565b50506000910152565b60008251610d71818460208701610d3b565b9190910192915050565b6020815260008251806020840152610d9a816040850160208701610d3b565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220eafe23541af66b174fb0c6e3d351ede2198aa059521fded0134efa2f9fc79f3f64736f6c63430008100033";
204
204
 
205
205
  type UpgradableMock3ConstructorParams =
206
206
  | [signer?: Signer]
package/types/factories/UpgradableMock4__factory.ts CHANGED
@@ -200,7 +200,7 @@ const _abi = [
200
200
  ];
201
201
 
202
202
  const _bytecode =
203
- "0x60a06040523060805234801561001457600080fd5b50608051610e4b61004c600039600081816102e60152818161032f015281816103b7015281816103f701526104730152610e4b6000f3fe6080604052600436106100815760003560e01c80631b3c90a814610086578063313ce5671461009d5780633659cfe6146100c05780633e6326fc146100e05780634162169f146101185780634f1ef2861461013857806352d1902d1461014b5780635aef7de614610160578063c4d66de814610180578063e1758bd8146101a0575b600080fd5b34801561009257600080fd5b5061009b6101b5565b005b3480156100a957600080fd5b5060045b6040519081526020015b60405180910390f35b3480156100cc57600080fd5b5061009b6100db366004610b9b565b6102dc565b3480156100ec57600080fd5b50606754610100906001600160a01b031681565b6040516001600160a01b0390911681526020016100b7565b34801561012457600080fd5b50606554610100906001600160a01b031681565b61009b610146366004610bce565b6103ad565b34801561015757600080fd5b506100ad610466565b34801561016c57600080fd5b50606654610100906001600160a01b031681565b34801561018c57600080fd5b5061009b61019b366004610b9b565b610514565b3480156101ac57600080fd5b5061010061062d565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610218573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023c9190610c91565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610296573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ba9190610c91565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361032d5760405162461bcd60e51b815260040161032490610cae565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661035f6106ba565b6001600160a01b0316146103855760405162461bcd60e51b815260040161032490610ce8565b61038e816106d6565b604080516000808252602082019092526103aa918391906106de565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103f55760405162461bcd60e51b815260040161032490610cae565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104276106ba565b6001600160a01b03161461044d5760405162461bcd60e51b815260040161032490610ce8565b610456826106d6565b610462828260016106de565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105015760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610324565b50600080516020610dcf83398151915290565b600054610100900460ff16158080156105345750600054600160ff909116105b8061055557506105433061084e565b158015610555575060005460ff166001145b6105b85760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610324565b6000805460ff1916600117905580156105db576000805461ff0019166101001790555b6105e48261085d565b8015610462576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610691573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b59190610c91565b905090565b600080516020610dcf833981519152546001600160a01b031690565b6103aa610880565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107165761071183610945565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610770575060408051601f3d908101601f1916820190925261076d91810190610d22565b60015b6107d35760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610324565b600080516020610dcf83398151915281146108425760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610324565b506107118383836109df565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b0383161790556103aa6101b5565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa1580156108c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ed9190610c91565b6001600160a01b0316146109435760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610324565b565b61094e8161084e565b6109b05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610324565b600080516020610dcf83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6109e883610a0a565b6000825111806109f55750805b1561071157610a048383610a4a565b50505050565b610a1381610945565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060610a558361084e565b610ab05760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610324565b600080846001600160a01b031684604051610acb9190610d5f565b600060405180830381855af49150503d8060008114610b06576040519150601f19603f3d011682016040523d82523d6000602084013e610b0b565b606091505b5091509150610b338282604051806060016040528060278152602001610def60279139610b3c565b95945050505050565b60608315610b4b575081610b55565b610b558383610b5c565b9392505050565b815115610b6c5781518083602001fd5b8060405162461bcd60e51b81526004016103249190610d7b565b6001600160a01b03811681146103aa57600080fd5b600060208284031215610bad57600080fd5b8135610b5581610b86565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610be157600080fd5b8235610bec81610b86565b915060208301356001600160401b0380821115610c0857600080fd5b818501915085601f830112610c1c57600080fd5b813581811115610c2e57610c2e610bb8565b604051601f8201601f19908116603f01168101908382118183101715610c5657610c56610bb8565b81604052828152886020848701011115610c6f57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ca357600080fd5b8151610b5581610b86565b6020808252602c90820152600080516020610daf83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610daf83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610d3457600080fd5b5051919050565b60005b83811015610d56578181015183820152602001610d3e565b50506000910152565b60008251610d71818460208701610d3b565b9190910192915050565b6020815260008251806020840152610d9a816040850160208701610d3b565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220642e1e6fbeb6031efeb5f16f0c1532a3d15416db5d9bfdd221e222f2ac75c69564736f6c63430008100033";
203
+ "0x60a06040523060805234801561001457600080fd5b50608051610e4b61004c600039600081816102e60152818161032f015281816103b7015281816103f701526104730152610e4b6000f3fe6080604052600436106100815760003560e01c80631b3c90a814610086578063313ce5671461009d5780633659cfe6146100c05780633e6326fc146100e05780634162169f146101185780634f1ef2861461013857806352d1902d1461014b5780635aef7de614610160578063c4d66de814610180578063e1758bd8146101a0575b600080fd5b34801561009257600080fd5b5061009b6101b5565b005b3480156100a957600080fd5b5060045b6040519081526020015b60405180910390f35b3480156100cc57600080fd5b5061009b6100db366004610b9b565b6102dc565b3480156100ec57600080fd5b50606754610100906001600160a01b031681565b6040516001600160a01b0390911681526020016100b7565b34801561012457600080fd5b50606554610100906001600160a01b031681565b61009b610146366004610bce565b6103ad565b34801561015757600080fd5b506100ad610466565b34801561016c57600080fd5b50606654610100906001600160a01b031681565b34801561018c57600080fd5b5061009b61019b366004610b9b565b610514565b3480156101ac57600080fd5b5061010061062d565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610218573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023c9190610c91565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610296573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ba9190610c91565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361032d5760405162461bcd60e51b815260040161032490610cae565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661035f6106ba565b6001600160a01b0316146103855760405162461bcd60e51b815260040161032490610ce8565b61038e816106d6565b604080516000808252602082019092526103aa918391906106de565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103f55760405162461bcd60e51b815260040161032490610cae565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104276106ba565b6001600160a01b03161461044d5760405162461bcd60e51b815260040161032490610ce8565b610456826106d6565b610462828260016106de565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105015760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610324565b50600080516020610dcf83398151915290565b600054610100900460ff16158080156105345750600054600160ff909116105b8061055557506105433061084e565b158015610555575060005460ff166001145b6105b85760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610324565b6000805460ff1916600117905580156105db576000805461ff0019166101001790555b6105e48261085d565b8015610462576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610691573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b59190610c91565b905090565b600080516020610dcf833981519152546001600160a01b031690565b6103aa610880565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107165761071183610945565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610770575060408051601f3d908101601f1916820190925261076d91810190610d22565b60015b6107d35760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610324565b600080516020610dcf83398151915281146108425760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610324565b506107118383836109df565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b0383161790556103aa6101b5565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa1580156108c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ed9190610c91565b6001600160a01b0316146109435760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610324565b565b61094e8161084e565b6109b05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610324565b600080516020610dcf83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6109e883610a0a565b6000825111806109f55750805b1561071157610a048383610a4a565b50505050565b610a1381610945565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060610a558361084e565b610ab05760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610324565b600080846001600160a01b031684604051610acb9190610d5f565b600060405180830381855af49150503d8060008114610b06576040519150601f19603f3d011682016040523d82523d6000602084013e610b0b565b606091505b5091509150610b338282604051806060016040528060278152602001610def60279139610b3c565b95945050505050565b60608315610b4b575081610b55565b610b558383610b5c565b9392505050565b815115610b6c5781518083602001fd5b8060405162461bcd60e51b81526004016103249190610d7b565b6001600160a01b03811681146103aa57600080fd5b600060208284031215610bad57600080fd5b8135610b5581610b86565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610be157600080fd5b8235610bec81610b86565b915060208301356001600160401b0380821115610c0857600080fd5b818501915085601f830112610c1c57600080fd5b813581811115610c2e57610c2e610bb8565b604051601f8201601f19908116603f01168101908382118183101715610c5657610c56610bb8565b81604052828152886020848701011115610c6f57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ca357600080fd5b8151610b5581610b86565b6020808252602c90820152600080516020610daf83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610daf83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610d3457600080fd5b5051919050565b60005b83811015610d56578181015183820152602001610d3e565b50506000910152565b60008251610d71818460208701610d3b565b9190910192915050565b6020815260008251806020840152610d9a816040850160208701610d3b565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212206a092125df57dcc9e29c2da12fa17bc93e5357353bcc27e9471012757aad771964736f6c63430008100033";
204
204
 
205
205
  type UpgradableMock4ConstructorParams =
206
206
  | [signer?: Signer]
package/types/factories/UpgradableMock__factory.ts CHANGED
@@ -213,7 +213,7 @@ const _abi = [
213
213
  ];
214
214
 
215
215
  const _bytecode =
216
- "0x60a06040523060805234801561001457600080fd5b50608051610d8661004c600039600081816103110152818161035a015281816103d901528181610419015261048c0152610d866000f3fe60806040526004361061008c5760003560e01c80631b3c90a814610091578063313ce567146100a85780633659cfe6146100cb5780633e6326fc146100eb5780634162169f146101235780634f1ef2861461014357806352d1902d146101565780635aef7de61461016b5780638da5cb5b1461018b578063c4d66de8146101ab578063e1758bd8146101cb575b600080fd5b34801561009d57600080fd5b506100a66101e0565b005b3480156100b457600080fd5b5060085b6040519081526020015b60405180910390f35b3480156100d757600080fd5b506100a66100e6366004610ad6565b610307565b3480156100f757600080fd5b5060675461010b906001600160a01b031681565b6040516001600160a01b0390911681526020016100c2565b34801561012f57600080fd5b5060655461010b906001600160a01b031681565b6100a6610151366004610b09565b6103cf565b34801561016257600080fd5b506100b861047f565b34801561017757600080fd5b5060665461010b906001600160a01b031681565b34801561019757600080fd5b50609a5461010b906001600160a01b031681565b3480156101b757600080fd5b506100a66101c6366004610ad6565b61052d565b3480156101d757600080fd5b5061010b610658565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610243573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102679190610bcc565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156102c1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102e59190610bcc565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103585760405162461bcd60e51b815260040161034f90610be9565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661038a6106e5565b6001600160a01b0316146103b05760405162461bcd60e51b815260040161034f90610c23565b604080516000808252602082019092526103cc91839190610701565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036104175760405162461bcd60e51b815260040161034f90610be9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104496106e5565b6001600160a01b03161461046f5760405162461bcd60e51b815260040161034f90610c23565b61047b82826001610701565b5050565b6000306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161461051a5760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161034f565b50600080516020610d0a83398151915290565b600054610100900460ff161580801561054d5750600054600160ff909116105b8061056e575061055c30610871565b15801561056e575060005460ff166001145b6105d15760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161034f565b6000805460ff1916600117905580156105f4576000805461ff0019166101001790555b609a80546001600160a01b0319166001600160a01b038416179055801561047b576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156106bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e09190610bcc565b905090565b600080516020610d0a833981519152546001600160a01b031690565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107395761073483610880565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610793575060408051601f3d908101601f1916820190925261079091810190610c5d565b60015b6107f65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161034f565b600080516020610d0a83398151915281146108655760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161034f565b5061073483838361091a565b6001600160a01b03163b151590565b61088981610871565b6108eb5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161034f565b600080516020610d0a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61092383610945565b6000825111806109305750805b156107345761093f8383610985565b50505050565b61094e81610880565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061099083610871565b6109eb5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161034f565b600080846001600160a01b031684604051610a069190610c9a565b600060405180830381855af49150503d8060008114610a41576040519150601f19603f3d011682016040523d82523d6000602084013e610a46565b606091505b5091509150610a6e8282604051806060016040528060278152602001610d2a60279139610a77565b95945050505050565b60608315610a86575081610a90565b610a908383610a97565b9392505050565b815115610aa75781518083602001fd5b8060405162461bcd60e51b815260040161034f9190610cb6565b6001600160a01b03811681146103cc57600080fd5b600060208284031215610ae857600080fd5b8135610a9081610ac1565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b1c57600080fd5b8235610b2781610ac1565b915060208301356001600160401b0380821115610b4357600080fd5b818501915085601f830112610b5757600080fd5b813581811115610b6957610b69610af3565b604051601f8201601f19908116603f01168101908382118183101715610b9157610b91610af3565b81604052828152886020848701011115610baa57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610bde57600080fd5b8151610a9081610ac1565b6020808252602c90820152600080516020610cea83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610cea83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610c6f57600080fd5b5051919050565b60005b83811015610c91578181015183820152602001610c79565b50506000910152565b60008251610cac818460208701610c76565b9190910192915050565b6020815260008251806020840152610cd5816040850160208701610c76565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220f52b4537182a3091c158ea304fbc52b549e1b25eaab3003680135bbe08b4d99664736f6c63430008100033";
216
+ "0x60a06040523060805234801561001457600080fd5b50608051610d8661004c600039600081816103110152818161035a015281816103d901528181610419015261048c0152610d866000f3fe60806040526004361061008c5760003560e01c80631b3c90a814610091578063313ce567146100a85780633659cfe6146100cb5780633e6326fc146100eb5780634162169f146101235780634f1ef2861461014357806352d1902d146101565780635aef7de61461016b5780638da5cb5b1461018b578063c4d66de8146101ab578063e1758bd8146101cb575b600080fd5b34801561009d57600080fd5b506100a66101e0565b005b3480156100b457600080fd5b5060085b6040519081526020015b60405180910390f35b3480156100d757600080fd5b506100a66100e6366004610ad6565b610307565b3480156100f757600080fd5b5060675461010b906001600160a01b031681565b6040516001600160a01b0390911681526020016100c2565b34801561012f57600080fd5b5060655461010b906001600160a01b031681565b6100a6610151366004610b09565b6103cf565b34801561016257600080fd5b506100b861047f565b34801561017757600080fd5b5060665461010b906001600160a01b031681565b34801561019757600080fd5b50609a5461010b906001600160a01b031681565b3480156101b757600080fd5b506100a66101c6366004610ad6565b61052d565b3480156101d757600080fd5b5061010b610658565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610243573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102679190610bcc565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156102c1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102e59190610bcc565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103585760405162461bcd60e51b815260040161034f90610be9565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661038a6106e5565b6001600160a01b0316146103b05760405162461bcd60e51b815260040161034f90610c23565b604080516000808252602082019092526103cc91839190610701565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036104175760405162461bcd60e51b815260040161034f90610be9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104496106e5565b6001600160a01b03161461046f5760405162461bcd60e51b815260040161034f90610c23565b61047b82826001610701565b5050565b6000306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161461051a5760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161034f565b50600080516020610d0a83398151915290565b600054610100900460ff161580801561054d5750600054600160ff909116105b8061056e575061055c30610871565b15801561056e575060005460ff166001145b6105d15760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161034f565b6000805460ff1916600117905580156105f4576000805461ff0019166101001790555b609a80546001600160a01b0319166001600160a01b038416179055801561047b576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156106bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e09190610bcc565b905090565b600080516020610d0a833981519152546001600160a01b031690565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107395761073483610880565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610793575060408051601f3d908101601f1916820190925261079091810190610c5d565b60015b6107f65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161034f565b600080516020610d0a83398151915281146108655760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161034f565b5061073483838361091a565b6001600160a01b03163b151590565b61088981610871565b6108eb5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161034f565b600080516020610d0a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61092383610945565b6000825111806109305750805b156107345761093f8383610985565b50505050565b61094e81610880565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061099083610871565b6109eb5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161034f565b600080846001600160a01b031684604051610a069190610c9a565b600060405180830381855af49150503d8060008114610a41576040519150601f19603f3d011682016040523d82523d6000602084013e610a46565b606091505b5091509150610a6e8282604051806060016040528060278152602001610d2a60279139610a77565b95945050505050565b60608315610a86575081610a90565b610a908383610a97565b9392505050565b815115610aa75781518083602001fd5b8060405162461bcd60e51b815260040161034f9190610cb6565b6001600160a01b03811681146103cc57600080fd5b600060208284031215610ae857600080fd5b8135610a9081610ac1565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b1c57600080fd5b8235610b2781610ac1565b915060208301356001600160401b0380821115610b4357600080fd5b818501915085601f830112610b5757600080fd5b813581811115610b6957610b69610af3565b604051601f8201601f19908116603f01168101908382118183101715610b9157610b91610af3565b81604052828152886020848701011115610baa57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610bde57600080fd5b8151610a9081610ac1565b6020808252602c90820152600080516020610cea83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610cea83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610c6f57600080fd5b5051919050565b60005b83811015610c91578181015183820152602001610c79565b50506000910152565b60008251610cac818460208701610c76565b9190910192915050565b6020815260008251806020840152610cd5816040850160208701610c76565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220248a2845ee904fc12c37138724b90c5d00911f860e8600349bc7c3c217ab518864736f6c63430008100033";
217
217
 
218
218
  type UpgradableMockConstructorParams =
219
219
  | [signer?: Signer]
package/yarn.lock CHANGED
@@ -2410,10 +2410,10 @@
2410
2410
  mcl-wasm "^0.7.1"
2411
2411
  rustbn.js "~0.2.0"
2412
2412
 
2413
- "@nomicfoundation/hardhat-network-helpers@^1.0.6":
2414
- version "1.0.6"
2415
- resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-network-helpers/-/hardhat-network-helpers-1.0.6.tgz#5e2026ddde5ca539f70a2bf498528afd08bd0827"
2416
- integrity sha512-a35iVD4ycF6AoTfllAnKm96IPIzzHpgKX/ep4oKc2bsUKFfMlacWdyntgC/7d5blyCTXfFssgNAvXDZfzNWVGQ==
2413
+ "@nomicfoundation/hardhat-network-helpers@^1.0.8":
2414
+ version "1.0.8"
2415
+ resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-network-helpers/-/hardhat-network-helpers-1.0.8.tgz#e4fe1be93e8a65508c46d73c41fa26c7e9f84931"
2416
+ integrity sha512-MNqQbzUJZnCMIYvlniC3U+kcavz/PhhQSsY90tbEtUyMj/IQqsLwIRZa4ctjABh3Bz0KCh9OXUZ7Yk/d9hr45Q==
2417
2417
  dependencies:
2418
2418
  ethereumjs-util "^7.1.4"
2419
2419