@gooddollar/goodprotocol 1.0.20 → 1.0.22

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 (97) hide show
  1. package/artifacts/abis/UBIScheme.min.json +1 -1
  2. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  3. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  4. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  5. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  6. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  7. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  8. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  9. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  10. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  11. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  12. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  13. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  14. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  15. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  16. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  17. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  18. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  19. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  20. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  21. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  22. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  23. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  24. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  25. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  26. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  27. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  28. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  29. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  30. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  31. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  32. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  33. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  34. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  35. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  36. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  37. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  38. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  39. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  40. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  41. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  42. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  43. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  44. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  45. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  46. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  47. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  48. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  49. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  50. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
  51. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
  52. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  53. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  54. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  55. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  56. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  57. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  58. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  59. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  60. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  61. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  62. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  63. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  64. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  65. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  66. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  67. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  68. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  69. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  70. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  71. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  72. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  73. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  74. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  75. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  76. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  77. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  78. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +48 -2
  79. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  80. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
  81. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  82. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  83. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  84. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  85. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  86. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  87. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  88. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  89. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
  90. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
  91. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  92. package/contracts/ubi/UBIScheme.sol +34 -4
  93. package/package.json +1 -1
  94. package/releases/deployment.json +3 -1
  95. package/scripts/misc/claimIncidentStats.ts +97 -0
  96. package/types/UBIScheme.ts +93 -0
  97. package/types/factories/UBIScheme__factory.ts +47 -1
package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json CHANGED
@@ -758,6 +758,32 @@
758
758
  "stateMutability": "view",
759
759
  "type": "function"
760
760
  },
761
+ {
762
+ "inputs": [
763
+ {
764
+ "internalType": "bool",
765
+ "name": "_pause",
766
+ "type": "bool"
767
+ }
768
+ ],
769
+ "name": "pause",
770
+ "outputs": [],
771
+ "stateMutability": "nonpayable",
772
+ "type": "function"
773
+ },
774
+ {
775
+ "inputs": [],
776
+ "name": "paused",
777
+ "outputs": [
778
+ {
779
+ "internalType": "bool",
780
+ "name": "",
781
+ "type": "bool"
782
+ }
783
+ ],
784
+ "stateMutability": "view",
785
+ "type": "function"
786
+ },
761
787
  {
762
788
  "inputs": [],
763
789
  "name": "periodStart",
@@ -771,6 +797,19 @@
771
797
  "stateMutability": "view",
772
798
  "type": "function"
773
799
  },
