@gooddollar/goodprotocol 1.0.31-beta.0 → 2.0.1

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 (738) hide show
  1. package/README.md +25 -0
  2. package/artifacts/abis/AaveMock.min.json +1 -1
  3. package/artifacts/abis/AaveStakingFactory.min.json +1 -1
  4. package/artifacts/abis/AdminWallet.min.json +1 -1
  5. package/artifacts/abis/AdminWalletFuse.min.json +1 -0
  6. package/artifacts/abis/BuyAndBridgeHelper.min.json +1 -0
  7. package/artifacts/abis/ClaimersDistribution.min.json +1 -1
  8. package/artifacts/abis/CompoundStakingFactory.min.json +1 -1
  9. package/artifacts/abis/CompoundVotingMachine.min.json +1 -1
  10. package/artifacts/abis/DAIMock.min.json +1 -1
  11. package/artifacts/abis/DAOUpgradeableContract.min.json +1 -1
  12. package/artifacts/abis/DecimalsMock.min.json +1 -1
  13. package/artifacts/abis/DistributionHelper.min.json +1 -1
  14. package/artifacts/abis/DistributionHelperTest.min.json +1 -1
  15. package/artifacts/abis/DistributionHelperTestHelper.min.json +1 -1
  16. package/artifacts/abis/DonationsStaking.min.json +1 -1
  17. package/artifacts/abis/ERC20Permit.min.json +1 -0
  18. package/artifacts/abis/ERC20PresetMinterPauserUpgradeable.min.json +1 -0
  19. package/artifacts/abis/ERC677.min.json +1 -0
  20. package/artifacts/abis/ERC677Receiver.min.json +1 -0
  21. package/artifacts/abis/ExchangeHelper.min.json +1 -1
  22. package/artifacts/abis/Faucet.min.json +1 -0
  23. package/artifacts/abis/FeesFormulaMock.min.json +1 -0
  24. package/artifacts/abis/FuseFaucet.min.json +1 -1
  25. package/artifacts/abis/FuseFaucetV2.min.json +1 -0
  26. package/artifacts/abis/FuseStakingV3.min.json +1 -1
  27. package/artifacts/abis/GReputation.min.json +1 -1
  28. package/artifacts/abis/GoodAaveStaking.min.json +1 -1
  29. package/artifacts/abis/GoodAaveStakingV2.min.json +1 -1
  30. package/artifacts/abis/GoodCompoundStaking.min.json +1 -1
  31. package/artifacts/abis/GoodCompoundStakingTest.min.json +1 -1
  32. package/artifacts/abis/GoodCompoundStakingV2.min.json +1 -1
  33. package/artifacts/abis/GoodDollar.min.json +1 -0
  34. package/artifacts/abis/GoodDollarMintBurnWrapper.min.json +1 -1
  35. package/artifacts/abis/GoodDollarStaking.min.json +1 -1
  36. package/artifacts/abis/GoodDollarStakingMock.min.json +1 -1
  37. package/artifacts/abis/GoodFundManager.min.json +1 -1
  38. package/artifacts/abis/GoodFundManagerTest.min.json +1 -1
  39. package/artifacts/abis/GoodMarketMaker.min.json +1 -1
  40. package/artifacts/abis/GoodReserveCDai.min.json +1 -1
  41. package/artifacts/abis/GovernanceStaking.min.json +1 -1
  42. package/artifacts/abis/IFeesFormula.min.json +1 -0
  43. package/artifacts/abis/IGoodDollar.min.json +1 -1
  44. package/artifacts/abis/IGoodDollarCustom.min.json +1 -0
  45. package/artifacts/abis/IGovernanceStaking.min.json +1 -0
  46. package/artifacts/abis/IIdentity.min.json +1 -1
  47. package/artifacts/abis/IIdentityV2.min.json +1 -0
  48. package/artifacts/abis/IStakingUpgrade.min.json +1 -0
  49. package/artifacts/abis/ISuperGoodDollar.min.json +1 -0
  50. package/artifacts/abis/IdentityMock.min.json +1 -0
  51. package/artifacts/abis/IdentityV2.min.json +1 -0
  52. package/artifacts/abis/InvitesFuseV2.min.json +1 -0
  53. package/artifacts/abis/InvitesV1.min.json +1 -1
  54. package/artifacts/abis/InvitesV2.min.json +1 -0
  55. package/artifacts/abis/LendingPoolMock.min.json +1 -1
  56. package/artifacts/abis/NameService.min.json +1 -1
  57. package/artifacts/abis/PayableMock.min.json +1 -0
  58. package/artifacts/abis/Proxy.min.json +1 -0
  59. package/artifacts/abis/Reputation.min.json +1 -1
  60. package/artifacts/abis/SelfApprove.min.json +1 -0
  61. package/artifacts/abis/SimpleStaking.min.json +1 -1
  62. package/artifacts/abis/SimpleStakingV2.min.json +1 -1
  63. package/artifacts/abis/SixteenDecimalsTokenMock.min.json +1 -1
  64. package/artifacts/abis/StakersDistribution.min.json +1 -1
  65. package/artifacts/abis/SuperGoodDollar.min.json +1 -0
  66. package/artifacts/abis/SuperToken.min.json +1 -0
  67. package/artifacts/abis/SuperfluidToken.min.json +1 -0
  68. package/artifacts/abis/TwentyDecimalsTokenMock.min.json +1 -1
  69. package/artifacts/abis/UBIScheme.min.json +1 -1
  70. package/artifacts/abis/USDCMock.min.json +1 -1
  71. package/artifacts/abis/UUPSProxiable.min.json +1 -0
  72. package/artifacts/abis/UUPSProxy.min.json +1 -0
  73. package/artifacts/abis/UUPSUtils.min.json +1 -0
  74. package/artifacts/abis/UpgradableMock.min.json +1 -1
  75. package/artifacts/abis/UpgradableMock2.min.json +1 -1
  76. package/artifacts/abis/UpgradableMock3.min.json +1 -1
  77. package/artifacts/abis/UpgradableMock4.min.json +1 -1
  78. package/artifacts/abis/cBATMock.min.json +1 -1
  79. package/artifacts/abis/cDAILowWorthMock.min.json +1 -1
  80. package/artifacts/abis/cDAIMock.min.json +1 -1
  81. package/artifacts/abis/cDAINonMintableMock.min.json +1 -1
  82. package/artifacts/abis/cDecimalsMock.min.json +1 -1
  83. package/artifacts/abis/cSDTMock.min.json +1 -1
  84. package/artifacts/abis/cUSDCMock.min.json +1 -1
  85. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  86. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  87. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  88. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  89. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  90. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  91. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  92. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  93. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  94. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  95. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  96. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  97. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  98. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  99. package/artifacts/contracts/Interfaces.sol/IGoodDollar.json +184 -0
  100. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  101. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  102. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  103. package/artifacts/contracts/Interfaces.sol/IIdentity.json +70 -0
  104. package/artifacts/contracts/Interfaces.sol/IIdentityV2.dbg.json +4 -0
  105. package/artifacts/contracts/Interfaces.sol/IIdentityV2.json +300 -0
  106. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  107. package/artifacts/contracts/Interfaces.sol/IMultichainRouter.dbg.json +1 -1
  108. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  109. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  110. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  111. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  112. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  113. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  114. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  115. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  116. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  117. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.dbg.json +4 -0
  118. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.json +736 -0
  119. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  120. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.json +15 -2
  121. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.dbg.json +4 -0
  122. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.json +480 -0
  123. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  124. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.json +28 -2
  125. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  126. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.json +28 -2
  127. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  128. package/artifacts/contracts/governance/GReputation.sol/GReputation.json +78 -3
  129. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.dbg.json +1 -1
  130. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.json +71 -2
  131. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.dbg.json +4 -0
  132. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.json +24 -0
  133. package/artifacts/contracts/governance/GoodDollarStaking.sol/IStakingUpgrade.dbg.json +4 -0
  134. package/artifacts/contracts/governance/GoodDollarStaking.sol/IStakingUpgrade.json +35 -0
  135. package/artifacts/contracts/governance/GoodDollarStaking.sol/RewardsMinter.dbg.json +1 -1
  136. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  137. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.json +31 -5
  138. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  139. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  140. package/artifacts/contracts/governance/Reputation.sol/Reputation.json +28 -2
  141. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  142. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.json +28 -2
  143. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.dbg.json +4 -0
  144. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json +1081 -0
  145. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.dbg.json +4 -0
  146. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.json +505 -0
  147. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  148. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.json +15 -2
  149. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.dbg.json +4 -0
  150. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.json +635 -0
  151. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  152. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.json +18 -5
  153. package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.dbg.json +1 -1
  154. package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.json +2 -2
  155. package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.dbg.json +1 -1
  156. package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.json +2 -2
  157. package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.dbg.json +1 -1
  158. package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.json +2 -2
  159. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  160. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.json +18 -5
  161. package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.dbg.json +1 -1
  162. package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.json +2 -2
  163. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  164. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.json +18 -5
  165. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.dbg.json +1 -1
  166. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.json +2 -2
  167. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.dbg.json +1 -1
  168. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.json +28 -2
  169. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.dbg.json +1 -1
  170. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.json +28 -2
  171. package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.dbg.json +1 -1
  172. package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.json +2 -2
  173. package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.dbg.json +4 -0
  174. package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.json +69 -0
  175. package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.dbg.json +1 -1
  176. package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.json +2 -2
  177. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  178. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +22 -9
  179. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.dbg.json +1 -1
  180. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.json +95 -2
  181. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  182. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.json +28 -2
  183. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.dbg.json +4 -0
  184. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.json +277 -0
  185. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  186. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.json +2 -2
  187. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  188. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.json +18 -5
  189. package/artifacts/contracts/mocks/MultichainRouterMock.sol/IWrapper.dbg.json +1 -1
  190. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.dbg.json +1 -1
  191. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.json +2 -2
  192. package/artifacts/contracts/mocks/OverMintTester.sol/IGoodDollarStakingTest.dbg.json +1 -1
  193. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  194. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.json +2 -2
  195. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  196. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
  197. package/artifacts/contracts/mocks/PayableMock.sol/PayableMock.dbg.json +4 -0
  198. package/artifacts/contracts/mocks/PayableMock.sol/PayableMock.json +18 -0
  199. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  200. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.json +18 -5
  201. package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.dbg.json +1 -1
  202. package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.json +2 -2
  203. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  204. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.json +2 -2
  205. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  206. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.json +18 -5
  207. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  208. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.json +28 -2
  209. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  210. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.json +28 -2
  211. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
  212. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.json +28 -2
  213. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
  214. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.json +28 -2
  215. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  216. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.json +18 -5
  217. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  218. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.json +18 -5
  219. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  220. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.json +18 -5
  221. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  222. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.json +18 -5
  223. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  224. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.json +18 -5
  225. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  226. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.json +18 -5
  227. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  228. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.json +18 -5
  229. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  230. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.json +18 -5
  231. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.dbg.json +1 -1
  232. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.json +28 -2
  233. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  234. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.json +28 -2
  235. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  236. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.json +28 -2
  237. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  238. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  239. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.json +31 -5
  240. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  241. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.json +2 -2
  242. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  243. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.json +2 -2
  244. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  245. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +32 -6
  246. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.dbg.json +1 -1
  247. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.json +15 -2
  248. package/artifacts/contracts/staking/FuseStakingV3.sol/IConsensus.dbg.json +1 -1
  249. package/artifacts/contracts/staking/FuseStakingV3.sol/PegSwap.dbg.json +1 -1
  250. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  251. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.json +28 -2
  252. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  253. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.json +16 -3
  254. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  255. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.json +16 -3
  256. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  257. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.json +2 -2
  258. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  259. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +3 -3
  260. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  261. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +20 -7
  262. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  263. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.json +20 -7
  264. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  265. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +4 -4
  266. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  267. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +22 -9
  268. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  269. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.json +22 -9
  270. package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.dbg.json +1 -1
  271. package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.json +2 -2
  272. package/artifacts/contracts/staking/utils/StakingRewardsFixedAPY.sol/StakingRewardsFixedAPY.dbg.json +1 -1
  273. package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.dbg.json +4 -0
  274. package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.json +768 -0
  275. package/artifacts/contracts/token/ERC677.sol/ERC677.dbg.json +4 -0
  276. package/artifacts/contracts/token/ERC677.sol/ERC677.json +66 -0
  277. package/artifacts/contracts/token/ERC677.sol/ERC677Receiver.dbg.json +4 -0
  278. package/artifacts/contracts/token/ERC677.sol/ERC677Receiver.json +40 -0
  279. package/artifacts/contracts/token/FeesFormula.sol/IFeesFormula.dbg.json +4 -0
  280. package/artifacts/contracts/token/FeesFormula.sol/IFeesFormula.json +45 -0
  281. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.dbg.json +4 -0
  282. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.json +1206 -0
  283. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/ERC20Permit.dbg.json +4 -0
  284. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/ERC20Permit.json +99 -0
  285. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/SelfApprove.dbg.json +4 -0
  286. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/SelfApprove.json +34 -0
  287. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/IGoodDollarCustom.dbg.json +4 -0
  288. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/IGoodDollarCustom.json +355 -0
  289. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/ISuperGoodDollar.dbg.json +4 -0
  290. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/ISuperGoodDollar.json +2132 -0
  291. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.dbg.json +4 -0
  292. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json +2627 -0
  293. package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.dbg.json +4 -0
  294. package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.json +1759 -0
  295. package/artifacts/contracts/token/superfluid/SuperfluidToken.sol/SuperfluidToken.dbg.json +4 -0
  296. package/artifacts/contracts/token/superfluid/SuperfluidToken.sol/SuperfluidToken.json +682 -0
  297. package/artifacts/contracts/token/superfluid/UUPSProxiable.sol/UUPSProxiable.dbg.json +4 -0
  298. package/artifacts/contracts/token/superfluid/UUPSProxiable.sol/UUPSProxiable.json +89 -0
  299. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/Proxy.dbg.json +4 -0
  300. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/Proxy.json +19 -0
  301. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.dbg.json +4 -0
  302. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.json +32 -0
  303. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.dbg.json +4 -0
  304. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.json +10 -0
  305. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  306. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +41 -22
  307. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +1 -1
  308. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.json +94 -48
  309. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.dbg.json +4 -0
  310. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.json +830 -0
  311. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  312. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.json +2 -2
  313. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
  314. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.json +2 -2
  315. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.dbg.json +4 -0
  316. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.json +184 -0
  317. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  318. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.json +2 -2
  319. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  320. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.json +28 -2
  321. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  322. package/artifacts/contracts/utils/DSMath.sol/DSMath.json +2 -2
  323. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  324. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.json +2 -2
  325. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json +1 -1
  326. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.json +35 -2
  327. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json +1 -1
  328. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json +1 -1
  329. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json +1 -1
  330. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.json +2 -2
  331. package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json +1 -1
  332. package/artifacts/contracts/utils/MultiCall.sol/Multicall.json +2 -2
  333. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json +1 -1
  334. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.json +2 -2
  335. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  336. package/artifacts/contracts/utils/NameService.sol/NameService.json +28 -2
  337. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  338. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  339. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.json +2 -2
  340. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  341. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.json +2 -2
  342. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
  343. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json +2 -2
  344. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
  345. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json +2 -2
  346. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
  347. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.json +2 -2
  348. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
  349. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.json +2 -2
  350. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  351. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json +2 -2
  352. package/contracts/Interfaces.sol +57 -3
  353. package/contracts/fuseFaucet/Faucet.sol +258 -0
  354. package/contracts/fuseFaucet/FuseFaucet.sol +1 -2
  355. package/contracts/fuseFaucet/FuseFaucetV2.sol +256 -0
  356. package/contracts/governance/GReputation.sol +104 -16
  357. package/contracts/governance/GoodDollarStaking.sol +139 -53
  358. package/contracts/governance/GovernanceStaking.sol +2 -2
  359. package/contracts/identity/IdentityV2.sol +559 -0
  360. package/contracts/invite/InvitesFuseV2.sol +337 -0
  361. package/contracts/invite/InvitesV1.sol +6 -24
  362. package/contracts/invite/InvitesV2.sol +345 -0
  363. package/contracts/mocks/AaveMock.sol +1 -1
  364. package/contracts/mocks/DAIMock.sol +1 -1
  365. package/contracts/mocks/DecimalsMock.sol +1 -1
  366. package/contracts/mocks/FeesFormularMock.sol +21 -0
  367. package/contracts/mocks/GoodDollarStakingMock.sol +16 -0
  368. package/contracts/mocks/GoodFundManagerTest.sol +1 -1
  369. package/contracts/mocks/IdentityMock.sol +58 -0
  370. package/contracts/mocks/LendingPoolMock.sol +1 -1
  371. package/contracts/mocks/PayableMock.sol +3 -0
  372. package/contracts/mocks/SixteenDecimalsTokenMock.sol +1 -6
  373. package/contracts/mocks/TwentyDecimalsTokenMock.sol +1 -6
  374. package/contracts/mocks/UpgradableMocks.sol +5 -3
  375. package/contracts/mocks/UsdcMock.sol +1 -6
  376. package/contracts/mocks/cBATMock.sol +7 -12
  377. package/contracts/mocks/cDAILowWorthMock.sol +8 -12
  378. package/contracts/mocks/cDAIMock.sol +1 -1
  379. package/contracts/mocks/cDAINonMintableMock.sol +7 -12
  380. package/contracts/mocks/cDecimalsMock.sol +1 -1
  381. package/contracts/mocks/cSDTMock.sol +3 -3
  382. package/contracts/mocks/cUSDCMock.sol +5 -5
  383. package/contracts/reserve/DistributionHelper.sol +1 -1
  384. package/contracts/reserve/GoodReserveCDai.sol +1 -1
  385. package/contracts/token/ERC20PresetMinterPauserUpgradeable.sol +140 -0
  386. package/contracts/token/ERC677.sol +74 -0
  387. package/contracts/token/FeesFormula.sol +10 -0
  388. package/contracts/token/GoodDollar.sol +243 -0
  389. package/contracts/token/superfluid/ERC20Permit.sol +101 -0
  390. package/contracts/token/superfluid/ISuperGoodDollar.sol +84 -0
  391. package/contracts/token/superfluid/SuperGoodDollar.sol +401 -0
  392. package/contracts/token/superfluid/SuperToken.sol +714 -0
  393. package/contracts/token/superfluid/SuperfluidToken.sol +403 -0
  394. package/contracts/token/superfluid/UUPSProxiable.sol +55 -0
  395. package/contracts/token/superfluid/UUPSProxy.sol +153 -0
  396. package/contracts/ubi/UBIScheme.sol +88 -68
  397. package/contracts/utils/AdminWallet.sol +42 -11
  398. package/contracts/utils/AdminWalletFuse.sol +271 -0
  399. package/contracts/utils/BuyAndBridgeHelper.sol +108 -0
  400. package/contracts/utils/GoodDollarMintBurnWrapper.sol +19 -1
  401. package/contracts/utils/ProxyFactory1967.sol +1 -1
  402. package/hardhat.config.ts +29 -6
  403. package/package.json +11 -7
  404. package/releases/deploy-settings.json +58 -4
  405. package/releases/deployment.json +65 -231
  406. package/scripts/deployFullDAO.ts +39 -19
  407. package/scripts/gdx/gdxAirdropCalculation.ts +10 -11
  408. package/scripts/governance/airdropCalculationRecover.ts +43 -33
  409. package/scripts/governance/airdropCalculationSorted.ts +438 -0
  410. package/scripts/governance/goodCheckpointSorted.ts +377 -0
  411. package/scripts/multichain-deploy/0_proxyFactory-deploy.ts +100 -0
  412. package/scripts/multichain-deploy/{basicdao-deploy.ts → 1_basicdao-deploy.ts} +123 -93
  413. package/scripts/multichain-deploy/2_helpers-deploy.ts +151 -0
  414. package/scripts/multichain-deploy/{gdSavings-deploy.ts → 3_gdSavings-deploy.ts} +106 -76
  415. package/scripts/multichain-deploy/4_ubi-deploy.ts +147 -0
  416. package/scripts/multichain-deploy/5_gov-deploy.ts +147 -0
  417. package/scripts/multichain-deploy/fulldeploy.sh +26 -0
  418. package/scripts/multichain-deploy/helpers.ts +149 -111
  419. package/scripts/multichain-deploy/verifyEtherscan.ts +197 -0
  420. package/scripts/test/localOldDaoDeploy.ts +10 -3
  421. package/scripts/upgradeToV3/v3-fix.ts +120 -0
  422. package/scripts/upgradeToV3/v3-upgrade.ts +219 -0
  423. package/scripts/upgrades/celo-defi-ubi-deploy.ts +165 -0
  424. package/scripts/upgrades/identity-upgrade.ts +109 -0
  425. package/scripts/upgrades/transferDaoToGuardians.ts +80 -0
  426. package/test/faucet/Faucet.test.ts +157 -0
  427. package/test/{FuseFaucet.test.ts → faucet/FuseFaucet.test.ts} +26 -31
  428. package/test/governance/ClaimersDistribution.test.ts +58 -6
  429. package/test/governance/CompoundVotingMachine.castvote.test.ts +3 -3
  430. package/test/governance/CompoundVotingMachine.crossblockchain.ts +3 -2
  431. package/test/governance/CompoundVotingMachine.daoscheme.ts +8 -10
  432. package/test/governance/CompoundVotingMachine.delegate.test.ts +4 -5
  433. package/test/governance/CompoundVotingMachine.guardian.test.ts +5 -11
  434. package/test/governance/CompoundVotingMachine.propose.test.ts +3 -2
  435. package/test/governance/CompoundVotingMachine.state.test.ts +3 -2
  436. package/test/governance/GReputation.test.ts +78 -32
  437. package/test/governance/GReputation.v2merkle.test.ts +186 -0
  438. package/test/governance/GoodDollarStaking.gd.test.ts +83 -1
  439. package/test/governance/GoodDollarStaking.good.test.ts +2 -1
  440. package/test/governance/GovernanceStaking.test.ts +4 -4
  441. package/test/governance/Reputation.test.ts +2 -1
  442. package/test/governance/StakersDistribution.test.ts +26 -13
  443. package/test/helpers.ts +145 -52
  444. package/test/identity/IdentityV2.test.ts +539 -0
  445. package/test/{InvitesV1.test.ts → invite/InvitesV1.test.ts} +10 -5
  446. package/test/invite/InvitesV2.test.ts +328 -0
  447. package/test/reserve/DistributionHelper.test.ts +2 -1
  448. package/test/reserve/GoodMarketMaker.test.ts +20 -19
  449. package/test/reserve/GoodReserveCDai.cap.test.ts +8 -1
  450. package/test/reserve/GoodReserveCDai.distribution.test.ts +2 -1
  451. package/test/reserve/GoodReserveCDai.gdx.test.ts +2 -2
  452. package/test/reserve/GoodReserveCDai.pause.test.ts +2 -1
  453. package/test/reserve/GoodReserveCDai.test.ts +14 -38
  454. package/test/reserve/GoodReserveCDai.uniswap.test.ts +21 -19
  455. package/test/staking/CompoundStakingFactory.test.ts +8 -5
  456. package/test/staking/DifferentStakingTokens.test.ts +3 -2
  457. package/test/staking/DonationsStaking.test.ts +33 -24
  458. package/test/staking/FuseStaking.test.ts +9 -9
  459. package/test/staking/GoodAaveStakingFactory.test.ts +36 -31
  460. package/test/staking/SimpleDAIStaking.test.ts +13 -19
  461. package/test/staking/StakingRewards.test.ts +19 -16
  462. package/test/staking/StakingRewardsFixedAPY.test.ts +2 -1
  463. package/test/staking/SwapHelper.test.ts +20 -17
  464. package/test/staking/UsdcAaveStaking.test.ts +36 -33
  465. package/test/token/GoodDollar.test.ts +445 -0
  466. package/test/token/SuperGoodDollar.test.ts +422 -0
  467. package/test/ubi/UBIScheme.e2e.test.ts +6 -5
  468. package/test/ubi/UBIScheme.test.ts +37 -36
  469. package/test/ubi/UBISchemeCycle.test.ts +11 -8
  470. package/test/utils/AdminWallet.test.ts +34 -11
  471. package/test/utils/BuyAndBridgeHelper.test.ts +249 -0
  472. package/test/utils/DAOUpgradeableContract.test.ts +3 -2
  473. package/test/utils/GoodDollarMintBurnWrapper.test.ts +3 -2
  474. package/test/utils/NameService.test.ts +37 -21
  475. package/test/utils/ProtocolUpgrade.test.ts +1 -1
  476. package/test/utils/ProxyFactory.test.ts +12 -10
  477. package/truffle-config.js +18 -18
  478. package/types/AaveMock.ts +24 -15
  479. package/types/AccessControlEnumerableUpgradeable.ts +9 -0
  480. package/types/AccessControlUpgradeable.ts +9 -0
  481. package/types/AdminWallet.ts +149 -110
  482. package/types/AdminWalletFuse.ts +1268 -0
  483. package/types/BuyAndBridgeHelper.ts +279 -0
  484. package/types/CBATMock.ts +24 -15
  485. package/types/CDAILowWorthMock.ts +24 -15
  486. package/types/CDAIMock.ts +24 -15
  487. package/types/CDAINonMintableMock.ts +24 -15
  488. package/types/CDecimalsMock.ts +24 -15
  489. package/types/CSDTMock.ts +24 -15
  490. package/types/CUSDCMock.ts +24 -15
  491. package/types/ClaimersDistribution.ts +28 -0
  492. package/types/CompoundVotingMachine.ts +28 -0
  493. package/types/ContextUpgradeable.ts +77 -0
  494. package/types/DAIMock.ts +24 -15
  495. package/types/DAOUpgradeableContract.ts +28 -0
  496. package/types/DecimalsMock.ts +24 -15
  497. package/types/DistributionHelper.ts +28 -0
  498. package/types/DistributionHelperTest.ts +28 -0
  499. package/types/DistributionHelperTestHelper.ts +28 -0
  500. package/types/DonationsStaking.ts +28 -0
  501. package/types/EIP712Upgradeable.ts +77 -0
  502. package/types/ERC165Upgradeable.ts +13 -2
  503. package/types/ERC1967UpgradeUpgradeable.ts +9 -0
  504. package/types/ERC20BurnableUpgradeable.ts +24 -15
  505. package/types/ERC20PausableUpgradeable.ts +24 -15
  506. package/types/ERC20Permit.ts +186 -0
  507. package/types/ERC20PermitUpgradeable.ts +531 -0
  508. package/types/ERC20PresetMinterPauserUpgradeable.ts +129 -16
  509. package/types/ERC20Upgradeable.ts +24 -15
  510. package/types/ERC20WithTokenInfo.ts +339 -0
  511. package/types/ERC677.ts +131 -0
  512. package/types/ERC677Receiver.ts +115 -0
  513. package/types/EventsEmitter.ts +88 -0
  514. package/types/ExchangeHelper.ts +28 -0
  515. package/types/Faucet.ts +1107 -0
  516. package/types/FeesFormulaMock.ts +130 -0
  517. package/types/FuseFaucet.ts +9 -0
  518. package/types/FuseFaucetV2.ts +729 -0
  519. package/types/FuseStakingV3.ts +9 -0
  520. package/types/GReputation.ts +103 -4
  521. package/types/GoodAaveStaking.ts +24 -15
  522. package/types/GoodAaveStakingV2.ts +24 -15
  523. package/types/GoodCompoundStaking.ts +24 -15
  524. package/types/GoodCompoundStakingTest.ts +24 -15
  525. package/types/GoodCompoundStakingV2.ts +24 -15
  526. package/types/GoodDollar.ts +1733 -0
  527. package/types/GoodDollarMintBurnWrapper.ts +55 -0
  528. package/types/GoodDollarStaking.ts +92 -0
  529. package/types/GoodDollarStakingMock.ts +131 -0
  530. package/types/GoodFundManager.ts +28 -0
  531. package/types/GoodFundManagerTest.ts +28 -0
  532. package/types/GoodMarketMaker.ts +28 -0
  533. package/types/GoodReserveCDai.ts +43 -15
  534. package/types/GovernanceStaking.ts +43 -15
  535. package/types/IERC1271Upgradeable.ts +109 -0
  536. package/types/IERC1820Registry.ts +398 -0
  537. package/types/IERC1822ProxiableUpgradeable.ts +90 -0
  538. package/types/IERC20MetadataUpgradeable.ts +15 -15
  539. package/types/IERC20Permit.ts +175 -0
  540. package/types/IERC20PermitUpgradeable.ts +176 -0
  541. package/types/IERC20Upgradeable.ts +15 -15
  542. package/types/IERC777.ts +586 -0
  543. package/types/IERC777Recipient.ts +130 -0
  544. package/types/IERC777Sender.ts +130 -0
  545. package/types/IFeesFormula.ts +111 -0
  546. package/types/IGoodDollar.ts +304 -7
  547. package/types/IGoodDollarCustom.ts +618 -0
  548. package/types/IGovernanceStaking.ts +98 -0
  549. package/types/IIdentity.ts +106 -0
  550. package/types/IIdentityV2.ts +557 -0
  551. package/types/IStakingUpgrade.ts +110 -0
  552. package/types/ISuperAgreement.ts +151 -0
  553. package/types/ISuperApp.ts +410 -0
  554. package/types/ISuperGoodDollar.ts +3029 -0
  555. package/types/ISuperToken.ts +2326 -0
  556. package/types/ISuperTokenFactory.ts +415 -0
  557. package/types/ISuperfluid.ts +1565 -0
  558. package/types/ISuperfluidGovernance.ts +455 -0
  559. package/types/ISuperfluidToken.ts +951 -0
  560. package/types/IdentityMock.ts +493 -0
  561. package/types/IdentityV2.ts +1743 -0
  562. package/types/Initializable.ts +77 -0
  563. package/types/InvitesFuseV2.ts +806 -0
  564. package/types/InvitesV1.ts +9 -0
  565. package/types/InvitesV2.ts +1010 -0
  566. package/types/LendingPoolMock.ts +24 -15
  567. package/types/NameService.ts +28 -0
  568. package/types/OwnableUpgradeable.ts +9 -0
  569. package/types/PausableUpgradeable.ts +9 -0
  570. package/types/PayableMock.ts +92 -0
  571. package/types/ReentrancyGuardUpgradeable.ts +78 -0
  572. package/types/Reputation.ts +28 -0
  573. package/types/SelfApprove.ts +115 -0
  574. package/types/SimpleStaking.ts +24 -15
  575. package/types/SimpleStakingV2.ts +24 -15
  576. package/types/SixteenDecimalsTokenMock.ts +24 -15
  577. package/types/StakersDistribution.ts +28 -0
  578. package/types/SuperGoodDollar.ts +3662 -0
  579. package/types/SuperToken.ts +2434 -0
  580. package/types/SuperfluidToken.ts +951 -0
  581. package/types/TokenInfo.ts +109 -0
  582. package/types/TwentyDecimalsTokenMock.ts +24 -15
  583. package/types/UBIScheme.ts +47 -40
  584. package/types/USDCMock.ts +24 -15
  585. package/types/UUPSProxiable.ts +183 -0
  586. package/types/UUPSProxy.ts +105 -0
  587. package/types/UUPSUpgradeable.ts +28 -0
  588. package/types/UpgradableMock.ts +28 -0
  589. package/types/UpgradableMock2.ts +28 -0
  590. package/types/UpgradableMock3.ts +28 -0
  591. package/types/UpgradableMock4.ts +28 -0
  592. package/types/factories/AaveMock__factory.ts +17 -4
  593. package/types/factories/AaveStakingFactory__factory.ts +1 -1
  594. package/types/factories/AaveUSDMockOracle__factory.ts +1 -1
  595. package/types/factories/AccessControlEnumerableUpgradeable__factory.ts +13 -0
  596. package/types/factories/AccessControlUpgradeable__factory.ts +13 -0
  597. package/types/factories/AdminWalletFuse__factory.ts +881 -0
  598. package/types/factories/AdminWallet__factory.ts +93 -47
  599. package/types/factories/BancorFormula__factory.ts +1 -1
  600. package/types/factories/BaseShareFieldV2__factory.ts +1 -1
  601. package/types/factories/BaseShareField__factory.ts +1 -1
  602. package/types/factories/BatUSDMockOracle__factory.ts +1 -1
  603. package/types/factories/BuyAndBridgeHelper__factory.ts +237 -0
  604. package/types/factories/CBATMock__factory.ts +17 -4
  605. package/types/factories/CDAILowWorthMock__factory.ts +17 -4
  606. package/types/factories/CDAIMock__factory.ts +17 -4
  607. package/types/factories/CDAINonMintableMock__factory.ts +17 -4
  608. package/types/factories/CDecimalsMock__factory.ts +17 -4
  609. package/types/factories/CSDTMock__factory.ts +17 -4
  610. package/types/factories/CUSDCMock__factory.ts +17 -4
  611. package/types/factories/ClaimersDistribution__factory.ts +27 -1
  612. package/types/factories/CompUSDMockOracle__factory.ts +1 -1
  613. package/types/factories/CompoundStakingFactory__factory.ts +1 -1
  614. package/types/factories/CompoundVotingMachine__factory.ts +27 -1
  615. package/types/factories/ContextUpgradeable__factory.ts +39 -0
  616. package/types/factories/DAIMock__factory.ts +17 -4
  617. package/types/factories/DAOContract__factory.ts +1 -1
  618. package/types/factories/DAOUpgradeableContract__factory.ts +27 -1
  619. package/types/factories/DaiEthPriceMockOracle__factory.ts +1 -1
  620. package/types/factories/DecimalsMock__factory.ts +17 -4
  621. package/types/factories/DistributionBridgeMock__factory.ts +1 -1
  622. package/types/factories/DistributionHelperTestHelper__factory.ts +27 -1
  623. package/types/factories/DistributionHelperTest__factory.ts +27 -1
  624. package/types/factories/DistributionHelper__factory.ts +27 -1
  625. package/types/factories/DonationsStaking__factory.ts +27 -1
  626. package/types/factories/EIP712Upgradeable__factory.ts +39 -0
  627. package/types/factories/ERC165Upgradeable__factory.ts +13 -0
  628. package/types/factories/ERC1967Proxy__factory.ts +1 -1
  629. package/types/factories/ERC1967UpgradeUpgradeable__factory.ts +13 -0
  630. package/types/factories/ERC20BurnableUpgradeable__factory.ts +16 -3
  631. package/types/factories/ERC20PausableUpgradeable__factory.ts +16 -3
  632. package/types/factories/ERC20PermitUpgradeable__factory.ts +388 -0
  633. package/types/factories/ERC20Permit__factory.ts +111 -0
  634. package/types/factories/ERC20PresetMinterPauserUpgradeable__factory.ts +99 -5
  635. package/types/factories/ERC20Upgradeable__factory.ts +17 -4
  636. package/types/factories/ERC20WithTokenInfo__factory.ts +248 -0
  637. package/types/factories/ERC677Receiver__factory.ts +55 -0
  638. package/types/factories/ERC677__factory.ts +75 -0
  639. package/types/factories/EthUSDMockOracle__factory.ts +1 -1
  640. package/types/factories/EventsEmitter__factory.ts +84 -0
  641. package/types/factories/ExchangeHelper__factory.ts +27 -1
  642. package/types/factories/Faucet__factory.ts +781 -0
  643. package/types/factories/FeesFormulaMock__factory.ts +132 -0
  644. package/types/factories/FuseFaucetV2__factory.ts +528 -0
  645. package/types/factories/FuseFaucet__factory.ts +14 -1
  646. package/types/factories/FuseStakingV3__factory.ts +14 -1
  647. package/types/factories/GReputation__factory.ts +77 -2
  648. package/types/factories/GasPriceMockOracle__factory.ts +1 -1
  649. package/types/factories/GoodAaveStakingV2__factory.ts +17 -4
  650. package/types/factories/GoodAaveStaking__factory.ts +17 -4
  651. package/types/factories/GoodCompoundStakingTest__factory.ts +17 -4
  652. package/types/factories/GoodCompoundStakingV2__factory.ts +17 -4
  653. package/types/factories/GoodCompoundStaking__factory.ts +17 -4
  654. package/types/factories/GoodDollarMintBurnWrapper__factory.ts +34 -1
  655. package/types/factories/GoodDollarStakingMock__factory.ts +94 -1
  656. package/types/factories/GoodDollarStaking__factory.ts +70 -1
  657. package/types/factories/GoodDollar__factory.ts +1254 -0
  658. package/types/factories/GoodFundManagerTest__factory.ts +27 -1
  659. package/types/factories/GoodFundManager__factory.ts +27 -1
  660. package/types/factories/GoodMarketMaker__factory.ts +27 -1
  661. package/types/factories/GoodReserveCDai__factory.ts +30 -4
  662. package/types/factories/GovernanceStaking__factory.ts +30 -4
  663. package/types/factories/IERC1271Upgradeable__factory.ts +50 -0
  664. package/types/factories/IERC1820Registry__factory.ts +239 -0
  665. package/types/factories/IERC1822ProxiableUpgradeable__factory.ts +43 -0
  666. package/types/factories/IERC20MetadataUpgradeable__factory.ts +3 -3
  667. package/types/factories/IERC20PermitUpgradeable__factory.ts +105 -0
  668. package/types/factories/IERC20Permit__factory.ts +98 -0
  669. package/types/factories/IERC20Upgradeable__factory.ts +3 -3
  670. package/types/factories/IERC777Recipient__factory.ts +64 -0
  671. package/types/factories/IERC777Sender__factory.ts +61 -0
  672. package/types/factories/IERC777__factory.ts +414 -0
  673. package/types/factories/IFeesFormula__factory.ts +57 -0
  674. package/types/factories/IGoodDollarCustom__factory.ts +370 -0
  675. package/types/factories/IGoodDollar__factory.ts +184 -0
  676. package/types/factories/IGovernanceStaking__factory.ts +39 -0
  677. package/types/factories/IIdentityV2__factory.ts +312 -0
  678. package/types/factories/IIdentity__factory.ts +70 -0
  679. package/types/factories/IStakingUpgrade__factory.ts +50 -0
  680. package/types/factories/ISuperAgreement__factory.ts +78 -0
  681. package/types/factories/ISuperApp__factory.ts +272 -0
  682. package/types/factories/ISuperGoodDollar__factory.ts +2147 -0
  683. package/types/factories/ISuperTokenFactory__factory.ts +271 -0
  684. package/types/factories/ISuperToken__factory.ts +1682 -0
  685. package/types/factories/ISuperfluidGovernance__factory.ts +264 -0
  686. package/types/factories/ISuperfluidToken__factory.ts +697 -0
  687. package/types/factories/ISuperfluid__factory.ts +1143 -0
  688. package/types/factories/IdentityMock__factory.ts +327 -0
  689. package/types/factories/IdentityV2__factory.ts +1129 -0
  690. package/types/factories/IncentiveControllerMock__factory.ts +1 -1
  691. package/types/factories/Initializable__factory.ts +36 -0
  692. package/types/factories/InvitesFuseV2__factory.ts +553 -0
  693. package/types/factories/InvitesV1__factory.ts +14 -1
  694. package/types/factories/InvitesV2__factory.ts +683 -0
  695. package/types/factories/LendingPoolMock__factory.ts +17 -4
  696. package/types/factories/Multicall__factory.ts +1 -1
  697. package/types/factories/MultichainBridgeHelper__factory.ts +1 -1
  698. package/types/factories/MultichainRouterMock__factory.ts +1 -1
  699. package/types/factories/NameService__factory.ts +27 -1
  700. package/types/factories/OverMintTesterRegularStake__factory.ts +1 -1
  701. package/types/factories/OverMintTester__factory.ts +1 -1
  702. package/types/factories/OwnableUpgradeable__factory.ts +13 -0
  703. package/types/factories/PausableUpgradeable__factory.ts +13 -0
  704. package/types/factories/PayableMock__factory.ts +66 -0
  705. package/types/factories/ProtocolUpgradeFuseRecover__factory.ts +1 -1
  706. package/types/factories/ProtocolUpgradeFuse__factory.ts +1 -1
  707. package/types/factories/ProtocolUpgradeRecover__factory.ts +1 -1
  708. package/types/factories/ProtocolUpgrade__factory.ts +1 -1
  709. package/types/factories/ProxyFactory1967__factory.ts +1 -1
  710. package/types/factories/ReentrancyGuardUpgradeable__factory.ts +43 -0
  711. package/types/factories/ReputationTestHelper__factory.ts +1 -1
  712. package/types/factories/Reputation__factory.ts +27 -1
  713. package/types/factories/SelfApprove__factory.ts +46 -0
  714. package/types/factories/SimpleStakingV2__factory.ts +16 -3
  715. package/types/factories/SimpleStaking__factory.ts +16 -3
  716. package/types/factories/SixteenDecimalsTokenMock__factory.ts +17 -4
  717. package/types/factories/StakersDistribution__factory.ts +27 -1
  718. package/types/factories/StakingMockFixedAPY__factory.ts +1 -1
  719. package/types/factories/SuperGoodDollar__factory.ts +2680 -0
  720. package/types/factories/SuperToken__factory.ts +1809 -0
  721. package/types/factories/SuperfluidToken__factory.ts +697 -0
  722. package/types/factories/SwapHelperTest__factory.ts +1 -1
  723. package/types/factories/TokenInfo__factory.ts +62 -0
  724. package/types/factories/TwentyDecimalsTokenMock__factory.ts +17 -4
  725. package/types/factories/UBIScheme__factory.ts +40 -21
  726. package/types/factories/USDCMock__factory.ts +17 -4
  727. package/types/factories/UUPSProxiable__factory.ts +101 -0
  728. package/types/factories/UUPSProxy__factory.ts +80 -0
  729. package/types/factories/UUPSUpgradeable__factory.ts +26 -0
  730. package/types/factories/UniswapV2SwapHelper__factory.ts +1 -1
  731. package/types/factories/UpgradableMock2__factory.ts +27 -1
  732. package/types/factories/UpgradableMock3__factory.ts +27 -1
  733. package/types/factories/UpgradableMock4__factory.ts +27 -1
  734. package/types/factories/UpgradableMock__factory.ts +27 -1
  735. package/types/hardhat.d.ts +459 -0
  736. package/types/index.ts +98 -0
  737. package/yarn.lock +1251 -306
  738. package/scripts/multichain-deploy/nonubiDistribution-deploy.ts +0 -170