800
+ {
801
+ "inputs": [
802
+ {
803
+ "internalType": "uint256",
804
+ "name": "_activeUserCount",
805
+ "type": "uint256"
806
+ }
807
+ ],
808
+ "name": "setActiveUserCount",
809
+ "outputs": [],
810
+ "stateMutability": "nonpayable",
811
+ "type": "function"
812
+ },
774
813
  {
775
814
  "inputs": [
776
815
  {
@@ -869,6 +908,13 @@
869
908
  "stateMutability": "nonpayable",
870
909
  "type": "function"
871
910
  },
911
+ {
912
+ "inputs": [],
913
+ "name": "upgrade",
914
+ "outputs": [],
915
+ "stateMutability": "nonpayable",
916
+ "type": "function"
917
+ },
872
918
  {
873
919
  "inputs": [
874
920
  {
@@ -914,8 +960,8 @@
914
960
  "type": "function"
915
961
  }
916
962
  ],
917
- "bytecode": "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c612b8161004b60003960008181610d7201528181610db2015281816111ef015261122f0152612b816000f3fe6080604052600436106102025760003560e01c8063013eba9214610207578063069786ea146102475780630ce82d67146102715780631099da4f146102865780631248b1011461029c5780631794bb3c146102d35780631a787f2e146102f55780631b3c90a8146103155780631bbc644c1461032a5780631d8f5ea91461035a57806322b45727146103705780633659cfe6146103865780633d84ceca146103a65780633e6326fc146103c65780634162169f146103f35780634202d21414610413578063456ac1c2146104335780634b4c71801461044d5780634e71d92d146104675780634f1ef2861461047c5780635231e2f01461048f578063560796d1146104bf5780635aef7de6146105105780635c9302c91461053057806373b2e80e14610546578063741470ac146105665780638081cbbd1461057c57806398d6621b1461059c5780639dc2c033146105b1578063a21f698a146105c7578063b656223d146105e7578063ba075410146105fd578063c033abf214610613578063c133750814610629578063c771387014610649578063c7a76adf1461065e578063cc054dfc1461067e578063cef63600146106ab578063d6a9f618146106cb578063d7c4cbb8146106eb578063dddc361614610701578063de1de3a014610716578063e1758bd814610736578063eac471a01461074b578063eda4e6d614610761575b600080fd5b34801561021357600080fd5b50610234610222366004612532565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561025357600080fd5b5061025c610777565b6040805192835260208301919091520161023e565b34801561027d57600080fd5b506102346107b5565b34801561029257600080fd5b5061023460a95481565b3480156102a857600080fd5b5061025c6102b736600461254f565b609a602052600090815260409020600181015460029091015482565b3480156102df57600080fd5b506102f36102ee366004612568565b6107d8565b005b34801561030157600080fd5b50610234610310366004612532565b610963565b34801561032157600080fd5b506102f3610a9a565b34801561033657600080fd5b5061034a610345366004612532565b610bdf565b604051901515815260200161023e565b34801561036657600080fd5b50610234609e5481565b34801561037c57600080fd5b5061023460a05481565b34801561039257600080fd5b506102f36103a1366004612532565b610d67565b3480156103b257600080fd5b506102f36103c136600461254f565b610e30565b3480156103d257600080fd5b506067546103e6906001600160a01b031681565b60405161023e91906125a9565b3480156103ff57600080fd5b506065546103e6906001600160a01b031681565b34801561041f57600080fd5b5061034a61042e366004612532565b610ece565b34801561043f57600080fd5b5060a35461034a9060ff1681565b34801561045957600080fd5b5060a85461034a9060ff1681565b34801561047357600080fd5b5061034a610f30565b6102f361048a36600461262a565b6111e4565b34801561049b57600080fd5b5061034a6104aa366004612532565b60ac6020526000908152604090205460ff1681565b3480156104cb57600080fd5b506104f96104da36600461254f565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161023e565b34801561051c57600080fd5b506066546103e6906001600160a01b031681565b34801561053c57600080fd5b50610234609c5481565b34801561055257600080fd5b5061034a610561366004612532565b61129e565b34801561057257600080fd5b5061023460a75481565b34801561058857600080fd5b5060aa546103e6906001600160a01b031681565b3480156105a857600080fd5b506102346112ca565b3480156105bd57600080fd5b5061023460a55481565b3480156105d357600080fd5b5061034a6105e2366004612532565b6112d5565b3480156105f357600080fd5b5061023460a25481565b34801561060957600080fd5b5061023460a65481565b34801561061f57600080fd5b50610234609f5481565b34801561063557600080fd5b506102346106443660046126bc565b6112fb565b34801561065557600080fd5b5061023461149f565b34801561066a57600080fd5b5061023461067936600461254f565b6115a3565b34801561068a57600080fd5b50610234610699366004612532565b60ad6020526000908152604090205481565b3480156106b757600080fd5b506102346106c636600461254f565b6115b8565b3480156106d757600080fd5b506102f36106e636600461277b565b6115cd565b3480156106f757600080fd5b5061023460a15481565b34801561070d57600080fd5b506102f36115e8565b34801561072257600080fd5b506102f361073136600461277b565b611647565b34801561074257600080fd5b506103e6611696565b34801561075757600080fd5b5061023460a45481565b34801561076d57600080fd5b50610234609d5481565b600080600062015180609d544261078e91906127ae565b61079891906127c5565b90506107a3816115a3565b6107ac826115b8565b92509250509091565b60006201518060a654426107c991906127ae565b6107d391906127c5565b905090565b600054610100900460ff16806107f1575060005460ff16155b6108595760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b600054610100900460ff1615801561087b576000805461ffff19166101011790555b600082116108cb5760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f6044820152606401610850565b6108d48461172d565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055605a60a455620249f0609f5561091762015180426127c5565b61092490620151806127e7565b6109309061a8c0612806565b609d81905560a65560a8805460ff1916600117905561138860a955801561095d576000805461ff00191690555b50505050565b6000609d5442101561097757506000919050565b60a85460ff1680156109b1575061098d826112d5565b15806109b157506001600160a01b038216600090815260ac602052604090205460ff165b15610a425760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b815260040160206040518083038186803b158015610a0457600080fd5b505afa158015610a18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a3c919061281e565b92915050565b62015180609d5442610a5491906127ae565b610a5e91906127c5565b609c54148015610a7057506000609e54115b15610a9257610a7e8261129e565b610a8a57609e54610a3c565b600092915050565b610a3c61149f565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610af857600080fd5b505afa158015610b0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b309190612837565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610b8557600080fd5b505afa158015610b99573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bbd9190612837565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b600080609d54118015610bf45750609d544210155b610c105760405162461bcd60e51b815260040161085090612854565b610c19826112d5565b8015610c2b5750610c2982610ece565b155b610c715760405162461bcd60e51b815260206004820152601760248201527634b9903737ba1030b71034b730b1ba34bb32903ab9b2b960491b6044820152606401610850565b6001600160a01b038216600090815260ac602052604090205460ff1615610ccb5760405162461bcd60e51b815260206004820152600e60248201526d185b1c9958591e48199a5cda195960921b6044820152606401610850565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055610cf6611750565b9050600160a06000828254610d0b91906127ae565b90915550610d1e905033826000806119f3565b6040518181526001600160a01b0384169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a350600192915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610db05760405162461bcd60e51b815260040161085090612882565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610de2611ca8565b6001600160a01b031614610e085760405162461bcd60e51b8152600401610850906128bc565b610e1181611cc4565b60408051600080825260208201909252610e2d91839190611ccc565b50565b610e38611e0c565b60008111610e925760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b6064820152608401610850565b60a48190556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610ef0836112d5565b15610f2757600062015180610f0583426127ae565b610f0f91906127c5565b905060a254811015610f25575060019392505050565b505b50600092915050565b600080609d54118015610f455750609d544210155b610f615760405162461bcd60e51b815260040161085090612854565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610fbd57600080fd5b505afa158015610fd1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ff59190612837565b6001600160a01b0316633af32abf336040518263ffffffff1660e01b815260040161102091906125a9565b60206040518083038186803b15801561103857600080fd5b505afa15801561104c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061107091906128f6565b6110b95760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b6044820152606401610850565b60006110c433611ee0565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561112b57600080fd5b505afa15801561113f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111639190612837565b905081801561117a57506001600160a01b03811615155b156111de5760405163748abee960e11b81526001600160a01b0382169063e9157dd2906111ab9033906004016125a9565b600060405180830381600087803b1580156111c557600080fd5b505af11580156111d9573d6000803e3d6000fd5b505050505b50905090565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561122d5760405162461bcd60e51b815260040161085090612882565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661125f611ca8565b6001600160a01b0316146112855760405162461bcd60e51b8152600401610850906128bc565b61128e82611cc4565b61129a82826001611ccc565b5050565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b60006107d333610963565b6001600160a01b0381166000908152609b602052604081205415610a8a57506001919050565b600080609d541180156113105750609d544210155b61132c5760405162461bcd60e51b815260040161085090612854565b60005b825181101561147157609f545a101561136957604051818152600080516020612b2c8339815191529060200160405180910390a192915050565b61138b83828151811061137e5761137e612913565b60200260200101516112d5565b80156113b657506113b48382815181106113a7576113a7612913565b6020026020010151610ece565b155b80156113fc575060ac60008483815181106113d3576113d3612913565b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff16155b156114615761142383828151811061141657611416612913565b6020026020010151610bdf565b6114615760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b6044820152606401610850565b61146a81612929565b905061132f565b50600080516020612b2c833981519152825160405161149291815260200190565b60405180910390a1505190565b6000806114aa611696565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016114d591906125a9565b60206040518083038186803b1580156114ed57600080fd5b505afa158015611501573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611525919061281e565b9050600060a55460a4548361153a91906127c5565b119050600060a5549050600060a7546115516107b5565b10158061155b5750825b156115705760a45461156d90856127c5565b91505b60a0541561158c5760a05461158590836127c5565b905061159b565b60a85460ff1661159b575060a9545b949350505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b6115d5611e0c565b60a8805460ff1916911515919091179055565b600062015180609d54426115fc91906127ae565b61160691906127c5565b9050609c54811115610e2d57609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610ec3565b61164f611e0c565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610ec3565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b1580156116f557600080fd5b505afa158015611709573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107d39190612837565b606780546001600160a01b0319166001600160a01b038316179055610e2d610a9a565b600061175a6115e8565b60a154609c5414158061176d5750609e54155b156119ec57600061177c611696565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016117ac91906125a9565b60206040518083038186803b1580156117c457600080fd5b505afa1580156117d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117fc919061281e565b9050600060a55460a4548361181191906127c5565b11905060a75461181f6107b5565b1015806118295750805b156119415760a35460ff16156118415761184161201c565b6040516370a0823160e01b81526001600160a01b038416906370a082319061186d9030906004016125a9565b60206040518083038186803b15801561188557600080fd5b505afa158015611899573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118bd919061281e565b915060a454826118cd91906127c5565b60a55560a45460a7556118e2610e10426127c5565b6118ee90610e106127e7565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a054156119915760a05460a55461198991906127c5565b609e556119a2565b60a85460ff166119a25760a954609e555b609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b81806119fc5750805b15611a8a576001609a6000609c5481526020019081526020016000206001016000828254611a2a9190612806565b9091555050609c546000908152609a602090815260408083206001600160a01b03881684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611a84908490612806565b90915550505b8015611b745760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611ac19088906004016125a9565b602060405180830381600087803b158015611adb57600080fd5b505af1158015611aef573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b13919061281e565b905080609a6000609c5481526020019081526020016000206002016000828254611b3d9190612806565b90915550506040518181526001600160a01b03861690600080516020612ac58339815191529060200160405180910390a25061095d565b8115611bd057609c546000908152609a602052604081206002018054859290611b9e908490612806565b90915550506040518381526001600160a01b03851690600080516020612ac58339815191529060200160405180910390a25b6000611bda611696565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611c0b9088908890600401612944565b602060405180830381600087803b158015611c2557600080fd5b505af1158015611c39573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c5d91906128f6565b611ca15760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b6044820152606401610850565b5050505050565b600080516020612ae5833981519152546001600160a01b031690565b610e2d611e0c565b6000611cd6611ca8565b9050611ce18461231f565b600083511180611cee5750815b15611cff57611cfd84846123b2565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16611ca157805460ff19166001178155604051611d7a908690611d4b9085906024016125a9565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526123b2565b50805460ff19168155611d8b611ca8565b6001600160a01b0316826001600160a01b031614611e035760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610850565b611ca18561249d565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b158015611e5057600080fd5b505afa158015611e64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e889190612837565b6001600160a01b031614611ede5760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610850565b565b600080611eeb611750565b9050611ef6836112d5565b8015611f1b57506001600160a01b038316600090815260ac602052604090205460ff16155b8015611f2d5750611f2b8361129e565b155b15611f4957611f408382600160006119f3565b50600192915050565b611f52836112d5565b1580611f7657506001600160a01b038316600090815260ac602052604090205460ff165b15610f2757600160a06000828254611f8e9190612806565b90915550506001600160a01b038316600090815260ac60205260409020805460ff1916905560a85460ff1615611fd157611fcc8360008060016119f3565b611fdf565b611fdf8382600160006119f3565b6040516001600160a01b038416907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a250600192915050565b6000612026611696565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161205691906125a9565b60206040518083038186803b15801561206e57600080fd5b505afa158015612082573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120a6919061281e565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a08231926120de92909116906004016125a9565b60206040518083038186803b1580156120f657600080fd5b505afa15801561210a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061212e919061281e565b6065546040519192506001600160a01b03169063d1b7089a9085906121599030908690602401612944565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526121b49392916001600160a01b0316906000906004016129b5565b600060405180830381600087803b1580156121ce57600080fd5b505af11580156121e2573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261220a91908101906129e9565b50600090506122198284612806565b6040516370a0823160e01b81529091506001600160a01b038516906370a08231906122489030906004016125a9565b60206040518083038186803b15801561226057600080fd5b505afa158015612274573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612298919061281e565b81146122e05760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b6044820152606401610850565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba910160405180910390a150505050565b803b6123835760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610850565b600080516020612ae583398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6124115760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610850565b600080846001600160a01b03168460405161242c9190612a75565b600060405180830381855af49150503d8060008114612467576040519150601f19603f3d011682016040523d82523d6000602084013e61246c565b606091505b50915091506124948282604051806060016040528060278152602001612b05602791396124dd565b95945050505050565b6124a68161231f565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606083156124ec575081612516565b8251156124fc5782518084602001fd5b8160405162461bcd60e51b81526004016108509190612a91565b9392505050565b6001600160a01b0381168114610e2d57600080fd5b60006020828403121561254457600080fd5b81356125168161251d565b60006020828403121561256157600080fd5b5035919050565b60008060006060848603121561257d57600080fd5b83356125888161251d565b925060208401356125988161251d565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156125fb576125fb6125bd565b604052919050565b60006001600160401b0382111561261c5761261c6125bd565b50601f01601f191660200190565b6000806040838503121561263d57600080fd5b82356126488161251d565b915060208301356001600160401b0381111561266357600080fd5b8301601f8101851361267457600080fd5b803561268761268282612603565b6125d3565b81815286602083850101111561269c57600080fd5b816020840160208301376000602083830101528093505050509250929050565b600060208083850312156126cf57600080fd5b82356001600160401b03808211156126e657600080fd5b818501915085601f8301126126fa57600080fd5b81358181111561270c5761270c6125bd565b8060051b915061271d8483016125d3565b818152918301840191848101908884111561273757600080fd5b938501935b8385101561276157843592506127518361251d565b828252938501939085019061273c565b98975050505050505050565b8015158114610e2d57600080fd5b60006020828403121561278d57600080fd5b81356125168161276d565b634e487b7160e01b600052601160045260246000fd5b6000828210156127c0576127c0612798565b500390565b6000826127e257634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561280157612801612798565b500290565b6000821982111561281957612819612798565b500190565b60006020828403121561283057600080fd5b5051919050565b60006020828403121561284957600080fd5b81516125168161251d565b6020808252601490820152731b9bdd081a5b881c195c9a5bd914dd185c9d195960621b604082015260600190565b6020808252602c90820152600080516020612aa583398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612aa583398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60006020828403121561290857600080fd5b81516125168161276d565b634e487b7160e01b600052603260045260246000fd5b600060001982141561293d5761293d612798565b5060010190565b6001600160a01b03929092168252602082015260400190565b60005b83811015612978578181015183820152602001612960565b8381111561095d5750506000910152565b600081518084526129a181602086016020860161295d565b601f01601f19169290920160200192915050565b600060018060a01b038087168352608060208401526129d76080840187612989565b94166040830152506060015292915050565b600080604083850312156129fc57600080fd5b8251612a078161276d565b60208401519092506001600160401b03811115612a2357600080fd5b8301601f81018513612a3457600080fd5b8051612a4261268282612603565b818152866020838501011115612a5757600080fd5b612a6882602083016020860161295d565b8093505050509250929050565b60008251612a8781846020870161295d565b9190910192915050565b602081526000612516602083018461298956fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c656472b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540fa264697066735822122082bf04ebcab0326eb0b4d8803888134a4e8b57d83640f929bb9ba3459222c56f64736f6c63430008080033",
918
- "deployedBytecode": "0x6080604052600436106102025760003560e01c8063013eba9214610207578063069786ea146102475780630ce82d67146102715780631099da4f146102865780631248b1011461029c5780631794bb3c146102d35780631a787f2e146102f55780631b3c90a8146103155780631bbc644c1461032a5780631d8f5ea91461035a57806322b45727146103705780633659cfe6146103865780633d84ceca146103a65780633e6326fc146103c65780634162169f146103f35780634202d21414610413578063456ac1c2146104335780634b4c71801461044d5780634e71d92d146104675780634f1ef2861461047c5780635231e2f01461048f578063560796d1146104bf5780635aef7de6146105105780635c9302c91461053057806373b2e80e14610546578063741470ac146105665780638081cbbd1461057c57806398d6621b1461059c5780639dc2c033146105b1578063a21f698a146105c7578063b656223d146105e7578063ba075410146105fd578063c033abf214610613578063c133750814610629578063c771387014610649578063c7a76adf1461065e578063cc054dfc1461067e578063cef63600146106ab578063d6a9f618146106cb578063d7c4cbb8146106eb578063dddc361614610701578063de1de3a014610716578063e1758bd814610736578063eac471a01461074b578063eda4e6d614610761575b600080fd5b34801561021357600080fd5b50610234610222366004612532565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561025357600080fd5b5061025c610777565b6040805192835260208301919091520161023e565b34801561027d57600080fd5b506102346107b5565b34801561029257600080fd5b5061023460a95481565b3480156102a857600080fd5b5061025c6102b736600461254f565b609a602052600090815260409020600181015460029091015482565b3480156102df57600080fd5b506102f36102ee366004612568565b6107d8565b005b34801561030157600080fd5b50610234610310366004612532565b610963565b34801561032157600080fd5b506102f3610a9a565b34801561033657600080fd5b5061034a610345366004612532565b610bdf565b604051901515815260200161023e565b34801561036657600080fd5b50610234609e5481565b34801561037c57600080fd5b5061023460a05481565b34801561039257600080fd5b506102f36103a1366004612532565b610d67565b3480156103b257600080fd5b506102f36103c136600461254f565b610e30565b3480156103d257600080fd5b506067546103e6906001600160a01b031681565b60405161023e91906125a9565b3480156103ff57600080fd5b506065546103e6906001600160a01b031681565b34801561041f57600080fd5b5061034a61042e366004612532565b610ece565b34801561043f57600080fd5b5060a35461034a9060ff1681565b34801561045957600080fd5b5060a85461034a9060ff1681565b34801561047357600080fd5b5061034a610f30565b6102f361048a36600461262a565b6111e4565b34801561049b57600080fd5b5061034a6104aa366004612532565b60ac6020526000908152604090205460ff1681565b3480156104cb57600080fd5b506104f96104da36600461254f565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161023e565b34801561051c57600080fd5b506066546103e6906001600160a01b031681565b34801561053c57600080fd5b50610234609c5481565b34801561055257600080fd5b5061034a610561366004612532565b61129e565b34801561057257600080fd5b5061023460a75481565b34801561058857600080fd5b5060aa546103e6906001600160a01b031681565b3480156105a857600080fd5b506102346112ca565b3480156105bd57600080fd5b5061023460a55481565b3480156105d357600080fd5b5061034a6105e2366004612532565b6112d5565b3480156105f357600080fd5b5061023460a25481565b34801561060957600080fd5b5061023460a65481565b34801561061f57600080fd5b50610234609f5481565b34801561063557600080fd5b506102346106443660046126bc565b6112fb565b34801561065557600080fd5b5061023461149f565b34801561066a57600080fd5b5061023461067936600461254f565b6115a3565b34801561068a57600080fd5b50610234610699366004612532565b60ad6020526000908152604090205481565b3480156106b757600080fd5b506102346106c636600461254f565b6115b8565b3480156106d757600080fd5b506102f36106e636600461277b565b6115cd565b3480156106f757600080fd5b5061023460a15481565b34801561070d57600080fd5b506102f36115e8565b34801561072257600080fd5b506102f361073136600461277b565b611647565b34801561074257600080fd5b506103e6611696565b34801561075757600080fd5b5061023460a45481565b34801561076d57600080fd5b50610234609d5481565b600080600062015180609d544261078e91906127ae565b61079891906127c5565b90506107a3816115a3565b6107ac826115b8565b92509250509091565b60006201518060a654426107c991906127ae565b6107d391906127c5565b905090565b600054610100900460ff16806107f1575060005460ff16155b6108595760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b600054610100900460ff1615801561087b576000805461ffff19166101011790555b600082116108cb5760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f6044820152606401610850565b6108d48461172d565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055605a60a455620249f0609f5561091762015180426127c5565b61092490620151806127e7565b6109309061a8c0612806565b609d81905560a65560a8805460ff1916600117905561138860a955801561095d576000805461ff00191690555b50505050565b6000609d5442101561097757506000919050565b60a85460ff1680156109b1575061098d826112d5565b15806109b157506001600160a01b038216600090815260ac602052604090205460ff165b15610a425760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b815260040160206040518083038186803b158015610a0457600080fd5b505afa158015610a18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a3c919061281e565b92915050565b62015180609d5442610a5491906127ae565b610a5e91906127c5565b609c54148015610a7057506000609e54115b15610a9257610a7e8261129e565b610a8a57609e54610a3c565b600092915050565b610a3c61149f565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610af857600080fd5b505afa158015610b0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b309190612837565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610b8557600080fd5b505afa158015610b99573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bbd9190612837565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b600080609d54118015610bf45750609d544210155b610c105760405162461bcd60e51b815260040161085090612854565b610c19826112d5565b8015610c2b5750610c2982610ece565b155b610c715760405162461bcd60e51b815260206004820152601760248201527634b9903737ba1030b71034b730b1ba34bb32903ab9b2b960491b6044820152606401610850565b6001600160a01b038216600090815260ac602052604090205460ff1615610ccb5760405162461bcd60e51b815260206004820152600e60248201526d185b1c9958591e48199a5cda195960921b6044820152606401610850565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055610cf6611750565b9050600160a06000828254610d0b91906127ae565b90915550610d1e905033826000806119f3565b6040518181526001600160a01b0384169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a350600192915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610db05760405162461bcd60e51b815260040161085090612882565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610de2611ca8565b6001600160a01b031614610e085760405162461bcd60e51b8152600401610850906128bc565b610e1181611cc4565b60408051600080825260208201909252610e2d91839190611ccc565b50565b610e38611e0c565b60008111610e925760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b6064820152608401610850565b60a48190556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610ef0836112d5565b15610f2757600062015180610f0583426127ae565b610f0f91906127c5565b905060a254811015610f25575060019392505050565b505b50600092915050565b600080609d54118015610f455750609d544210155b610f615760405162461bcd60e51b815260040161085090612854565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610fbd57600080fd5b505afa158015610fd1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ff59190612837565b6001600160a01b0316633af32abf336040518263ffffffff1660e01b815260040161102091906125a9565b60206040518083038186803b15801561103857600080fd5b505afa15801561104c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061107091906128f6565b6110b95760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b6044820152606401610850565b60006110c433611ee0565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561112b57600080fd5b505afa15801561113f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111639190612837565b905081801561117a57506001600160a01b03811615155b156111de5760405163748abee960e11b81526001600160a01b0382169063e9157dd2906111ab9033906004016125a9565b600060405180830381600087803b1580156111c557600080fd5b505af11580156111d9573d6000803e3d6000fd5b505050505b50905090565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561122d5760405162461bcd60e51b815260040161085090612882565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661125f611ca8565b6001600160a01b0316146112855760405162461bcd60e51b8152600401610850906128bc565b61128e82611cc4565b61129a82826001611ccc565b5050565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b60006107d333610963565b6001600160a01b0381166000908152609b602052604081205415610a8a57506001919050565b600080609d541180156113105750609d544210155b61132c5760405162461bcd60e51b815260040161085090612854565b60005b825181101561147157609f545a101561136957604051818152600080516020612b2c8339815191529060200160405180910390a192915050565b61138b83828151811061137e5761137e612913565b60200260200101516112d5565b80156113b657506113b48382815181106113a7576113a7612913565b6020026020010151610ece565b155b80156113fc575060ac60008483815181106113d3576113d3612913565b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff16155b156114615761142383828151811061141657611416612913565b6020026020010151610bdf565b6114615760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b6044820152606401610850565b61146a81612929565b905061132f565b50600080516020612b2c833981519152825160405161149291815260200190565b60405180910390a1505190565b6000806114aa611696565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016114d591906125a9565b60206040518083038186803b1580156114ed57600080fd5b505afa158015611501573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611525919061281e565b9050600060a55460a4548361153a91906127c5565b119050600060a5549050600060a7546115516107b5565b10158061155b5750825b156115705760a45461156d90856127c5565b91505b60a0541561158c5760a05461158590836127c5565b905061159b565b60a85460ff1661159b575060a9545b949350505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b6115d5611e0c565b60a8805460ff1916911515919091179055565b600062015180609d54426115fc91906127ae565b61160691906127c5565b9050609c54811115610e2d57609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610ec3565b61164f611e0c565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610ec3565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b1580156116f557600080fd5b505afa158015611709573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107d39190612837565b606780546001600160a01b0319166001600160a01b038316179055610e2d610a9a565b600061175a6115e8565b60a154609c5414158061176d5750609e54155b156119ec57600061177c611696565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016117ac91906125a9565b60206040518083038186803b1580156117c457600080fd5b505afa1580156117d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117fc919061281e565b9050600060a55460a4548361181191906127c5565b11905060a75461181f6107b5565b1015806118295750805b156119415760a35460ff16156118415761184161201c565b6040516370a0823160e01b81526001600160a01b038416906370a082319061186d9030906004016125a9565b60206040518083038186803b15801561188557600080fd5b505afa158015611899573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118bd919061281e565b915060a454826118cd91906127c5565b60a55560a45460a7556118e2610e10426127c5565b6118ee90610e106127e7565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a054156119915760a05460a55461198991906127c5565b609e556119a2565b60a85460ff166119a25760a954609e555b609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b81806119fc5750805b15611a8a576001609a6000609c5481526020019081526020016000206001016000828254611a2a9190612806565b9091555050609c546000908152609a602090815260408083206001600160a01b03881684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611a84908490612806565b90915550505b8015611b745760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611ac19088906004016125a9565b602060405180830381600087803b158015611adb57600080fd5b505af1158015611aef573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b13919061281e565b905080609a6000609c5481526020019081526020016000206002016000828254611b3d9190612806565b90915550506040518181526001600160a01b03861690600080516020612ac58339815191529060200160405180910390a25061095d565b8115611bd057609c546000908152609a602052604081206002018054859290611b9e908490612806565b90915550506040518381526001600160a01b03851690600080516020612ac58339815191529060200160405180910390a25b6000611bda611696565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611c0b9088908890600401612944565b602060405180830381600087803b158015611c2557600080fd5b505af1158015611c39573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c5d91906128f6565b611ca15760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b6044820152606401610850565b5050505050565b600080516020612ae5833981519152546001600160a01b031690565b610e2d611e0c565b6000611cd6611ca8565b9050611ce18461231f565b600083511180611cee5750815b15611cff57611cfd84846123b2565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16611ca157805460ff19166001178155604051611d7a908690611d4b9085906024016125a9565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526123b2565b50805460ff19168155611d8b611ca8565b6001600160a01b0316826001600160a01b031614611e035760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610850565b611ca18561249d565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b158015611e5057600080fd5b505afa158015611e64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e889190612837565b6001600160a01b031614611ede5760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610850565b565b600080611eeb611750565b9050611ef6836112d5565b8015611f1b57506001600160a01b038316600090815260ac602052604090205460ff16155b8015611f2d5750611f2b8361129e565b155b15611f4957611f408382600160006119f3565b50600192915050565b611f52836112d5565b1580611f7657506001600160a01b038316600090815260ac602052604090205460ff165b15610f2757600160a06000828254611f8e9190612806565b90915550506001600160a01b038316600090815260ac60205260409020805460ff1916905560a85460ff1615611fd157611fcc8360008060016119f3565b611fdf565b611fdf8382600160006119f3565b6040516001600160a01b038416907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a250600192915050565b6000612026611696565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161205691906125a9565b60206040518083038186803b15801561206e57600080fd5b505afa158015612082573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120a6919061281e565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a08231926120de92909116906004016125a9565b60206040518083038186803b1580156120f657600080fd5b505afa15801561210a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061212e919061281e565b6065546040519192506001600160a01b03169063d1b7089a9085906121599030908690602401612944565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526121b49392916001600160a01b0316906000906004016129b5565b600060405180830381600087803b1580156121ce57600080fd5b505af11580156121e2573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261220a91908101906129e9565b50600090506122198284612806565b6040516370a0823160e01b81529091506001600160a01b038516906370a08231906122489030906004016125a9565b60206040518083038186803b15801561226057600080fd5b505afa158015612274573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612298919061281e565b81146122e05760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b6044820152606401610850565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba910160405180910390a150505050565b803b6123835760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610850565b600080516020612ae583398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6124115760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610850565b600080846001600160a01b03168460405161242c9190612a75565b600060405180830381855af49150503d8060008114612467576040519150601f19603f3d011682016040523d82523d6000602084013e61246c565b606091505b50915091506124948282604051806060016040528060278152602001612b05602791396124dd565b95945050505050565b6124a68161231f565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606083156124ec575081612516565b8251156124fc5782518084602001fd5b8160405162461bcd60e51b81526004016108509190612a91565b9392505050565b6001600160a01b0381168114610e2d57600080fd5b60006020828403121561254457600080fd5b81356125168161251d565b60006020828403121561256157600080fd5b5035919050565b60008060006060848603121561257d57600080fd5b83356125888161251d565b925060208401356125988161251d565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156125fb576125fb6125bd565b604052919050565b60006001600160401b0382111561261c5761261c6125bd565b50601f01601f191660200190565b6000806040838503121561263d57600080fd5b82356126488161251d565b915060208301356001600160401b0381111561266357600080fd5b8301601f8101851361267457600080fd5b803561268761268282612603565b6125d3565b81815286602083850101111561269c57600080fd5b816020840160208301376000602083830101528093505050509250929050565b600060208083850312156126cf57600080fd5b82356001600160401b03808211156126e657600080fd5b818501915085601f8301126126fa57600080fd5b81358181111561270c5761270c6125bd565b8060051b915061271d8483016125d3565b818152918301840191848101908884111561273757600080fd5b938501935b8385101561276157843592506127518361251d565b828252938501939085019061273c565b98975050505050505050565b8015158114610e2d57600080fd5b60006020828403121561278d57600080fd5b81356125168161276d565b634e487b7160e01b600052601160045260246000fd5b6000828210156127c0576127c0612798565b500390565b6000826127e257634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561280157612801612798565b500290565b6000821982111561281957612819612798565b500190565b60006020828403121561283057600080fd5b5051919050565b60006020828403121561284957600080fd5b81516125168161251d565b6020808252601490820152731b9bdd081a5b881c195c9a5bd914dd185c9d195960621b604082015260600190565b6020808252602c90820152600080516020612aa583398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612aa583398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60006020828403121561290857600080fd5b81516125168161276d565b634e487b7160e01b600052603260045260246000fd5b600060001982141561293d5761293d612798565b5060010190565b6001600160a01b03929092168252602082015260400190565b60005b83811015612978578181015183820152602001612960565b8381111561095d5750506000910152565b600081518084526129a181602086016020860161295d565b601f01601f19169290920160200192915050565b600060018060a01b038087168352608060208401526129d76080840187612989565b94166040830152506060015292915050565b600080604083850312156129fc57600080fd5b8251612a078161276d565b60208401519092506001600160401b03811115612a2357600080fd5b8301601f81018513612a3457600080fd5b8051612a4261268282612603565b818152866020838501011115612a5757600080fd5b612a6882602083016020860161295d565b8093505050509250929050565b60008251612a8781846020870161295d565b9190910192915050565b602081526000612516602083018461298956fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c656472b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540fa264697066735822122082bf04ebcab0326eb0b4d8803888134a4e8b57d83640f929bb9ba3459222c56f64736f6c63430008080033",
963
+ "bytecode": "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c612d1261004b60003960008181610e4201528181610e82015281816112c301526113030152612d126000f3fe60806040526004361061022e5760003560e01c8063013eba921461023357806302329a2914610273578063069786ea146102955780630ce82d67146102bf5780631099da4f146102d45780631248b101146102ea5780631794bb3c146103215780631a787f2e146103415780631b3c90a8146103615780631bbc644c146103765780631d8f5ea9146103a657806322b45727146103bc5780633659cfe6146103d25780633d84ceca146103f25780633e6326fc146104125780634162169f1461043f5780634202d2141461045f578063456ac1c21461047f5780634b4c7180146104995780634e71d92d146104b35780634f1ef286146104c85780635231e2f0146104db578063560796d11461050b5780635aef7de61461055c5780635c9302c91461057c5780635c975abb1461059257806373b2e80e146105ac578063741470ac146105cc5780638081cbbd146105e25780638fd247d21461060257806398d6621b146106225780639dc2c03314610637578063a21f698a1461064d578063b656223d1461066d578063ba07541014610683578063c033abf214610699578063c1337508146106af578063c7713870146106cf578063c7a76adf146106e4578063cc054dfc14610704578063cef6360014610731578063d55ec69714610751578063d6a9f61814610766578063d7c4cbb814610786578063dddc36161461079c578063de1de3a0146107b1578063e1758bd8146107d1578063eac471a0146107e6578063eda4e6d6146107fc575b600080fd5b34801561023f57600080fd5b5061026061024e36600461269a565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027f57600080fd5b5061029361028e3660046126c5565b610812565b005b3480156102a157600080fd5b506102aa61082d565b6040805192835260208301919091520161026a565b3480156102cb57600080fd5b5061026061086b565b3480156102e057600080fd5b5061026060a95481565b3480156102f657600080fd5b506102aa6103053660046126e2565b609a602052600090815260409020600181015460029091015482565b34801561032d57600080fd5b5061029361033c3660046126fb565b61088e565b34801561034d57600080fd5b5061026061035c36600461269a565b610a19565b34801561036d57600080fd5b50610293610b50565b34801561038257600080fd5b5061039661039136600461269a565b610c95565b604051901515815260200161026a565b3480156103b257600080fd5b50610260609e5481565b3480156103c857600080fd5b5061026060a05481565b3480156103de57600080fd5b506102936103ed36600461269a565b610e37565b3480156103fe57600080fd5b5061029361040d3660046126e2565b610f00565b34801561041e57600080fd5b50606754610432906001600160a01b031681565b60405161026a919061273c565b34801561044b57600080fd5b50606554610432906001600160a01b031681565b34801561046b57600080fd5b5061039661047a36600461269a565b610f91565b34801561048b57600080fd5b5060a3546103969060ff1681565b3480156104a557600080fd5b5060a8546103969060ff1681565b3480156104bf57600080fd5b50610396610ff3565b6102936104d63660046127bd565b6112b8565b3480156104e757600080fd5b506103966104f636600461269a565b60ac6020526000908152604090205460ff1681565b34801561051757600080fd5b506105456105263660046126e2565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161026a565b34801561056857600080fd5b50606654610432906001600160a01b031681565b34801561058857600080fd5b50610260609c5481565b34801561059e57600080fd5b5060ae546103969060ff1681565b3480156105b857600080fd5b506103966105c736600461269a565b611372565b3480156105d857600080fd5b5061026060a75481565b3480156105ee57600080fd5b5060aa54610432906001600160a01b031681565b34801561060e57600080fd5b5061029361061d3660046126e2565b61139e565b34801561062e57600080fd5b506102606113ab565b34801561064357600080fd5b5061026060a55481565b34801561065957600080fd5b5061039661066836600461269a565b6113b6565b34801561067957600080fd5b5061026060a25481565b34801561068f57600080fd5b5061026060a65481565b3480156106a557600080fd5b50610260609f5481565b3480156106bb57600080fd5b506102606106ca36600461284f565b6113dc565b3480156106db57600080fd5b50610260611591565b3480156106f057600080fd5b506102606106ff3660046126e2565b611695565b34801561071057600080fd5b5061026061071f36600461269a565b60ad6020526000908152604090205481565b34801561073d57600080fd5b5061026061074c3660046126e2565b6116aa565b34801561075d57600080fd5b506102936116bf565b34801561077257600080fd5b506102936107813660046126c5565b611735565b34801561079257600080fd5b5061026060a15481565b3480156107a857600080fd5b50610293611750565b3480156107bd57600080fd5b506102936107cc3660046126c5565b6117af565b3480156107dd57600080fd5b506104326117fe565b3480156107f257600080fd5b5061026060a45481565b34801561080857600080fd5b50610260609d5481565b61081a611895565b60ae805460ff1916911515919091179055565b600080600062015180609d54426108449190612916565b61084e919061292d565b905061085981611695565b610862826116aa565b92509250509091565b60006201518060a6544261087f9190612916565b610889919061292d565b905090565b600054610100900460ff16806108a7575060005460ff16155b61090f5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b600054610100900460ff16158015610931576000805461ffff19166101011790555b600082116109815760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f6044820152606401610906565b61098a84611969565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055605a60a455620249f0609f556109cd620151804261292d565b6109da906201518061294f565b6109e69061a8c061296e565b609d81905560a65560a8805460ff1916600117905561138860a9558015610a13576000805461ff00191690555b50505050565b6000609d54421015610a2d57506000919050565b60a85460ff168015610a675750610a43826113b6565b1580610a6757506001600160a01b038216600090815260ac602052604090205460ff165b15610af85760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b815260040160206040518083038186803b158015610aba57600080fd5b505afa158015610ace573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610af29190612986565b92915050565b62015180609d5442610b0a9190612916565b610b14919061292d565b609c54148015610b2657506000609e54115b15610b4857610b3482611372565b610b4057609e54610af2565b600092915050565b610af2611591565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610bae57600080fd5b505afa158015610bc2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610be6919061299f565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610c3b57600080fd5b505afa158015610c4f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c73919061299f565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610cad57506000609d54115b8015610cbb5750609d544210155b610cd75760405162461bcd60e51b8152600401610906906129bc565b610ce0826113b6565b8015610cf25750610cf082610f91565b155b610d385760405162461bcd60e51b815260206004820152601760248201527634b9903737ba1030b71034b730b1ba34bb32903ab9b2b960491b6044820152606401610906565b6001600160a01b038216600090815260ac602052604090205460ff1615610d925760405162461bcd60e51b815260206004820152600e60248201526d185b1c9958591e48199a5cda195960921b6044820152606401610906565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055610dbd61198c565b60a05490915015610de157600160a06000828254610ddb9190612916565b90915550505b610dee3382600080611c2f565b6040518181526001600160a01b0384169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a350600192915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610e805760405162461bcd60e51b8152600401610906906129f3565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610eb2611ee4565b6001600160a01b031614610ed85760405162461bcd60e51b815260040161090690612a2d565b610ee181611f00565b60408051600080825260208201909252610efd91839190611f08565b50565b610f08611895565b60008111610f625760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b6064820152608401610906565b60a4819055600060a755604051818152600080516020612c56833981519152906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610fb3836113b6565b15610fea57600062015180610fc88342612916565b610fd2919061292d565b905060a254811015610fe8575060019392505050565b505b50600092915050565b60ae5460009060ff1615801561100b57506000609d54115b80156110195750609d544210155b6110355760405162461bcd60e51b8152600401610906906129bc565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561109157600080fd5b505afa1580156110a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110c9919061299f565b6001600160a01b0316633af32abf336040518263ffffffff1660e01b81526004016110f4919061273c565b60206040518083038186803b15801561110c57600080fd5b505afa158015611120573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111449190612a67565b61118d5760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b6044820152606401610906565b600061119833612048565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156111ff57600080fd5b505afa158015611213573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611237919061299f565b905081801561124e57506001600160a01b03811615155b156112b25760405163748abee960e11b81526001600160a01b0382169063e9157dd29061127f90339060040161273c565b600060405180830381600087803b15801561129957600080fd5b505af11580156112ad573d6000803e3d6000fd5b505050505b50905090565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156113015760405162461bcd60e51b8152600401610906906129f3565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316611333611ee4565b6001600160a01b0316146113595760405162461bcd60e51b815260040161090690612a2d565b61136282611f00565b61136e82826001611f08565b5050565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b6113a6611895565b60a055565b600061088933610a19565b6001600160a01b0381166000908152609b602052604081205415610b4057506001919050565b60ae5460009060ff161580156113f457506000609d54115b80156114025750609d544210155b61141e5760405162461bcd60e51b8152600401610906906129bc565b60005b825181101561156357609f545a101561145b57604051818152600080516020612cbd8339815191529060200160405180910390a192915050565b61147d83828151811061147057611470612a84565b60200260200101516113b6565b80156114a857506114a683828151811061149957611499612a84565b6020026020010151610f91565b155b80156114ee575060ac60008483815181106114c5576114c5612a84565b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff16155b156115535761151583828151811061150857611508612a84565b6020026020010151610c95565b6115535760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b6044820152606401610906565b61155c81612a9a565b9050611421565b50600080516020612cbd833981519152825160405161158491815260200190565b60405180910390a1505190565b60008061159c6117fe565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016115c7919061273c565b60206040518083038186803b1580156115df57600080fd5b505afa1580156115f3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116179190612986565b9050600060a55460a4548361162c919061292d565b119050600060a5549050600060a75461164361086b565b10158061164d5750825b156116625760a45461165f908561292d565b91505b60a0541561167e5760a054611677908361292d565b905061168d565b60a85460ff1661168d575060a9545b949350505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b6116c7611895565b60ae805460ff1916600117905561c35060a0556000609e819055601e60a45560a7556116f66277f88042612916565b60a65563621e0ac0609d5561170961198c565b50600080516020612c5683398151915260a45460405161172b91815260200190565b60405180910390a1565b61173d611895565b60a8805460ff1916911515919091179055565b600062015180609d54426117649190612916565b61176e919061292d565b9050609c54811115610efd57609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610f86565b6117b7611895565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610f86565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561185d57600080fd5b505afa158015611871573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610889919061299f565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b1580156118d957600080fd5b505afa1580156118ed573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611911919061299f565b6001600160a01b0316146119675760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610906565b565b606780546001600160a01b0319166001600160a01b038316179055610efd610b50565b6000611996611750565b60a154609c541415806119a95750609e54155b15611c285760006119b86117fe565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016119e8919061273c565b60206040518083038186803b158015611a0057600080fd5b505afa158015611a14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a389190612986565b9050600060a55460a45483611a4d919061292d565b11905060a754611a5b61086b565b101580611a655750805b15611b7d5760a35460ff1615611a7d57611a7d612184565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611aa990309060040161273c565b60206040518083038186803b158015611ac157600080fd5b505afa158015611ad5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611af99190612986565b915060a45482611b09919061292d565b60a55560a45460a755611b1e610e104261292d565b611b2a90610e1061294f565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05415611bcd5760a05460a554611bc5919061292d565b609e55611bde565b60a85460ff16611bde5760a954609e555b609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b8180611c385750805b15611cc6576001609a6000609c5481526020019081526020016000206001016000828254611c66919061296e565b9091555050609c546000908152609a602090815260408083206001600160a01b03881684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611cc090849061296e565b90915550505b8015611db05760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611cfd90889060040161273c565b602060405180830381600087803b158015611d1757600080fd5b505af1158015611d2b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d4f9190612986565b905080609a6000609c5481526020019081526020016000206002016000828254611d79919061296e565b90915550506040518181526001600160a01b03861690600080516020612c368339815191529060200160405180910390a250610a13565b8115611e0c57609c546000908152609a602052604081206002018054859290611dda90849061296e565b90915550506040518381526001600160a01b03851690600080516020612c368339815191529060200160405180910390a25b6000611e166117fe565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611e479088908890600401612ab5565b602060405180830381600087803b158015611e6157600080fd5b505af1158015611e75573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e999190612a67565b611edd5760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b6044820152606401610906565b5050505050565b600080516020612c76833981519152546001600160a01b031690565b610efd611895565b6000611f12611ee4565b9050611f1d84612487565b600083511180611f2a5750815b15611f3b57611f39848461251a565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16611edd57805460ff19166001178155604051611fb6908690611f8790859060240161273c565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b17905261251a565b50805460ff19168155611fc7611ee4565b6001600160a01b0316826001600160a01b03161461203f5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610906565b611edd85612605565b60008061205361198c565b905061205e836113b6565b801561208357506001600160a01b038316600090815260ac602052604090205460ff16155b8015612095575061209383611372565b155b156120b1576120a8838260016000611c2f565b50600192915050565b6120ba836113b6565b15806120de57506001600160a01b038316600090815260ac602052604090205460ff165b15610fea57600160a060008282546120f6919061296e565b90915550506001600160a01b038316600090815260ac60205260409020805460ff1916905560a85460ff161561213957612134836000806001611c2f565b612147565b612147838260016000611c2f565b6040516001600160a01b038416907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a250600192915050565b600061218e6117fe565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016121be919061273c565b60206040518083038186803b1580156121d657600080fd5b505afa1580156121ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061220e9190612986565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a0823192612246929091169060040161273c565b60206040518083038186803b15801561225e57600080fd5b505afa158015612272573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122969190612986565b6065546040519192506001600160a01b03169063d1b7089a9085906122c19030908690602401612ab5565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b031916815261231c9392916001600160a01b031690600090600401612b26565b600060405180830381600087803b15801561233657600080fd5b505af115801561234a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526123729190810190612b5a565b5060009050612381828461296e565b6040516370a0823160e01b81529091506001600160a01b038516906370a08231906123b090309060040161273c565b60206040518083038186803b1580156123c857600080fd5b505afa1580156123dc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124009190612986565b81146124485760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b6044820152606401610906565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba910160405180910390a150505050565b803b6124eb5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610906565b600080516020612c7683398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6125795760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610906565b600080846001600160a01b0316846040516125949190612be6565b600060405180830381855af49150503d80600081146125cf576040519150601f19603f3d011682016040523d82523d6000602084013e6125d4565b606091505b50915091506125fc8282604051806060016040528060278152602001612c9660279139612645565b95945050505050565b61260e81612487565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060831561265457508161267e565b8251156126645782518084602001fd5b8160405162461bcd60e51b81526004016109069190612c02565b9392505050565b6001600160a01b0381168114610efd57600080fd5b6000602082840312156126ac57600080fd5b813561267e81612685565b8015158114610efd57600080fd5b6000602082840312156126d757600080fd5b813561267e816126b7565b6000602082840312156126f457600080fd5b5035919050565b60008060006060848603121561271057600080fd5b833561271b81612685565b9250602084013561272b81612685565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561278e5761278e612750565b604052919050565b60006001600160401b038211156127af576127af612750565b50601f01601f191660200190565b600080604083850312156127d057600080fd5b82356127db81612685565b915060208301356001600160401b038111156127f657600080fd5b8301601f8101851361280757600080fd5b803561281a61281582612796565b612766565b81815286602083850101111561282f57600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561286257600080fd5b82356001600160401b038082111561287957600080fd5b818501915085601f83011261288d57600080fd5b81358181111561289f5761289f612750565b8060051b91506128b0848301612766565b81815291830184019184810190888411156128ca57600080fd5b938501935b838510156128f457843592506128e483612685565b82825293850193908501906128cf565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b60008282101561292857612928612900565b500390565b60008261294a57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561296957612969612900565b500290565b6000821982111561298157612981612900565b500190565b60006020828403121561299857600080fd5b5051919050565b6000602082840312156129b157600080fd5b815161267e81612685565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612c1683398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612c1683398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215612a7957600080fd5b815161267e816126b7565b634e487b7160e01b600052603260045260246000fd5b6000600019821415612aae57612aae612900565b5060010190565b6001600160a01b03929092168252602082015260400190565b60005b83811015612ae9578181015183820152602001612ad1565b83811115610a135750506000910152565b60008151808452612b12816020860160208601612ace565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612b486080840187612afa565b94166040830152506060015292915050565b60008060408385031215612b6d57600080fd5b8251612b78816126b7565b60208401519092506001600160401b03811115612b9457600080fd5b8301601f81018513612ba557600080fd5b8051612bb361281582612796565b818152866020838501011115612bc857600080fd5b612bd9826020830160208601612ace565b8093505050509250929050565b60008251612bf8818460208701612ace565b9190910192915050565b60208152600061267e6020830184612afa56fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304a61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c656472b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540fa26469706673582212208bf38984404596b09ce617ade5ace96dd496dc0c59223478d703e728861993a464736f6c63430008080033",
964
+ "deployedBytecode": "0x60806040526004361061022e5760003560e01c8063013eba921461023357806302329a2914610273578063069786ea146102955780630ce82d67146102bf5780631099da4f146102d45780631248b101146102ea5780631794bb3c146103215780631a787f2e146103415780631b3c90a8146103615780631bbc644c146103765780631d8f5ea9146103a657806322b45727146103bc5780633659cfe6146103d25780633d84ceca146103f25780633e6326fc146104125780634162169f1461043f5780634202d2141461045f578063456ac1c21461047f5780634b4c7180146104995780634e71d92d146104b35780634f1ef286146104c85780635231e2f0146104db578063560796d11461050b5780635aef7de61461055c5780635c9302c91461057c5780635c975abb1461059257806373b2e80e146105ac578063741470ac146105cc5780638081cbbd146105e25780638fd247d21461060257806398d6621b146106225780639dc2c03314610637578063a21f698a1461064d578063b656223d1461066d578063ba07541014610683578063c033abf214610699578063c1337508146106af578063c7713870146106cf578063c7a76adf146106e4578063cc054dfc14610704578063cef6360014610731578063d55ec69714610751578063d6a9f61814610766578063d7c4cbb814610786578063dddc36161461079c578063de1de3a0146107b1578063e1758bd8146107d1578063eac471a0146107e6578063eda4e6d6146107fc575b600080fd5b34801561023f57600080fd5b5061026061024e36600461269a565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027f57600080fd5b5061029361028e3660046126c5565b610812565b005b3480156102a157600080fd5b506102aa61082d565b6040805192835260208301919091520161026a565b3480156102cb57600080fd5b5061026061086b565b3480156102e057600080fd5b5061026060a95481565b3480156102f657600080fd5b506102aa6103053660046126e2565b609a602052600090815260409020600181015460029091015482565b34801561032d57600080fd5b5061029361033c3660046126fb565b61088e565b34801561034d57600080fd5b5061026061035c36600461269a565b610a19565b34801561036d57600080fd5b50610293610b50565b34801561038257600080fd5b5061039661039136600461269a565b610c95565b604051901515815260200161026a565b3480156103b257600080fd5b50610260609e5481565b3480156103c857600080fd5b5061026060a05481565b3480156103de57600080fd5b506102936103ed36600461269a565b610e37565b3480156103fe57600080fd5b5061029361040d3660046126e2565b610f00565b34801561041e57600080fd5b50606754610432906001600160a01b031681565b60405161026a919061273c565b34801561044b57600080fd5b50606554610432906001600160a01b031681565b34801561046b57600080fd5b5061039661047a36600461269a565b610f91565b34801561048b57600080fd5b5060a3546103969060ff1681565b3480156104a557600080fd5b5060a8546103969060ff1681565b3480156104bf57600080fd5b50610396610ff3565b6102936104d63660046127bd565b6112b8565b3480156104e757600080fd5b506103966104f636600461269a565b60ac6020526000908152604090205460ff1681565b34801561051757600080fd5b506105456105263660046126e2565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161026a565b34801561056857600080fd5b50606654610432906001600160a01b031681565b34801561058857600080fd5b50610260609c5481565b34801561059e57600080fd5b5060ae546103969060ff1681565b3480156105b857600080fd5b506103966105c736600461269a565b611372565b3480156105d857600080fd5b5061026060a75481565b3480156105ee57600080fd5b5060aa54610432906001600160a01b031681565b34801561060e57600080fd5b5061029361061d3660046126e2565b61139e565b34801561062e57600080fd5b506102606113ab565b34801561064357600080fd5b5061026060a55481565b34801561065957600080fd5b5061039661066836600461269a565b6113b6565b34801561067957600080fd5b5061026060a25481565b34801561068f57600080fd5b5061026060a65481565b3480156106a557600080fd5b50610260609f5481565b3480156106bb57600080fd5b506102606106ca36600461284f565b6113dc565b3480156106db57600080fd5b50610260611591565b3480156106f057600080fd5b506102606106ff3660046126e2565b611695565b34801561071057600080fd5b5061026061071f36600461269a565b60ad6020526000908152604090205481565b34801561073d57600080fd5b5061026061074c3660046126e2565b6116aa565b34801561075d57600080fd5b506102936116bf565b34801561077257600080fd5b506102936107813660046126c5565b611735565b34801561079257600080fd5b5061026060a15481565b3480156107a857600080fd5b50610293611750565b3480156107bd57600080fd5b506102936107cc3660046126c5565b6117af565b3480156107dd57600080fd5b506104326117fe565b3480156107f257600080fd5b5061026060a45481565b34801561080857600080fd5b50610260609d5481565b61081a611895565b60ae805460ff1916911515919091179055565b600080600062015180609d54426108449190612916565b61084e919061292d565b905061085981611695565b610862826116aa565b92509250509091565b60006201518060a6544261087f9190612916565b610889919061292d565b905090565b600054610100900460ff16806108a7575060005460ff16155b61090f5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b600054610100900460ff16158015610931576000805461ffff19166101011790555b600082116109815760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f6044820152606401610906565b61098a84611969565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055605a60a455620249f0609f556109cd620151804261292d565b6109da906201518061294f565b6109e69061a8c061296e565b609d81905560a65560a8805460ff1916600117905561138860a9558015610a13576000805461ff00191690555b50505050565b6000609d54421015610a2d57506000919050565b60a85460ff168015610a675750610a43826113b6565b1580610a6757506001600160a01b038216600090815260ac602052604090205460ff165b15610af85760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b815260040160206040518083038186803b158015610aba57600080fd5b505afa158015610ace573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610af29190612986565b92915050565b62015180609d5442610b0a9190612916565b610b14919061292d565b609c54148015610b2657506000609e54115b15610b4857610b3482611372565b610b4057609e54610af2565b600092915050565b610af2611591565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610bae57600080fd5b505afa158015610bc2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610be6919061299f565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610c3b57600080fd5b505afa158015610c4f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c73919061299f565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610cad57506000609d54115b8015610cbb5750609d544210155b610cd75760405162461bcd60e51b8152600401610906906129bc565b610ce0826113b6565b8015610cf25750610cf082610f91565b155b610d385760405162461bcd60e51b815260206004820152601760248201527634b9903737ba1030b71034b730b1ba34bb32903ab9b2b960491b6044820152606401610906565b6001600160a01b038216600090815260ac602052604090205460ff1615610d925760405162461bcd60e51b815260206004820152600e60248201526d185b1c9958591e48199a5cda195960921b6044820152606401610906565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055610dbd61198c565b60a05490915015610de157600160a06000828254610ddb9190612916565b90915550505b610dee3382600080611c2f565b6040518181526001600160a01b0384169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a350600192915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610e805760405162461bcd60e51b8152600401610906906129f3565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610eb2611ee4565b6001600160a01b031614610ed85760405162461bcd60e51b815260040161090690612a2d565b610ee181611f00565b60408051600080825260208201909252610efd91839190611f08565b50565b610f08611895565b60008111610f625760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b6064820152608401610906565b60a4819055600060a755604051818152600080516020612c56833981519152906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610fb3836113b6565b15610fea57600062015180610fc88342612916565b610fd2919061292d565b905060a254811015610fe8575060019392505050565b505b50600092915050565b60ae5460009060ff1615801561100b57506000609d54115b80156110195750609d544210155b6110355760405162461bcd60e51b8152600401610906906129bc565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561109157600080fd5b505afa1580156110a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110c9919061299f565b6001600160a01b0316633af32abf336040518263ffffffff1660e01b81526004016110f4919061273c565b60206040518083038186803b15801561110c57600080fd5b505afa158015611120573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111449190612a67565b61118d5760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b6044820152606401610906565b600061119833612048565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156111ff57600080fd5b505afa158015611213573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611237919061299f565b905081801561124e57506001600160a01b03811615155b156112b25760405163748abee960e11b81526001600160a01b0382169063e9157dd29061127f90339060040161273c565b600060405180830381600087803b15801561129957600080fd5b505af11580156112ad573d6000803e3d6000fd5b505050505b50905090565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156113015760405162461bcd60e51b8152600401610906906129f3565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316611333611ee4565b6001600160a01b0316146113595760405162461bcd60e51b815260040161090690612a2d565b61136282611f00565b61136e82826001611f08565b5050565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b6113a6611895565b60a055565b600061088933610a19565b6001600160a01b0381166000908152609b602052604081205415610b4057506001919050565b60ae5460009060ff161580156113f457506000609d54115b80156114025750609d544210155b61141e5760405162461bcd60e51b8152600401610906906129bc565b60005b825181101561156357609f545a101561145b57604051818152600080516020612cbd8339815191529060200160405180910390a192915050565b61147d83828151811061147057611470612a84565b60200260200101516113b6565b80156114a857506114a683828151811061149957611499612a84565b6020026020010151610f91565b155b80156114ee575060ac60008483815181106114c5576114c5612a84565b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff16155b156115535761151583828151811061150857611508612a84565b6020026020010151610c95565b6115535760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b6044820152606401610906565b61155c81612a9a565b9050611421565b50600080516020612cbd833981519152825160405161158491815260200190565b60405180910390a1505190565b60008061159c6117fe565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016115c7919061273c565b60206040518083038186803b1580156115df57600080fd5b505afa1580156115f3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116179190612986565b9050600060a55460a4548361162c919061292d565b119050600060a5549050600060a75461164361086b565b10158061164d5750825b156116625760a45461165f908561292d565b91505b60a0541561167e5760a054611677908361292d565b905061168d565b60a85460ff1661168d575060a9545b949350505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b6116c7611895565b60ae805460ff1916600117905561c35060a0556000609e819055601e60a45560a7556116f66277f88042612916565b60a65563621e0ac0609d5561170961198c565b50600080516020612c5683398151915260a45460405161172b91815260200190565b60405180910390a1565b61173d611895565b60a8805460ff1916911515919091179055565b600062015180609d54426117649190612916565b61176e919061292d565b9050609c54811115610efd57609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610f86565b6117b7611895565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610f86565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561185d57600080fd5b505afa158015611871573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610889919061299f565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b1580156118d957600080fd5b505afa1580156118ed573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611911919061299f565b6001600160a01b0316146119675760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610906565b565b606780546001600160a01b0319166001600160a01b038316179055610efd610b50565b6000611996611750565b60a154609c541415806119a95750609e54155b15611c285760006119b86117fe565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016119e8919061273c565b60206040518083038186803b158015611a0057600080fd5b505afa158015611a14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a389190612986565b9050600060a55460a45483611a4d919061292d565b11905060a754611a5b61086b565b101580611a655750805b15611b7d5760a35460ff1615611a7d57611a7d612184565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611aa990309060040161273c565b60206040518083038186803b158015611ac157600080fd5b505afa158015611ad5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611af99190612986565b915060a45482611b09919061292d565b60a55560a45460a755611b1e610e104261292d565b611b2a90610e1061294f565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05415611bcd5760a05460a554611bc5919061292d565b609e55611bde565b60a85460ff16611bde5760a954609e555b609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b8180611c385750805b15611cc6576001609a6000609c5481526020019081526020016000206001016000828254611c66919061296e565b9091555050609c546000908152609a602090815260408083206001600160a01b03881684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611cc090849061296e565b90915550505b8015611db05760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611cfd90889060040161273c565b602060405180830381600087803b158015611d1757600080fd5b505af1158015611d2b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d4f9190612986565b905080609a6000609c5481526020019081526020016000206002016000828254611d79919061296e565b90915550506040518181526001600160a01b03861690600080516020612c368339815191529060200160405180910390a250610a13565b8115611e0c57609c546000908152609a602052604081206002018054859290611dda90849061296e565b90915550506040518381526001600160a01b03851690600080516020612c368339815191529060200160405180910390a25b6000611e166117fe565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611e479088908890600401612ab5565b602060405180830381600087803b158015611e6157600080fd5b505af1158015611e75573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e999190612a67565b611edd5760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b6044820152606401610906565b5050505050565b600080516020612c76833981519152546001600160a01b031690565b610efd611895565b6000611f12611ee4565b9050611f1d84612487565b600083511180611f2a5750815b15611f3b57611f39848461251a565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16611edd57805460ff19166001178155604051611fb6908690611f8790859060240161273c565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b17905261251a565b50805460ff19168155611fc7611ee4565b6001600160a01b0316826001600160a01b03161461203f5760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610906565b611edd85612605565b60008061205361198c565b905061205e836113b6565b801561208357506001600160a01b038316600090815260ac602052604090205460ff16155b8015612095575061209383611372565b155b156120b1576120a8838260016000611c2f565b50600192915050565b6120ba836113b6565b15806120de57506001600160a01b038316600090815260ac602052604090205460ff165b15610fea57600160a060008282546120f6919061296e565b90915550506001600160a01b038316600090815260ac60205260409020805460ff1916905560a85460ff161561213957612134836000806001611c2f565b612147565b612147838260016000611c2f565b6040516001600160a01b038416907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a250600192915050565b600061218e6117fe565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016121be919061273c565b60206040518083038186803b1580156121d657600080fd5b505afa1580156121ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061220e9190612986565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a0823192612246929091169060040161273c565b60206040518083038186803b15801561225e57600080fd5b505afa158015612272573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122969190612986565b6065546040519192506001600160a01b03169063d1b7089a9085906122c19030908690602401612ab5565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b031916815261231c9392916001600160a01b031690600090600401612b26565b600060405180830381600087803b15801561233657600080fd5b505af115801561234a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526123729190810190612b5a565b5060009050612381828461296e565b6040516370a0823160e01b81529091506001600160a01b038516906370a08231906123b090309060040161273c565b60206040518083038186803b1580156123c857600080fd5b505afa1580156123dc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124009190612986565b81146124485760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b6044820152606401610906565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba910160405180910390a150505050565b803b6124eb5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610906565b600080516020612c7683398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6125795760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610906565b600080846001600160a01b0316846040516125949190612be6565b600060405180830381855af49150503d80600081146125cf576040519150601f19603f3d011682016040523d82523d6000602084013e6125d4565b606091505b50915091506125fc8282604051806060016040528060278152602001612c9660279139612645565b95945050505050565b61260e81612487565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060831561265457508161267e565b8251156126645782518084602001fd5b8160405162461bcd60e51b81526004016109069190612c02565b9392505050565b6001600160a01b0381168114610efd57600080fd5b6000602082840312156126ac57600080fd5b813561267e81612685565b8015158114610efd57600080fd5b6000602082840312156126d757600080fd5b813561267e816126b7565b6000602082840312156126f457600080fd5b5035919050565b60008060006060848603121561271057600080fd5b833561271b81612685565b9250602084013561272b81612685565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561278e5761278e612750565b604052919050565b60006001600160401b038211156127af576127af612750565b50601f01601f191660200190565b600080604083850312156127d057600080fd5b82356127db81612685565b915060208301356001600160401b038111156127f657600080fd5b8301601f8101851361280757600080fd5b803561281a61281582612796565b612766565b81815286602083850101111561282f57600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561286257600080fd5b82356001600160401b038082111561287957600080fd5b818501915085601f83011261288d57600080fd5b81358181111561289f5761289f612750565b8060051b91506128b0848301612766565b81815291830184019184810190888411156128ca57600080fd5b938501935b838510156128f457843592506128e483612685565b82825293850193908501906128cf565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b60008282101561292857612928612900565b500390565b60008261294a57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561296957612969612900565b500290565b6000821982111561298157612981612900565b500190565b60006020828403121561299857600080fd5b5051919050565b6000602082840312156129b157600080fd5b815161267e81612685565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612c1683398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612c1683398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215612a7957600080fd5b815161267e816126b7565b634e487b7160e01b600052603260045260246000fd5b6000600019821415612aae57612aae612900565b5060010190565b6001600160a01b03929092168252602082015260400190565b60005b83811015612ae9578181015183820152602001612ad1565b83811115610a135750506000910152565b60008151808452612b12816020860160208601612ace565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612b486080840187612afa565b94166040830152506060015292915050565b60008060408385031215612b6d57600080fd5b8251612b78816126b7565b60208401519092506001600160401b03811115612b9457600080fd5b8301601f81018513612ba557600080fd5b8051612bb361281582612796565b818152866020838501011115612bc857600080fd5b612bd9826020830160208601612ace565b8093505050509250929050565b60008251612bf8818460208701612ace565b9190910192915050565b60208152600061267e6020830184612afa56fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304a61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c656472b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540fa26469706673582212208bf38984404596b09ce617ade5ace96dd496dc0c59223478d703e728861993a464736f6c63430008080033",
919
965
  "linkReferences": {},
920
966
  "deployedLinkReferences": {}
921
967
  }
package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
3
+ "buildInfo": "../../../build-info/a6eaa29cbcb23d6af74de5a69aab77aa.json"
4
4
  }
package/contracts/ubi/UBIScheme.sol CHANGED
@@ -1,4 +1,6 @@
1
- // SPDX-License-Identifier: MIT
1
+ // SPDX-License-Identifier: MIXED
2
+
3
+ // License-Identifier: MIT
2
4
  pragma solidity >=0.8.0;
3
5
 
4
6
  import "../utils/DAOUpgradeableContract.sol";
@@ -103,6 +105,8 @@ contract UBIScheme is DAOUpgradeableContract {
103
105
  // Emits when a user is activated
104
106
  event ActivatedUser(address indexed account);
105
107
 
108
+ bool public paused;
109
+
106
110
  // Emits when a fish has been succeded
107
111
  event InactiveUserFished(
108
112
  address indexed caller,
@@ -191,8 +195,8 @@ contract UBIScheme is DAOUpgradeableContract {
191
195
 
192
196
  modifier requireStarted() {
193
197
  require(
194
- periodStart > 0 && block.timestamp >= periodStart,
195
- "not in periodStarted"
198
+ paused == false && periodStart > 0 && block.timestamp >= periodStart,
199
+ "not in periodStarted or paused"
196
200
  );
197
201
  _;
198
202
  }
@@ -232,6 +236,7 @@ contract UBIScheme is DAOUpgradeableContract {
232
236
  _onlyAvatar();
233
237
  require(_newLength > 0, "cycle must be at least 1 day long");
234
238
  cycleLength = _newLength;
239
+ currentCycleLength = 0; //this will trigger a distributionFormula on next claim day
235
240
  emit CycleLengthSet(_newLength);
236
241
  }
237
242
 
@@ -516,7 +521,9 @@ contract UBIScheme is DAOUpgradeableContract {
516
521
  // making sure that the calculation will be with the correct number of active users in case
517
522
  // that the fisher is the first to make the calculation today
518
523
  uint256 newDistribution = distributionFormula();
519
- activeUsersCount -= 1;
524
+ if (activeUsersCount > 0) {
525
+ activeUsersCount -= 1;
526
+ }
520
527
  _transferTokens(msg.sender, newDistribution, false, false);
521
528
  emit InactiveUserFished(msg.sender, _account, newDistribution);
522
529
  return true;
@@ -559,4 +566,27 @@ contract UBIScheme is DAOUpgradeableContract {
559
566
  shouldWithdrawFromDAO = _shouldWithdraw;
560
567
  emit ShouldWithdrawFromDAOSet(shouldWithdrawFromDAO);
561
568
  }
569
+
570
+ function pause(bool _pause) public {
571
+ _onlyAvatar();
572
+ paused = _pause;
573
+ }
574
+
575
+ function upgrade() public {
576
+ _onlyAvatar();
577
+ paused = true;
578
+ activeUsersCount = 50000; //estimated
579
+ dailyUbi = 0; //required so distributionformula will trigger
580
+ cycleLength = 30;
581
+ currentCycleLength = 0; //this will trigger a new cycle calculation in distribution formula
582
+ startOfCycle = block.timestamp - 91 days; //this will trigger a new calculation in distributionFormula
583
+ periodStart = 1646136000;
584
+ distributionFormula();
585
+ emit CycleLengthSet(cycleLength);
586
+ }
587
+
588
+ function setActiveUserCount(uint256 _activeUserCount) public {
589
+ _onlyAvatar();
590
+ activeUsersCount = _activeUserCount;
591
+ }
562
592
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gooddollar/goodprotocol",
3
- "version": "1.0.20",
3
+ "version": "1.0.22",
4
4
  "description": "GoodDollar Protocol",
5
5
  "scripts": {
6
6
  "build": "scripts/build.sh deploy",
package/releases/deployment.json CHANGED
@@ -513,7 +513,9 @@
513
513
  "0x3ff2d8eb2573819a9ef7167d2ba6fd6d31b17f4f",
514
514
  6944
515
515
  ]
516
- ]
516
+ ],
517
+ "MultichainRouter": "0x765277eebeca2e31912c9946eae1021199b39c61",
518
+ "anyGoodDollar": "0xd17652350cfd2a37ba2f947c910987a3b1a1c60d"
517
519
  },
518
520
  "production": {
519
521
  "NameService": "0xec6dcE387B1616a0c44fF2E4fA9E90E53Cf14eb0",
package/scripts/misc/claimIncidentStats.ts ADDED
@@ -0,0 +1,97 @@
1
+ import { countBy, chunk, difference, flatten, sortBy } from "lodash";
2
+ import fs from "fs";
3
+ import { network, ethers, upgrades } from "hardhat";
4
+ import { Contract, Provider, setMulticallAddress } from "ethers-multicall";
5
+ import Identity from "../../artifacts/contracts/Interfaces.sol/IIdentity.json";
6
+
7
+ setMulticallAddress(122, "0x3CE6158b7278Bf6792e014FA7B4f3c6c46fe9410");
8
+ const CLAIM_START_BLOCK = 17896430;
9
+
10
+ const fuseProvider = new ethers.providers.JsonRpcBatchProvider(
11
+ "https://rpc.fuse.io"
12
+ );
13
+ const ethcallProvider = new Provider(fuseProvider, 122);
14
+
15
+ const GD_FUSE = "0x495d133b938596c9984d462f007b676bdc57ecec";
16
+ const IDENTITY_FUSE = "0xFa8d865A962ca8456dF331D78806152d3aC5B84F";
17
+
18
+ let gd = new ethers.Contract(
19
+ GD_FUSE,
20
+ [
21
+ "event Transfer(address indexed from, address indexed to, uint amount)",
22
+ "function balanceOf(address) view returns(uint256)"
23
+ ],
24
+ fuseProvider
25
+ );
26
+ const gdMulti = new Contract(GD_FUSE, [
27
+ "event Transfer(address indexed from, address indexed to, uint amount)",
28
+ "function balanceOf(address) view returns(uint256)"
29
+ ]);
30
+
31
+ const hasBalanceToRefund = async wallets => {
32
+ const chunks = chunk(wallets, 1000);
33
+ let balances = {};
34
+ for (let batch of chunks) {
35
+ const calls = batch.map(a => gdMulti.balanceOf(a));
36
+ const result = await ethcallProvider.all(calls);
37
+ console.log("batch:", batch.length, calls.length, result.length);
38
+ batch.forEach((d, i) => (balances[d] = result[i]));
39
+ }
40
+ console.log("got balances for:", Object.entries(balances).length);
41
+ const hasBalance = countBy(balances, v => v >= 9622260);
42
+ const noBalance = Object.entries(balances).filter(([k, v]) => v < 9622260);
43
+ console.log({ hasBalance });
44
+ return noBalance.map(_ => _[0]);
45
+ };
46
+
47
+ const hasRefunded = async wallets => {
48
+ const events = await gd.queryFilter(
49
+ gd.filters.Transfer(
50
+ undefined,
51
+ "0xd253A5203817225e9768C05E5996d642fb96bA86"
52
+ ),
53
+ 17896430
54
+ );
55
+ const refunded = events.filter(e => e.args.amount >= 9622260);
56
+ return refunded.map(_ => _.args.from.toLowerCase());
57
+ };
58
+
59
+ const whereIsTheMoney = async noBalance => {
60
+ let targets = [];
61
+ for (let batch of chunk(noBalance, 100)) {
62
+ const tos = await Promise.all(
63
+ batch.map(async a => {
64
+ const e = await gd.queryFilter(
65
+ gd.filters.Transfer(a),
66
+ CLAIM_START_BLOCK
67
+ );
68
+ const tos = e.filter(_ => _.args.amount > 1000000).map(_ => _.args.to);
69
+ return tos;
70
+ })
71
+ );
72
+ targets.push(...flatten(tos));
73
+ }
74
+ const targetCounter = countBy(targets, _ => _);
75
+ console.log(
76
+ "transfer targets:",
77
+ sortBy(Object.entries(targetCounter), "1").reverse()
78
+ );
79
+ };
80
+ const main = async () => {
81
+ const wallets = JSON.parse(fs.readFileSync("torefund.json").toString()).map(
82
+ _ => _.toLowerCase()
83
+ );
84
+ console.log("Total Claimed:", wallets.length);
85
+ const refunded = await hasRefunded(wallets);
86
+ const notRefunded = difference(wallets, refunded);
87
+ console.log(
88
+ "refunded:",
89
+ refunded.length,
90
+ "not refunded:",
91
+ notRefunded.length
92
+ );
93
+
94
+ const noBalanceToRefund = await hasBalanceToRefund(notRefunded);
95
+ await whereIsTheMoney(noBalanceToRefund);
96
+ };
97
+ main().catch(e => console.log(e));