@@ -100,19 +100,13 @@ const _abi = [
100
100
  anonymous: false,
101
101
  inputs: [
102
102
  {
103
- indexed: true,
104
- internalType: "address",
105
- name: "previousOwner",
106
- type: "address",
107
- },
108
- {
109
- indexed: true,
110
- internalType: "address",
111
- name: "newOwner",
112
- type: "address",
103
+ indexed: false,
104
+ internalType: "uint8",
105
+ name: "version",
106
+ type: "uint8",
113
107
  },
114
108
  ],
115
- name: "OwnershipTransferred",
109
+ name: "Initialized",
116
110
  type: "event",
117
111
  },
118
112
  {
@@ -287,6 +281,19 @@ const _abi = [
287
281
  stateMutability: "nonpayable",
288
282
  type: "function",
289
283
  },
284
+ {
285
+ inputs: [],
286
+ name: "day",
287
+ outputs: [
288
+ {
289
+ internalType: "uint64",
290
+ name: "",
291
+ type: "uint64",
292
+ },
293
+ ],
294
+ stateMutability: "view",
295
+ type: "function",
296
+ },
290
297
  {
291
298
  inputs: [],
292
299
  name: "gasPrice",
@@ -334,6 +341,19 @@ const _abi = [
334
341
  stateMutability: "nonpayable",
335
342
  type: "function",
336
343
  },
344
+ {
345
+ inputs: [],
346
+ name: "getIdentity",
347
+ outputs: [
348
+ {
349
+ internalType: "contract IIdentityV2",
350
+ name: "",
351
+ type: "address",
352
+ },
353
+ ],
354
+ stateMutability: "view",
355
+ type: "function",
356
+ },
337
357
  {
338
358
  inputs: [
339
359
  {
@@ -395,19 +415,6 @@ const _abi = [
395
415
  stateMutability: "view",
396
416
  type: "function",
397
417
  },
398
- {
399
- inputs: [],
400
- name: "identity",
401
- outputs: [
402
- {
403
- internalType: "contract IIdentity",
404
- name: "",
405
- type: "address",
406
- },
407
- ],
408
- stateMutability: "view",
409
- type: "function",
410
- },
411
418
  {
412
419
  inputs: [
413
420
  {
@@ -415,15 +422,20 @@ const _abi = [
415
422
  name: "_admins",
416
423
  type: "address[]",
417
424
  },
425
+ {
426
+ internalType: "contract NameService",
427
+ name: "_ns",
428
+ type: "address",
429
+ },
418
430
  {
419
431
  internalType: "address",
420
432
  name: "_owner",
421
433
  type: "address",
422
434
  },
423
435
  {
424
- internalType: "contract IIdentity",
425
- name: "_identity",
426
- type: "address",
436
+ internalType: "uint256",
437
+ name: "_gasPrice",
438
+ type: "uint256",
427
439
  },
428
440
  ],
429
441
  name: "initialize",
@@ -452,10 +464,23 @@ const _abi = [
452
464
  },
453
465
  {
454
466
  inputs: [],
455
- name: "owner",
467
+ name: "maxDailyNewWallets",
456
468
  outputs: [
457
469
  {
458
- internalType: "address",
470
+ internalType: "uint64",
471
+ name: "",
472
+ type: "uint64",
473
+ },
474
+ ],
475
+ stateMutability: "view",
476
+ type: "function",
477
+ },
478
+ {
479
+ inputs: [],
480
+ name: "nameService",
481
+ outputs: [
482
+ {
483
+ internalType: "contract NameService",
459
484
  name: "",
460
485
  type: "address",
461
486
  },
@@ -463,6 +488,19 @@ const _abi = [
463
488
  stateMutability: "view",
464
489
  type: "function",
465
490
  },
491
+ {
492
+ inputs: [],
493
+ name: "proxiableUUID",
494
+ outputs: [
495
+ {
496
+ internalType: "bytes32",
497
+ name: "",
498
+ type: "bytes32",
499
+ },
500
+ ],
501
+ stateMutability: "view",
502
+ type: "function",
503
+ },
466
504
  {
467
505
  inputs: [
468
506
  {
@@ -502,13 +540,6 @@ const _abi = [
502
540
  stateMutability: "nonpayable",
503
541
  type: "function",
504
542
  },
505
- {
506
- inputs: [],
507
- name: "renounceOwnership",
508
- outputs: [],
509
- stateMutability: "nonpayable",
510
- type: "function",
511
- },
512
543
  {
513
544
  inputs: [
514
545
  {
@@ -666,11 +697,11 @@ const _abi = [
666
697
  inputs: [
667
698
  {
668
699
  internalType: "address",
669
- name: "newOwner",
700
+ name: "newImplementation",
670
701
  type: "address",
671
702
  },
672
703
  ],
673
- name: "transferOwnership",
704
+ name: "upgradeTo",
674
705
  outputs: [],
675
706
  stateMutability: "nonpayable",
676
707
  type: "function",
@@ -682,28 +713,33 @@ const _abi = [
682
713
  name: "newImplementation",
683
714
  type: "address",
684
715
  },
716
+ {
717
+ internalType: "bytes",
718
+ name: "data",
719
+ type: "bytes",
720
+ },
685
721
  ],
686
- name: "upgradeTo",
722
+ name: "upgradeToAndCall",
687
723
  outputs: [],
688
- stateMutability: "nonpayable",
724
+ stateMutability: "payable",
689
725
  type: "function",
690
726
  },
691
727
  {
692
728
  inputs: [
693
729
  {
694
730
  internalType: "address",
695
- name: "newImplementation",
731
+ name: "_user",
696
732
  type: "address",
697
733
  },
698
734
  {
699
- internalType: "bytes",
700
- name: "data",
701
- type: "bytes",
735
+ internalType: "string",
736
+ name: "_did",
737
+ type: "string",
702
738
  },
703
739
  ],
704
- name: "upgradeToAndCall",
740
+ name: "whitelist",
705
741
  outputs: [],
706
- stateMutability: "payable",
742
+ stateMutability: "nonpayable",
707
743
  type: "function",
708
744
  },
709
745
  {
@@ -718,6 +754,16 @@ const _abi = [
718
754
  name: "_did",
719
755
  type: "string",
720
756
  },
757
+ {
758
+ internalType: "uint256",
759
+ name: "orgChain",
760
+ type: "uint256",
761
+ },
762
+ {
763
+ internalType: "uint256",
764
+ name: "dateAuthenticated",
765
+ type: "uint256",
766
+ },
721
767
  ],
722
768
  name: "whitelist",
723
769
  outputs: [],
@@ -731,7 +777,7 @@ const _abi = [
731
777
  ];
732
778
 
733
779
  const _bytecode =
734
- "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c61235561004b6000396000818161082a0152818161086a01528181610ae10152610b2101526123556000f3fe60806040526004361061016c5760003560e01c806301ffc9a714610178578063133d93a1146101ad578063248a9ca3146101dd57806324d7806c146101fd5780632beeaca41461021d5780632bf164581461023f5780632c159a1a1461026d5780632f2ff15d1461029b57806336568abe146102bb5780633659cfe6146102db5780633771dcf8146102fb578063377e11e01461031b5780634f1ef2861461033b5780635fc944e91461034e578063715018a61461036e57806378c8cda7146103835780637e2c1355146103a35780638da5cb5b146103c357806390482d72146103d857806391d14854146103f85780639c54df6414610418578063a217fddf14610438578063c48924961461044d578063d547741f14610464578063db62683814610484578063e6ea3939146104a4578063eb91e651146104bb578063f2fde38b146104db578063f3da9f05146104fb578063f9f92be414610512578063fe173b971461053257600080fd5b3661017357005b600080fd5b34801561018457600080fd5b50610198610193366004611a6f565b610549565b60405190151581526020015b60405180910390f35b3480156101b957600080fd5b506101cf60008051602061229983398151915281565b6040519081526020016101a4565b3480156101e957600080fd5b506101cf6101f8366004611a99565b610580565b34801561020957600080fd5b50610198610218366004611ac7565b610595565b34801561022957600080fd5b5061023d610238366004611b81565b6105af565b005b34801561024b57600080fd5b5061025f61025a366004611c04565b610678565b6040516101a4929190611cb4565b34801561027957600080fd5b506101325461028e906001600160a01b031681565b6040516101a49190611cd7565b3480156102a757600080fd5b5061023d6102b6366004611ceb565b610783565b3480156102c757600080fd5b5061023d6102d6366004611ceb565b6107a5565b3480156102e757600080fd5b5061023d6102f6366004611ac7565b61081f565b34801561030757600080fd5b5061023d610316366004611ac7565b6108e8565b34801561032757600080fd5b5061023d610336366004611d3e565b610a16565b61023d610349366004611ddc565b610ad6565b34801561035a57600080fd5b5061023d610369366004611e21565b610b8c565b34801561037a57600080fd5b5061023d610cba565b34801561038f57600080fd5b5061023d61039e366004611ac7565b610cf5565b3480156103af57600080fd5b5061023d6103be366004611e43565b610d8d565b3480156103cf57600080fd5b5061028e610dce565b3480156103e457600080fd5b5061023d6103f3366004611ee4565b610ddd565b34801561040457600080fd5b50610198610413366004611ceb565b610eaa565b34801561042457600080fd5b5061023d610433366004611f47565b610ed5565b34801561044457600080fd5b506101cf600081565b34801561045957600080fd5b506101cf61012f5481565b34801561047057600080fd5b5061023d61047f366004611ceb565b61100c565b34801561049057600080fd5b5061023d61049f366004611a99565b611029565b3480156104b057600080fd5b506101cf61012e5481565b3480156104c757600080fd5b5061023d6104d6366004611ac7565b611038565b3480156104e757600080fd5b5061023d6104f6366004611ac7565b61108e565b34801561050757600080fd5b506101cf6101305481565b34801561051e57600080fd5b5061023d61052d366004611ac7565b61112b565b34801561053e57600080fd5b506101cf6101315481565b60006001600160e01b03198216637965db0b60e01b148061057a57506301ffc9a760e01b6001600160e01b03198316145b92915050565b600090815260fb602052604090206001015490565b600061057a60008051602061229983398151915283610eaa565b6105b833610595565b6105dd5760405162461bcd60e51b81526004016105d490611f7b565b60405180910390fd5b61013254604051631b02709960e01b81526001600160a01b0390911690631b027099906106109085908590600401611fa8565b600060405180830381600087803b15801561062a57600080fd5b505af115801561063e573d6000803e3d6000fd5b50505050600261012f546106529190611fe2565b333111801590610666575061066633610595565b156106745761067433611181565b5050565b6000606061068533610595565b6106a15760405162461bcd60e51b81526004016105d490611f7b565b846001600160a01b031683856040516106ba9190612004565b60006040518083038185875af1925050503d80600081146106f7576040519150601f19603f3d011682016040523d82523d6000602084013e6106fc565b606091505b5060405191935091506001600160a01b038616907f534b52c783549f909f9e743120524d0b7154058e4a54cdc895c2c0b587a1c7e09061074190879087908790612020565b60405180910390a2600261012f546107599190611fe2565b33311180159061076d575061076d33610595565b1561077b5761077b33611181565b935093915050565b61078c82610580565b610796813361128d565b6107a083836112f1565b505050565b6001600160a01b03811633146108155760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b60648201526084016105d4565b6106748282611377565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156108685760405162461bcd60e51b81526004016105d49061204a565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661089a6113de565b6001600160a01b0316146108c05760405162461bcd60e51b81526004016105d490612084565b6108c9816113fa565b604080516000808252602082019092526108e591839190611429565b50565b6108f133610595565b61090d5760405162461bcd60e51b81526004016105d490611f7b565b61013054610133600061091e611570565b81526020019081526020016000206000836001600160a01b03166001600160a01b0316815260200190815260200160002054106109b65760405162461bcd60e51b815260206004820152603060248201527f557365722077616c6c657420686173206265656e20746f7070656420746f6f2060448201526f6d616e792074696d657320746f64617960801b60648201526084016105d4565b600461012e546109c69190611fe2565b816001600160a01b031631106109db576109e4565b6109e481611181565b600261012f546109f49190611fe2565b333111801590610a085750610a0833610595565b156108e5576108e533611181565b33610a1f610dce565b6001600160a01b031614610a455760405162461bcd60e51b81526004016105d4906120be565b60005b8151811015610a9457610a82600080516020612299833981519152838381518110610a7557610a756120f3565b602002602001015161100c565b80610a8c81612109565b915050610a48565b5080604051610aa39190612124565b604051908190038120907fd5e6894641b5030a67e637ab2e12da64d8aec689f8bd1328de2b04d6a439c81090600090a250565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610b1f5760405162461bcd60e51b81526004016105d49061204a565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610b516113de565b6001600160a01b031614610b775760405162461bcd60e51b81526004016105d490612084565b610b80826113fa565b61067482826001611429565b61012d548210610bd45760405162461bcd60e51b815260206004820152601360248201527241646d696e206c69737420697320656d70747960681b60448201526064016105d4565b815b61012d5481108015610be757508181105b15610ca957610c1d61012d8281548110610c0357610c036120f3565b6000918252602090912001546001600160a01b0316610595565b8015610c615750600261012f54610c349190611fe2565b61012d8281548110610c4857610c486120f3565b6000918252602090912001546001600160a01b03163111155b15610c9757610c9761012d8281548110610c7d57610c7d6120f3565b6000918252602090912001546001600160a01b0316611181565b80610ca181612109565b915050610bd6565b50600261012f546106529190611fe2565b33610cc3610dce565b6001600160a01b031614610ce95760405162461bcd60e51b81526004016105d4906120be565b610cf36000611584565b565b610cfe33610595565b610d1a5760405162461bcd60e51b81526004016105d490611f7b565b6101325460405163291d954960e01b81526001600160a01b039091169063291d954990610d4b908490600401611cd7565b600060405180830381600087803b158015610d6557600080fd5b505af1158015610d79573d6000803e3d6000fd5b50505050600261012f546109f49190611fe2565b33610d96610dce565b6001600160a01b031614610dbc5760405162461bcd60e51b81526004016105d4906120be565b610dc8848484846115d6565b50505050565b6097546001600160a01b031690565b600054610100900460ff1680610df6575060005460ff16155b610e125760405162461bcd60e51b81526004016105d490612163565b600054610100900460ff16158015610e34576000805461ffff19166101011790555b610e3c611601565b610e4461166c565b610e4f6000846116cc565b610e67620927c06289544060036402540be4006115d6565b61013280546001600160a01b0319166001600160a01b038416179055835115610e9357610e9384610ed5565b8015610dc8576000805461ff001916905550505050565b600091825260fb602090815260408084206001600160a01b0393909316845291905290205460ff1690565b33610ede610dce565b6001600160a01b031614610f045760405162461bcd60e51b81526004016105d4906120be565b60005b8151811015610fca57610f32828281518110610f2557610f256120f3565b6020026020010151610595565b610fb857610f67600080516020612299833981519152838381518110610f5a57610f5a6120f3565b6020026020010151610783565b61012d828281518110610f7c57610f7c6120f3565b60209081029190910181015182546001810184556000938452919092200180546001600160a01b0319166001600160a01b039092169190911790555b80610fc281612109565b915050610f07565b5080604051610fd99190612124565b604051908190038120907f45486b220020cc2482ad1a5e0ae4d5f0b5372cea1b48173f6273c616a504726990600090a250565b61101582610580565b61101f813361128d565b6107a08383611377565b6109e4816103698160326121b1565b61104133610595565b61105d5760405162461bcd60e51b81526004016105d490611f7b565b610132546040516363513b6160e11b81526001600160a01b039091169063c6a276c290610d4b908490600401611cd7565b33611097610dce565b6001600160a01b0316146110bd5760405162461bcd60e51b81526004016105d4906120be565b6001600160a01b0381166111225760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084016105d4565b6108e581611584565b61113433610595565b6111505760405162461bcd60e51b81526004016105d490611f7b565b61013254604051630c477e0b60e11b81526001600160a01b039091169063188efc1690610d4b908490600401611cd7565b60016101336000611190611570565b81526020019081526020016000206000836001600160a01b03166001600160a01b0316815260200190815260200160002060008282546111d091906121b1565b90915550600090506111e182610595565b6111ee5761012e546111f3565b61012f545b9050600061120b6001600160a01b03841631836121c9565b6040519091506001600160a01b0384169082156108fc029083906000818181858888f19350505050158015611244573d6000803e3d6000fd5b50826001600160a01b03167ff60e56b8021f6ac77bd50d4acdbed9ad9e85107144d43090774a9ebe5ffed9858260405161128091815260200190565b60405180910390a2505050565b6112978282610eaa565b610674576112af816001600160a01b031660146116d6565b6112ba8360206116d6565b6040516020016112cb9291906121e0565b60408051601f198184030181529082905262461bcd60e51b82526105d49160040161224f565b6112fb8282610eaa565b61067457600082815260fb602090815260408083206001600160a01b03851684529091529020805460ff191660011790556113333390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b6113818282610eaa565b1561067457600082815260fb602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b6000805160206122d9833981519152546001600160a01b031690565b33611403610dce565b6001600160a01b0316146108e55760405162461bcd60e51b81526004016105d4906120be565b60006114336113de565b905061143e84611878565b60008351118061144b5750815b1561145c5761145a848461190b565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff1661156957805460ff191660011781556040516114d79086906114a8908590602401611cd7565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b17905261190b565b50805460ff191681556114e86113de565b6001600160a01b0316826001600160a01b0316146115605760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b60648201526084016105d4565b611569856119f6565b5050505050565b600061157f6201518042611fe2565b905090565b609780546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b6101318190556115e68185612262565b61012e556115f48184612262565b61012f5550610130555050565b600054610100900460ff168061161a575060005460ff16155b6116365760405162461bcd60e51b81526004016105d490612163565b600054610100900460ff16158015611658576000805461ffff19166101011790555b80156108e5576000805461ff001916905550565b600054610100900460ff1680611685575060005460ff16155b6116a15760405162461bcd60e51b81526004016105d490612163565b600054610100900460ff161580156116c3576000805461ffff19166101011790555b61165833611584565b61067482826112f1565b606060006116e5836002612262565b6116f09060026121b1565b6001600160401b0381111561170757611707611ae4565b6040519080825280601f01601f191660200182016040528015611731576020820181803683370190505b509050600360fc1b8160008151811061174c5761174c6120f3565b60200101906001600160f81b031916908160001a905350600f60fb1b8160018151811061177b5761177b6120f3565b60200101906001600160f81b031916908160001a905350600061179f846002612262565b6117aa9060016121b1565b90505b6001811115611822576f181899199a1a9b1b9c1cb0b131b232b360811b85600f16601081106117de576117de6120f3565b1a60f81b8282815181106117f4576117f46120f3565b60200101906001600160f81b031916908160001a90535060049490941c9361181b81612281565b90506117ad565b5083156118715760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e7460448201526064016105d4565b9392505050565b803b6118dc5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016105d4565b6000805160206122d983398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b61196a5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016105d4565b600080846001600160a01b0316846040516119859190612004565b600060405180830381855af49150503d80600081146119c0576040519150601f19603f3d011682016040523d82523d6000602084013e6119c5565b606091505b50915091506119ed82826040518060600160405280602781526020016122f960279139611a36565b95945050505050565b6119ff81611878565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60608315611a45575081611871565b825115611a555782518084602001fd5b8160405162461bcd60e51b81526004016105d4919061224f565b600060208284031215611a8157600080fd5b81356001600160e01b03198116811461187157600080fd5b600060208284031215611aab57600080fd5b5035919050565b6001600160a01b03811681146108e557600080fd5b600060208284031215611ad957600080fd5b813561187181611ab2565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715611b2257611b22611ae4565b604052919050565b60006001600160401b03831115611b4357611b43611ae4565b611b56601f8401601f1916602001611afa565b9050828152838383011115611b6a57600080fd5b828260208301376000602084830101529392505050565b60008060408385031215611b9457600080fd5b8235611b9f81611ab2565b915060208301356001600160401b03811115611bba57600080fd5b8301601f81018513611bcb57600080fd5b611bda85823560208401611b2a565b9150509250929050565b600082601f830112611bf557600080fd5b61187183833560208501611b2a565b600080600060608486031215611c1957600080fd5b8335611c2481611ab2565b925060208401356001600160401b03811115611c3f57600080fd5b611c4b86828701611be4565b925050604084013590509250925092565b60005b83811015611c77578181015183820152602001611c5f565b83811115610dc85750506000910152565b60008151808452611ca0816020860160208601611c5c565b601f01601f19169290920160200192915050565b8215158152604060208201526000611ccf6040830184611c88565b949350505050565b6001600160a01b0391909116815260200190565b60008060408385031215611cfe57600080fd5b823591506020830135611d1081611ab2565b809150509250929050565b60006001600160401b03821115611d3457611d34611ae4565b5060051b60200190565b60006020808385031215611d5157600080fd5b82356001600160401b03811115611d6757600080fd5b8301601f81018513611d7857600080fd5b8035611d8b611d8682611d1b565b611afa565b81815260059190911b82018301908381019087831115611daa57600080fd5b928401925b82841015611dd1578335611dc281611ab2565b82529284019290840190611daf565b979650505050505050565b60008060408385031215611def57600080fd5b8235611dfa81611ab2565b915060208301356001600160401b03811115611e1557600080fd5b611bda85828601611be4565b60008060408385031215611e3457600080fd5b50508035926020909101359150565b60008060008060808587031215611e5957600080fd5b5050823594602084013594506040840135936060013592509050565b600082601f830112611e8657600080fd5b81356020611e96611d8683611d1b565b82815260059290921b84018101918181019086841115611eb557600080fd5b8286015b84811015611ed9578035611ecc81611ab2565b8352918301918301611eb9565b509695505050505050565b600080600060608486031215611ef957600080fd5b83356001600160401b03811115611f0f57600080fd5b611f1b86828701611e75565b9350506020840135611f2c81611ab2565b91506040840135611f3c81611ab2565b809150509250925092565b600060208284031215611f5957600080fd5b81356001600160401b03811115611f6f57600080fd5b611ccf84828501611e75565b60208082526013908201527221b0b63632b91034b9903737ba1030b236b4b760691b604082015260600190565b6001600160a01b0383168152604060208201819052600090611ccf90830184611c88565b634e487b7160e01b600052601160045260246000fd5b600082611fff57634e487b7160e01b600052601260045260246000fd5b500490565b60008251612016818460208701611c5c565b9190910192915050565b6060815260006120336060830186611c88565b602083019490945250901515604090910152919050565b6020808252602c908201526000805160206122b983398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c908201526000805160206122b983398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6020808252818101527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604082015260600190565b634e487b7160e01b600052603260045260246000fd5b600060001982141561211d5761211d611fcc565b5060010190565b815160009082906020808601845b838110156121575781516001600160a01b031685529382019390820190600101612132565b50929695505050505050565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b600082198211156121c4576121c4611fcc565b500190565b6000828210156121db576121db611fcc565b500390565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b815260008351612212816017850160208801611c5c565b7001034b99036b4b9b9b4b733903937b6329607d1b6017918401918201528351612243816028840160208801611c5c565b01602801949350505050565b6020815260006118716020830184611c88565b600081600019048311821515161561227c5761227c611fcc565b500290565b60008161229057612290611fcc565b50600019019056febf18f3bdda8a65fc5ec294c2c787f805aceec15eed9fe17fdb6588866be113dc46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220cf00ba1125c19cfb009678cb08b617c500cdfae47d6ce8d2355424d2a26afa7864736f6c63430008080033";
780
+ "0x60a06040523060805234801561001457600080fd5b5060805161253161004c6000396000818161089b015281816108db01528181610bce01528181610c0e0152610c8601526125316000f3fe6080604052600436106101825760003560e01c806301ffc9a71461018e578063133d93a1146101c3578063248a9ca3146101f357806324d7806c146102135780632beeaca4146102335780632bf16458146102555780632f2ff15d1461028357806336568abe146102a35780633659cfe6146102c357806336afc6fa146102e35780633771dcf814610305578063377e11e0146103255780633e6326fc146103455780634f1ef2861461036657806352d1902d146103795780635b61e2c11461038e5780635fc944e9146103c757806378c8cda7146103e75780637b76ac91146104075780637e2c13551461042f5780637fad46f21461044f57806391d148541461046f578063971d902c1461048f5780639c54df64146104af578063a217fddf146104cf578063c4892496146104e4578063d547741f146104fa578063db6268381461051a578063e6ea39391461053a578063eb91e65114610550578063f3da9f0514610570578063f9f92be414610586578063fe173b97146105a657600080fd5b3661018957005b600080fd5b34801561019a57600080fd5b506101ae6101a9366004611c4d565b6105bc565b60405190151581526020015b60405180910390f35b3480156101cf57600080fd5b506101e560008051602061247583398151915281565b6040519081526020016101ba565b3480156101ff57600080fd5b506101e561020e366004611c77565b6105f3565b34801561021f57600080fd5b506101ae61022e366004611ca5565b610608565b34801561023f57600080fd5b5061025361024e366004611d77565b610622565b005b34801561026157600080fd5b50610275610270366004611dc6565b6106ec565b6040516101ba929190611e6e565b34801561028f57600080fd5b5061025361029e366004611e91565b6107f6565b3480156102af57600080fd5b506102536102be366004611e91565b610817565b3480156102cf57600080fd5b506102536102de366004611ca5565b610891565b3480156102ef57600080fd5b506102f8610959565b6040516101ba9190611ec1565b34801561031157600080fd5b50610253610320366004611ca5565b6109e5565b34801561033157600080fd5b50610253610340366004611ef8565b610b0c565b34801561035157600080fd5b50610100546102f8906001600160a01b031681565b610253610374366004611d77565b610bc4565b34801561038557600080fd5b506101e5610c79565b34801561039a57600080fd5b50610102546103af906001600160401b031681565b6040516001600160401b0390911681526020016101ba565b3480156103d357600080fd5b506102536103e2366004611f96565b610d27565b3480156103f357600080fd5b50610253610402366004611ca5565b610e4e565b34801561041357600080fd5b50610102546103af90600160401b90046001600160401b031681565b34801561043b57600080fd5b5061025361044a366004611fb8565b610ee7565b34801561045b57600080fd5b5061025361046a366004612059565b610f20565b34801561047b57600080fd5b506101ae61048a366004611e91565b6110ac565b34801561049b57600080fd5b506102536104aa3660046120c2565b6110d7565b3480156104bb57600080fd5b506102536104ca366004612121565b611198565b3480156104db57600080fd5b506101e5600081565b3480156104f057600080fd5b506101e560fd5481565b34801561050657600080fd5b50610253610515366004611e91565b6112cb565b34801561052657600080fd5b50610253610535366004611c77565b6112e7565b34801561054657600080fd5b506101e560fc5481565b34801561055c57600080fd5b5061025361056b366004611ca5565b6112f6565b34801561057c57600080fd5b506101e560fe5481565b34801561059257600080fd5b506102536105a1366004611ca5565b61134e565b3480156105b257600080fd5b506101e560ff5481565b60006001600160e01b03198216637965db0b60e01b14806105ed57506301ffc9a760e01b6001600160e01b03198316145b92915050565b600090815260c9602052604090206001015490565b60006105ed600080516020612475833981519152836110ac565b61062b33610608565b6106505760405162461bcd60e51b815260040161064790612155565b60405180910390fd5b610658610959565b6001600160a01b0316631b02709983836040518363ffffffff1660e01b8152600401610685929190612182565b600060405180830381600087803b15801561069f57600080fd5b505af11580156106b3573d6000803e3d6000fd5b50505050600260fd546106c691906121bc565b3331118015906106da57506106da33610608565b156106e8576106e8336113a6565b5050565b600060606106f933610608565b6107155760405162461bcd60e51b815260040161064790612155565b846001600160a01b0316838560405161072e91906121de565b60006040518083038185875af1925050503d806000811461076b576040519150601f19603f3d011682016040523d82523d6000602084013e610770565b606091505b5060405191935091506001600160a01b038616907f534b52c783549f909f9e743120524d0b7154058e4a54cdc895c2c0b587a1c7e0906107b5908790879087906121fa565b60405180910390a2600260fd546107cc91906121bc565b3331118015906107e057506107e033610608565b156107ee576107ee336113a6565b935093915050565b6107ff826105f3565b610808816114b0565b61081283836114ba565b505050565b6001600160a01b03811633146108875760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b6064820152608401610647565b6106e88282611540565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036108d95760405162461bcd60e51b815260040161064790612224565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661090b6115a7565b6001600160a01b0316146109315760405162461bcd60e51b81526004016106479061225e565b61093a816115c3565b60408051600080825260208201909252610956918391906115ea565b50565b6101005460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156109bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109e09190612298565b905090565b6109ee33610608565b610a0a5760405162461bcd60e51b815260040161064790612155565b60fe546101016000610a1a611755565b81526020019081526020016000206000836001600160a01b03166001600160a01b031681526020019081526020016000205410610ab25760405162461bcd60e51b815260206004820152603060248201527f557365722077616c6c657420686173206265656e20746f7070656420746f6f2060448201526f6d616e792074696d657320746f64617960801b6064820152608401610647565b600460fc54610ac191906121bc565b816001600160a01b0316311015610adb57610adb816113a6565b600260fd54610aea91906121bc565b333111801590610afe5750610afe33610608565b1561095657610956336113a6565b610b176000336110ac565b610b335760405162461bcd60e51b8152600401610647906122b5565b60005b8151811015610b8257610b70600080516020612475833981519152838381518110610b6357610b636122d8565b60200260200101516112cb565b80610b7a816122ee565b915050610b36565b5080604051610b919190612307565b604051908190038120907fd5e6894641b5030a67e637ab2e12da64d8aec689f8bd1328de2b04d6a439c81090600090a250565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610c0c5760405162461bcd60e51b815260040161064790612224565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610c3e6115a7565b6001600160a01b031614610c645760405162461bcd60e51b81526004016106479061225e565b610c6d826115c3565b6106e8828260016115ea565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610d145760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610647565b506000805160206124b583398151915290565b60fb548210610d6e5760405162461bcd60e51b815260206004820152601360248201527241646d696e206c69737420697320656d70747960681b6044820152606401610647565b815b60fb5481108015610d8057508181105b15610e3e57610db560fb8281548110610d9b57610d9b6122d8565b6000918252602090912001546001600160a01b0316610608565b8015610df75750600260fd54610dcb91906121bc565b60fb8281548110610dde57610dde6122d8565b6000918252602090912001546001600160a01b03163111155b15610e2c57610e2c60fb8281548110610e1257610e126122d8565b6000918252602090912001546001600160a01b03166113a6565b80610e36816122ee565b915050610d70565b50600260fd546106c691906121bc565b610e5733610608565b610e735760405162461bcd60e51b815260040161064790612155565b610e7b610959565b6001600160a01b031663291d9549826040518263ffffffff1660e01b8152600401610ea69190611ec1565b600060405180830381600087803b158015610ec057600080fd5b505af1158015610ed4573d6000803e3d6000fd5b50505050600260fd54610aea91906121bc565b610ef26000336110ac565b610f0e5760405162461bcd60e51b8152600401610647906122b5565b610f1a84848484611764565b50505050565b600054610100900460ff1615808015610f405750600054600160ff909116105b80610f615750610f4f3061178b565b158015610f61575060005460ff166001145b610fc45760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610647565b6000805460ff191660011790558015610fe7576000805461ff0019166101001790555b610fef61179a565b610ffa600084611807565b611005600033611807565b611018620927c062895440600385611764565b61010080546001600160a01b0319166001600160a01b0386161790558451156110445761104485611198565b336001600160a01b0384161461105f5761105f6000336112cb565b80156110a5576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050565b600091825260c9602090815260408084206001600160a01b0393909316845291905290205460ff1690565b6110e033610608565b6110fc5760405162461bcd60e51b815260040161064790612155565b611104610959565b6001600160a01b031663e737031a858585856040518563ffffffff1660e01b81526004016111359493929190612346565b600060405180830381600087803b15801561114f57600080fd5b505af1158015611163573d6000803e3d6000fd5b50505050600260fd5461117691906121bc565b33311180159061118a575061118a33610608565b15610f1a57610f1a336113a6565b6111a36000336110ac565b6111bf5760405162461bcd60e51b8152600401610647906122b5565b60005b8151811015611289576111ed8282815181106111e0576111e06122d8565b6020026020010151610608565b15156000036112775761122760008051602061247583398151915283838151811061121a5761121a6122d8565b60200260200101516107f6565b60fb82828151811061123b5761123b6122d8565b60209081029190910181015182546001810184556000938452919092200180546001600160a01b0319166001600160a01b039092169190911790555b80611281816122ee565b9150506111c2565b50806040516112989190612307565b604051908190038120907f45486b220020cc2482ad1a5e0ae4d5f0b5372cea1b48173f6273c616a504726990600090a250565b6112d4826105f3565b6112dd816114b0565b6108128383611540565b610adb816103e281603261237d565b6112ff33610608565b61131b5760405162461bcd60e51b815260040161064790612155565b611323610959565b6001600160a01b031663c6a276c2826040518263ffffffff1660e01b8152600401610ea69190611ec1565b61135733610608565b6113735760405162461bcd60e51b815260040161064790612155565b61137b610959565b6001600160a01b031663188efc16826040518263ffffffff1660e01b8152600401610ea69190611ec1565b600161010160006113b5611755565b81526020019081526020016000206000836001600160a01b03166001600160a01b0316815260200190815260200160002060008282546113f5919061237d565b909155506000905061140682610608565b6114125760fc54611416565b60fd545b9050600061142e6001600160a01b0384163183612390565b6040519091506001600160a01b0384169082156108fc029083906000818181858888f19350505050158015611467573d6000803e3d6000fd5b50826001600160a01b03167ff60e56b8021f6ac77bd50d4acdbed9ad9e85107144d43090774a9ebe5ffed985826040516114a391815260200190565b60405180910390a2505050565b6109568133611811565b6114c482826110ac565b6106e857600082815260c9602090815260408083206001600160a01b03851684529091529020805460ff191660011790556114fc3390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b61154a82826110ac565b156106e857600082815260c9602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b6000805160206124b5833981519152546001600160a01b031690565b6115ce6000336110ac565b6109565760405162461bcd60e51b8152600401610647906122b5565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff161561161d576108128361186a565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015611677575060408051601f3d908101601f19168201909252611674918101906123a3565b60015b6116da5760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610647565b6000805160206124b583398151915281146117495760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610647565b50610812838383611904565b60006109e062015180426121bc565b60ff81905561177381856123bc565b60fc5561178081846123bc565b60fd555060fe555050565b6001600160a01b03163b151590565b600054610100900460ff166118055760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b6064820152608401610647565b565b6106e882826114ba565b61181b82826110ac565b6106e85761182881611929565b61183383602061193b565b6040516020016118449291906123db565b60408051601f198184030181529082905262461bcd60e51b82526106479160040161244a565b6118738161178b565b6118d55760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610647565b6000805160206124b583398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61190d83611add565b60008251118061191a5750805b1561081257610f1a8383611b1d565b60606105ed6001600160a01b03831660145b6060600061194a8360026123bc565b61195590600261237d565b6001600160401b0381111561196c5761196c611cc2565b6040519080825280601f01601f191660200182016040528015611996576020820181803683370190505b509050600360fc1b816000815181106119b1576119b16122d8565b60200101906001600160f81b031916908160001a905350600f60fb1b816001815181106119e0576119e06122d8565b60200101906001600160f81b031916908160001a9053506000611a048460026123bc565b611a0f90600161237d565b90505b6001811115611a87576f181899199a1a9b1b9c1cb0b131b232b360811b85600f1660108110611a4357611a436122d8565b1a60f81b828281518110611a5957611a596122d8565b60200101906001600160f81b031916908160001a90535060049490941c93611a808161245d565b9050611a12565b508315611ad65760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610647565b9392505050565b611ae68161186a565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060611b288361178b565b611b835760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610647565b600080846001600160a01b031684604051611b9e91906121de565b600060405180830381855af49150503d8060008114611bd9576040519150601f19603f3d011682016040523d82523d6000602084013e611bde565b606091505b5091509150611c0682826040518060600160405280602781526020016124d560279139611c0f565b95945050505050565b60608315611c1e575081611ad6565b611ad68383815115611c335781518083602001fd5b8060405162461bcd60e51b8152600401610647919061244a565b600060208284031215611c5f57600080fd5b81356001600160e01b031981168114611ad657600080fd5b600060208284031215611c8957600080fd5b5035919050565b6001600160a01b038116811461095657600080fd5b600060208284031215611cb757600080fd5b8135611ad681611c90565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715611d0057611d00611cc2565b604052919050565b600082601f830112611d1957600080fd5b81356001600160401b03811115611d3257611d32611cc2565b611d45601f8201601f1916602001611cd8565b818152846020838601011115611d5a57600080fd5b816020850160208301376000918101602001919091529392505050565b60008060408385031215611d8a57600080fd5b8235611d9581611c90565b915060208301356001600160401b03811115611db057600080fd5b611dbc85828601611d08565b9150509250929050565b600080600060608486031215611ddb57600080fd5b8335611de681611c90565b925060208401356001600160401b03811115611e0157600080fd5b611e0d86828701611d08565b925050604084013590509250925092565b60005b83811015611e39578181015183820152602001611e21565b50506000910152565b60008151808452611e5a816020860160208601611e1e565b601f01601f19169290920160200192915050565b8215158152604060208201526000611e896040830184611e42565b949350505050565b60008060408385031215611ea457600080fd5b823591506020830135611eb681611c90565b809150509250929050565b6001600160a01b0391909116815260200190565b60006001600160401b03821115611eee57611eee611cc2565b5060051b60200190565b60006020808385031215611f0b57600080fd5b82356001600160401b03811115611f2157600080fd5b8301601f81018513611f3257600080fd5b8035611f45611f4082611ed5565b611cd8565b81815260059190911b82018301908381019087831115611f6457600080fd5b928401925b82841015611f8b578335611f7c81611c90565b82529284019290840190611f69565b979650505050505050565b60008060408385031215611fa957600080fd5b50508035926020909101359150565b60008060008060808587031215611fce57600080fd5b5050823594602084013594506040840135936060013592509050565b600082601f830112611ffb57600080fd5b8135602061200b611f4083611ed5565b82815260059290921b8401810191818101908684111561202a57600080fd5b8286015b8481101561204e57803561204181611c90565b835291830191830161202e565b509695505050505050565b6000806000806080858703121561206f57600080fd5b84356001600160401b0381111561208557600080fd5b61209187828801611fea565b94505060208501356120a281611c90565b925060408501356120b281611c90565b9396929550929360600135925050565b600080600080608085870312156120d857600080fd5b84356120e381611c90565b935060208501356001600160401b038111156120fe57600080fd5b61210a87828801611d08565b949794965050505060408301359260600135919050565b60006020828403121561213357600080fd5b81356001600160401b0381111561214957600080fd5b611e8984828501611fea565b60208082526013908201527221b0b63632b91034b9903737ba1030b236b4b760691b604082015260600190565b6001600160a01b0383168152604060208201819052600090611e8990830184611e42565b634e487b7160e01b600052601160045260246000fd5b6000826121d957634e487b7160e01b600052601260045260246000fd5b500490565b600082516121f0818460208701611e1e565b9190910192915050565b60608152600061220d6060830186611e42565b602083019490945250901515604090910152919050565b6020808252602c9082015260008051602061249583398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c9082015260008051602061249583398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6000602082840312156122aa57600080fd5b8151611ad681611c90565b6020808252600990820152683737ba1037bbb732b960b91b604082015260600190565b634e487b7160e01b600052603260045260246000fd5b600060018201612300576123006121a6565b5060010190565b815160009082906020808601845b8381101561233a5781516001600160a01b031685529382019390820190600101612315565b50929695505050505050565b6001600160a01b038516815260806020820181905260009061236a90830186611e42565b6040830194909452506060015292915050565b808201808211156105ed576105ed6121a6565b818103818111156105ed576105ed6121a6565b6000602082840312156123b557600080fd5b5051919050565b60008160001904831182151516156123d6576123d66121a6565b500290565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b81526000835161240d816017850160208801611e1e565b7001034b99036b4b9b9b4b733903937b6329607d1b601791840191820152835161243e816028840160208801611e1e565b01602801949350505050565b602081526000611ad66020830184611e42565b60008161246c5761246c6121a6565b50600019019056febf18f3bdda8a65fc5ec294c2c787f805aceec15eed9fe17fdb6588866be113dc46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212206b3566287a84b62dd5b2d5db1f704aba248f86c5039315b3853946753bc30af864736f6c63430008100033";
735
781
 
736
782
  type AdminWalletConstructorParams =
737
783
  | [signer?: Signer]
@@ -625,7 +625,7 @@ const _abi = [
625
625
  ];
626
626
 
627
627
  const _bytecode =
628
- "0x608060405234801561001057600080fd5b506149d1806100206000396000f3fe608060405234801561001057600080fd5b50600436106100e65760003560e01c80631da6bbfb146100eb57806329a00e7c146101115780632f55bdb51461012457806335b49af41461013757806348d73fed1461011157806349f9b0f71461014a57806365098bb31461015d57806376cf0b561461017057806379c1b4501461015d5780638074590a1461018357806394491fab146101965780639d1141081461015d578063a11aa1b4146101a9578063abfd231d14610137578063e1c7392a146101d9578063ebbb2158146101e3578063f3250fe2146101f6578063f732f1c91461014a575b600080fd5b6100fe6100f9366004614676565b610209565b6040519081526020015b60405180910390f35b6100fe61011f366004614676565b610222565b6100fe610132366004614676565b610230565b6100fe610145366004614676565b61034e565b6100fe610158366004614676565b61035c565b6100fe61016b3660046146b3565b61036a565b6100fe61017e366004614676565b610385565b6100fe610191366004614676565b6104b5565b6100fe6101a43660046146b3565b610599565b6101bc6101b7366004614701565b6106bb565b6040805163ffffffff938416815292909116602083015201610108565b6101e16107f3565b005b6100fe6101f1366004614676565b611928565b6100fe610204366004614676565b611a56565b600061021785858585611928565b90505b949350505050565b600061021785858585611a56565b600080851161025a5760405162461bcd60e51b81526004016102519061473c565b60405180910390fd5b6000841161027a5760405162461bcd60e51b815260040161025190614768565b60018363ffffffff161180156102a95750610299620f424060026147b3565b63ffffffff168363ffffffff1611155b6102c55760405162461bcd60e51b8152600401610251906147df565b816102d25750600061021a565b63ffffffff8316620f424014156102ff57836102ee8387611b09565b6102f89190614828565b905061021a565b6000808061030d8786611b1c565b905061031e818888620f4240611b28565b9093509150600060ff83166103338a86611b09565b901c9050610341898261483c565b9998505050505050505050565b6000610217858585856104b5565b600061021785858585610385565b60006103798686868686610599565b90505b95945050505050565b60008085116103a65760405162461bcd60e51b81526004016102519061473c565b600084116103c65760405162461bcd60e51b815260040161025190614768565b60008363ffffffff161180156103e55750620f424063ffffffff841611155b6104015760405162461bcd60e51b815260040161025190614853565b848211156104215760405162461bcd60e51b815260040161025190614887565b8161042e5750600061021a565b8482141561043d57508261021a565b63ffffffff8316620f4240141561045957846102ee8584611b09565b60008080610467858961483c565b90506104788882620f424089611b28565b909350915060006104898885611b09565b905060ff831688901b8461049d828461483c565b6104a79190614828565b9a9950505050505050505050565b60008085116104d65760405162461bcd60e51b81526004016102519061473c565b600084116104f65760405162461bcd60e51b815260040161025190614768565b60018363ffffffff161180156105255750610515620f424060026147b3565b63ffffffff168363ffffffff1611155b6105415760405162461bcd60e51b8152600401610251906147df565b848211156105615760405162461bcd60e51b815260040161025190614887565b8161056e5750600061021a565b8482141561057d57508261021a565b63ffffffff8316620f4240141561045957846102ee8386611b09565b600080861180156105aa5750600084115b6105c65760405162461bcd60e51b815260040161025190614768565b60008563ffffffff161180156105e55750620f424063ffffffff861611155b80156105f7575060008363ffffffff16115b801561060c5750620f424063ffffffff841611155b6106285760405162461bcd60e51b815260040161025190614853565b8263ffffffff168563ffffffff161415610661576106468683611b1c565b6106508584611b09565b61065a9190614828565b905061037c565b6000808061066f8986611b1c565b905061067d818a8a89611b28565b9093509150600061068e8885611b09565b905060ff831688901b846106a2828461483c565b6106ac9190614828565b9b9a5050505050505050505050565b600080858714156106f65760008711806106d55750600085115b6106f15760405162461bcd60e51b815260040161025190614768565b61072e565b6000871180156107065750600086115b80156107125750600085115b61072e5760405162461bcd60e51b815260040161025190614768565b60008411801561073e5750600083115b6107855760405162461bcd60e51b81526020600482015260186024820152774552525f494e56414c49445f524553455256455f5241544560401b6044820152606401610251565b60006107918886611b09565b9050600061079f8786611b09565b9050878910156107c2576107b7888a84846001611c15565b9350935050506107e9565b878911156107d8576107b7898984846000611c15565b6107e28282611ce2565b9350935050505b9550959350505050565b610f216001641c35fedd1560601b036020556001646c3390ecc9605e1b036021556001640cf801476160611b0360225560016431bdb23e1d605f1b0360235560016502fb1d8fe083605b1b0360245560016505b771955b37605a1b036025556001650af67a93bb5160591b0360265560016515060c256cb360581b036027556001651428a2f98d7360581b036028556001654d515663970960561b03602955600165944620b0e70f60551b03602a55600166011c592761c66760541b03602b5560016602214d10d014eb60531b03602c55600166020ade36b7dbef60531b03602d5560016603eab73b3bbfe360521b03602e556001660782ee3593f6d760511b03602f556001661ccf4b44bb4821604f1b0360305560016606e7f88ad8a77760511b0360315560016669f3d1c921891d604d1b03603255600166cb2ff529eb71e5604c1b03603355600166c2d415c3db974b604c1b0360345560016702eb40f9f620fda7604a1b0360355560016705990681d961a1eb60491b03603655600167055e12902701414760491b0360375560016714962dee9dc9764160471b0360385560016704ef57b9b560fab560491b0360395560016712ed7b32a58f552b60471b03603a556001679131271922eaa60760441b03603b556001678b380f3558668c4760441b03603c556001680215f77c045fbe885760421b03603d556001600160831b03603e556001670f577eded5773a1160471b03603f556001680eb5ec597592befbf5603f1b036040556001681c35fedd14b861eb05603e1b036041556001683619c87664579bc94b603d1b0360425560016867c00a3b07ffc01fd7603c1b03604355600168c6f6c8f8739773a7a5603b1b03604455600168bec763f8209b7a72b1603b1b0360455560016902dbb8caad9b7097b91b60391b03604655600169057b3d49dda84556d6f760381b03604755600169054183095b2c8ececf3160381b036048556001690a14517cc6b9457111ef60371b0360495560016913545598e5c23276ccf160361b03604a556001692511882c39c3adea96ff60351b03604b55600169471649d87199aa99075760341b03604c557004429a21a029d4c1457cfbffffffffffff604d55700415bc6d6fb7dd71af2cb3ffffffffffff604e557003eab73b3bbfe282243ce1ffffffffffff604f557003c1771ac9fb6b4c18e229ffffffffffff605055700399e96897690418f785257fffffffffff605155700373fc456c53bb779bf0ea9fffffffffff60525570034f9e8e490c48e67e6ab8bfffffffffff60535570032cbfd4a7adc790560b3337ffffffffff60545570030b50570f6e5d2acca94613ffffffffff6055557002eb40f9f620fda6b56c2861ffffffffff6056557002cc8340ecb0d0f520a6af58ffffffffff6057557002af09481380a0a35cf1ba02ffffffffff605855700292c5bdd3b92ec810287b1b3fffffffff605955700277abdcdab07d5a77ac6d6b9fffffffff605a5570025daf6654b1eaa55fd64df5efffffffff605b55700244c49c648baa98192dce88b7ffffffff605c5570022ce03cd5619a311b2471268bffffffff605d55700215f77c045fbe885654a44a0fffffffff605e556001600160811b03605f557001eaefdbdaaee7421fc4d3ede5ffffffff6060557001d6bd8b2eb257df7e8ca57b09bfffffff6061557001c35fedd14b861eb0443f7f133fffffff6062557001b0ce43b322bcde4a56e8ada5afffffff60635570019f0028ec1fff007f5a195a39dfffffff60645570018ded91f0e72ee74f49b15ba527ffffff60655570017d8ec7f04136f4e5615fd41a63ffffff60665570016ddc6556cdb84bdc8d12d22e6fffffff60675570015ecf52776a1155b5bd8395814f7fffff60685570015060c256cb23b3b3cc3754cf40ffffff6069557001428a2f98d728ae223ddab715be3fffff606a5570013545598e5c23276ccf0ede68034fffff606b557001288c4161ce1d6f54b7f61081194fffff606c5570011c592761c666aa641d5a01a40f17ffff606d55700110a688680a7530515f3e6e6cfdcdffff606e557001056f1b5bedf75c6bcb2ce8aed428ffff606f556ffaadceceeff8a0890f3875f008277fff6070556ff05dc6b27edad306388a600f6ba0bfff6071556fe67a5a25da41063de1495d5b18cdbfff6072556fdcff115b14eedde6fc3aa5353f2e4fff6073556fd3e7a3924312399f9aae2e0f868f8fff6074556fcb2ff529eb71e41582cccd5a1ee26fff6075556fc2d415c3db974ab32a51840c0b67edff6076556fbad03e7d883f69ad5b0a186184e06bff6077556fb320d03b2c343d4829abd6075f0cc5ff6078556fabc25204e02828d73c6e80bcdb1a95bf6079556fa4b16f74ee4bb2040a1ec6c15fbbf2df607a556f9deaf736ac1f569deb1b5ae3f36c130f607b556f976bd9952c7aa957f5937d790ef65037607c556f9131271922eaa6064b73a22d0bd4f2bf607d556f8b380f3558668c46c91c49a2f8e967b9607e556f857ddf0117efa215952912839f6473e6607f55565b6119266f60e393c68d20b1bd09deaabc0373b9c56080556f5f8f46e4854120989ed94719fb4c20116081556f5e479ebb9129fb1b7e72a648f992b6066082556f5d0bd23fe42dfedde2e9586be12b85fe6083556f5bdb29ddee979308ddfca81aeeb8095a6084556f5ab4fd8a260d2c7e2c0d2afcf0009dad6085556f5998b31359a55d48724c65cf090012216086556f5885bcad2b322dfc43e8860f9c018cf56087556f577b97aa1fe222bb452fdf111b1f0be26088556f5679cb5e3575632e5baa27e2b949f7046089556f557fe8241b3a31c83c732f1cdff4a1c5608a556f548d868026504875d6e59bbe95fc2a6b608b556f53a2465ce347cf34d05a867c17dd3088608c556f52bdce5dcd4faed59c7f5511cf8f8acc608d556f51dfcb453c07f8da817606e7885f7c3e608e556f5107ef6b0a5a2be8f8ff15590daa3cce608f556f5035f241d6eae0cd7bacba119993de7b6090556f4f698fe90d5b53d532171e1210164c666091556f4ea288ca297a0e6a09a0eee240e16c856092556f4de0a13fdcf5d4213fc398ba6e3becde6093556f4d23a145eef91fec06b06140804c48086094556f4c6b5430d4c1ee5526473db4ae0f11de6095556f4bb7886c240562eba11f4963a53b42406096556f4b080f3f1cb491d2d521e0ea4583521e6097556f4a5cbc96a05589cb4d86be1db31683646098556f49b566d40243517658d78c33162d6ece6099556f4911e6a02e5507a30f947383fd9a3276609a556f487216c2b31be4adc41db8a8d5cc0c88609b556f47d5d3fc4a7a1b188cd3d788b5c5e9fc609c556f473cfce4871a2c40bc4f9e1c32b955d0609d556f46a771ca578ab878485810e285e31c67609e556f4615149718aed4c258c373dc676aa72d609f556f4585c8b3f8fe489c6e1833ca4787138460a0556f44f972f174e41e5efb7e9d63c29ce73560a1556f446ff970ba86d8b00beb05ecebf3c4dc60a2556f43e9438ec88971812d6f198b5ccaad9660a3556f436539d11ff7bea657aeddb394e809ef60a4556f42e3c5d3e5a913401d86f66db5d81c2c60a5556f4264d2395303070ea726cbe98df6217460a6556f41e84a9a593bb7194c3a6349ecae4eea60a7556f416e1b785d13eba07a08f3f18876a5ab60a8556f40f6322ff389d423ba9dd7e7e7b7e80960a9556f40807cec8a466880ecf4184545d240a460aa556f400cea9ce88a8d3ae668e8ea0d9bf07f60ab556f3f9b6ae8772d4c55091e0ed7dfea0ac160ac556f3f2bee253fd84594f54bcaafac383a1360ad556f3ebe654e95208bb9210c575c081c595860ae556f3e52c1fc5665635b78ce1f05ad53c08660af556f3de8f65ac388101ddf718a6f5c1eff6560b0556f3d80f522d59bd0b328ca012df4cd2d4960b1556f3d1ab193129ea72b23648a161163a85a60b2556f3cb61f68d32576c135b95cfb53f76d7560b3556f3c5332d9f1aae851a3619e77e4cc847360b4556f3bf1e08edbe2aa109e1525f65759ef7360b5556f3b921d9cff13fa2c197746a3dfc4918f60b6556f3b33df818910bfc1a5aefb8f63ae2ac460b7556f3ad71c1c77e34fa32a9f184967eccbf660b8556f3a7bc9abf2c5bb53e2f7384a8a16521a60b9556f3a21dec7e76369783a68a0c6385a1c5760ba556f39c9525de6c9cdf7c1c157ca4a7a6ee360bb556f39721bad3dc85d1240ff0190e0adaac360bc556f391c324344d3248f0469eb28dd3d77e060bd556f38c78df7e3c796279fb4ff84394ab3da60be556f387426ea4638ae9aae08049d3554c20a60bf556f3821f57dbd2763256c1a99bbd205137860c0556f37d0f256cb46a8c92ff62fbbef28969860c1556f37811658591ffc7abdd1feaf3cef9b7360c2556f37325aa10e9e82f7df0f380f7997154b60c3556f36e4b888cfb408d873b9a80d439311c660c4556f3698299e59f4bb9de645fc9b08c64cca60c5556f364ca7a5012cb603023b57dd3ebfd50d60c6556f36022c928915b778ab1b06aaee7e61d460c7556f35b8b28d1a73dc27500ffe35559cc02860c8556f357033e951fe250ec5eb4e60955132d760c9556f3528ab2867934e3a21b5412e4c4f888160ca556f34e212f66c55057f9676c80094a61d5960cb556f349c66289e5b3c4b540c24f42fa4b9bb60cc556f34579fbbd0c733a9c8d6af6b0f7d00f760cd556f3413bad2e712288b924b5882b5b369bf60ce556f33d0b2b56286510ef730e213f71f12e960cf556f338e82ce00e2496262c64457535ba1a160d0556f334d26a96b373bb7c2f8ea1827f27a9260d1556f330c99f4f4211469e00b3e18c31475ea60d2556f32ccd87d6486094999c7d5e6f33237d860d3556f328dde2dd617b6665a2e8556f250c1af60d4556f324fa70e9adc270f8262755af5a99af960d5556f32122f443110611ca51040f41fa6e1e360d6556f31d5730e42c0831482f0f1485c4263d860d7556f31996ec6b07b4a83421b5ebc4ab4e1f160d8556f315e1ee0a68ff46bb43ec2b85032e87660d9556f31237fe7bc4deacf6775b9efa1a145f860da556f30e98e7f1cc5a356e44627a6972ea2ff60db556f30b04760b8917ec74205a3002650ec0560dc556f3077a75c803468e9132ce0cf3224241d60dd556f303fab57a6a275c36f19cda9bace667a60de556f3008504beb8dcbd2cf3bc1f6d5a064f060df556f2fd19346ed17dac61219ce0c2c5ac4b060e0556f2f9b7169808c324b5852fd3d54ba971460e1556f2f65e7e711cf4b064eea9c08cbdad57460e2556f2f30f405093042ddff8a251b6bf6d10360e3556f2efc931a3750f2e8bfe323edfe03757460e4556f2ec8c28e46dbe56d98685278339400cb60e5556f2e957fd933c3926d8a599b602379b85160e6556f2e62c882c7c9ed4473412702f08ba0e560e7556f2e309a221c12ba361e3ed695167feee260e8556f2dfef25d1f865ae18dd07cfea4bcea1060e9556f2dcdcee821cdc80decc02c44344aeb3160ea556f2d9d2d8562b34944d0b201bb87260c8360eb556f2d6d0c04a5b62a2c42636308669b729a60ec556f2d3d6842c9a235517fc5a0332691528f60ed556f2d0e402963fe1ea2834abc408c437c1060ee556f2cdf91ae602647908aff975e4d6a2a8c60ef556f2cb15ad3a1eb65f6d74a75da09a1b6c560f0556f2c8399a6ab8e9774d6fcff373d21072760f1556f2c564c4046f64edba6883ca06bbc453560f2556f2c2970c431f952641e05cb493e23eed360f3556f2bfd0560cd9eb14563bc7c0732856c1860f4556f2bd1084ed0332f7ff4150f9d0ef41a2c60f5556f2ba577d0fa1628b76d040b12a82492fb60f6556f2b7a5233cd21581e855e89dc2f1e8a9260f7556f2b4f95cd46904d05d72bdcde337d9cc760f8556f2b2540fc9b4d9abba3faca669191467560f9556f2afb5229f68d0830d8be8adb0a0db70f60fa556f2ad1c7c63a9b294c5bc73a3ba3ab7a2b60fb556f2aa8a04ac3cbe1ee1c9c86361465dbb860fc556f2a7fda392d725a44a2c8aeb9ab35430d60fd556f2a57741b18cde618717792b4faa216db60fe556f2a2f6c81f5d84dd950a35626d6d5503a60ff55565b565b60008085116119495760405162461bcd60e51b81526004016102519061473c565b600084116119695760405162461bcd60e51b815260040161025190614768565b60018363ffffffff161180156119985750611988620f424060026147b3565b63ffffffff168363ffffffff1611155b6119b45760405162461bcd60e51b8152600401610251906147df565b816119c15750600061021a565b63ffffffff8316620f424014156119fe578460016119df8487611b09565b6119e9919061483c565b6119f39190614828565b6102f89060016148b3565b60008080611a0c8886611b1c565b9050611a1d8189620f424089611b28565b9093509150600060ff83166001611a348a87611b09565b611a3e919061483c565b611a4a911c60016148b3565b9050610341888261483c565b6000808511611a775760405162461bcd60e51b81526004016102519061473c565b60008411611a975760405162461bcd60e51b815260040161025190614768565b60008363ffffffff16118015611ab65750620f424063ffffffff841611155b611ad25760405162461bcd60e51b815260040161025190614853565b81611adf5750600061021a565b63ffffffff8316620f42401415611afb57836102ee8684611b09565b6000808061030d8588611b1c565b6000611b1582846148cb565b9392505050565b6000611b1582846148b3565b600080600160811b8610611b3b57600080fd5b60008086611b4d6001607f1b8a6148cb565b611b579190614828565b905070015bf0a8b1457695355fb8ac404e7a79e3811015611b8257611b7b81611d1a565b9150611b8e565b611b8b81612293565b91505b60008563ffffffff168763ffffffff1684611ba991906148cb565b611bb39190614828565b9050600160831b811015611bd857611bca81612381565b607f94509450505050611c0c565b6000611be3826129ac565b9050611bff611bf382607f6148ea565b60ff1683901c82612a5f565b95509350611c0c92505050565b94509492505050565b600080611c2285856130b8565b9095509350600086611c38896001607f1b611b09565b611c429190614828565b9050600070015bf0a8b1457695355fb8ac404e7a79e38210611c6c57611c6782612293565b611c75565b611c7582611d1a565b9050600086611c84838a611b09565b611c8e9190614828565b9050600086611ca557611ca082613173565b611cae565b611cae826131b4565b9050611cd0611cbd828b611b09565b611ccb8a6001607f1b611b09565b611ce2565b95509550505050509550959350505050565b600080828411611cff57611cf6848461321d565b91509150611d13565b600080611d0c858761321d565b9450925050505b9250929050565b6000808080806fd3094c70f034de4b96ff7d5b6f99fcd88610611d7357611d456001607e1b856148b3565b93506fd3094c70f034de4b96ff7d5b6f99fcd8611d666001607f1b886148cb565b611d709190614828565b95505b6fa45af1e1f40c333b3de1db4dd55f29a78610611dc657611d986001607d1b856148b3565b93506fa45af1e1f40c333b3de1db4dd55f29a7611db96001607f1b886148cb565b611dc39190614828565b95505b6f910b022db7ae67ce76b441c27035c6a18610611e1957611deb6001607c1b856148b3565b93506f910b022db7ae67ce76b441c27035c6a1611e0c6001607f1b886148cb565b611e169190614828565b95505b6f88415abbe9a76bead8d00cf112e4d4a88610611e6c57611e3e6001607b1b856148b3565b93506f88415abbe9a76bead8d00cf112e4d4a8611e5f6001607f1b886148cb565b611e699190614828565b95505b6f84102b00893f64c705e841d5d4064bd38610611ebf57611e916001607a1b856148b3565b93506f84102b00893f64c705e841d5d4064bd3611eb26001607f1b886148cb565b611ebc9190614828565b95505b6f8204055aaef1c8bd5c3259f4822735a28610611f1257611ee4600160791b856148b3565b93506f8204055aaef1c8bd5c3259f4822735a2611f056001607f1b886148cb565b611f0f9190614828565b95505b6f810100ab00222d861931c15e39b44e998610611f6557611f37600160781b856148b3565b93506f810100ab00222d861931c15e39b44e99611f586001607f1b886148cb565b611f629190614828565b95505b6f808040155aabbbe9451521693554f7338610611fb857611f8a600160771b856148b3565b93506f808040155aabbbe9451521693554f733611fab6001607f1b886148cb565b611fb59190614828565b95505b611fc66001607f1b8761483c565b92508291506001607f1b611fda83806148cb565b611fe49190614828565b9050600160801b611ff5848261483c565b611fff90846148cb565b6120099190614828565b61201390856148b3565b93506001607f1b61202482846148cb565b61202e9190614828565b9150600160811b61204f846faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa61483c565b61205990846148cb565b6120639190614828565b61206d90856148b3565b93506001607f1b61207e82846148cb565b6120889190614828565b9150600360801b6120a9846f9999999999999999999999999999999961483c565b6120b390846148cb565b6120bd9190614828565b6120c790856148b3565b93506001607f1b6120d882846148cb565b6120e29190614828565b9150600160821b612103846f9249249249249249249249249249249261483c565b61210d90846148cb565b6121179190614828565b61212190856148b3565b93506001607f1b61213282846148cb565b61213c9190614828565b9150600560801b61215d846f8e38e38e38e38e38e38e38e38e38e38e61483c565b61216790846148cb565b6121719190614828565b61217b90856148b3565b93506001607f1b61218c82846148cb565b6121969190614828565b9150600360811b6121b7846f8ba2e8ba2e8ba2e8ba2e8ba2e8ba2e8b61483c565b6121c190846148cb565b6121cb9190614828565b6121d590856148b3565b93506001607f1b6121e682846148cb565b6121f09190614828565b9150600760801b612211846f89d89d89d89d89d89d89d89d89d89d8961483c565b61221b90846148cb565b6122259190614828565b61222f90856148b3565b93506001607f1b61224082846148cb565b61224a9190614828565b9150600160831b61226b846f8888888888888888888888888888888861483c565b61227590846148cb565b61227f9190614828565b61228990856148b3565b9695505050505050565b600080600160801b83106122d75760006122b96122b46001607f1b86614828565b6132e1565b60ff811694851c949091506122d3906001607f1b906148cb565b9150505b6001607f1b83111561234c57607f5b60ff81161561234a576001607f1b6122fe85806148cb565b6123089190614828565b9350600160801b841061233a57600193841c9361232590826148ea565b60ff166001901b8261233791906148b3565b91505b61234381614923565b90506122e6565b505b6f05b9de1d10bf4103d647b0955897ba806123776f03f80fe03f80fe03f80fe03f80fe03f8836148cb565b611b159190614828565b60008080806123946001607c1b86614940565b91508190506001607f1b6123a882806148cb565b6123b29190614828565b90506123c6816710e1b3be415a00006148cb565b6123d090846148b3565b92506001607f1b6123e183836148cb565b6123eb9190614828565b90506123ff816705a0913f6b1e00006148cb565b61240990846148b3565b92506001607f1b61241a83836148cb565b6124249190614828565b905061243881670168244fdac780006148cb565b61244290846148b3565b92506001607f1b61245383836148cb565b61245d9190614828565b905061247081664807432bc180006148cb565b61247a90846148b3565b92506001607f1b61248b83836148cb565b6124959190614828565b90506124a881660c0135dca040006148cb565b6124b290846148b3565b92506001607f1b6124c383836148cb565b6124cd9190614828565b90506124e0816601b707b1cdc0006148cb565b6124ea90846148b3565b92506001607f1b6124fb83836148cb565b6125059190614828565b9050612517816536e0f639b8006148cb565b61252190846148b3565b92506001607f1b61253283836148cb565b61253c9190614828565b905061254e81650618fee9f8006148cb565b61255890846148b3565b92506001607f1b61256983836148cb565b6125739190614828565b905061258481649c197dcc006148cb565b61258e90846148b3565b92506001607f1b61259f83836148cb565b6125a99190614828565b90506125ba81640e30dce4006148cb565b6125c490846148b3565b92506001607f1b6125d583836148cb565b6125df9190614828565b90506125f08164012ebd13006148cb565b6125fa90846148b3565b92506001607f1b61260b83836148cb565b6126159190614828565b9050612625816317499f006148cb565b61262f90846148b3565b92506001607f1b61264083836148cb565b61264a9190614828565b905061265a816301a9d4806148cb565b61266490846148b3565b92506001607f1b61267583836148cb565b61267f9190614828565b905061268e81621c63806148cb565b61269890846148b3565b92506001607f1b6126a983836148cb565b6126b39190614828565b90506126c2816201c6386148cb565b6126cc90846148b3565b92506001607f1b6126dd83836148cb565b6126e79190614828565b90506126f581611ab86148cb565b6126ff90846148b3565b92506001607f1b61271083836148cb565b61271a9190614828565b90506127288161017c6148cb565b61273290846148b3565b92506001607f1b61274383836148cb565b61274d9190614828565b905061275a8160146148cb565b61276490846148b3565b92506001607f1b61277583836148cb565b61277f9190614828565b905061278c8160016148cb565b61279690846148b3565b92506001607f1b826127b06721c3677c82b4000086614828565b6127ba91906148b3565b6127c491906148b3565b92506001607c1b85161561280c5770018ebef9eac820ae8682b9793ac6d1e7766127ff847001c3d6a24ed82218787d624d3e5eba95f96148cb565b6128099190614828565b92505b6001607d1b851615612852577001368b2fc6f9609fe7aceb46aa619baed46128458470018ebef9eac820ae8682b9793ac6d1e7786148cb565b61284f9190614828565b92505b6001607e1b851615612897576fbc5ab1b16779be3575bd8f0520a9f21f61288a847001368b2fc6f9609fe7aceb46aa619baed56148cb565b6128949190614828565b92505b6001607f1b8516156128db576f454aaa8efe072e7f6ddbab84b40a55c96128ce846fbc5ab1b16779be3575bd8f0520a9f21e6148cb565b6128d89190614828565b92505b600160801b85161561291f576f0960aadc109e7a3bf4578099615711ea612912846f454aaa8efe072e7f6ddbab84b40a55c56148cb565b61291c9190614828565b92505b600160811b851615612962576e2bf84208204f5977f9a8cf01fdce3d612955846f0960aadc109e7a3bf4578099615711d76148cb565b61295f9190614828565b92505b600160821b8516156129a3576d03c6ab775dd0b95b4cbee7e65d11612996846e2bf84208204f5977f9a8cf01fdc3076148cb565b6129a09190614828565b92505b50909392505050565b60006020607f5b60ff81166129c2836001614954565b60ff161015612a1557600060026129d98385614954565b6129e39190614979565b90508460008260ff16608081106129fc576129fc61490d565b015410612a0b57809250612a0f565b8091505b506129b3565b8360008260ff1660808110612a2c57612a2c61490d565b015410612a3a579392505050565b8360008360ff1660808110612a5157612a5161490d565b0154106100e6575092915050565b6000828160ff8416612a7183806148cb565b901c9150612a8e826b0d10b13981d2a0bc5e5fdcab601e1b6148cb565b612a9890826148b3565b905060ff8416612aa886846148cb565b901c9150612ac5826b045ae5bdd5f0e03eca1ff439601e1b6148cb565b612acf90826148b3565b905060ff8416612adf86846148cb565b901c9150612afc826e45ae5bdd5f0e03eca1ff43900000006148cb565b612b0690826148b3565b905060ff8416612b1686846148cb565b901c9150612b32826adefabf91302cd95b9ffda5601c1b6148cb565b612b3c90826148b3565b905060ff8416612b4c86846148cb565b901c9150612b68826a4a53953065644873dfff37601b1b6148cb565b612b7290826148b3565b905060ff8416612b8286846148cb565b901c9150612b9e826d54f1cf12bd04e516b6da880000006148cb565b612ba890826148b3565b905060ff8416612bb886846148cb565b901c9150612bd4826d0a9e39e257a09ca2d6db510000006148cb565b612bde90826148b3565b905060ff8416612bee86846148cb565b901c9150612c0a826d012e066e7b839fa050c3090000006148cb565b612c1490826148b3565b905060ff8416612c2486846148cb565b901c9150612c3f826c1e33d7d926c329a1ad1a8000006148cb565b612c4990826148b3565b905060ff8416612c5986846148cb565b901c9150612c74826c02bee513bdb4a6b19b5f8000006148cb565b612c7e90826148b3565b905060ff8416612c8e86846148cb565b901c9150612ca8826b3a9316fa79b88eccf2a000006148cb565b612cb290826148b3565b905060ff8416612cc286846148cb565b901c9150612cdc826b048177ebe1fa8123752000006148cb565b612ce690826148b3565b905060ff8416612cf686846148cb565b901c9150612d0f826a5263fe90242dcbacf000006148cb565b612d1990826148b3565b905060ff8416612d2986846148cb565b901c9150612d42826a057e22099c030d941000006148cb565b612d4c90826148b3565b905060ff8416612d5c86846148cb565b901c9150612d74826957e22099c030d94100006148cb565b612d7e90826148b3565b905060ff8416612d8e86846148cb565b901c9150612da68269052b6b545699763100006148cb565b612db090826148b3565b905060ff8416612dc086846148cb565b901c9150612dd782684985f67696bf7480006148cb565b612de190826148b3565b905060ff8416612df186846148cb565b901c9150612e08826803dea12ea99e4980006148cb565b612e1290826148b3565b905060ff8416612e2286846148cb565b901c9150612e38826731880f2214b6e0006148cb565b612e4290826148b3565b905060ff8416612e5286846148cb565b901c9150612e688267025bcff56eb360006148cb565b612e7290826148b3565b905060ff8416612e8286846148cb565b901c9150612e9782661b722e10ab10006148cb565b612ea190826148b3565b905060ff8416612eb186846148cb565b901c9150612ec6826601317c700770006148cb565b612ed090826148b3565b905060ff8416612ee086846148cb565b901c9150612ef482650cba84aafa006148cb565b612efe90826148b3565b905060ff8416612f0e86846148cb565b901c9150612f21826482573a0a006148cb565b612f2b90826148b3565b905060ff8416612f3b86846148cb565b901c9150612f4e826405035ad9006148cb565b612f5890826148b3565b905060ff8416612f6886846148cb565b901c9150612f7a82632f881b006148cb565b612f8490826148b3565b905060ff8416612f9486846148cb565b901c9150612fa6826301b293406148cb565b612fb090826148b3565b905060ff8416612fc086846148cb565b901c9150612fd182620efc406148cb565b612fdb90826148b3565b905060ff8416612feb86846148cb565b901c9150612ffb82617fe06148cb565b61300590826148b3565b905060ff841661301586846148cb565b901c9150613025826104206148cb565b61302f90826148b3565b905060ff841661303f86846148cb565b901c915061304e8260216148cb565b61305890826148b3565b905060ff841661306886846148cb565b901c91506130778260016148cb565b61308190826148b3565b9050600160ff85161b856130a46b0d10b13981d2a0bc5e5fdcab601f1b84614828565b6130ae91906148b3565b61037c91906148b3565b600080600160801b84111580156130d35750600160801b8311155b156130e2575082905081611d13565b600160801b84101561311557826130fd600160801b866148cb565b6131079190614828565b600160801b91509150611d13565b600160801b83101561313b57600160801b8461313182866148cb565b611cf69190614828565b600083851161314a578361314c565b845b905060006131616122b46001607f1b84614828565b60ff1695861c969490951c9450505050565b60006f2f16ac6c59de6f8d5d6f63c1482a7c86821161319b576131958261334d565b92915050565b816131aa6001607f1b806148cb565b6131959190614828565b60006f2f16ac6c59de6f8d5d6f63c1482a7c8682116131d65761319582613bc9565b7001af16ac6c59de6f8d5d6f63c1482a7c8082116131f75761319582614454565b706b22d43e72c326539cceeef8bb48f255ff82116100e65761319582614579565b919050565b6000807d10c6f7a0b5ed8d36b4c7f34938583621fafc8b0079a2834d26fa3fcc9ea98411156132a25760006132717d10c6f7a0b5ed8d36b4c7f34938583621fafc8b0079a2834d26fa3fcc9ea960016148b3565b61327b9086614828565b6132869060016148b3565b90506132928186614828565b945061329e8185614828565b9350505b60006132c36132b4620f4240876148cb565b6132be8787611b1c565b614623565b905060006132d482620f424061483c565b9196919550909350505050565b600080610100831015613314575b600183111561330f57600192831c926133089082614954565b90506132ef565b613195565b60805b60ff81161561334657600160ff82161b841061333b5760ff81169390931c92908117905b60011c607f16613317565b5092915050565b600081816001607f1b61336083806148cb565b61336a9190614828565b9150613386826c029a534e74dcf60586cd18f611601f1b6148cb565b61339090826148b3565b90506001607f1b6133a185846148cb565b6133ab9190614828565b91506133c6826b4a09419b34fee42b6c1f37c960231b6148cb565b6133d090826148b3565b90506001607f1b6133e185846148cb565b6133eb9190614828565b9150613407826c24268508c8e0756933cb3e3d25601d1b6148cb565b61341190826148b3565b90506001607f1b61342285846148cb565b61342c9190614828565b9150613448826c04af62c06bf4213d25d793548560211b6148cb565b61345290826148b3565b90506001607f1b61346385846148cb565b61346d9190614828565b915061348a82701440b0be1615a47dba6e5b3b1f100000006148cb565b61349490826148b3565b90506001607f1b6134a585846148cb565b6134af9190614828565b91506134c9826ab481d807d1aa66d0449061602e1b6148cb565b6134d390826148b3565b90506001607f1b6134e485846148cb565b6134ee9190614828565b915061350b827066ebaac4c37c622dd8288a7eb1b20000006148cb565b61351590826148b3565b90506001607f1b61352685846148cb565b6135309190614828565b915061354c826c778b92009afbedea1d0dd0867960211b6148cb565b61355690826148b3565b90506001607f1b61356785846148cb565b6135719190614828565b915061358f82710233c33c676a5eb2416094a87b36570000006148cb565b61359990826148b3565b90506001607f1b6135aa85846148cb565b6135b49190614828565b91506135cf826b541cde48bc0254bed49a9f87602c1b6148cb565b6135d990826148b3565b90506001607f1b6135ea85846148cb565b6135f49190614828565b915061361282710cae1fad2cdd4d4cb8d73abca0d19a4000006148cb565b61361c90826148b3565b90506001607f1b61362d85846148cb565b6136379190614828565b9150613654826d07b6caa8bdd834571073bb6ea55960221b6148cb565b61365e90826148b3565b90506001607f1b61366f85846148cb565b6136799190614828565b915061369782714ba8d20d2dabd386c9529659841a2e2000006148cb565b6136a190826148b3565b90506001607f1b6136b285846148cb565b6136bc9190614828565b91506136d4826805d6042a35c33e6d51604d1b6148cb565b6136de90826148b3565b90506001607f1b6136ef85846148cb565b6136f99190614828565b9150613718827201cfa8e70c03625b9db76c8ebf5bbf248200006148cb565b61372290826148b3565b90506001607f1b61373385846148cb565b61373d9190614828565b915061375b826e02428eccfc10306f932f9984d937c160211b6148cb565b61376590826148b3565b90506001607f1b61377685846148cb565b6137809190614828565b915061379f82720b550d19b129d270c44f6f55f027723cbb00006148cb565b6137a990826148b3565b90506001607f1b6137ba85846148cb565b6137c49190614828565b91506137e0826c01c877dadc761dc272deb65d4b60341b6148cb565b6137ea90826148b3565b90506001607f1b6137fb85846148cb565b6138059190614828565b9150613824827248178ece97479f33a77f2ad22a81b64406c0006148cb565b61382e90826148b3565b90506001607f1b61383f85846148cb565b6138499190614828565b9150613867826e2db2a09a2e76043fb7d9a57bcbe29b60221b6148cb565b61387190826148b3565b90506001607f1b61388285846148cb565b61388c9190614828565b91506138ac827301d0e76631a5b05d007b8cb72a7c7f11ec36e0006148cb565b6138b690826148b3565b90506001607f1b6138c785846148cb565b6138d19190614828565b91506138ea8269094386f7b3f0bfb38d8f604f1b6148cb565b6138f490826148b3565b90506001607f1b61390585846148cb565b61390f9190614828565b915061392f82730bd8369f1b702bf491e2ebfcee08250313b654006148cb565b61393990826148b3565b90506001607f1b61394a85846148cb565b6139549190614828565b9150613973826f07971f0caa7db1c2acb2d6764895d93560221b6148cb565b61397d90826148b3565b90506001607f1b61398e85846148cb565b6139989190614828565b91506139b882734dff5820e165e910f95120a708e742496221e6006148cb565b6139c290826148b3565b90506001607f1b6139d385846148cb565b6139dd9190614828565b91506139f9826c064647b36d8fe769bc7728729b603d1b6148cb565b613a0390826148b3565b90506001607f1b613a1485846148cb565b613a1e9190614828565b9150613a3f82740205db8dffff45bfa2938f128f599dbf16eb11d8806148cb565b613a4990826148b3565b90506001607f1b613a5a85846148cb565b613a649190614828565b9150613a83826fa74089d7b3086a2927c2f0d5e71a734160231b6148cb565b613a8d90826148b3565b90506001607f1b613a9e85846148cb565b613aa89190614828565b9150613ac982740d86dae2a4cc0f47633a544479735869b487b59c406148cb565b613ad390826148b3565b90506001607f1b613ae485846148cb565b613aee9190614828565b9150613aff82610231609c1b6148cb565b613b0990826148b3565b90506001607f1b613b1a85846148cb565b613b249190614828565b9150613b4582745b0485a76f6646c2039db1507cdd51b086496808226148cb565b613b4f90826148b3565b90506001607f1b613b6085846148cb565b613b6a9190614828565b9150613b8a8270764c1e23624aa2de0bf7d35ad802af121160211b6148cb565b613b9490826148b3565b90506001607f1b84613bb56bde1bc4d19efcac82445da75b60201b84614828565b613bbf91906148b3565b61021a91906148b3565b60008181613bdb826001607f1b61483c565b613bf4906bde1bc4d19efcac82445da75b60201b6148cb565b90506001607f1b613c0585846148cb565b613c0f9190614828565b9150613c2b826c029a534e74dcf60586cd18f611601f1b6148cb565b613c3590826148b3565b90506001607f1b613c4685846148cb565b613c509190614828565b9150613c6b826b4a09419b34fee42b6c1f37c960231b6148cb565b613c75908261483c565b90506001607f1b613c8685846148cb565b613c909190614828565b9150613cac826c24268508c8e0756933cb3e3d25601d1b6148cb565b613cb690826148b3565b90506001607f1b613cc785846148cb565b613cd19190614828565b9150613ced826c04af62c06bf4213d25d793548560211b6148cb565b613cf7908261483c565b90506001607f1b613d0885846148cb565b613d129190614828565b9150613d2f82701440b0be1615a47dba6e5b3b1f100000006148cb565b613d3990826148b3565b90506001607f1b613d4a85846148cb565b613d549190614828565b9150613d6e826ab481d807d1aa66d0449061602e1b6148cb565b613d78908261483c565b90506001607f1b613d8985846148cb565b613d939190614828565b9150613db0827066ebaac4c37c622dd8288a7eb1b20000006148cb565b613dba90826148b3565b90506001607f1b613dcb85846148cb565b613dd59190614828565b9150613df1826c778b92009afbedea1d0dd0867960211b6148cb565b613dfb908261483c565b90506001607f1b613e0c85846148cb565b613e169190614828565b9150613e3482710233c33c676a5eb2416094a87b36570000006148cb565b613e3e90826148b3565b90506001607f1b613e4f85846148cb565b613e599190614828565b9150613e74826b541cde48bc0254bed49a9f87602c1b6148cb565b613e7e908261483c565b90506001607f1b613e8f85846148cb565b613e999190614828565b9150613eb782710cae1fad2cdd4d4cb8d73abca0d19a4000006148cb565b613ec190826148b3565b90506001607f1b613ed285846148cb565b613edc9190614828565b9150613ef9826d07b6caa8bdd834571073bb6ea55960221b6148cb565b613f03908261483c565b90506001607f1b613f1485846148cb565b613f1e9190614828565b9150613f3c82714ba8d20d2dabd386c9529659841a2e2000006148cb565b613f4690826148b3565b90506001607f1b613f5785846148cb565b613f619190614828565b9150613f79826805d6042a35c33e6d51604d1b6148cb565b613f83908261483c565b90506001607f1b613f9485846148cb565b613f9e9190614828565b9150613fbd827201cfa8e70c03625b9db76c8ebf5bbf248200006148cb565b613fc790826148b3565b90506001607f1b613fd885846148cb565b613fe29190614828565b9150614000826e02428eccfc10306f932f9984d937c160211b6148cb565b61400a908261483c565b90506001607f1b61401b85846148cb565b6140259190614828565b915061404482720b550d19b129d270c44f6f55f027723cbb00006148cb565b61404e90826148b3565b90506001607f1b61405f85846148cb565b6140699190614828565b9150614085826c01c877dadc761dc272deb65d4b60341b6148cb565b61408f908261483c565b90506001607f1b6140a085846148cb565b6140aa9190614828565b91506140c9827248178ece97479f33a77f2ad22a81b64406c0006148cb565b6140d390826148b3565b90506001607f1b6140e485846148cb565b6140ee9190614828565b915061410c826e2db2a09a2e76043fb7d9a57bcbe29b60221b6148cb565b614116908261483c565b90506001607f1b61412785846148cb565b6141319190614828565b9150614151827301d0e76631a5b05d007b8cb72a7c7f11ec36e0006148cb565b61415b90826148b3565b90506001607f1b61416c85846148cb565b6141769190614828565b915061418f8269094386f7b3f0bfb38d8f604f1b6148cb565b614199908261483c565b90506001607f1b6141aa85846148cb565b6141b49190614828565b91506141d482730bd8369f1b702bf491e2ebfcee08250313b654006148cb565b6141de90826148b3565b90506001607f1b6141ef85846148cb565b6141f99190614828565b9150614218826f07971f0caa7db1c2acb2d6764895d93560221b6148cb565b614222908261483c565b90506001607f1b61423385846148cb565b61423d9190614828565b915061425d82734dff5820e165e910f95120a708e742496221e6006148cb565b61426790826148b3565b90506001607f1b61427885846148cb565b6142829190614828565b915061429e826c064647b36d8fe769bc7728729b603d1b6148cb565b6142a8908261483c565b90506001607f1b6142b985846148cb565b6142c39190614828565b91506142e482740205db8dffff45bfa2938f128f599dbf16eb11d8806148cb565b6142ee90826148b3565b90506001607f1b6142ff85846148cb565b6143099190614828565b9150614328826fa74089d7b3086a2927c2f0d5e71a734160231b6148cb565b614332908261483c565b90506001607f1b61434385846148cb565b61434d9190614828565b915061436e82740d86dae2a4cc0f47633a544479735869b487b59c406148cb565b61437890826148b3565b90506001607f1b61438985846148cb565b6143939190614828565b91506143a482610231609c1b6148cb565b6143ae908261483c565b90506001607f1b6143bf85846148cb565b6143c99190614828565b91506143ea82745b0485a76f6646c2039db1507cdd51b086496808226148cb565b6143f490826148b3565b90506001607f1b61440585846148cb565b61440f9190614828565b915061442f8270764c1e23624aa2de0bf7d35ad802af121160211b6148cb565b614439908261483c565b905061021a6bde1bc4d19efcac82445da75b60201b82614828565b60008060016144736f2f16ac6c59de6f8d5d6f63c1482a7c868561483c565b61447d919061483c565b9050600061449b6f03060c183060c183060c183060c1830683614828565b905060006144b9826f03060c183060c183060c183060c183066148cb565b905060006144c88360016148b3565b6144e2906f03060c183060c183060c183060c183066148cb565b90506000608084608081106144f9576144f961490d565b015490506000608061450c8660016148b3565b6080811061451c5761451c61490d565b015490506f03060c183060c183060c183060c1830661453b858861483c565b61454590836148cb565b61454f888661483c565b61455990856148cb565b61456391906148b3565b61456d9190614828565b98975050505050505050565b60008070015bf0a8b1457695355fb8ac404e7a79e383106145a25761459d83612293565b6145ab565b6145ab83611d1a565b9050600070015bf0a8b1457695355fb8ac404e7a79e382106145d5576145d082612293565b6145de565b6145de82611d1a565b9050836001607f1b836145f182856148cb565b6145fb9190614828565b614605848661483c565b61460f91906148b3565b61461991906148cb565b61021a9190614828565b6000614630600283614828565b61463a908361483c565b6146448385614940565b61464e9190614828565b6146588385614828565b611b1591906148b3565b803563ffffffff8116811461321857600080fd5b6000806000806080858703121561468c57600080fd5b84359350602085013592506146a360408601614662565b9396929550929360600135925050565b600080600080600060a086880312156146cb57600080fd5b853594506146db60208701614662565b9350604086013592506146f060608701614662565b949793965091946080013592915050565b600080600080600060a0868803121561471957600080fd5b505083359560208501359550604085013594606081013594506080013592509050565b6020808252601290820152714552525f494e56414c49445f535550504c5960701b604082015260600190565b6020808252601b908201527a4552525f494e56414c49445f524553455256455f42414c414e434560281b604082015260600190565b634e487b7160e01b600052601160045260246000fd5b600063ffffffff808316818516818304811182151516156147d6576147d661479d565b02949350505050565b6020808252601990820152784552525f494e56414c49445f524553455256455f524154494f60381b604082015260600190565b634e487b7160e01b600052601260045260246000fd5b60008261483757614837614812565b500490565b60008282101561484e5761484e61479d565b500390565b6020808252601a908201527911549497d253959053125117d49154d154959157d5d15251d21560321b604082015260600190565b60208082526012908201527111549497d253959053125117d05353d5539560721b604082015260600190565b600082198211156148c6576148c661479d565b500190565b60008160001904831182151516156148e5576148e561479d565b500290565b600060ff821660ff8416808210156149045761490461479d565b90039392505050565b634e487b7160e01b600052603260045260246000fd5b600060ff8216806149365761493661479d565b6000190192915050565b60008261494f5761494f614812565b500690565b600060ff821660ff84168060ff038211156149715761497161479d565b019392505050565b600060ff83168061498c5761498c614812565b8060ff8416049150509291505056fea26469706673582212206bc3deef7327e75e69ddb3309795ec495ebcb1a1cf924582e91e730d9e53ef2564736f6c63430008080033";
628
+ "0x608060405234801561001057600080fd5b506149c0806100206000396000f3fe608060405234801561001057600080fd5b50600436106100e65760003560e01c80631da6bbfb146100eb57806329a00e7c146101115780632f55bdb51461012457806335b49af41461013757806348d73fed1461011157806349f9b0f71461014a57806365098bb31461015d57806376cf0b561461017057806379c1b4501461015d5780638074590a1461018357806394491fab146101965780639d1141081461015d578063a11aa1b4146101a9578063abfd231d14610137578063e1c7392a146101d9578063ebbb2158146101e3578063f3250fe2146101f6578063f732f1c91461014a575b600080fd5b6100fe6100f9366004614684565b610209565b6040519081526020015b60405180910390f35b6100fe61011f366004614684565b610222565b6100fe610132366004614684565b610230565b6100fe610145366004614684565b610351565b6100fe610158366004614684565b61035f565b6100fe61016b3660046146c1565b61036d565b6100fe61017e366004614684565b610388565b6100fe610191366004614684565b6104ba565b6100fe6101a43660046146c1565b6105a0565b6101bc6101b736600461470f565b6106c1565b6040805163ffffffff938416815292909116602083015201610108565b6101e16107f8565b005b6100fe6101f1366004614684565b61192d565b6100fe610204366004614684565b611a5e565b60006102178585858561192d565b90505b949350505050565b600061021785858585611a5e565b600080851161025a5760405162461bcd60e51b81526004016102519061474a565b60405180910390fd5b6000841161027a5760405162461bcd60e51b815260040161025190614776565b60018363ffffffff161180156102a95750610299620f424060026147c1565b63ffffffff168363ffffffff1611155b6102c55760405162461bcd60e51b8152600401610251906147ed565b816000036102d55750600061021a565b620f423f1963ffffffff84160161030257836102f18387611b14565b6102fb9190614836565b905061021a565b600080806103108786611b29565b9050610321818888620f4240611b35565b9093509150600060ff83166103368a86611b14565b901c9050610344898261484a565b9998505050505050505050565b6000610217858585856104ba565b600061021785858585610388565b600061037c86868686866105a0565b90505b95945050505050565b60008085116103a95760405162461bcd60e51b81526004016102519061474a565b600084116103c95760405162461bcd60e51b815260040161025190614776565b60008363ffffffff161180156103e85750620f424063ffffffff841611155b6104045760405162461bcd60e51b81526004016102519061485d565b848211156104245760405162461bcd60e51b815260040161025190614891565b816000036104345750600061021a565b84820361044257508261021a565b620f423f1963ffffffff84160161045e57846102f18584611b14565b6000808061046c858961484a565b905061047d8882620f424089611b35565b9093509150600061048e8885611b14565b905060ff831688901b846104a2828461484a565b6104ac9190614836565b9a9950505050505050505050565b60008085116104db5760405162461bcd60e51b81526004016102519061474a565b600084116104fb5760405162461bcd60e51b815260040161025190614776565b60018363ffffffff1611801561052a575061051a620f424060026147c1565b63ffffffff168363ffffffff1611155b6105465760405162461bcd60e51b8152600401610251906147ed565b848211156105665760405162461bcd60e51b815260040161025190614891565b816000036105765750600061021a565b84820361058457508261021a565b620f423f1963ffffffff84160161045e57846102f18386611b14565b600080861180156105b15750600084115b6105cd5760405162461bcd60e51b815260040161025190614776565b60008563ffffffff161180156105ec5750620f424063ffffffff861611155b80156105fe575060008363ffffffff16115b80156106135750620f424063ffffffff841611155b61062f5760405162461bcd60e51b81526004016102519061485d565b8263ffffffff168563ffffffff16036106675761064c8683611b29565b6106568584611b14565b6106609190614836565b905061037f565b600080806106758986611b29565b9050610683818a8a89611b35565b909350915060006106948885611b14565b905060ff831688901b846106a8828461484a565b6106b29190614836565b9b9a5050505050505050505050565b6000808587036106fb5760008711806106da5750600085115b6106f65760405162461bcd60e51b815260040161025190614776565b610733565b60008711801561070b5750600086115b80156107175750600085115b6107335760405162461bcd60e51b815260040161025190614776565b6000841180156107435750600083115b61078a5760405162461bcd60e51b81526020600482015260186024820152774552525f494e56414c49445f524553455256455f5241544560401b6044820152606401610251565b60006107968886611b14565b905060006107a48786611b14565b9050878910156107c7576107bc888a84846001611c22565b9350935050506107ee565b878911156107dd576107bc898984846000611c22565b6107e78282611cef565b9350935050505b9550959350505050565b610f266001641c35fedd1560601b036020556001646c3390ecc9605e1b036021556001640cf801476160611b0360225560016431bdb23e1d605f1b0360235560016502fb1d8fe083605b1b0360245560016505b771955b37605a1b036025556001650af67a93bb5160591b0360265560016515060c256cb360581b036027556001651428a2f98d7360581b036028556001654d515663970960561b03602955600165944620b0e70f60551b03602a55600166011c592761c66760541b03602b5560016602214d10d014eb60531b03602c55600166020ade36b7dbef60531b03602d5560016603eab73b3bbfe360521b03602e556001660782ee3593f6d760511b03602f556001661ccf4b44bb4821604f1b0360305560016606e7f88ad8a77760511b0360315560016669f3d1c921891d604d1b03603255600166cb2ff529eb71e5604c1b03603355600166c2d415c3db974b604c1b0360345560016702eb40f9f620fda7604a1b0360355560016705990681d961a1eb60491b03603655600167055e12902701414760491b0360375560016714962dee9dc9764160471b0360385560016704ef57b9b560fab560491b0360395560016712ed7b32a58f552b60471b03603a556001679131271922eaa60760441b03603b556001678b380f3558668c4760441b03603c556001680215f77c045fbe885760421b03603d556001600160831b03603e556001670f577eded5773a1160471b03603f556001680eb5ec597592befbf5603f1b036040556001681c35fedd14b861eb05603e1b036041556001683619c87664579bc94b603d1b0360425560016867c00a3b07ffc01fd7603c1b03604355600168c6f6c8f8739773a7a5603b1b03604455600168bec763f8209b7a72b1603b1b0360455560016902dbb8caad9b7097b91b60391b03604655600169057b3d49dda84556d6f760381b03604755600169054183095b2c8ececf3160381b036048556001690a14517cc6b9457111ef60371b0360495560016913545598e5c23276ccf160361b03604a556001692511882c39c3adea96ff60351b03604b55600169471649d87199aa99075760341b03604c557004429a21a029d4c1457cfbffffffffffff604d55700415bc6d6fb7dd71af2cb3ffffffffffff604e557003eab73b3bbfe282243ce1ffffffffffff604f557003c1771ac9fb6b4c18e229ffffffffffff605055700399e96897690418f785257fffffffffff605155700373fc456c53bb779bf0ea9fffffffffff60525570034f9e8e490c48e67e6ab8bfffffffffff60535570032cbfd4a7adc790560b3337ffffffffff60545570030b50570f6e5d2acca94613ffffffffff6055557002eb40f9f620fda6b56c2861ffffffffff6056557002cc8340ecb0d0f520a6af58ffffffffff6057557002af09481380a0a35cf1ba02ffffffffff605855700292c5bdd3b92ec810287b1b3fffffffff605955700277abdcdab07d5a77ac6d6b9fffffffff605a5570025daf6654b1eaa55fd64df5efffffffff605b55700244c49c648baa98192dce88b7ffffffff605c5570022ce03cd5619a311b2471268bffffffff605d55700215f77c045fbe885654a44a0fffffffff605e556001600160811b03605f557001eaefdbdaaee7421fc4d3ede5ffffffff6060557001d6bd8b2eb257df7e8ca57b09bfffffff6061557001c35fedd14b861eb0443f7f133fffffff6062557001b0ce43b322bcde4a56e8ada5afffffff60635570019f0028ec1fff007f5a195a39dfffffff60645570018ded91f0e72ee74f49b15ba527ffffff60655570017d8ec7f04136f4e5615fd41a63ffffff60665570016ddc6556cdb84bdc8d12d22e6fffffff60675570015ecf52776a1155b5bd8395814f7fffff60685570015060c256cb23b3b3cc3754cf40ffffff6069557001428a2f98d728ae223ddab715be3fffff606a5570013545598e5c23276ccf0ede68034fffff606b557001288c4161ce1d6f54b7f61081194fffff606c5570011c592761c666aa641d5a01a40f17ffff606d55700110a688680a7530515f3e6e6cfdcdffff606e557001056f1b5bedf75c6bcb2ce8aed428ffff606f556ffaadceceeff8a0890f3875f008277fff6070556ff05dc6b27edad306388a600f6ba0bfff6071556fe67a5a25da41063de1495d5b18cdbfff6072556fdcff115b14eedde6fc3aa5353f2e4fff6073556fd3e7a3924312399f9aae2e0f868f8fff6074556fcb2ff529eb71e41582cccd5a1ee26fff6075556fc2d415c3db974ab32a51840c0b67edff6076556fbad03e7d883f69ad5b0a186184e06bff6077556fb320d03b2c343d4829abd6075f0cc5ff6078556fabc25204e02828d73c6e80bcdb1a95bf6079556fa4b16f74ee4bb2040a1ec6c15fbbf2df607a556f9deaf736ac1f569deb1b5ae3f36c130f607b556f976bd9952c7aa957f5937d790ef65037607c556f9131271922eaa6064b73a22d0bd4f2bf607d556f8b380f3558668c46c91c49a2f8e967b9607e556f857ddf0117efa215952912839f6473e6607f55565b61192b6f60e393c68d20b1bd09deaabc0373b9c56080556f5f8f46e4854120989ed94719fb4c20116081556f5e479ebb9129fb1b7e72a648f992b6066082556f5d0bd23fe42dfedde2e9586be12b85fe6083556f5bdb29ddee979308ddfca81aeeb8095a6084556f5ab4fd8a260d2c7e2c0d2afcf0009dad6085556f5998b31359a55d48724c65cf090012216086556f5885bcad2b322dfc43e8860f9c018cf56087556f577b97aa1fe222bb452fdf111b1f0be26088556f5679cb5e3575632e5baa27e2b949f7046089556f557fe8241b3a31c83c732f1cdff4a1c5608a556f548d868026504875d6e59bbe95fc2a6b608b556f53a2465ce347cf34d05a867c17dd3088608c556f52bdce5dcd4faed59c7f5511cf8f8acc608d556f51dfcb453c07f8da817606e7885f7c3e608e556f5107ef6b0a5a2be8f8ff15590daa3cce608f556f5035f241d6eae0cd7bacba119993de7b6090556f4f698fe90d5b53d532171e1210164c666091556f4ea288ca297a0e6a09a0eee240e16c856092556f4de0a13fdcf5d4213fc398ba6e3becde6093556f4d23a145eef91fec06b06140804c48086094556f4c6b5430d4c1ee5526473db4ae0f11de6095556f4bb7886c240562eba11f4963a53b42406096556f4b080f3f1cb491d2d521e0ea4583521e6097556f4a5cbc96a05589cb4d86be1db31683646098556f49b566d40243517658d78c33162d6ece6099556f4911e6a02e5507a30f947383fd9a3276609a556f487216c2b31be4adc41db8a8d5cc0c88609b556f47d5d3fc4a7a1b188cd3d788b5c5e9fc609c556f473cfce4871a2c40bc4f9e1c32b955d0609d556f46a771ca578ab878485810e285e31c67609e556f4615149718aed4c258c373dc676aa72d609f556f4585c8b3f8fe489c6e1833ca4787138460a0556f44f972f174e41e5efb7e9d63c29ce73560a1556f446ff970ba86d8b00beb05ecebf3c4dc60a2556f43e9438ec88971812d6f198b5ccaad9660a3556f436539d11ff7bea657aeddb394e809ef60a4556f42e3c5d3e5a913401d86f66db5d81c2c60a5556f4264d2395303070ea726cbe98df6217460a6556f41e84a9a593bb7194c3a6349ecae4eea60a7556f416e1b785d13eba07a08f3f18876a5ab60a8556f40f6322ff389d423ba9dd7e7e7b7e80960a9556f40807cec8a466880ecf4184545d240a460aa556f400cea9ce88a8d3ae668e8ea0d9bf07f60ab556f3f9b6ae8772d4c55091e0ed7dfea0ac160ac556f3f2bee253fd84594f54bcaafac383a1360ad556f3ebe654e95208bb9210c575c081c595860ae556f3e52c1fc5665635b78ce1f05ad53c08660af556f3de8f65ac388101ddf718a6f5c1eff6560b0556f3d80f522d59bd0b328ca012df4cd2d4960b1556f3d1ab193129ea72b23648a161163a85a60b2556f3cb61f68d32576c135b95cfb53f76d7560b3556f3c5332d9f1aae851a3619e77e4cc847360b4556f3bf1e08edbe2aa109e1525f65759ef7360b5556f3b921d9cff13fa2c197746a3dfc4918f60b6556f3b33df818910bfc1a5aefb8f63ae2ac460b7556f3ad71c1c77e34fa32a9f184967eccbf660b8556f3a7bc9abf2c5bb53e2f7384a8a16521a60b9556f3a21dec7e76369783a68a0c6385a1c5760ba556f39c9525de6c9cdf7c1c157ca4a7a6ee360bb556f39721bad3dc85d1240ff0190e0adaac360bc556f391c324344d3248f0469eb28dd3d77e060bd556f38c78df7e3c796279fb4ff84394ab3da60be556f387426ea4638ae9aae08049d3554c20a60bf556f3821f57dbd2763256c1a99bbd205137860c0556f37d0f256cb46a8c92ff62fbbef28969860c1556f37811658591ffc7abdd1feaf3cef9b7360c2556f37325aa10e9e82f7df0f380f7997154b60c3556f36e4b888cfb408d873b9a80d439311c660c4556f3698299e59f4bb9de645fc9b08c64cca60c5556f364ca7a5012cb603023b57dd3ebfd50d60c6556f36022c928915b778ab1b06aaee7e61d460c7556f35b8b28d1a73dc27500ffe35559cc02860c8556f357033e951fe250ec5eb4e60955132d760c9556f3528ab2867934e3a21b5412e4c4f888160ca556f34e212f66c55057f9676c80094a61d5960cb556f349c66289e5b3c4b540c24f42fa4b9bb60cc556f34579fbbd0c733a9c8d6af6b0f7d00f760cd556f3413bad2e712288b924b5882b5b369bf60ce556f33d0b2b56286510ef730e213f71f12e960cf556f338e82ce00e2496262c64457535ba1a160d0556f334d26a96b373bb7c2f8ea1827f27a9260d1556f330c99f4f4211469e00b3e18c31475ea60d2556f32ccd87d6486094999c7d5e6f33237d860d3556f328dde2dd617b6665a2e8556f250c1af60d4556f324fa70e9adc270f8262755af5a99af960d5556f32122f443110611ca51040f41fa6e1e360d6556f31d5730e42c0831482f0f1485c4263d860d7556f31996ec6b07b4a83421b5ebc4ab4e1f160d8556f315e1ee0a68ff46bb43ec2b85032e87660d9556f31237fe7bc4deacf6775b9efa1a145f860da556f30e98e7f1cc5a356e44627a6972ea2ff60db556f30b04760b8917ec74205a3002650ec0560dc556f3077a75c803468e9132ce0cf3224241d60dd556f303fab57a6a275c36f19cda9bace667a60de556f3008504beb8dcbd2cf3bc1f6d5a064f060df556f2fd19346ed17dac61219ce0c2c5ac4b060e0556f2f9b7169808c324b5852fd3d54ba971460e1556f2f65e7e711cf4b064eea9c08cbdad57460e2556f2f30f405093042ddff8a251b6bf6d10360e3556f2efc931a3750f2e8bfe323edfe03757460e4556f2ec8c28e46dbe56d98685278339400cb60e5556f2e957fd933c3926d8a599b602379b85160e6556f2e62c882c7c9ed4473412702f08ba0e560e7556f2e309a221c12ba361e3ed695167feee260e8556f2dfef25d1f865ae18dd07cfea4bcea1060e9556f2dcdcee821cdc80decc02c44344aeb3160ea556f2d9d2d8562b34944d0b201bb87260c8360eb556f2d6d0c04a5b62a2c42636308669b729a60ec556f2d3d6842c9a235517fc5a0332691528f60ed556f2d0e402963fe1ea2834abc408c437c1060ee556f2cdf91ae602647908aff975e4d6a2a8c60ef556f2cb15ad3a1eb65f6d74a75da09a1b6c560f0556f2c8399a6ab8e9774d6fcff373d21072760f1556f2c564c4046f64edba6883ca06bbc453560f2556f2c2970c431f952641e05cb493e23eed360f3556f2bfd0560cd9eb14563bc7c0732856c1860f4556f2bd1084ed0332f7ff4150f9d0ef41a2c60f5556f2ba577d0fa1628b76d040b12a82492fb60f6556f2b7a5233cd21581e855e89dc2f1e8a9260f7556f2b4f95cd46904d05d72bdcde337d9cc760f8556f2b2540fc9b4d9abba3faca669191467560f9556f2afb5229f68d0830d8be8adb0a0db70f60fa556f2ad1c7c63a9b294c5bc73a3ba3ab7a2b60fb556f2aa8a04ac3cbe1ee1c9c86361465dbb860fc556f2a7fda392d725a44a2c8aeb9ab35430d60fd556f2a57741b18cde618717792b4faa216db60fe556f2a2f6c81f5d84dd950a35626d6d5503a60ff55565b565b600080851161194e5760405162461bcd60e51b81526004016102519061474a565b6000841161196e5760405162461bcd60e51b815260040161025190614776565b60018363ffffffff1611801561199d575061198d620f424060026147c1565b63ffffffff168363ffffffff1611155b6119b95760405162461bcd60e51b8152600401610251906147ed565b816000036119c95750600061021a565b620f423f1963ffffffff841601611a06578460016119e78487611b14565b6119f1919061484a565b6119fb9190614836565b6102fb9060016148bd565b60008080611a148886611b29565b9050611a258189620f424089611b35565b9093509150600060ff83166001611a3c8a87611b14565b611a46919061484a565b611a52911c60016148bd565b9050610344888261484a565b6000808511611a7f5760405162461bcd60e51b81526004016102519061474a565b60008411611a9f5760405162461bcd60e51b815260040161025190614776565b60008363ffffffff16118015611abe5750620f424063ffffffff841611155b611ada5760405162461bcd60e51b81526004016102519061485d565b81600003611aea5750600061021a565b620f423f1963ffffffff841601611b0657836102f18684611b14565b600080806103108588611b29565b6000611b2082846148d0565b90505b92915050565b6000611b2082846148bd565b600080600160811b8610611b4857600080fd5b60008086611b5a6001607f1b8a6148d0565b611b649190614836565b905070015bf0a8b1457695355fb8ac404e7a79e3811015611b8f57611b8881611d27565b9150611b9b565b611b98816122a0565b91505b60008563ffffffff168763ffffffff1684611bb691906148d0565b611bc09190614836565b9050600160831b811015611be557611bd781612395565b607f94509450505050611c19565b6000611bf0826129c0565b9050611c0c611c0082607f6148ef565b60ff1683901c82612a73565b95509350611c1992505050565b94509492505050565b600080611c2f85856130cc565b9095509350600086611c45896001607f1b611b14565b611c4f9190614836565b9050600070015bf0a8b1457695355fb8ac404e7a79e38210611c7957611c74826122a0565b611c82565b611c8282611d27565b9050600086611c91838a611b14565b611c9b9190614836565b9050600086611cb257611cad82613187565b611cbb565b611cbb826131c2565b9050611cdd611cca828b611b14565b611cd88a6001607f1b611b14565b611cef565b95509550505050509550959350505050565b600080828411611d0c57611d03848461322b565b91509150611d20565b600080611d19858761322b565b9450925050505b9250929050565b6000808080806fd3094c70f034de4b96ff7d5b6f99fcd88610611d8057611d526001607e1b856148bd565b93506fd3094c70f034de4b96ff7d5b6f99fcd8611d736001607f1b886148d0565b611d7d9190614836565b95505b6fa45af1e1f40c333b3de1db4dd55f29a78610611dd357611da56001607d1b856148bd565b93506fa45af1e1f40c333b3de1db4dd55f29a7611dc66001607f1b886148d0565b611dd09190614836565b95505b6f910b022db7ae67ce76b441c27035c6a18610611e2657611df86001607c1b856148bd565b93506f910b022db7ae67ce76b441c27035c6a1611e196001607f1b886148d0565b611e239190614836565b95505b6f88415abbe9a76bead8d00cf112e4d4a88610611e7957611e4b6001607b1b856148bd565b93506f88415abbe9a76bead8d00cf112e4d4a8611e6c6001607f1b886148d0565b611e769190614836565b95505b6f84102b00893f64c705e841d5d4064bd38610611ecc57611e9e6001607a1b856148bd565b93506f84102b00893f64c705e841d5d4064bd3611ebf6001607f1b886148d0565b611ec99190614836565b95505b6f8204055aaef1c8bd5c3259f4822735a28610611f1f57611ef1600160791b856148bd565b93506f8204055aaef1c8bd5c3259f4822735a2611f126001607f1b886148d0565b611f1c9190614836565b95505b6f810100ab00222d861931c15e39b44e998610611f7257611f44600160781b856148bd565b93506f810100ab00222d861931c15e39b44e99611f656001607f1b886148d0565b611f6f9190614836565b95505b6f808040155aabbbe9451521693554f7338610611fc557611f97600160771b856148bd565b93506f808040155aabbbe9451521693554f733611fb86001607f1b886148d0565b611fc29190614836565b95505b611fd36001607f1b8761484a565b92508291506001607f1b611fe783806148d0565b611ff19190614836565b9050600160801b612002848261484a565b61200c90846148d0565b6120169190614836565b61202090856148bd565b93506001607f1b61203182846148d0565b61203b9190614836565b9150600160811b61205c846faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa61484a565b61206690846148d0565b6120709190614836565b61207a90856148bd565b93506001607f1b61208b82846148d0565b6120959190614836565b9150600360801b6120b6846f9999999999999999999999999999999961484a565b6120c090846148d0565b6120ca9190614836565b6120d490856148bd565b93506001607f1b6120e582846148d0565b6120ef9190614836565b9150600160821b612110846f9249249249249249249249249249249261484a565b61211a90846148d0565b6121249190614836565b61212e90856148bd565b93506001607f1b61213f82846148d0565b6121499190614836565b9150600560801b61216a846f8e38e38e38e38e38e38e38e38e38e38e61484a565b61217490846148d0565b61217e9190614836565b61218890856148bd565b93506001607f1b61219982846148d0565b6121a39190614836565b9150600360811b6121c4846f8ba2e8ba2e8ba2e8ba2e8ba2e8ba2e8b61484a565b6121ce90846148d0565b6121d89190614836565b6121e290856148bd565b93506001607f1b6121f382846148d0565b6121fd9190614836565b9150600760801b61221e846f89d89d89d89d89d89d89d89d89d89d8961484a565b61222890846148d0565b6122329190614836565b61223c90856148bd565b93506001607f1b61224d82846148d0565b6122579190614836565b9150600160831b612278846f8888888888888888888888888888888861484a565b61228290846148d0565b61228c9190614836565b61229690856148bd565b9695505050505050565b600080600160801b83106122e45760006122c66122c16001607f1b86614836565b6132ef565b60ff811694851c949091506122e0906001607f1b906148d0565b9150505b6001607f1b83111561235957607f5b60ff811615612357576001607f1b61230b85806148d0565b6123159190614836565b9350600160801b841061234757600193841c9361233290826148ef565b60ff166001901b8261234491906148bd565b91505b6123508161491e565b90506122f3565b505b6f05b9de1d10bf4103d647b0955897ba806123846f03f80fe03f80fe03f80fe03f80fe03f8836148d0565b61238e9190614836565b9392505050565b60008080806123a86001607c1b8661493b565b91508190506001607f1b6123bc82806148d0565b6123c69190614836565b90506123da816710e1b3be415a00006148d0565b6123e490846148bd565b92506001607f1b6123f583836148d0565b6123ff9190614836565b9050612413816705a0913f6b1e00006148d0565b61241d90846148bd565b92506001607f1b61242e83836148d0565b6124389190614836565b905061244c81670168244fdac780006148d0565b61245690846148bd565b92506001607f1b61246783836148d0565b6124719190614836565b905061248481664807432bc180006148d0565b61248e90846148bd565b92506001607f1b61249f83836148d0565b6124a99190614836565b90506124bc81660c0135dca040006148d0565b6124c690846148bd565b92506001607f1b6124d783836148d0565b6124e19190614836565b90506124f4816601b707b1cdc0006148d0565b6124fe90846148bd565b92506001607f1b61250f83836148d0565b6125199190614836565b905061252b816536e0f639b8006148d0565b61253590846148bd565b92506001607f1b61254683836148d0565b6125509190614836565b905061256281650618fee9f8006148d0565b61256c90846148bd565b92506001607f1b61257d83836148d0565b6125879190614836565b905061259881649c197dcc006148d0565b6125a290846148bd565b92506001607f1b6125b383836148d0565b6125bd9190614836565b90506125ce81640e30dce4006148d0565b6125d890846148bd565b92506001607f1b6125e983836148d0565b6125f39190614836565b90506126048164012ebd13006148d0565b61260e90846148bd565b92506001607f1b61261f83836148d0565b6126299190614836565b9050612639816317499f006148d0565b61264390846148bd565b92506001607f1b61265483836148d0565b61265e9190614836565b905061266e816301a9d4806148d0565b61267890846148bd565b92506001607f1b61268983836148d0565b6126939190614836565b90506126a281621c63806148d0565b6126ac90846148bd565b92506001607f1b6126bd83836148d0565b6126c79190614836565b90506126d6816201c6386148d0565b6126e090846148bd565b92506001607f1b6126f183836148d0565b6126fb9190614836565b905061270981611ab86148d0565b61271390846148bd565b92506001607f1b61272483836148d0565b61272e9190614836565b905061273c8161017c6148d0565b61274690846148bd565b92506001607f1b61275783836148d0565b6127619190614836565b905061276e8160146148d0565b61277890846148bd565b92506001607f1b61278983836148d0565b6127939190614836565b90506127a08160016148d0565b6127aa90846148bd565b92506001607f1b826127c46721c3677c82b4000086614836565b6127ce91906148bd565b6127d891906148bd565b92506001607c1b8516156128205770018ebef9eac820ae8682b9793ac6d1e776612813847001c3d6a24ed82218787d624d3e5eba95f96148d0565b61281d9190614836565b92505b6001607d1b851615612866577001368b2fc6f9609fe7aceb46aa619baed46128598470018ebef9eac820ae8682b9793ac6d1e7786148d0565b6128639190614836565b92505b6001607e1b8516156128ab576fbc5ab1b16779be3575bd8f0520a9f21f61289e847001368b2fc6f9609fe7aceb46aa619baed56148d0565b6128a89190614836565b92505b6001607f1b8516156128ef576f454aaa8efe072e7f6ddbab84b40a55c96128e2846fbc5ab1b16779be3575bd8f0520a9f21e6148d0565b6128ec9190614836565b92505b600160801b851615612933576f0960aadc109e7a3bf4578099615711ea612926846f454aaa8efe072e7f6ddbab84b40a55c56148d0565b6129309190614836565b92505b600160811b851615612976576e2bf84208204f5977f9a8cf01fdce3d612969846f0960aadc109e7a3bf4578099615711d76148d0565b6129739190614836565b92505b600160821b8516156129b7576d03c6ab775dd0b95b4cbee7e65d116129aa846e2bf84208204f5977f9a8cf01fdc3076148d0565b6129b49190614836565b92505b50909392505050565b60006020607f5b60ff81166129d683600161494f565b60ff161015612a2957600060026129ed838561494f565b6129f79190614968565b90508460008260ff1660808110612a1057612a10614908565b015410612a1f57809250612a23565b8091505b506129c7565b8360008260ff1660808110612a4057612a40614908565b015410612a4e579392505050565b8360008360ff1660808110612a6557612a65614908565b0154106100e6575092915050565b6000828160ff8416612a8583806148d0565b901c9150612aa2826b0d10b13981d2a0bc5e5fdcab601e1b6148d0565b612aac90826148bd565b905060ff8416612abc86846148d0565b901c9150612ad9826b045ae5bdd5f0e03eca1ff439601e1b6148d0565b612ae390826148bd565b905060ff8416612af386846148d0565b901c9150612b10826e45ae5bdd5f0e03eca1ff43900000006148d0565b612b1a90826148bd565b905060ff8416612b2a86846148d0565b901c9150612b46826adefabf91302cd95b9ffda5601c1b6148d0565b612b5090826148bd565b905060ff8416612b6086846148d0565b901c9150612b7c826a4a53953065644873dfff37601b1b6148d0565b612b8690826148bd565b905060ff8416612b9686846148d0565b901c9150612bb2826d54f1cf12bd04e516b6da880000006148d0565b612bbc90826148bd565b905060ff8416612bcc86846148d0565b901c9150612be8826d0a9e39e257a09ca2d6db510000006148d0565b612bf290826148bd565b905060ff8416612c0286846148d0565b901c9150612c1e826d012e066e7b839fa050c3090000006148d0565b612c2890826148bd565b905060ff8416612c3886846148d0565b901c9150612c53826c1e33d7d926c329a1ad1a8000006148d0565b612c5d90826148bd565b905060ff8416612c6d86846148d0565b901c9150612c88826c02bee513bdb4a6b19b5f8000006148d0565b612c9290826148bd565b905060ff8416612ca286846148d0565b901c9150612cbc826b3a9316fa79b88eccf2a000006148d0565b612cc690826148bd565b905060ff8416612cd686846148d0565b901c9150612cf0826b048177ebe1fa8123752000006148d0565b612cfa90826148bd565b905060ff8416612d0a86846148d0565b901c9150612d23826a5263fe90242dcbacf000006148d0565b612d2d90826148bd565b905060ff8416612d3d86846148d0565b901c9150612d56826a057e22099c030d941000006148d0565b612d6090826148bd565b905060ff8416612d7086846148d0565b901c9150612d88826957e22099c030d94100006148d0565b612d9290826148bd565b905060ff8416612da286846148d0565b901c9150612dba8269052b6b545699763100006148d0565b612dc490826148bd565b905060ff8416612dd486846148d0565b901c9150612deb82684985f67696bf7480006148d0565b612df590826148bd565b905060ff8416612e0586846148d0565b901c9150612e1c826803dea12ea99e4980006148d0565b612e2690826148bd565b905060ff8416612e3686846148d0565b901c9150612e4c826731880f2214b6e0006148d0565b612e5690826148bd565b905060ff8416612e6686846148d0565b901c9150612e7c8267025bcff56eb360006148d0565b612e8690826148bd565b905060ff8416612e9686846148d0565b901c9150612eab82661b722e10ab10006148d0565b612eb590826148bd565b905060ff8416612ec586846148d0565b901c9150612eda826601317c700770006148d0565b612ee490826148bd565b905060ff8416612ef486846148d0565b901c9150612f0882650cba84aafa006148d0565b612f1290826148bd565b905060ff8416612f2286846148d0565b901c9150612f35826482573a0a006148d0565b612f3f90826148bd565b905060ff8416612f4f86846148d0565b901c9150612f62826405035ad9006148d0565b612f6c90826148bd565b905060ff8416612f7c86846148d0565b901c9150612f8e82632f881b006148d0565b612f9890826148bd565b905060ff8416612fa886846148d0565b901c9150612fba826301b293406148d0565b612fc490826148bd565b905060ff8416612fd486846148d0565b901c9150612fe582620efc406148d0565b612fef90826148bd565b905060ff8416612fff86846148d0565b901c915061300f82617fe06148d0565b61301990826148bd565b905060ff841661302986846148d0565b901c9150613039826104206148d0565b61304390826148bd565b905060ff841661305386846148d0565b901c91506130628260216148d0565b61306c90826148bd565b905060ff841661307c86846148d0565b901c915061308b8260016148d0565b61309590826148bd565b9050600160ff85161b856130b86b0d10b13981d2a0bc5e5fdcab601f1b84614836565b6130c291906148bd565b61037f91906148bd565b600080600160801b84111580156130e75750600160801b8311155b156130f6575082905081611d20565b600160801b8410156131295782613111600160801b866148d0565b61311b9190614836565b600160801b91509150611d20565b600160801b83101561314f57600160801b8461314582866148d0565b611d039190614836565b600083851161315e5783613160565b845b905060006131756122c16001607f1b84614836565b60ff1695861c969490951c9450505050565b60006f2f16ac6c59de6f8d5d6f63c1482a7c8682116131a957611b238261335b565b816131b86001607f1b806148d0565b611b239190614836565b60006f2f16ac6c59de6f8d5d6f63c1482a7c8682116131e457611b2382613bd7565b7001af16ac6c59de6f8d5d6f63c1482a7c80821161320557611b2382614462565b706b22d43e72c326539cceeef8bb48f255ff82116100e657611b2382614587565b919050565b6000807d10c6f7a0b5ed8d36b4c7f34938583621fafc8b0079a2834d26fa3fcc9ea98411156132b057600061327f7d10c6f7a0b5ed8d36b4c7f34938583621fafc8b0079a2834d26fa3fcc9ea960016148bd565b6132899086614836565b6132949060016148bd565b90506132a08186614836565b94506132ac8185614836565b9350505b60006132d16132c2620f4240876148d0565b6132cc8787611b29565b614631565b905060006132e282620f424061484a565b9196919550909350505050565b600080610100831015613322575b600183111561331d57600192831c92613316908261494f565b90506132fd565b611b23565b60805b60ff81161561335457600160ff82161b84106133495760ff81169390931c92908117905b60011c607f16613325565b5092915050565b600081816001607f1b61336e83806148d0565b6133789190614836565b9150613394826c029a534e74dcf60586cd18f611601f1b6148d0565b61339e90826148bd565b90506001607f1b6133af85846148d0565b6133b99190614836565b91506133d4826b4a09419b34fee42b6c1f37c960231b6148d0565b6133de90826148bd565b90506001607f1b6133ef85846148d0565b6133f99190614836565b9150613415826c24268508c8e0756933cb3e3d25601d1b6148d0565b61341f90826148bd565b90506001607f1b61343085846148d0565b61343a9190614836565b9150613456826c04af62c06bf4213d25d793548560211b6148d0565b61346090826148bd565b90506001607f1b61347185846148d0565b61347b9190614836565b915061349882701440b0be1615a47dba6e5b3b1f100000006148d0565b6134a290826148bd565b90506001607f1b6134b385846148d0565b6134bd9190614836565b91506134d7826ab481d807d1aa66d0449061602e1b6148d0565b6134e190826148bd565b90506001607f1b6134f285846148d0565b6134fc9190614836565b9150613519827066ebaac4c37c622dd8288a7eb1b20000006148d0565b61352390826148bd565b90506001607f1b61353485846148d0565b61353e9190614836565b915061355a826c778b92009afbedea1d0dd0867960211b6148d0565b61356490826148bd565b90506001607f1b61357585846148d0565b61357f9190614836565b915061359d82710233c33c676a5eb2416094a87b36570000006148d0565b6135a790826148bd565b90506001607f1b6135b885846148d0565b6135c29190614836565b91506135dd826b541cde48bc0254bed49a9f87602c1b6148d0565b6135e790826148bd565b90506001607f1b6135f885846148d0565b6136029190614836565b915061362082710cae1fad2cdd4d4cb8d73abca0d19a4000006148d0565b61362a90826148bd565b90506001607f1b61363b85846148d0565b6136459190614836565b9150613662826d07b6caa8bdd834571073bb6ea55960221b6148d0565b61366c90826148bd565b90506001607f1b61367d85846148d0565b6136879190614836565b91506136a582714ba8d20d2dabd386c9529659841a2e2000006148d0565b6136af90826148bd565b90506001607f1b6136c085846148d0565b6136ca9190614836565b91506136e2826805d6042a35c33e6d51604d1b6148d0565b6136ec90826148bd565b90506001607f1b6136fd85846148d0565b6137079190614836565b9150613726827201cfa8e70c03625b9db76c8ebf5bbf248200006148d0565b61373090826148bd565b90506001607f1b61374185846148d0565b61374b9190614836565b9150613769826e02428eccfc10306f932f9984d937c160211b6148d0565b61377390826148bd565b90506001607f1b61378485846148d0565b61378e9190614836565b91506137ad82720b550d19b129d270c44f6f55f027723cbb00006148d0565b6137b790826148bd565b90506001607f1b6137c885846148d0565b6137d29190614836565b91506137ee826c01c877dadc761dc272deb65d4b60341b6148d0565b6137f890826148bd565b90506001607f1b61380985846148d0565b6138139190614836565b9150613832827248178ece97479f33a77f2ad22a81b64406c0006148d0565b61383c90826148bd565b90506001607f1b61384d85846148d0565b6138579190614836565b9150613875826e2db2a09a2e76043fb7d9a57bcbe29b60221b6148d0565b61387f90826148bd565b90506001607f1b61389085846148d0565b61389a9190614836565b91506138ba827301d0e76631a5b05d007b8cb72a7c7f11ec36e0006148d0565b6138c490826148bd565b90506001607f1b6138d585846148d0565b6138df9190614836565b91506138f88269094386f7b3f0bfb38d8f604f1b6148d0565b61390290826148bd565b90506001607f1b61391385846148d0565b61391d9190614836565b915061393d82730bd8369f1b702bf491e2ebfcee08250313b654006148d0565b61394790826148bd565b90506001607f1b61395885846148d0565b6139629190614836565b9150613981826f07971f0caa7db1c2acb2d6764895d93560221b6148d0565b61398b90826148bd565b90506001607f1b61399c85846148d0565b6139a69190614836565b91506139c682734dff5820e165e910f95120a708e742496221e6006148d0565b6139d090826148bd565b90506001607f1b6139e185846148d0565b6139eb9190614836565b9150613a07826c064647b36d8fe769bc7728729b603d1b6148d0565b613a1190826148bd565b90506001607f1b613a2285846148d0565b613a2c9190614836565b9150613a4d82740205db8dffff45bfa2938f128f599dbf16eb11d8806148d0565b613a5790826148bd565b90506001607f1b613a6885846148d0565b613a729190614836565b9150613a91826fa74089d7b3086a2927c2f0d5e71a734160231b6148d0565b613a9b90826148bd565b90506001607f1b613aac85846148d0565b613ab69190614836565b9150613ad782740d86dae2a4cc0f47633a544479735869b487b59c406148d0565b613ae190826148bd565b90506001607f1b613af285846148d0565b613afc9190614836565b9150613b0d82610231609c1b6148d0565b613b1790826148bd565b90506001607f1b613b2885846148d0565b613b329190614836565b9150613b5382745b0485a76f6646c2039db1507cdd51b086496808226148d0565b613b5d90826148bd565b90506001607f1b613b6e85846148d0565b613b789190614836565b9150613b988270764c1e23624aa2de0bf7d35ad802af121160211b6148d0565b613ba290826148bd565b90506001607f1b84613bc36bde1bc4d19efcac82445da75b60201b84614836565b613bcd91906148bd565b61021a91906148bd565b60008181613be9826001607f1b61484a565b613c02906bde1bc4d19efcac82445da75b60201b6148d0565b90506001607f1b613c1385846148d0565b613c1d9190614836565b9150613c39826c029a534e74dcf60586cd18f611601f1b6148d0565b613c4390826148bd565b90506001607f1b613c5485846148d0565b613c5e9190614836565b9150613c79826b4a09419b34fee42b6c1f37c960231b6148d0565b613c83908261484a565b90506001607f1b613c9485846148d0565b613c9e9190614836565b9150613cba826c24268508c8e0756933cb3e3d25601d1b6148d0565b613cc490826148bd565b90506001607f1b613cd585846148d0565b613cdf9190614836565b9150613cfb826c04af62c06bf4213d25d793548560211b6148d0565b613d05908261484a565b90506001607f1b613d1685846148d0565b613d209190614836565b9150613d3d82701440b0be1615a47dba6e5b3b1f100000006148d0565b613d4790826148bd565b90506001607f1b613d5885846148d0565b613d629190614836565b9150613d7c826ab481d807d1aa66d0449061602e1b6148d0565b613d86908261484a565b90506001607f1b613d9785846148d0565b613da19190614836565b9150613dbe827066ebaac4c37c622dd8288a7eb1b20000006148d0565b613dc890826148bd565b90506001607f1b613dd985846148d0565b613de39190614836565b9150613dff826c778b92009afbedea1d0dd0867960211b6148d0565b613e09908261484a565b90506001607f1b613e1a85846148d0565b613e249190614836565b9150613e4282710233c33c676a5eb2416094a87b36570000006148d0565b613e4c90826148bd565b90506001607f1b613e5d85846148d0565b613e679190614836565b9150613e82826b541cde48bc0254bed49a9f87602c1b6148d0565b613e8c908261484a565b90506001607f1b613e9d85846148d0565b613ea79190614836565b9150613ec582710cae1fad2cdd4d4cb8d73abca0d19a4000006148d0565b613ecf90826148bd565b90506001607f1b613ee085846148d0565b613eea9190614836565b9150613f07826d07b6caa8bdd834571073bb6ea55960221b6148d0565b613f11908261484a565b90506001607f1b613f2285846148d0565b613f2c9190614836565b9150613f4a82714ba8d20d2dabd386c9529659841a2e2000006148d0565b613f5490826148bd565b90506001607f1b613f6585846148d0565b613f6f9190614836565b9150613f87826805d6042a35c33e6d51604d1b6148d0565b613f91908261484a565b90506001607f1b613fa285846148d0565b613fac9190614836565b9150613fcb827201cfa8e70c03625b9db76c8ebf5bbf248200006148d0565b613fd590826148bd565b90506001607f1b613fe685846148d0565b613ff09190614836565b915061400e826e02428eccfc10306f932f9984d937c160211b6148d0565b614018908261484a565b90506001607f1b61402985846148d0565b6140339190614836565b915061405282720b550d19b129d270c44f6f55f027723cbb00006148d0565b61405c90826148bd565b90506001607f1b61406d85846148d0565b6140779190614836565b9150614093826c01c877dadc761dc272deb65d4b60341b6148d0565b61409d908261484a565b90506001607f1b6140ae85846148d0565b6140b89190614836565b91506140d7827248178ece97479f33a77f2ad22a81b64406c0006148d0565b6140e190826148bd565b90506001607f1b6140f285846148d0565b6140fc9190614836565b915061411a826e2db2a09a2e76043fb7d9a57bcbe29b60221b6148d0565b614124908261484a565b90506001607f1b61413585846148d0565b61413f9190614836565b915061415f827301d0e76631a5b05d007b8cb72a7c7f11ec36e0006148d0565b61416990826148bd565b90506001607f1b61417a85846148d0565b6141849190614836565b915061419d8269094386f7b3f0bfb38d8f604f1b6148d0565b6141a7908261484a565b90506001607f1b6141b885846148d0565b6141c29190614836565b91506141e282730bd8369f1b702bf491e2ebfcee08250313b654006148d0565b6141ec90826148bd565b90506001607f1b6141fd85846148d0565b6142079190614836565b9150614226826f07971f0caa7db1c2acb2d6764895d93560221b6148d0565b614230908261484a565b90506001607f1b61424185846148d0565b61424b9190614836565b915061426b82734dff5820e165e910f95120a708e742496221e6006148d0565b61427590826148bd565b90506001607f1b61428685846148d0565b6142909190614836565b91506142ac826c064647b36d8fe769bc7728729b603d1b6148d0565b6142b6908261484a565b90506001607f1b6142c785846148d0565b6142d19190614836565b91506142f282740205db8dffff45bfa2938f128f599dbf16eb11d8806148d0565b6142fc90826148bd565b90506001607f1b61430d85846148d0565b6143179190614836565b9150614336826fa74089d7b3086a2927c2f0d5e71a734160231b6148d0565b614340908261484a565b90506001607f1b61435185846148d0565b61435b9190614836565b915061437c82740d86dae2a4cc0f47633a544479735869b487b59c406148d0565b61438690826148bd565b90506001607f1b61439785846148d0565b6143a19190614836565b91506143b282610231609c1b6148d0565b6143bc908261484a565b90506001607f1b6143cd85846148d0565b6143d79190614836565b91506143f882745b0485a76f6646c2039db1507cdd51b086496808226148d0565b61440290826148bd565b90506001607f1b61441385846148d0565b61441d9190614836565b915061443d8270764c1e23624aa2de0bf7d35ad802af121160211b6148d0565b614447908261484a565b905061021a6bde1bc4d19efcac82445da75b60201b82614836565b60008060016144816f2f16ac6c59de6f8d5d6f63c1482a7c868561484a565b61448b919061484a565b905060006144a96f03060c183060c183060c183060c1830683614836565b905060006144c7826f03060c183060c183060c183060c183066148d0565b905060006144d68360016148bd565b6144f0906f03060c183060c183060c183060c183066148d0565b905060006080846080811061450757614507614908565b015490506000608061451a8660016148bd565b6080811061452a5761452a614908565b015490506f03060c183060c183060c183060c18306614549858861484a565b61455390836148d0565b61455d888661484a565b61456790856148d0565b61457191906148bd565b61457b9190614836565b98975050505050505050565b60008070015bf0a8b1457695355fb8ac404e7a79e383106145b0576145ab836122a0565b6145b9565b6145b983611d27565b9050600070015bf0a8b1457695355fb8ac404e7a79e382106145e3576145de826122a0565b6145ec565b6145ec82611d27565b9050836001607f1b836145ff82856148d0565b6146099190614836565b614613848661484a565b61461d91906148bd565b61462791906148d0565b61021a9190614836565b600061463e600283614836565b614648908361484a565b614652838561493b565b61465c9190614836565b6146668385614836565b611b2091906148bd565b803563ffffffff8116811461322657600080fd5b6000806000806080858703121561469a57600080fd5b84359350602085013592506146b160408601614670565b9396929550929360600135925050565b600080600080600060a086880312156146d957600080fd5b853594506146e960208701614670565b9350604086013592506146fe60608701614670565b949793965091946080013592915050565b600080600080600060a0868803121561472757600080fd5b505083359560208501359550604085013594606081013594506080013592509050565b6020808252601290820152714552525f494e56414c49445f535550504c5960701b604082015260600190565b6020808252601b908201527a4552525f494e56414c49445f524553455256455f42414c414e434560281b604082015260600190565b634e487b7160e01b600052601160045260246000fd5b600063ffffffff808316818516818304811182151516156147e4576147e46147ab565b02949350505050565b6020808252601990820152784552525f494e56414c49445f524553455256455f524154494f60381b604082015260600190565b634e487b7160e01b600052601260045260246000fd5b60008261484557614845614820565b500490565b81810381811115611b2357611b236147ab565b6020808252601a908201527911549497d253959053125117d49154d154959157d5d15251d21560321b604082015260600190565b60208082526012908201527111549497d253959053125117d05353d5539560721b604082015260600190565b80820180821115611b2357611b236147ab565b60008160001904831182151516156148ea576148ea6147ab565b500290565b60ff8281168282160390811115611b2357611b236147ab565b634e487b7160e01b600052603260045260246000fd5b600060ff821680614931576149316147ab565b6000190192915050565b60008261494a5761494a614820565b500690565b60ff8181168382160190811115611b2357611b236147ab565b600060ff83168061497b5761497b614820565b8060ff8416049150509291505056fea26469706673582212207152b4f35d6f4a4a8a7df6a21eb9dea3c858829ecf5766c5b3687d31edcd736564736f6c63430008100033";
629
629
 
630
630
  type BancorFormulaConstructorParams =
631
631
  | [signer?: Signer]
@@ -202,7 +202,7 @@ const _abi = [
202
202
  ];
203
203
 
204
204
  const _bytecode =
205
- "0x608060405234801561001057600080fd5b50610f99806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c806328e964e91461005c578063574c5c93146100b8578063a82415ae146100d9578063a87430ba146100ec578063c59d4847146101a9575b600080fd5b61009e61006a366004610cec565b6001600160a01b031660009081526004602052604081205490546001600160801b0391821692600160801b90910490911690565b604080519283526020830191909152015b60405180910390f35b6100cb6100c6366004610d0e565b610222565b6040519081526020016100af565b6100cb6100e7366004610d0e565b610335565b6101556100fa366004610cec565b6004602052600090815260409020805460018201546002909201546001600160801b0380831693600160801b9384900482169381831693918190048316928216916001600160401b03918104821691600160c01b9091041687565b604080516001600160801b039889168152968816602088015294871694860194909452918516606085015290931660808301526001600160401b0392831660a08301529190911660c082015260e0016100af565b600354600054600154600254604080519485526001600160801b038085166020870152600160801b948590048116918601919091528083166060860152918390048216608085015290811660a08401529081046001600160401b031660c0830152600160c01b900460ff1660e0820152610100016100af565b600061022f8484846105c2565b6001600160a01b03851660009081526004602052604090205461025e9086906001600160801b03166001610743565b6001600160a01b03851660009081526004602052604081206001810180546001600160801b0380821690925560029092018054600160801b9093048216938493919290916102ae91859116610d5d565b92506101000a8154816001600160801b0302191690836001600160801b031602179055508060008054906101000a90046001600160801b03166102f19190610d5d565b600080546001600160801b0319166001600160801b0392909216919091179055610322662386f26fc1000082610d9e565b6001600160801b03169695505050505050565b6001600160a01b0384166000908152600460209081526040808320815160e08101835281546001600160801b038082168352600160801b9182900481169583019590955260018084015480871695840195909552938190048516606083015260029092015480851660808301526001600160401b03928104831660a0830152600160c01b900490911660c082015260035491549092849116158015906103db5750854310155b80156103e75750438510155b1561059d57600254600090610405906001600160801b031643610dc4565b9050600061041a89662386f26fc10000610ddb565b6104249083610ddb565b9050600080600061043488610bda565b600254929550909350915061045490600160c01b900460ff16600a610ee0565b60015461046a91906001600160801b0316610ddb565b61047f85676765c793fa10079d601b1b610ddb565b6104899190610eef565b6104939088610f03565b96508783156105965780604001516001600160801b0316676765c793fa10079d601b1b89600260189054906101000a900460ff16600a6104d39190610ee0565b84602001516001600160801b03166104eb9190610ddb565b6104f59190610ddb565b6104ff9190610eef565b6105099190610dc4565b9650600061051f85670de0b6b3a7640000610ddb565b61053489676765c793fa10079d601b1b610ddb565b61053e9190610eef565b905064174876e80081610552856064610ddb565b600a61055f886064610ddb565b61056a906005610ddb565b6105749190610eef565b61057e9190610f03565b6105889190610ddb565b6105929190610eef565b9750505b5050505050505b8083606001516001600160801b03166105b69190610f03565b98975050505050505050565b6001546001600160801b03166105f2575050600280546001600160801b031916436001600160801b031617905550565b81431015801561060c57506002546001600160801b031682115b1561062d57600280546001600160801b0319166001600160801b0384161790555b6002546000906001600160801b03168311801561064a5750824310155b61065f576002546001600160801b0316610661565b825b905060008243116106725743610674565b825b9050838110806106845750828210155b15610690575050505050565b600061069c8383610dc4565b905060006106b187662386f26fc10000610ddb565b6106bb9083610ddb565b6002549091506106d690600160c01b900460ff16600a610ee0565b6001546106ec91906001600160801b0316610ddb565b61070182676765c793fa10079d601b1b610ddb565b61070b9190610eef565b6003546107189190610f03565b6003555050600280546001600160801b0319166001600160801b039290921691909117905550505050565b6001600160a01b038316600090815260046020526040902080546001600160801b0380821691600160801b9004168015610955576040805160e08101825284546001600160801b038082168352600160801b91829004811660208401526001870154808216948401949094529281900483166060830152600286015492831660808301526001600160401b03908304811660a0830152600160c01b90920490911660c0820152600090819081906107f990610bda565b9250925092508260001461094d5760018601546003546002546000926001600160801b031691676765c793fa10079d601b1b9161084190600160c01b900460ff16600a610ee0565b61084b9089610ddb565b6108559190610ddb565b61085f9190610eef565b6108699190610dc4565b905060008461087c83633b9aca00610ddb565b6108869190610eef565b905064174876e8008161089a856064610ddb565b600a6108a7886064610ddb565b6108b2906005610ddb565b6108bc9190610eef565b6108c69190610f03565b6108d09190610ddb565b6108da9190610eef565b60018901549092506108fd908390600160801b90046001600160801b0316610f03565b600189810180546001600160801b03908116600160801b948216850217909155905461092d928592910416610f03565b600180546001600160801b03928316600160801b02921691909117905550505b505050610978565b6002830180546001600160c01b0316600160c01b436001600160401b0316021790555b818511610a76576002830180546001600160c01b0316600160c01b436001600160401b0316021790558115610a715782546000908390600160801b90046001600160801b03166109c88883610dc4565b6109d29190610ddb565b6109dc9190610eef565b845490915081908590601090610a03908490600160801b90046001600160801b0316610f1b565b92506101000a8154816001600160801b0302191690836001600160801b0316021790555080600160008282829054906101000a90046001600160801b0316610a4b9190610f1b565b92506101000a8154816001600160801b0302191690836001600160801b03160217905550505b610b17565b83610b1757610a858286610dc4565b83548490601090610aa7908490600160801b90046001600160801b0316610d5d565b92506101000a8154816001600160801b0302191690836001600160801b031602179055508185610ad79190610dc4565b60018054600090610af29084906001600160801b0316610d5d565b92506101000a8154816001600160801b0302191690836001600160801b031602179055505b60028381018054600160801b600160c01b031916600160801b436001600160401b03160217905583546001600160801b0319166001600160801b0387161784556003549054676765c793fa10079d601b1b9190610b7f90600160c01b900460ff16600a610ee0565b8554610b9b9190600160801b90046001600160801b0316610ddb565b610ba59190610ddb565b610baf9190610eef565b60019390930180546001600160801b0319166001600160801b03909416939093179092555050505050565b6000806000808460c001518560a00151610bf49190610f43565b6001600160401b0316905060008560c001516001600160401b031643610c1a9190610dc4565b600254600160801b90046001600160401b031610610c4f5760c0860151610c4a906001600160401b031643610dc4565b610c63565b600254600160801b90046001600160401b03165b905060008660a001516001600160401b031643610c809190610dc4565b600254909150600090600160801b90046001600160401b0316841015610caf57610caa8484610dc4565b610cb2565b60005b90506000610cc08284610dc4565b9299919850919650945050505050565b80356001600160a01b0381168114610ce757600080fd5b919050565b600060208284031215610cfe57600080fd5b610d0782610cd0565b9392505050565b60008060008060808587031215610d2457600080fd5b610d2d85610cd0565b966020860135965060408601359560600135945092505050565b634e487b7160e01b600052601160045260246000fd5b60006001600160801b03828116848216808303821115610d7f57610d7f610d47565b01949350505050565b634e487b7160e01b600052601260045260246000fd5b60006001600160801b0383811680610db857610db8610d88565b92169190910492915050565b600082821015610dd657610dd6610d47565b500390565b6000816000190483118215151615610df557610df5610d47565b500290565b600181815b80851115610e35578160001904821115610e1b57610e1b610d47565b80851615610e2857918102915b93841c9390800290610dff565b509250929050565b600082610e4c57506001610eda565b81610e5957506000610eda565b8160018114610e6f5760028114610e7957610e95565b6001915050610eda565b60ff841115610e8a57610e8a610d47565b50506001821b610eda565b5060208310610133831016604e8410600b8410161715610eb8575081810a610eda565b610ec28383610dfa565b8060001904821115610ed657610ed6610d47565b0290505b92915050565b6000610d0760ff841683610e3d565b600082610efe57610efe610d88565b500490565b60008219821115610f1657610f16610d47565b500190565b60006001600160801b0383811690831681811015610f3b57610f3b610d47565b039392505050565b60006001600160401b0383811690831681811015610f3b57610f3b610d4756fea2646970667358221220465805dcbf9a20631e838650664773eee4685df7d71770717459f9222672554e64736f6c63430008080033";
205
+ "0x608060405234801561001057600080fd5b50610f8e806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c806328e964e91461005c578063574c5c93146100b8578063a82415ae146100d9578063a87430ba146100ec578063c59d4847146101a9575b600080fd5b61009e61006a366004610cf2565b6001600160a01b031660009081526004602052604081205490546001600160801b0391821692600160801b90910490911690565b604080519283526020830191909152015b60405180910390f35b6100cb6100c6366004610d14565b610222565b6040519081526020016100af565b6100cb6100e7366004610d14565b610335565b6101556100fa366004610cf2565b6004602052600090815260409020805460018201546002909201546001600160801b0380831693600160801b9384900482169381831693918190048316928216916001600160401b03918104821691600160c01b9091041687565b604080516001600160801b039889168152968816602088015294871694860194909452918516606085015290931660808301526001600160401b0392831660a08301529190911660c082015260e0016100af565b600354600054600154600254604080519485526001600160801b038085166020870152600160801b948590048116918601919091528083166060860152918390048216608085015290811660a08401529081046001600160401b031660c0830152600160c01b900460ff1660e0820152610100016100af565b600061022f8484846105c2565b6001600160a01b03851660009081526004602052604090205461025e9086906001600160801b03166001610746565b6001600160a01b03851660009081526004602052604081206001810180546001600160801b0380821690925560029092018054600160801b9093048216938493919290916102ae91859116610d63565b92506101000a8154816001600160801b0302191690836001600160801b031602179055508060008054906101000a90046001600160801b03166102f19190610d63565b600080546001600160801b0319166001600160801b0392909216919091179055610322662386f26fc1000082610da0565b6001600160801b03169695505050505050565b6001600160a01b0384166000908152600460209081526040808320815160e08101835281546001600160801b038082168352600160801b9182900481169583019590955260018084015480871695840195909552938190048516606083015260029092015480851660808301526001600160401b03928104831660a0830152600160c01b900490911660c082015260035491549092849116158015906103db5750854310155b80156103e75750438510155b1561059d57600254600090610405906001600160801b031643610dc6565b9050600061041a89662386f26fc10000610ddf565b6104249083610ddf565b9050600080600061043488610be0565b600254929550909350915061045490600160c01b900460ff16600a610ee2565b60015461046a91906001600160801b0316610ddf565b61047f85676765c793fa10079d601b1b610ddf565b6104899190610ef1565b6104939088610f05565b96508783156105965780604001516001600160801b0316676765c793fa10079d601b1b89600260189054906101000a900460ff16600a6104d39190610ee2565b84602001516001600160801b03166104eb9190610ddf565b6104f59190610ddf565b6104ff9190610ef1565b6105099190610dc6565b9650600061051f85670de0b6b3a7640000610ddf565b61053489676765c793fa10079d601b1b610ddf565b61053e9190610ef1565b905064174876e80081610552856064610ddf565b600a61055f886064610ddf565b61056a906005610ddf565b6105749190610ef1565b61057e9190610f05565b6105889190610ddf565b6105929190610ef1565b9750505b5050505050505b8083606001516001600160801b03166105b69190610f05565b98975050505050505050565b6001546001600160801b03166000036105f5575050600280546001600160801b031916436001600160801b031617905550565b81431015801561060f57506002546001600160801b031682115b1561063057600280546001600160801b0319166001600160801b0384161790555b6002546000906001600160801b03168311801561064d5750824310155b610662576002546001600160801b0316610664565b825b905060008243116106755743610677565b825b9050838110806106875750828210155b15610693575050505050565b600061069f8383610dc6565b905060006106b487662386f26fc10000610ddf565b6106be9083610ddf565b6002549091506106d990600160c01b900460ff16600a610ee2565b6001546106ef91906001600160801b0316610ddf565b61070482676765c793fa10079d601b1b610ddf565b61070e9190610ef1565b60035461071b9190610f05565b6003555050600280546001600160801b0319166001600160801b039290921691909117905550505050565b6001600160a01b038316600090815260046020526040902080546001600160801b0380821691600160801b9004168015610958576040805160e08101825284546001600160801b038082168352600160801b91829004811660208401526001870154808216948401949094529281900483166060830152600286015492831660808301526001600160401b03908304811660a0830152600160c01b90920490911660c0820152600090819081906107fc90610be0565b925092509250826000146109505760018601546003546002546000926001600160801b031691676765c793fa10079d601b1b9161084490600160c01b900460ff16600a610ee2565b61084e9089610ddf565b6108589190610ddf565b6108629190610ef1565b61086c9190610dc6565b905060008461087f83633b9aca00610ddf565b6108899190610ef1565b905064174876e8008161089d856064610ddf565b600a6108aa886064610ddf565b6108b5906005610ddf565b6108bf9190610ef1565b6108c99190610f05565b6108d39190610ddf565b6108dd9190610ef1565b6001890154909250610900908390600160801b90046001600160801b0316610f05565b600189810180546001600160801b03908116600160801b9482168502179091559054610930928592910416610f05565b600180546001600160801b03928316600160801b02921691909117905550505b50505061097b565b6002830180546001600160c01b0316600160c01b436001600160401b0316021790555b818511610a79576002830180546001600160c01b0316600160c01b436001600160401b0316021790558115610a745782546000908390600160801b90046001600160801b03166109cb8883610dc6565b6109d59190610ddf565b6109df9190610ef1565b845490915081908590601090610a06908490600160801b90046001600160801b0316610f18565b92506101000a8154816001600160801b0302191690836001600160801b0316021790555080600160008282829054906101000a90046001600160801b0316610a4e9190610f18565b92506101000a8154816001600160801b0302191690836001600160801b03160217905550505b610b1d565b83600003610b1d57610a8b8286610dc6565b83548490601090610aad908490600160801b90046001600160801b0316610d63565b92506101000a8154816001600160801b0302191690836001600160801b031602179055508185610add9190610dc6565b60018054600090610af89084906001600160801b0316610d63565b92506101000a8154816001600160801b0302191690836001600160801b031602179055505b60028381018054600160801b600160c01b031916600160801b436001600160401b03160217905583546001600160801b0319166001600160801b0387161784556003549054676765c793fa10079d601b1b9190610b8590600160c01b900460ff16600a610ee2565b8554610ba19190600160801b90046001600160801b0316610ddf565b610bab9190610ddf565b610bb59190610ef1565b60019390930180546001600160801b0319166001600160801b03909416939093179092555050505050565b6000806000808460c001518560a00151610bfa9190610f38565b6001600160401b0316905060008560c001516001600160401b031643610c209190610dc6565b600254600160801b90046001600160401b031610610c555760c0860151610c50906001600160401b031643610dc6565b610c69565b600254600160801b90046001600160401b03165b905060008660a001516001600160401b031643610c869190610dc6565b600254909150600090600160801b90046001600160401b0316841015610cb557610cb08484610dc6565b610cb8565b60005b90506000610cc68284610dc6565b9299919850919650945050505050565b80356001600160a01b0381168114610ced57600080fd5b919050565b600060208284031215610d0457600080fd5b610d0d82610cd6565b9392505050565b60008060008060808587031215610d2a57600080fd5b610d3385610cd6565b966020860135965060408601359560600135945092505050565b634e487b7160e01b600052601160045260246000fd5b6001600160801b03818116838216019080821115610d8357610d83610d4d565b5092915050565b634e487b7160e01b600052601260045260246000fd5b60006001600160801b0383811680610dba57610dba610d8a565b92169190910492915050565b81810381811115610dd957610dd9610d4d565b92915050565b6000816000190483118215151615610df957610df9610d4d565b500290565b600181815b80851115610e39578160001904821115610e1f57610e1f610d4d565b80851615610e2c57918102915b93841c9390800290610e03565b509250929050565b600082610e5057506001610dd9565b81610e5d57506000610dd9565b8160018114610e735760028114610e7d57610e99565b6001915050610dd9565b60ff841115610e8e57610e8e610d4d565b50506001821b610dd9565b5060208310610133831016604e8410600b8410161715610ebc575081810a610dd9565b610ec68383610dfe565b8060001904821115610eda57610eda610d4d565b029392505050565b6000610d0d60ff841683610e41565b600082610f0057610f00610d8a565b500490565b80820180821115610dd957610dd9610d4d565b6001600160801b03828116828216039080821115610d8357610d83610d4d565b6001600160401b03828116828216039080821115610d8357610d83610d4d56fea2646970667358221220d34c1a68a807e36979737d9c6258689356ba2d472b6f9b534d52e34f87f4aad264736f6c63430008100033";
206
206
 
207
207
  type BaseShareFieldV2ConstructorParams =
208
208
  | [signer?: Signer]
@@ -258,7 +258,7 @@ const _abi = [
258
258
  ];
259
259
 
260
260
  const _bytecode =
261
- "0x608060405234801561001057600080fd5b50610c34806100206000396000f3fe608060405234801561001057600080fd5b50600436106100a45760003560e01c80631ce720f3146100a957806328e964e9146100cd5780633a6080321461010e5780634a291b0114610125578063574c5c931461012e578063899e1b6c146101415780639c81ff6b1461016c578063a82415ae14610175578063a87430ba14610188578063a9f8d18114610220578063bea2811514610229578063e319828c14610232575b600080fd5b6007546100b69060ff1681565b60405160ff90911681526020015b60405180910390f35b6100f96100db366004610a09565b6001600160a01b031660009081526008602052604081205490549091565b604080519283526020830191909152016100c4565b61011760025481565b6040519081526020016100c4565b61011760015481565b61011761013c366004610a24565b61023b565b600554610154906001600160401b031681565b6040516001600160401b0390911681526020016100c4565b61011760045481565b610117610183366004610a24565b6102c1565b6101df610196366004610a09565b60086020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160401b0380821691600160401b90041687565b60408051978852602088019690965294860193909352606085019190915260808401526001600160401b0390811660a08401521660c082015260e0016100c4565b61011760065481565b61011760005481565b61011760035481565b6001600160a01b038416600090815260086020526040812061025e8585856104fb565b61026e86826000015460016105fd565b6003810180546000918290556004830180549192839261028f908490610a73565b90915550506003546102a2908290610a73565b6003556102b6662386f26fc1000082610a8b565b979650505050505050565b6001600160a01b0384166000908152600860209081526040808320815160e08101835281548152600180830154948201949094526002808301549382019390935260038201546060820152600482015460808201526005909101546001600160401b0380821660a0840152600160401b9091041660c0820152905491549091908390158015906103515750854310155b801561035d5750438510155b156104df576000600654436103729190610aad565b9050600061038789662386f26fc10000610ac4565b6103919083610ac4565b905060008060006103a188610924565b60075492955090935091506103ba9060ff16600a610bc7565b6001546103c79190610ac4565b6103dc85676765c793fa10079d601b1b610ac4565b6103e69190610a8b565b6103f09088610a73565b96508783156104d8576040810151600754676765c793fa10079d601b1b908a9061041e9060ff16600a610bc7565b846020015161042d9190610ac4565b6104379190610ac4565b6104419190610a8b565b61044b9190610aad565b9650600061046185670de0b6b3a7640000610ac4565b61047689676765c793fa10079d601b1b610ac4565b6104809190610a8b565b905064174876e80081610494856064610ac4565b600a6104a1886064610ac4565b6104ac906005610ac4565b6104b69190610a8b565b6104c09190610a73565b6104ca9190610ac4565b6104d49190610a8b565b9750505b5050505050505b8083606001516104ef9190610a73565b98975050505050505050565b60015461050b5750504360065550565b81431015801561051c575081600654105b156105275760068290555b60008260065410801561053a5750824310155b61054657600654610548565b825b90506000824311610559574361055b565b825b90508381108061056b5750828210155b15610577575050505050565b60006105838383610aad565b9050600061059887662386f26fc10000610ac4565b6105a29083610ac4565b6007549091506105b69060ff16600a610bc7565b6001546105c39190610ac4565b6105d882676765c793fa10079d601b1b610ac4565b6105e29190610a8b565b6002546105ef9190610a73565b600255505060065550505050565b6001600160a01b03831660009081526008602052604090208054600182015480156107a9576040805160e0810182528454815260018501546020820152600285015491810191909152600384015460608201526004840154608082015260058401546001600160401b0380821660a0840152600160401b9091041660c08201526000908190819061068d90610924565b925092509250826000146107a157600280870154905460075460009291676765c793fa10079d601b1b916106c59060ff16600a610bc7565b6106cf9089610ac4565b6106d99190610ac4565b6106e39190610a8b565b6106ed9190610aad565b9050600061070385670de0b6b3a7640000610ac4565b61071883676765c793fa10079d601b1b610ac4565b6107229190610a8b565b905064174876e80081610736856064610ac4565b600a610743886064610ac4565b61074e906005610ac4565b6107589190610a8b565b6107629190610a73565b61076c9190610ac4565b6107769190610a8b565b91508188600301546107889190610a73565b600389015560045461079b908390610a73565b60045550505b5050506107d0565b600583018054600160401b600160801b031916600160401b436001600160401b0316021790555b81851161086657600583018054600160401b600160801b031916600160401b436001600160401b031602179055811561086157600082846001015487856108179190610aad565b6108219190610ac4565b61082b9190610a8b565b9050808460010160008282546108419190610aad565b92505081905550806001600082825461085a9190610aad565b9091555050505b6108af565b836108af576108758286610aad565b8360010160008282546108889190610a73565b9091555061089890508286610aad565b600160008282546108a99190610a73565b90915550505b6005830180546001600160401b031916436001600160401b0316179055848355600254600754676765c793fa10079d601b1b91906108f19060ff16600a610bc7565b85600101546109009190610ac4565b61090a9190610ac4565b6109149190610a8b565b8360020181905550505050505050565b6000806000808460c001518560a0015161093e9190610bd6565b60055460c08701516001600160401b03928316935060009261096d92811691610968911643610aad565b6109d3565b905060008660a001516001600160401b03164361098a9190610aad565b6005549091506000906001600160401b03168410156109b2576109ad8484610aad565b6109b5565b60005b905060006109c38284610aad565b9299919850919650945050505050565b60008183106109e257816109e4565b825b90505b92915050565b80356001600160a01b0381168114610a0457600080fd5b919050565b600060208284031215610a1b57600080fd5b6109e4826109ed565b60008060008060808587031215610a3a57600080fd5b610a43856109ed565b966020860135965060408601359560600135945092505050565b634e487b7160e01b600052601160045260246000fd5b60008219821115610a8657610a86610a5d565b500190565b600082610aa857634e487b7160e01b600052601260045260246000fd5b500490565b600082821015610abf57610abf610a5d565b500390565b6000816000190483118215151615610ade57610ade610a5d565b500290565b600181815b80851115610b1e578160001904821115610b0457610b04610a5d565b80851615610b1157918102915b93841c9390800290610ae8565b509250929050565b600082610b35575060016109e7565b81610b42575060006109e7565b8160018114610b585760028114610b6257610b7e565b60019150506109e7565b60ff841115610b7357610b73610a5d565b50506001821b6109e7565b5060208310610133831016604e8410600b8410161715610ba1575081810a6109e7565b610bab8383610ae3565b8060001904821115610bbf57610bbf610a5d565b029392505050565b60006109e460ff841683610b26565b60006001600160401b0383811690831681811015610bf657610bf6610a5d565b03939250505056fea264697066735822122001ce4f605fafc0df42c35bca16bc960c676de0680027566ef17ee1adca56a31464736f6c63430008080033";
261
+ "0x608060405234801561001057600080fd5b50610c30806100206000396000f3fe608060405234801561001057600080fd5b50600436106100a45760003560e01c80631ce720f3146100a957806328e964e9146100cd5780633a6080321461010e5780634a291b0114610125578063574c5c931461012e578063899e1b6c146101415780639c81ff6b1461016c578063a82415ae14610175578063a87430ba14610188578063a9f8d18114610220578063bea2811514610229578063e319828c14610232575b600080fd5b6007546100b69060ff1681565b60405160ff90911681526020015b60405180910390f35b6100f96100db366004610a0f565b6001600160a01b031660009081526008602052604081205490549091565b604080519283526020830191909152016100c4565b61011760025481565b6040519081526020016100c4565b61011760015481565b61011761013c366004610a2a565b61023b565b600554610154906001600160401b031681565b6040516001600160401b0390911681526020016100c4565b61011760045481565b610117610183366004610a2a565b6102c1565b6101df610196366004610a0f565b60086020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160401b0380821691600160401b90041687565b60408051978852602088019690965294860193909352606085019190915260808401526001600160401b0390811660a08401521660c082015260e0016100c4565b61011760065481565b61011760005481565b61011760035481565b6001600160a01b038416600090815260086020526040812061025e8585856104fb565b61026e8682600001546001610600565b6003810180546000918290556004830180549192839261028f908490610a79565b90915550506003546102a2908290610a79565b6003556102b6662386f26fc1000082610a8c565b979650505050505050565b6001600160a01b0384166000908152600860209081526040808320815160e08101835281548152600180830154948201949094526002808301549382019390935260038201546060820152600482015460808201526005909101546001600160401b0380821660a0840152600160401b9091041660c0820152905491549091908390158015906103515750854310155b801561035d5750438510155b156104df576000600654436103729190610aae565b9050600061038789662386f26fc10000610ac1565b6103919083610ac1565b905060008060006103a18861092a565b60075492955090935091506103ba9060ff16600a610bc4565b6001546103c79190610ac1565b6103dc85676765c793fa10079d601b1b610ac1565b6103e69190610a8c565b6103f09088610a79565b96508783156104d8576040810151600754676765c793fa10079d601b1b908a9061041e9060ff16600a610bc4565b846020015161042d9190610ac1565b6104379190610ac1565b6104419190610a8c565b61044b9190610aae565b9650600061046185670de0b6b3a7640000610ac1565b61047689676765c793fa10079d601b1b610ac1565b6104809190610a8c565b905064174876e80081610494856064610ac1565b600a6104a1886064610ac1565b6104ac906005610ac1565b6104b69190610a8c565b6104c09190610a79565b6104ca9190610ac1565b6104d49190610a8c565b9750505b5050505050505b8083606001516104ef9190610a79565b98975050505050505050565b60015460000361050e5750504360065550565b81431015801561051f575081600654105b1561052a5760068290555b60008260065410801561053d5750824310155b6105495760065461054b565b825b9050600082431161055c574361055e565b825b90508381108061056e5750828210155b1561057a575050505050565b60006105868383610aae565b9050600061059b87662386f26fc10000610ac1565b6105a59083610ac1565b6007549091506105b99060ff16600a610bc4565b6001546105c69190610ac1565b6105db82676765c793fa10079d601b1b610ac1565b6105e59190610a8c565b6002546105f29190610a79565b600255505060065550505050565b6001600160a01b03831660009081526008602052604090208054600182015480156107ac576040805160e0810182528454815260018501546020820152600285015491810191909152600384015460608201526004840154608082015260058401546001600160401b0380821660a0840152600160401b9091041660c0820152600090819081906106909061092a565b925092509250826000146107a457600280870154905460075460009291676765c793fa10079d601b1b916106c89060ff16600a610bc4565b6106d29089610ac1565b6106dc9190610ac1565b6106e69190610a8c565b6106f09190610aae565b9050600061070685670de0b6b3a7640000610ac1565b61071b83676765c793fa10079d601b1b610ac1565b6107259190610a8c565b905064174876e80081610739856064610ac1565b600a610746886064610ac1565b610751906005610ac1565b61075b9190610a8c565b6107659190610a79565b61076f9190610ac1565b6107799190610a8c565b915081886003015461078b9190610a79565b600389015560045461079e908390610a79565b60045550505b5050506107d3565b600583018054600160401b600160801b031916600160401b436001600160401b0316021790555b81851161086957600583018054600160401b600160801b031916600160401b436001600160401b0316021790558115610864576000828460010154878561081a9190610aae565b6108249190610ac1565b61082e9190610a8c565b9050808460010160008282546108449190610aae565b92505081905550806001600082825461085d9190610aae565b9091555050505b6108b5565b836000036108b55761087b8286610aae565b83600101600082825461088e9190610a79565b9091555061089e90508286610aae565b600160008282546108af9190610a79565b90915550505b6005830180546001600160401b031916436001600160401b0316179055848355600254600754676765c793fa10079d601b1b91906108f79060ff16600a610bc4565b85600101546109069190610ac1565b6109109190610ac1565b61091a9190610a8c565b8360020181905550505050505050565b6000806000808460c001518560a001516109449190610bd3565b60055460c08701516001600160401b0392831693506000926109739281169161096e911643610aae565b6109d9565b905060008660a001516001600160401b0316436109909190610aae565b6005549091506000906001600160401b03168410156109b8576109b38484610aae565b6109bb565b60005b905060006109c98284610aae565b9299919850919650945050505050565b60008183106109e857816109ea565b825b90505b92915050565b80356001600160a01b0381168114610a0a57600080fd5b919050565b600060208284031215610a2157600080fd5b6109ea826109f3565b60008060008060808587031215610a4057600080fd5b610a49856109f3565b966020860135965060408601359560600135945092505050565b634e487b7160e01b600052601160045260246000fd5b808201808211156109ed576109ed610a63565b600082610aa957634e487b7160e01b600052601260045260246000fd5b500490565b818103818111156109ed576109ed610a63565b6000816000190483118215151615610adb57610adb610a63565b500290565b600181815b80851115610b1b578160001904821115610b0157610b01610a63565b80851615610b0e57918102915b93841c9390800290610ae5565b509250929050565b600082610b32575060016109ed565b81610b3f575060006109ed565b8160018114610b555760028114610b5f57610b7b565b60019150506109ed565b60ff841115610b7057610b70610a63565b50506001821b6109ed565b5060208310610133831016604e8410600b8410161715610b9e575081810a6109ed565b610ba88383610ae0565b8060001904821115610bbc57610bbc610a63565b029392505050565b60006109ea60ff841683610b23565b6001600160401b03828116828216039080821115610bf357610bf3610a63565b509291505056fea2646970667358221220a432a5c533ed6d1409d93c659e59db5434c86bc9df74d076894fe0c0be954e3964736f6c63430008100033";
262
262
 
263
263
  type BaseShareFieldConstructorParams =
264
264
  | [signer?: Signer]
@@ -26,7 +26,7 @@ const _abi = [
26
26
  ];
27
27
 
28
28
  const _bytecode =
29
- "0x6080604052348015600f57600080fd5b50607a80601d6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b6305f5e10060405190815260200160405180910390f3fea264697066735822122062b4d9317316db273293a1388c09195087f06319765306898ee1d0aaa080f95864736f6c63430008080033";
29
+ "0x6080604052348015600f57600080fd5b50607a80601d6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b6305f5e10060405190815260200160405180910390f3fea2646970667358221220491bb67aa299e98a66e8bf407dfadc8913ff5281b06687bb35db9668038aa44764736f6c63430008100033";
30
30
 
31
31
  type BatUSDMockOracleConstructorParams =
32
32
  | [signer?: Signer]