@gooddollar/goodprotocol 1.0.20 → 1.0.21-beta.0

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 +35 -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 +25 -3
  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 +59 -0
  97. package/types/factories/UBIScheme__factory.ts +34 -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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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",
@@ -869,6 +895,13 @@
869
895
  "stateMutability": "nonpayable",
870
896
  "type": "function"
871
897
  },
898
+ {
899
+ "inputs": [],
900
+ "name": "upgrade",
901
+ "outputs": [],
902
+ "stateMutability": "nonpayable",
903
+ "type": "function"
904
+ },
872
905
  {
873
906
  "inputs": [
874
907
  {
@@ -914,8 +947,8 @@
914
947
  "type": "function"
915
948
  }
916
949
  ],
917
- "bytecode": "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c612b8161004b60003960008181610d7201528181610db2015281816111ef015261122f0152612b816000f3fe6080604052600436106102025760003560e01c8063013eba9214610207578063069786ea146102475780630ce82d67146102715780631099da4f146102865780631248b1011461029c5780631794bb3c146102d35780631a787f2e146102f55780631b3c90a8146103155780631bbc644c1461032a5780631d8f5ea91461035a57806322b45727146103705780633659cfe6146103865780633d84ceca146103a65780633e6326fc146103c65780634162169f146103f35780634202d21414610413578063456ac1c2146104335780634b4c71801461044d5780634e71d92d146104675780634f1ef2861461047c5780635231e2f01461048f578063560796d1146104bf5780635aef7de6146105105780635c9302c91461053057806373b2e80e14610546578063741470ac146105665780638081cbbd1461057c57806398d6621b1461059c5780639dc2c033146105b1578063a21f698a146105c7578063b656223d146105e7578063ba075410146105fd578063c033abf214610613578063c133750814610629578063c771387014610649578063c7a76adf1461065e578063cc054dfc1461067e578063cef63600146106ab578063d6a9f618146106cb578063d7c4cbb8146106eb578063dddc361614610701578063de1de3a014610716578063e1758bd814610736578063eac471a01461074b578063eda4e6d614610761575b600080fd5b34801561021357600080fd5b50610234610222366004612532565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561025357600080fd5b5061025c610777565b6040805192835260208301919091520161023e565b34801561027d57600080fd5b506102346107b5565b34801561029257600080fd5b5061023460a95481565b3480156102a857600080fd5b5061025c6102b736600461254f565b609a602052600090815260409020600181015460029091015482565b3480156102df57600080fd5b506102f36102ee366004612568565b6107d8565b005b34801561030157600080fd5b50610234610310366004612532565b610963565b34801561032157600080fd5b506102f3610a9a565b34801561033657600080fd5b5061034a610345366004612532565b610bdf565b604051901515815260200161023e565b34801561036657600080fd5b50610234609e5481565b34801561037c57600080fd5b5061023460a05481565b34801561039257600080fd5b506102f36103a1366004612532565b610d67565b3480156103b257600080fd5b506102f36103c136600461254f565b610e30565b3480156103d257600080fd5b506067546103e6906001600160a01b031681565b60405161023e91906125a9565b3480156103ff57600080fd5b506065546103e6906001600160a01b031681565b34801561041f57600080fd5b5061034a61042e366004612532565b610ece565b34801561043f57600080fd5b5060a35461034a9060ff1681565b34801561045957600080fd5b5060a85461034a9060ff1681565b34801561047357600080fd5b5061034a610f30565b6102f361048a36600461262a565b6111e4565b34801561049b57600080fd5b5061034a6104aa366004612532565b60ac6020526000908152604090205460ff1681565b3480156104cb57600080fd5b506104f96104da36600461254f565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161023e565b34801561051c57600080fd5b506066546103e6906001600160a01b031681565b34801561053c57600080fd5b50610234609c5481565b34801561055257600080fd5b5061034a610561366004612532565b61129e565b34801561057257600080fd5b5061023460a75481565b34801561058857600080fd5b5060aa546103e6906001600160a01b031681565b3480156105a857600080fd5b506102346112ca565b3480156105bd57600080fd5b5061023460a55481565b3480156105d357600080fd5b5061034a6105e2366004612532565b6112d5565b3480156105f357600080fd5b5061023460a25481565b34801561060957600080fd5b5061023460a65481565b34801561061f57600080fd5b50610234609f5481565b34801561063557600080fd5b506102346106443660046126bc565b6112fb565b34801561065557600080fd5b5061023461149f565b34801561066a57600080fd5b5061023461067936600461254f565b6115a3565b34801561068a57600080fd5b50610234610699366004612532565b60ad6020526000908152604090205481565b3480156106b757600080fd5b506102346106c636600461254f565b6115b8565b3480156106d757600080fd5b506102f36106e636600461277b565b6115cd565b3480156106f757600080fd5b5061023460a15481565b34801561070d57600080fd5b506102f36115e8565b34801561072257600080fd5b506102f361073136600461277b565b611647565b34801561074257600080fd5b506103e6611696565b34801561075757600080fd5b5061023460a45481565b34801561076d57600080fd5b50610234609d5481565b600080600062015180609d544261078e91906127ae565b61079891906127c5565b90506107a3816115a3565b6107ac826115b8565b92509250509091565b60006201518060a654426107c991906127ae565b6107d391906127c5565b905090565b600054610100900460ff16806107f1575060005460ff16155b6108595760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b600054610100900460ff1615801561087b576000805461ffff19166101011790555b600082116108cb5760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f6044820152606401610850565b6108d48461172d565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055605a60a455620249f0609f5561091762015180426127c5565b61092490620151806127e7565b6109309061a8c0612806565b609d81905560a65560a8805460ff1916600117905561138860a955801561095d576000805461ff00191690555b50505050565b6000609d5442101561097757506000919050565b60a85460ff1680156109b1575061098d826112d5565b15806109b157506001600160a01b038216600090815260ac602052604090205460ff165b15610a425760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b815260040160206040518083038186803b158015610a0457600080fd5b505afa158015610a18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a3c919061281e565b92915050565b62015180609d5442610a5491906127ae565b610a5e91906127c5565b609c54148015610a7057506000609e54115b15610a9257610a7e8261129e565b610a8a57609e54610a3c565b600092915050565b610a3c61149f565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610af857600080fd5b505afa158015610b0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b309190612837565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610b8557600080fd5b505afa158015610b99573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bbd9190612837565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b600080609d54118015610bf45750609d544210155b610c105760405162461bcd60e51b815260040161085090612854565b610c19826112d5565b8015610c2b5750610c2982610ece565b155b610c715760405162461bcd60e51b815260206004820152601760248201527634b9903737ba1030b71034b730b1ba34bb32903ab9b2b960491b6044820152606401610850565b6001600160a01b038216600090815260ac602052604090205460ff1615610ccb5760405162461bcd60e51b815260206004820152600e60248201526d185b1c9958591e48199a5cda195960921b6044820152606401610850565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055610cf6611750565b9050600160a06000828254610d0b91906127ae565b90915550610d1e905033826000806119f3565b6040518181526001600160a01b0384169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a350600192915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610db05760405162461bcd60e51b815260040161085090612882565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610de2611ca8565b6001600160a01b031614610e085760405162461bcd60e51b8152600401610850906128bc565b610e1181611cc4565b60408051600080825260208201909252610e2d91839190611ccc565b50565b610e38611e0c565b60008111610e925760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b6064820152608401610850565b60a48190556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610ef0836112d5565b15610f2757600062015180610f0583426127ae565b610f0f91906127c5565b905060a254811015610f25575060019392505050565b505b50600092915050565b600080609d54118015610f455750609d544210155b610f615760405162461bcd60e51b815260040161085090612854565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610fbd57600080fd5b505afa158015610fd1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ff59190612837565b6001600160a01b0316633af32abf336040518263ffffffff1660e01b815260040161102091906125a9565b60206040518083038186803b15801561103857600080fd5b505afa15801561104c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061107091906128f6565b6110b95760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b6044820152606401610850565b60006110c433611ee0565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561112b57600080fd5b505afa15801561113f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111639190612837565b905081801561117a57506001600160a01b03811615155b156111de5760405163748abee960e11b81526001600160a01b0382169063e9157dd2906111ab9033906004016125a9565b600060405180830381600087803b1580156111c557600080fd5b505af11580156111d9573d6000803e3d6000fd5b505050505b50905090565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561122d5760405162461bcd60e51b815260040161085090612882565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661125f611ca8565b6001600160a01b0316146112855760405162461bcd60e51b8152600401610850906128bc565b61128e82611cc4565b61129a82826001611ccc565b5050565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b60006107d333610963565b6001600160a01b0381166000908152609b602052604081205415610a8a57506001919050565b600080609d541180156113105750609d544210155b61132c5760405162461bcd60e51b815260040161085090612854565b60005b825181101561147157609f545a101561136957604051818152600080516020612b2c8339815191529060200160405180910390a192915050565b61138b83828151811061137e5761137e612913565b60200260200101516112d5565b80156113b657506113b48382815181106113a7576113a7612913565b6020026020010151610ece565b155b80156113fc575060ac60008483815181106113d3576113d3612913565b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff16155b156114615761142383828151811061141657611416612913565b6020026020010151610bdf565b6114615760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b6044820152606401610850565b61146a81612929565b905061132f565b50600080516020612b2c833981519152825160405161149291815260200190565b60405180910390a1505190565b6000806114aa611696565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016114d591906125a9565b60206040518083038186803b1580156114ed57600080fd5b505afa158015611501573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611525919061281e565b9050600060a55460a4548361153a91906127c5565b119050600060a5549050600060a7546115516107b5565b10158061155b5750825b156115705760a45461156d90856127c5565b91505b60a0541561158c5760a05461158590836127c5565b905061159b565b60a85460ff1661159b575060a9545b949350505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b6115d5611e0c565b60a8805460ff1916911515919091179055565b600062015180609d54426115fc91906127ae565b61160691906127c5565b9050609c54811115610e2d57609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610ec3565b61164f611e0c565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610ec3565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b1580156116f557600080fd5b505afa158015611709573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107d39190612837565b606780546001600160a01b0319166001600160a01b038316179055610e2d610a9a565b600061175a6115e8565b60a154609c5414158061176d5750609e54155b156119ec57600061177c611696565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016117ac91906125a9565b60206040518083038186803b1580156117c457600080fd5b505afa1580156117d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117fc919061281e565b9050600060a55460a4548361181191906127c5565b11905060a75461181f6107b5565b1015806118295750805b156119415760a35460ff16156118415761184161201c565b6040516370a0823160e01b81526001600160a01b038416906370a082319061186d9030906004016125a9565b60206040518083038186803b15801561188557600080fd5b505afa158015611899573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118bd919061281e565b915060a454826118cd91906127c5565b60a55560a45460a7556118e2610e10426127c5565b6118ee90610e106127e7565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a054156119915760a05460a55461198991906127c5565b609e556119a2565b60a85460ff166119a25760a954609e555b609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b81806119fc5750805b15611a8a576001609a6000609c5481526020019081526020016000206001016000828254611a2a9190612806565b9091555050609c546000908152609a602090815260408083206001600160a01b03881684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611a84908490612806565b90915550505b8015611b745760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611ac19088906004016125a9565b602060405180830381600087803b158015611adb57600080fd5b505af1158015611aef573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b13919061281e565b905080609a6000609c5481526020019081526020016000206002016000828254611b3d9190612806565b90915550506040518181526001600160a01b03861690600080516020612ac58339815191529060200160405180910390a25061095d565b8115611bd057609c546000908152609a602052604081206002018054859290611b9e908490612806565b90915550506040518381526001600160a01b03851690600080516020612ac58339815191529060200160405180910390a25b6000611bda611696565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611c0b9088908890600401612944565b602060405180830381600087803b158015611c2557600080fd5b505af1158015611c39573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c5d91906128f6565b611ca15760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b6044820152606401610850565b5050505050565b600080516020612ae5833981519152546001600160a01b031690565b610e2d611e0c565b6000611cd6611ca8565b9050611ce18461231f565b600083511180611cee5750815b15611cff57611cfd84846123b2565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16611ca157805460ff19166001178155604051611d7a908690611d4b9085906024016125a9565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526123b2565b50805460ff19168155611d8b611ca8565b6001600160a01b0316826001600160a01b031614611e035760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610850565b611ca18561249d565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b158015611e5057600080fd5b505afa158015611e64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e889190612837565b6001600160a01b031614611ede5760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610850565b565b600080611eeb611750565b9050611ef6836112d5565b8015611f1b57506001600160a01b038316600090815260ac602052604090205460ff16155b8015611f2d5750611f2b8361129e565b155b15611f4957611f408382600160006119f3565b50600192915050565b611f52836112d5565b1580611f7657506001600160a01b038316600090815260ac602052604090205460ff165b15610f2757600160a06000828254611f8e9190612806565b90915550506001600160a01b038316600090815260ac60205260409020805460ff1916905560a85460ff1615611fd157611fcc8360008060016119f3565b611fdf565b611fdf8382600160006119f3565b6040516001600160a01b038416907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a250600192915050565b6000612026611696565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161205691906125a9565b60206040518083038186803b15801561206e57600080fd5b505afa158015612082573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120a6919061281e565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a08231926120de92909116906004016125a9565b60206040518083038186803b1580156120f657600080fd5b505afa15801561210a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061212e919061281e565b6065546040519192506001600160a01b03169063d1b7089a9085906121599030908690602401612944565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526121b49392916001600160a01b0316906000906004016129b5565b600060405180830381600087803b1580156121ce57600080fd5b505af11580156121e2573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261220a91908101906129e9565b50600090506122198284612806565b6040516370a0823160e01b81529091506001600160a01b038516906370a08231906122489030906004016125a9565b60206040518083038186803b15801561226057600080fd5b505afa158015612274573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612298919061281e565b81146122e05760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b6044820152606401610850565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba910160405180910390a150505050565b803b6123835760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610850565b600080516020612ae583398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6124115760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610850565b600080846001600160a01b03168460405161242c9190612a75565b600060405180830381855af49150503d8060008114612467576040519150601f19603f3d011682016040523d82523d6000602084013e61246c565b606091505b50915091506124948282604051806060016040528060278152602001612b05602791396124dd565b95945050505050565b6124a68161231f565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606083156124ec575081612516565b8251156124fc5782518084602001fd5b8160405162461bcd60e51b81526004016108509190612a91565b9392505050565b6001600160a01b0381168114610e2d57600080fd5b60006020828403121561254457600080fd5b81356125168161251d565b60006020828403121561256157600080fd5b5035919050565b60008060006060848603121561257d57600080fd5b83356125888161251d565b925060208401356125988161251d565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156125fb576125fb6125bd565b604052919050565b60006001600160401b0382111561261c5761261c6125bd565b50601f01601f191660200190565b6000806040838503121561263d57600080fd5b82356126488161251d565b915060208301356001600160401b0381111561266357600080fd5b8301601f8101851361267457600080fd5b803561268761268282612603565b6125d3565b81815286602083850101111561269c57600080fd5b816020840160208301376000602083830101528093505050509250929050565b600060208083850312156126cf57600080fd5b82356001600160401b03808211156126e657600080fd5b818501915085601f8301126126fa57600080fd5b81358181111561270c5761270c6125bd565b8060051b915061271d8483016125d3565b818152918301840191848101908884111561273757600080fd5b938501935b8385101561276157843592506127518361251d565b828252938501939085019061273c565b98975050505050505050565b8015158114610e2d57600080fd5b60006020828403121561278d57600080fd5b81356125168161276d565b634e487b7160e01b600052601160045260246000fd5b6000828210156127c0576127c0612798565b500390565b6000826127e257634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561280157612801612798565b500290565b6000821982111561281957612819612798565b500190565b60006020828403121561283057600080fd5b5051919050565b60006020828403121561284957600080fd5b81516125168161251d565b6020808252601490820152731b9bdd081a5b881c195c9a5bd914dd185c9d195960621b604082015260600190565b6020808252602c90820152600080516020612aa583398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612aa583398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60006020828403121561290857600080fd5b81516125168161276d565b634e487b7160e01b600052603260045260246000fd5b600060001982141561293d5761293d612798565b5060010190565b6001600160a01b03929092168252602082015260400190565b60005b83811015612978578181015183820152602001612960565b8381111561095d5750506000910152565b600081518084526129a181602086016020860161295d565b601f01601f19169290920160200192915050565b600060018060a01b038087168352608060208401526129d76080840187612989565b94166040830152506060015292915050565b600080604083850312156129fc57600080fd5b8251612a078161276d565b60208401519092506001600160401b03811115612a2357600080fd5b8301601f81018513612a3457600080fd5b8051612a4261268282612603565b818152866020838501011115612a5757600080fd5b612a6882602083016020860161295d565b8093505050509250929050565b60008251612a8781846020870161295d565b9190910192915050565b602081526000612516602083018461298956fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c656472b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540fa264697066735822122082bf04ebcab0326eb0b4d8803888134a4e8b57d83640f929bb9ba3459222c56f64736f6c63430008080033",
918
- "deployedBytecode": "0x6080604052600436106102025760003560e01c8063013eba9214610207578063069786ea146102475780630ce82d67146102715780631099da4f146102865780631248b1011461029c5780631794bb3c146102d35780631a787f2e146102f55780631b3c90a8146103155780631bbc644c1461032a5780631d8f5ea91461035a57806322b45727146103705780633659cfe6146103865780633d84ceca146103a65780633e6326fc146103c65780634162169f146103f35780634202d21414610413578063456ac1c2146104335780634b4c71801461044d5780634e71d92d146104675780634f1ef2861461047c5780635231e2f01461048f578063560796d1146104bf5780635aef7de6146105105780635c9302c91461053057806373b2e80e14610546578063741470ac146105665780638081cbbd1461057c57806398d6621b1461059c5780639dc2c033146105b1578063a21f698a146105c7578063b656223d146105e7578063ba075410146105fd578063c033abf214610613578063c133750814610629578063c771387014610649578063c7a76adf1461065e578063cc054dfc1461067e578063cef63600146106ab578063d6a9f618146106cb578063d7c4cbb8146106eb578063dddc361614610701578063de1de3a014610716578063e1758bd814610736578063eac471a01461074b578063eda4e6d614610761575b600080fd5b34801561021357600080fd5b50610234610222366004612532565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561025357600080fd5b5061025c610777565b6040805192835260208301919091520161023e565b34801561027d57600080fd5b506102346107b5565b34801561029257600080fd5b5061023460a95481565b3480156102a857600080fd5b5061025c6102b736600461254f565b609a602052600090815260409020600181015460029091015482565b3480156102df57600080fd5b506102f36102ee366004612568565b6107d8565b005b34801561030157600080fd5b50610234610310366004612532565b610963565b34801561032157600080fd5b506102f3610a9a565b34801561033657600080fd5b5061034a610345366004612532565b610bdf565b604051901515815260200161023e565b34801561036657600080fd5b50610234609e5481565b34801561037c57600080fd5b5061023460a05481565b34801561039257600080fd5b506102f36103a1366004612532565b610d67565b3480156103b257600080fd5b506102f36103c136600461254f565b610e30565b3480156103d257600080fd5b506067546103e6906001600160a01b031681565b60405161023e91906125a9565b3480156103ff57600080fd5b506065546103e6906001600160a01b031681565b34801561041f57600080fd5b5061034a61042e366004612532565b610ece565b34801561043f57600080fd5b5060a35461034a9060ff1681565b34801561045957600080fd5b5060a85461034a9060ff1681565b34801561047357600080fd5b5061034a610f30565b6102f361048a36600461262a565b6111e4565b34801561049b57600080fd5b5061034a6104aa366004612532565b60ac6020526000908152604090205460ff1681565b3480156104cb57600080fd5b506104f96104da36600461254f565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161023e565b34801561051c57600080fd5b506066546103e6906001600160a01b031681565b34801561053c57600080fd5b50610234609c5481565b34801561055257600080fd5b5061034a610561366004612532565b61129e565b34801561057257600080fd5b5061023460a75481565b34801561058857600080fd5b5060aa546103e6906001600160a01b031681565b3480156105a857600080fd5b506102346112ca565b3480156105bd57600080fd5b5061023460a55481565b3480156105d357600080fd5b5061034a6105e2366004612532565b6112d5565b3480156105f357600080fd5b5061023460a25481565b34801561060957600080fd5b5061023460a65481565b34801561061f57600080fd5b50610234609f5481565b34801561063557600080fd5b506102346106443660046126bc565b6112fb565b34801561065557600080fd5b5061023461149f565b34801561066a57600080fd5b5061023461067936600461254f565b6115a3565b34801561068a57600080fd5b50610234610699366004612532565b60ad6020526000908152604090205481565b3480156106b757600080fd5b506102346106c636600461254f565b6115b8565b3480156106d757600080fd5b506102f36106e636600461277b565b6115cd565b3480156106f757600080fd5b5061023460a15481565b34801561070d57600080fd5b506102f36115e8565b34801561072257600080fd5b506102f361073136600461277b565b611647565b34801561074257600080fd5b506103e6611696565b34801561075757600080fd5b5061023460a45481565b34801561076d57600080fd5b50610234609d5481565b600080600062015180609d544261078e91906127ae565b61079891906127c5565b90506107a3816115a3565b6107ac826115b8565b92509250509091565b60006201518060a654426107c991906127ae565b6107d391906127c5565b905090565b600054610100900460ff16806107f1575060005460ff16155b6108595760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b600054610100900460ff1615801561087b576000805461ffff19166101011790555b600082116108cb5760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f6044820152606401610850565b6108d48461172d565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055605a60a455620249f0609f5561091762015180426127c5565b61092490620151806127e7565b6109309061a8c0612806565b609d81905560a65560a8805460ff1916600117905561138860a955801561095d576000805461ff00191690555b50505050565b6000609d5442101561097757506000919050565b60a85460ff1680156109b1575061098d826112d5565b15806109b157506001600160a01b038216600090815260ac602052604090205460ff165b15610a425760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b815260040160206040518083038186803b158015610a0457600080fd5b505afa158015610a18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a3c919061281e565b92915050565b62015180609d5442610a5491906127ae565b610a5e91906127c5565b609c54148015610a7057506000609e54115b15610a9257610a7e8261129e565b610a8a57609e54610a3c565b600092915050565b610a3c61149f565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610af857600080fd5b505afa158015610b0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b309190612837565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610b8557600080fd5b505afa158015610b99573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bbd9190612837565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b600080609d54118015610bf45750609d544210155b610c105760405162461bcd60e51b815260040161085090612854565b610c19826112d5565b8015610c2b5750610c2982610ece565b155b610c715760405162461bcd60e51b815260206004820152601760248201527634b9903737ba1030b71034b730b1ba34bb32903ab9b2b960491b6044820152606401610850565b6001600160a01b038216600090815260ac602052604090205460ff1615610ccb5760405162461bcd60e51b815260206004820152600e60248201526d185b1c9958591e48199a5cda195960921b6044820152606401610850565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055610cf6611750565b9050600160a06000828254610d0b91906127ae565b90915550610d1e905033826000806119f3565b6040518181526001600160a01b0384169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a350600192915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610db05760405162461bcd60e51b815260040161085090612882565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610de2611ca8565b6001600160a01b031614610e085760405162461bcd60e51b8152600401610850906128bc565b610e1181611cc4565b60408051600080825260208201909252610e2d91839190611ccc565b50565b610e38611e0c565b60008111610e925760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b6064820152608401610850565b60a48190556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610ef0836112d5565b15610f2757600062015180610f0583426127ae565b610f0f91906127c5565b905060a254811015610f25575060019392505050565b505b50600092915050565b600080609d54118015610f455750609d544210155b610f615760405162461bcd60e51b815260040161085090612854565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610fbd57600080fd5b505afa158015610fd1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ff59190612837565b6001600160a01b0316633af32abf336040518263ffffffff1660e01b815260040161102091906125a9565b60206040518083038186803b15801561103857600080fd5b505afa15801561104c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061107091906128f6565b6110b95760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b6044820152606401610850565b60006110c433611ee0565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561112b57600080fd5b505afa15801561113f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111639190612837565b905081801561117a57506001600160a01b03811615155b156111de5760405163748abee960e11b81526001600160a01b0382169063e9157dd2906111ab9033906004016125a9565b600060405180830381600087803b1580156111c557600080fd5b505af11580156111d9573d6000803e3d6000fd5b505050505b50905090565b306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016141561122d5760405162461bcd60e51b815260040161085090612882565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661125f611ca8565b6001600160a01b0316146112855760405162461bcd60e51b8152600401610850906128bc565b61128e82611cc4565b61129a82826001611ccc565b5050565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b60006107d333610963565b6001600160a01b0381166000908152609b602052604081205415610a8a57506001919050565b600080609d541180156113105750609d544210155b61132c5760405162461bcd60e51b815260040161085090612854565b60005b825181101561147157609f545a101561136957604051818152600080516020612b2c8339815191529060200160405180910390a192915050565b61138b83828151811061137e5761137e612913565b60200260200101516112d5565b80156113b657506113b48382815181106113a7576113a7612913565b6020026020010151610ece565b155b80156113fc575060ac60008483815181106113d3576113d3612913565b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff16155b156114615761142383828151811061141657611416612913565b6020026020010151610bdf565b6114615760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b6044820152606401610850565b61146a81612929565b905061132f565b50600080516020612b2c833981519152825160405161149291815260200190565b60405180910390a1505190565b6000806114aa611696565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016114d591906125a9565b60206040518083038186803b1580156114ed57600080fd5b505afa158015611501573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611525919061281e565b9050600060a55460a4548361153a91906127c5565b119050600060a5549050600060a7546115516107b5565b10158061155b5750825b156115705760a45461156d90856127c5565b91505b60a0541561158c5760a05461158590836127c5565b905061159b565b60a85460ff1661159b575060a9545b949350505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b6115d5611e0c565b60a8805460ff1916911515919091179055565b600062015180609d54426115fc91906127ae565b61160691906127c5565b9050609c54811115610e2d57609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610ec3565b61164f611e0c565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610ec3565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b1580156116f557600080fd5b505afa158015611709573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107d39190612837565b606780546001600160a01b0319166001600160a01b038316179055610e2d610a9a565b600061175a6115e8565b60a154609c5414158061176d5750609e54155b156119ec57600061177c611696565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016117ac91906125a9565b60206040518083038186803b1580156117c457600080fd5b505afa1580156117d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117fc919061281e565b9050600060a55460a4548361181191906127c5565b11905060a75461181f6107b5565b1015806118295750805b156119415760a35460ff16156118415761184161201c565b6040516370a0823160e01b81526001600160a01b038416906370a082319061186d9030906004016125a9565b60206040518083038186803b15801561188557600080fd5b505afa158015611899573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118bd919061281e565b915060a454826118cd91906127c5565b60a55560a45460a7556118e2610e10426127c5565b6118ee90610e106127e7565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a054156119915760a05460a55461198991906127c5565b609e556119a2565b60a85460ff166119a25760a954609e555b609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b81806119fc5750805b15611a8a576001609a6000609c5481526020019081526020016000206001016000828254611a2a9190612806565b9091555050609c546000908152609a602090815260408083206001600160a01b03881684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611a84908490612806565b90915550505b8015611b745760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611ac19088906004016125a9565b602060405180830381600087803b158015611adb57600080fd5b505af1158015611aef573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b13919061281e565b905080609a6000609c5481526020019081526020016000206002016000828254611b3d9190612806565b90915550506040518181526001600160a01b03861690600080516020612ac58339815191529060200160405180910390a25061095d565b8115611bd057609c546000908152609a602052604081206002018054859290611b9e908490612806565b90915550506040518381526001600160a01b03851690600080516020612ac58339815191529060200160405180910390a25b6000611bda611696565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611c0b9088908890600401612944565b602060405180830381600087803b158015611c2557600080fd5b505af1158015611c39573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c5d91906128f6565b611ca15760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b6044820152606401610850565b5050505050565b600080516020612ae5833981519152546001600160a01b031690565b610e2d611e0c565b6000611cd6611ca8565b9050611ce18461231f565b600083511180611cee5750815b15611cff57611cfd84846123b2565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16611ca157805460ff19166001178155604051611d7a908690611d4b9085906024016125a9565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526123b2565b50805460ff19168155611d8b611ca8565b6001600160a01b0316826001600160a01b031614611e035760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b6064820152608401610850565b611ca18561249d565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b158015611e5057600080fd5b505afa158015611e64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e889190612837565b6001600160a01b031614611ede5760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610850565b565b600080611eeb611750565b9050611ef6836112d5565b8015611f1b57506001600160a01b038316600090815260ac602052604090205460ff16155b8015611f2d5750611f2b8361129e565b155b15611f4957611f408382600160006119f3565b50600192915050565b611f52836112d5565b1580611f7657506001600160a01b038316600090815260ac602052604090205460ff165b15610f2757600160a06000828254611f8e9190612806565b90915550506001600160a01b038316600090815260ac60205260409020805460ff1916905560a85460ff1615611fd157611fcc8360008060016119f3565b611fdf565b611fdf8382600160006119f3565b6040516001600160a01b038416907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a250600192915050565b6000612026611696565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161205691906125a9565b60206040518083038186803b15801561206e57600080fd5b505afa158015612082573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120a6919061281e565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a08231926120de92909116906004016125a9565b60206040518083038186803b1580156120f657600080fd5b505afa15801561210a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061212e919061281e565b6065546040519192506001600160a01b03169063d1b7089a9085906121599030908690602401612944565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526121b49392916001600160a01b0316906000906004016129b5565b600060405180830381600087803b1580156121ce57600080fd5b505af11580156121e2573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261220a91908101906129e9565b50600090506122198284612806565b6040516370a0823160e01b81529091506001600160a01b038516906370a08231906122489030906004016125a9565b60206040518083038186803b15801561226057600080fd5b505afa158015612274573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612298919061281e565b81146122e05760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b6044820152606401610850565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba910160405180910390a150505050565b803b6123835760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610850565b600080516020612ae583398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b6124115760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610850565b600080846001600160a01b03168460405161242c9190612a75565b600060405180830381855af49150503d8060008114612467576040519150601f19603f3d011682016040523d82523d6000602084013e61246c565b606091505b50915091506124948282604051806060016040528060278152602001612b05602791396124dd565b95945050505050565b6124a68161231f565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606083156124ec575081612516565b8251156124fc5782518084602001fd5b8160405162461bcd60e51b81526004016108509190612a91565b9392505050565b6001600160a01b0381168114610e2d57600080fd5b60006020828403121561254457600080fd5b81356125168161251d565b60006020828403121561256157600080fd5b5035919050565b60008060006060848603121561257d57600080fd5b83356125888161251d565b925060208401356125988161251d565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156125fb576125fb6125bd565b604052919050565b60006001600160401b0382111561261c5761261c6125bd565b50601f01601f191660200190565b6000806040838503121561263d57600080fd5b82356126488161251d565b915060208301356001600160401b0381111561266357600080fd5b8301601f8101851361267457600080fd5b803561268761268282612603565b6125d3565b81815286602083850101111561269c57600080fd5b816020840160208301376000602083830101528093505050509250929050565b600060208083850312156126cf57600080fd5b82356001600160401b03808211156126e657600080fd5b818501915085601f8301126126fa57600080fd5b81358181111561270c5761270c6125bd565b8060051b915061271d8483016125d3565b818152918301840191848101908884111561273757600080fd5b938501935b8385101561276157843592506127518361251d565b828252938501939085019061273c565b98975050505050505050565b8015158114610e2d57600080fd5b60006020828403121561278d57600080fd5b81356125168161276d565b634e487b7160e01b600052601160045260246000fd5b6000828210156127c0576127c0612798565b500390565b6000826127e257634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561280157612801612798565b500290565b6000821982111561281957612819612798565b500190565b60006020828403121561283057600080fd5b5051919050565b60006020828403121561284957600080fd5b81516125168161251d565b6020808252601490820152731b9bdd081a5b881c195c9a5bd914dd185c9d195960621b604082015260600190565b6020808252602c90820152600080516020612aa583398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612aa583398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60006020828403121561290857600080fd5b81516125168161276d565b634e487b7160e01b600052603260045260246000fd5b600060001982141561293d5761293d612798565b5060010190565b6001600160a01b03929092168252602082015260400190565b60005b83811015612978578181015183820152602001612960565b8381111561095d5750506000910152565b600081518084526129a181602086016020860161295d565b601f01601f19169290920160200192915050565b600060018060a01b038087168352608060208401526129d76080840187612989565b94166040830152506060015292915050565b600080604083850312156129fc57600080fd5b8251612a078161276d565b60208401519092506001600160401b03811115612a2357600080fd5b8301601f81018513612a3457600080fd5b8051612a4261268282612603565b818152866020838501011115612a5757600080fd5b612a6882602083016020860161295d565b8093505050509250929050565b60008251612a8781846020870161295d565b9190910192915050565b602081526000612516602083018461298956fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c656472b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540fa264697066735822122082bf04ebcab0326eb0b4d8803888134a4e8b57d83640f929bb9ba3459222c56f64736f6c63430008080033",
950
+ "bytecode": "0x60a06040523060601b60805234801561001757600080fd5b5060805160601c612cb861004b60003960008181610e1701528181610e57015281816112aa01526112ea0152612cb86000f3fe6080604052600436106102235760003560e01c8063013eba921461022857806302329a2914610268578063069786ea1461028a5780630ce82d67146102b45780631099da4f146102c95780631248b101146102df5780631794bb3c146103165780631a787f2e146103365780631b3c90a8146103565780631bbc644c1461036b5780631d8f5ea91461039b57806322b45727146103b15780633659cfe6146103c75780633d84ceca146103e75780633e6326fc146104075780634162169f146104345780634202d21414610454578063456ac1c2146104745780634b4c71801461048e5780634e71d92d146104a85780634f1ef286146104bd5780635231e2f0146104d0578063560796d1146105005780635aef7de6146105515780635c9302c9146105715780635c975abb1461058757806373b2e80e146105a1578063741470ac146105c15780638081cbbd146105d757806398d6621b146105f75780639dc2c0331461060c578063a21f698a14610622578063b656223d14610642578063ba07541014610658578063c033abf21461066e578063c133750814610684578063c7713870146106a4578063c7a76adf146106b9578063cc054dfc146106d9578063cef6360014610706578063d55ec69714610726578063d6a9f6181461073b578063d7c4cbb81461075b578063dddc361614610771578063de1de3a014610786578063e1758bd8146107a6578063eac471a0146107bb578063eda4e6d6146107d1575b600080fd5b34801561023457600080fd5b50610255610243366004612660565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027457600080fd5b5061028861028336600461268b565b6107e7565b005b34801561029657600080fd5b5061029f610802565b6040805192835260208301919091520161025f565b3480156102c057600080fd5b50610255610840565b3480156102d557600080fd5b5061025560a95481565b3480156102eb57600080fd5b5061029f6102fa3660046126a8565b609a602052600090815260409020600181015460029091015482565b34801561032257600080fd5b506102886103313660046126c1565b610863565b34801561034257600080fd5b50610255610351366004612660565b6109ee565b34801561036257600080fd5b50610288610b25565b34801561037757600080fd5b5061038b610386366004612660565b610c6a565b604051901515815260200161025f565b3480156103a757600080fd5b50610255609e5481565b3480156103bd57600080fd5b5061025560a05481565b3480156103d357600080fd5b506102886103e2366004612660565b610e0c565b3480156103f357600080fd5b506102886104023660046126a8565b610ed5565b34801561041357600080fd5b50606754610427906001600160a01b031681565b60405161025f9190612702565b34801561044057600080fd5b50606554610427906001600160a01b031681565b34801561046057600080fd5b5061038b61046f366004612660565b610f78565b34801561048057600080fd5b5060a35461038b9060ff1681565b34801561049a57600080fd5b5060a85461038b9060ff1681565b3480156104b457600080fd5b5061038b610fda565b6102886104cb366004612783565b61129f565b3480156104dc57600080fd5b5061038b6104eb366004612660565b60ac6020526000908152604090205460ff1681565b34801561050c57600080fd5b5061053a61051b3660046126a8565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161025f565b34801561055d57600080fd5b50606654610427906001600160a01b031681565b34801561057d57600080fd5b50610255609c5481565b34801561059357600080fd5b5060ae5461038b9060ff1681565b3480156105ad57600080fd5b5061038b6105bc366004612660565b611359565b3480156105cd57600080fd5b5061025560a75481565b3480156105e357600080fd5b5060aa54610427906001600160a01b031681565b34801561060357600080fd5b50610255611385565b34801561061857600080fd5b5061025560a55481565b34801561062e57600080fd5b5061038b61063d366004612660565b611390565b34801561064e57600080fd5b5061025560a25481565b34801561066457600080fd5b5061025560a65481565b34801561067a57600080fd5b50610255609f5481565b34801561069057600080fd5b5061025561069f366004612815565b6113b6565b3480156106b057600080fd5b5061025561156b565b3480156106c557600080fd5b506102556106d43660046126a8565b61166f565b3480156106e557600080fd5b506102556106f4366004612660565b60ad6020526000908152604090205481565b34801561071257600080fd5b506102556107213660046126a8565b611684565b34801561073257600080fd5b50610288611699565b34801561074757600080fd5b5061028861075636600461268b565b6116fd565b34801561076757600080fd5b5061025560a15481565b34801561077d57600080fd5b50610288611718565b34801561079257600080fd5b506102886107a136600461268b565b611777565b3480156107b257600080fd5b506104276117c6565b3480156107c757600080fd5b5061025560a45481565b3480156107dd57600080fd5b50610255609d5481565b6107ef61185d565b60ae805460ff1916911515919091179055565b600080600062015180609d544261081991906128dc565b61082391906128f3565b905061082e8161166f565b61083782611684565b92509250509091565b60006201518060a6544261085491906128dc565b61085e91906128f3565b905090565b600054610100900460ff168061087c575060005460ff16155b6108e45760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b600054610100900460ff16158015610906576000805461ffff19166101011790555b600082116109565760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f60448201526064016108db565b61095f8461192f565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055605a60a455620249f0609f556109a262015180426128f3565b6109af9062015180612915565b6109bb9061a8c0612934565b609d81905560a65560a8805460ff1916600117905561138860a95580156109e8576000805461ff00191690555b50505050565b6000609d54421015610a0257506000919050565b60a85460ff168015610a3c5750610a1882611390565b1580610a3c57506001600160a01b038216600090815260ac602052604090205460ff165b15610acd5760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b815260040160206040518083038186803b158015610a8f57600080fd5b505afa158015610aa3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ac7919061294c565b92915050565b62015180609d5442610adf91906128dc565b610ae991906128f3565b609c54148015610afb57506000609e54115b15610b1d57610b0982611359565b610b1557609e54610ac7565b600092915050565b610ac761156b565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610b8357600080fd5b505afa158015610b97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bbb9190612965565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610c1057600080fd5b505afa158015610c24573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c489190612965565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610c8257506000609d54115b8015610c905750609d544210155b610cac5760405162461bcd60e51b81526004016108db90612982565b610cb582611390565b8015610cc75750610cc582610f78565b155b610d0d5760405162461bcd60e51b815260206004820152601760248201527634b9903737ba1030b71034b730b1ba34bb32903ab9b2b960491b60448201526064016108db565b6001600160a01b038216600090815260ac602052604090205460ff1615610d675760405162461bcd60e51b815260206004820152600e60248201526d185b1c9958591e48199a5cda195960921b60448201526064016108db565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055610d92611952565b60a05490915015610db657600160a06000828254610db091906128dc565b90915550505b610dc33382600080611bf5565b6040518181526001600160a01b0384169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a350600192915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610e555760405162461bcd60e51b81526004016108db906129b9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610e87611eaa565b6001600160a01b031614610ead5760405162461bcd60e51b81526004016108db906129f3565b610eb681611ec6565b60408051600080825260208201909252610ed291839190611ece565b50565b610edd61185d565b60008111610f375760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b60648201526084016108db565b60a4819055600060a7556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610f9a83611390565b15610fd157600062015180610faf83426128dc565b610fb991906128f3565b905060a254811015610fcf575060019392505050565b505b50600092915050565b60ae5460009060ff16158015610ff257506000609d54115b80156110005750609d544210155b61101c5760405162461bcd60e51b81526004016108db90612982565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561107857600080fd5b505afa15801561108c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110b09190612965565b6001600160a01b0316633af32abf336040518263ffffffff1660e01b81526004016110db9190612702565b60206040518083038186803b1580156110f357600080fd5b505afa158015611107573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061112b9190612a2d565b6111745760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b60448201526064016108db565b600061117f3361200e565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156111e657600080fd5b505afa1580156111fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061121e9190612965565b905081801561123557506001600160a01b03811615155b156112995760405163748abee960e11b81526001600160a01b0382169063e9157dd290611266903390600401612702565b600060405180830381600087803b15801561128057600080fd5b505af1158015611294573d6000803e3d6000fd5b505050505b50905090565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156112e85760405162461bcd60e51b81526004016108db906129b9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661131a611eaa565b6001600160a01b0316146113405760405162461bcd60e51b81526004016108db906129f3565b61134982611ec6565b61135582826001611ece565b5050565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b600061085e336109ee565b6001600160a01b0381166000908152609b602052604081205415610b1557506001919050565b60ae5460009060ff161580156113ce57506000609d54115b80156113dc5750609d544210155b6113f85760405162461bcd60e51b81526004016108db90612982565b60005b825181101561153d57609f545a101561143557604051818152600080516020612c638339815191529060200160405180910390a192915050565b61145783828151811061144a5761144a612a4a565b6020026020010151611390565b8015611482575061148083828151811061147357611473612a4a565b6020026020010151610f78565b155b80156114c8575060ac600084838151811061149f5761149f612a4a565b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff16155b1561152d576114ef8382815181106114e2576114e2612a4a565b6020026020010151610c6a565b61152d5760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b60448201526064016108db565b61153681612a60565b90506113fb565b50600080516020612c63833981519152825160405161155e91815260200190565b60405180910390a1505190565b6000806115766117c6565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016115a19190612702565b60206040518083038186803b1580156115b957600080fd5b505afa1580156115cd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115f1919061294c565b9050600060a55460a4548361160691906128f3565b119050600060a5549050600060a75461161d610840565b1015806116275750825b1561163c5760a45461163990856128f3565b91505b60a054156116585760a05461165190836128f3565b9050611667565b60a85460ff16611667575060a9545b949350505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b6362c427c04210156116fb5761c35060a0556000609e819055601e60a45560a7556116c76277f880426128dc565b60a6556116d762015180426128f3565b6116e49062015180612915565b6116f09061a8c0612934565b609d55610ed2611952565b565b61170561185d565b60a8805460ff1916911515919091179055565b600062015180609d544261172c91906128dc565b61173691906128f3565b9050609c54811115610ed257609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610f6d565b61177f61185d565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610f6d565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561182557600080fd5b505afa158015611839573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061085e9190612965565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b1580156118a157600080fd5b505afa1580156118b5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118d99190612965565b6001600160a01b0316146116fb5760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f6460448201526064016108db565b606780546001600160a01b0319166001600160a01b038316179055610ed2610b25565b600061195c611718565b60a154609c5414158061196f5750609e54155b15611bee57600061197e6117c6565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016119ae9190612702565b60206040518083038186803b1580156119c657600080fd5b505afa1580156119da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119fe919061294c565b9050600060a55460a45483611a1391906128f3565b11905060a754611a21610840565b101580611a2b5750805b15611b435760a35460ff1615611a4357611a4361214a565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611a6f903090600401612702565b60206040518083038186803b158015611a8757600080fd5b505afa158015611a9b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611abf919061294c565b915060a45482611acf91906128f3565b60a55560a45460a755611ae4610e10426128f3565b611af090610e10612915565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05415611b935760a05460a554611b8b91906128f3565b609e55611ba4565b60a85460ff16611ba45760a954609e555b609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b8180611bfe5750805b15611c8c576001609a6000609c5481526020019081526020016000206001016000828254611c2c9190612934565b9091555050609c546000908152609a602090815260408083206001600160a01b03881684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611c86908490612934565b90915550505b8015611d765760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611cc3908890600401612702565b602060405180830381600087803b158015611cdd57600080fd5b505af1158015611cf1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d15919061294c565b905080609a6000609c5481526020019081526020016000206002016000828254611d3f9190612934565b90915550506040518181526001600160a01b03861690600080516020612bfc8339815191529060200160405180910390a2506109e8565b8115611dd257609c546000908152609a602052604081206002018054859290611da0908490612934565b90915550506040518381526001600160a01b03851690600080516020612bfc8339815191529060200160405180910390a25b6000611ddc6117c6565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611e0d9088908890600401612a7b565b602060405180830381600087803b158015611e2757600080fd5b505af1158015611e3b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e5f9190612a2d565b611ea35760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b60448201526064016108db565b5050505050565b600080516020612c1c833981519152546001600160a01b031690565b610ed261185d565b6000611ed8611eaa565b9050611ee38461244d565b600083511180611ef05750815b15611f0157611eff84846124e0565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16611ea357805460ff19166001178155604051611f7c908690611f4d908590602401612702565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526124e0565b50805460ff19168155611f8d611eaa565b6001600160a01b0316826001600160a01b0316146120055760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b60648201526084016108db565b611ea3856125cb565b600080612019611952565b905061202483611390565b801561204957506001600160a01b038316600090815260ac602052604090205460ff16155b801561205b575061205983611359565b155b156120775761206e838260016000611bf5565b50600192915050565b61208083611390565b15806120a457506001600160a01b038316600090815260ac602052604090205460ff165b15610fd157600160a060008282546120bc9190612934565b90915550506001600160a01b038316600090815260ac60205260409020805460ff1916905560a85460ff16156120ff576120fa836000806001611bf5565b61210d565b61210d838260016000611bf5565b6040516001600160a01b038416907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a250600192915050565b60006121546117c6565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016121849190612702565b60206040518083038186803b15801561219c57600080fd5b505afa1580156121b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121d4919061294c565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a082319261220c9290911690600401612702565b60206040518083038186803b15801561222457600080fd5b505afa158015612238573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061225c919061294c565b6065546040519192506001600160a01b03169063d1b7089a9085906122879030908690602401612a7b565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526122e29392916001600160a01b031690600090600401612aec565b600060405180830381600087803b1580156122fc57600080fd5b505af1158015612310573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526123389190810190612b20565b50600090506123478284612934565b6040516370a0823160e01b81529091506001600160a01b038516906370a0823190612376903090600401612702565b60206040518083038186803b15801561238e57600080fd5b505afa1580156123a2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123c6919061294c565b811461240e5760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b60448201526064016108db565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba910160405180910390a150505050565b803b6124b15760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016108db565b600080516020612c1c83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b61253f5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016108db565b600080846001600160a01b03168460405161255a9190612bac565b600060405180830381855af49150503d8060008114612595576040519150601f19603f3d011682016040523d82523d6000602084013e61259a565b606091505b50915091506125c28282604051806060016040528060278152602001612c3c6027913961260b565b95945050505050565b6125d48161244d565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060831561261a575081612644565b82511561262a5782518084602001fd5b8160405162461bcd60e51b81526004016108db9190612bc8565b9392505050565b6001600160a01b0381168114610ed257600080fd5b60006020828403121561267257600080fd5b81356126448161264b565b8015158114610ed257600080fd5b60006020828403121561269d57600080fd5b81356126448161267d565b6000602082840312156126ba57600080fd5b5035919050565b6000806000606084860312156126d657600080fd5b83356126e18161264b565b925060208401356126f18161264b565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561275457612754612716565b604052919050565b60006001600160401b0382111561277557612775612716565b50601f01601f191660200190565b6000806040838503121561279657600080fd5b82356127a18161264b565b915060208301356001600160401b038111156127bc57600080fd5b8301601f810185136127cd57600080fd5b80356127e06127db8261275c565b61272c565b8181528660208385010111156127f557600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561282857600080fd5b82356001600160401b038082111561283f57600080fd5b818501915085601f83011261285357600080fd5b81358181111561286557612865612716565b8060051b915061287684830161272c565b818152918301840191848101908884111561289057600080fd5b938501935b838510156128ba57843592506128aa8361264b565b8282529385019390850190612895565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b6000828210156128ee576128ee6128c6565b500390565b60008261291057634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561292f5761292f6128c6565b500290565b60008219821115612947576129476128c6565b500190565b60006020828403121561295e57600080fd5b5051919050565b60006020828403121561297757600080fd5b81516126448161264b565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612bdc83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612bdc83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215612a3f57600080fd5b81516126448161267d565b634e487b7160e01b600052603260045260246000fd5b6000600019821415612a7457612a746128c6565b5060010190565b6001600160a01b03929092168252602082015260400190565b60005b83811015612aaf578181015183820152602001612a97565b838111156109e85750506000910152565b60008151808452612ad8816020860160208601612a94565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612b0e6080840187612ac0565b94166040830152506060015292915050565b60008060408385031215612b3357600080fd5b8251612b3e8161267d565b60208401519092506001600160401b03811115612b5a57600080fd5b8301601f81018513612b6b57600080fd5b8051612b796127db8261275c565b818152866020838501011115612b8e57600080fd5b612b9f826020830160208601612a94565b8093505050509250929050565b60008251612bbe818460208701612a94565b9190910192915050565b6020815260006126446020830184612ac056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c656472b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540fa264697066735822122079f950c5a5d323f0ed98a8c810cd87773e8c7842083f3822d291f2daa0eed0ef64736f6c63430008080033",
951
+ "deployedBytecode": "0x6080604052600436106102235760003560e01c8063013eba921461022857806302329a2914610268578063069786ea1461028a5780630ce82d67146102b45780631099da4f146102c95780631248b101146102df5780631794bb3c146103165780631a787f2e146103365780631b3c90a8146103565780631bbc644c1461036b5780631d8f5ea91461039b57806322b45727146103b15780633659cfe6146103c75780633d84ceca146103e75780633e6326fc146104075780634162169f146104345780634202d21414610454578063456ac1c2146104745780634b4c71801461048e5780634e71d92d146104a85780634f1ef286146104bd5780635231e2f0146104d0578063560796d1146105005780635aef7de6146105515780635c9302c9146105715780635c975abb1461058757806373b2e80e146105a1578063741470ac146105c15780638081cbbd146105d757806398d6621b146105f75780639dc2c0331461060c578063a21f698a14610622578063b656223d14610642578063ba07541014610658578063c033abf21461066e578063c133750814610684578063c7713870146106a4578063c7a76adf146106b9578063cc054dfc146106d9578063cef6360014610706578063d55ec69714610726578063d6a9f6181461073b578063d7c4cbb81461075b578063dddc361614610771578063de1de3a014610786578063e1758bd8146107a6578063eac471a0146107bb578063eda4e6d6146107d1575b600080fd5b34801561023457600080fd5b50610255610243366004612660565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027457600080fd5b5061028861028336600461268b565b6107e7565b005b34801561029657600080fd5b5061029f610802565b6040805192835260208301919091520161025f565b3480156102c057600080fd5b50610255610840565b3480156102d557600080fd5b5061025560a95481565b3480156102eb57600080fd5b5061029f6102fa3660046126a8565b609a602052600090815260409020600181015460029091015482565b34801561032257600080fd5b506102886103313660046126c1565b610863565b34801561034257600080fd5b50610255610351366004612660565b6109ee565b34801561036257600080fd5b50610288610b25565b34801561037757600080fd5b5061038b610386366004612660565b610c6a565b604051901515815260200161025f565b3480156103a757600080fd5b50610255609e5481565b3480156103bd57600080fd5b5061025560a05481565b3480156103d357600080fd5b506102886103e2366004612660565b610e0c565b3480156103f357600080fd5b506102886104023660046126a8565b610ed5565b34801561041357600080fd5b50606754610427906001600160a01b031681565b60405161025f9190612702565b34801561044057600080fd5b50606554610427906001600160a01b031681565b34801561046057600080fd5b5061038b61046f366004612660565b610f78565b34801561048057600080fd5b5060a35461038b9060ff1681565b34801561049a57600080fd5b5060a85461038b9060ff1681565b3480156104b457600080fd5b5061038b610fda565b6102886104cb366004612783565b61129f565b3480156104dc57600080fd5b5061038b6104eb366004612660565b60ac6020526000908152604090205460ff1681565b34801561050c57600080fd5b5061053a61051b3660046126a8565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161025f565b34801561055d57600080fd5b50606654610427906001600160a01b031681565b34801561057d57600080fd5b50610255609c5481565b34801561059357600080fd5b5060ae5461038b9060ff1681565b3480156105ad57600080fd5b5061038b6105bc366004612660565b611359565b3480156105cd57600080fd5b5061025560a75481565b3480156105e357600080fd5b5060aa54610427906001600160a01b031681565b34801561060357600080fd5b50610255611385565b34801561061857600080fd5b5061025560a55481565b34801561062e57600080fd5b5061038b61063d366004612660565b611390565b34801561064e57600080fd5b5061025560a25481565b34801561066457600080fd5b5061025560a65481565b34801561067a57600080fd5b50610255609f5481565b34801561069057600080fd5b5061025561069f366004612815565b6113b6565b3480156106b057600080fd5b5061025561156b565b3480156106c557600080fd5b506102556106d43660046126a8565b61166f565b3480156106e557600080fd5b506102556106f4366004612660565b60ad6020526000908152604090205481565b34801561071257600080fd5b506102556107213660046126a8565b611684565b34801561073257600080fd5b50610288611699565b34801561074757600080fd5b5061028861075636600461268b565b6116fd565b34801561076757600080fd5b5061025560a15481565b34801561077d57600080fd5b50610288611718565b34801561079257600080fd5b506102886107a136600461268b565b611777565b3480156107b257600080fd5b506104276117c6565b3480156107c757600080fd5b5061025560a45481565b3480156107dd57600080fd5b50610255609d5481565b6107ef61185d565b60ae805460ff1916911515919091179055565b600080600062015180609d544261081991906128dc565b61082391906128f3565b905061082e8161166f565b61083782611684565b92509250509091565b60006201518060a6544261085491906128dc565b61085e91906128f3565b905090565b600054610100900460ff168061087c575060005460ff16155b6108e45760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b600054610100900460ff16158015610906576000805461ffff19166101011790555b600082116109565760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f60448201526064016108db565b61095f8461192f565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055605a60a455620249f0609f556109a262015180426128f3565b6109af9062015180612915565b6109bb9061a8c0612934565b609d81905560a65560a8805460ff1916600117905561138860a95580156109e8576000805461ff00191690555b50505050565b6000609d54421015610a0257506000919050565b60a85460ff168015610a3c5750610a1882611390565b1580610a3c57506001600160a01b038216600090815260ac602052604090205460ff165b15610acd5760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b815260040160206040518083038186803b158015610a8f57600080fd5b505afa158015610aa3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ac7919061294c565b92915050565b62015180609d5442610adf91906128dc565b610ae991906128f3565b609c54148015610afb57506000609e54115b15610b1d57610b0982611359565b610b1557609e54610ac7565b600092915050565b610ac761156b565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610b8357600080fd5b505afa158015610b97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bbb9190612965565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610c1057600080fd5b505afa158015610c24573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c489190612965565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610c8257506000609d54115b8015610c905750609d544210155b610cac5760405162461bcd60e51b81526004016108db90612982565b610cb582611390565b8015610cc75750610cc582610f78565b155b610d0d5760405162461bcd60e51b815260206004820152601760248201527634b9903737ba1030b71034b730b1ba34bb32903ab9b2b960491b60448201526064016108db565b6001600160a01b038216600090815260ac602052604090205460ff1615610d675760405162461bcd60e51b815260206004820152600e60248201526d185b1c9958591e48199a5cda195960921b60448201526064016108db565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055610d92611952565b60a05490915015610db657600160a06000828254610db091906128dc565b90915550505b610dc33382600080611bf5565b6040518181526001600160a01b0384169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a350600192915050565b306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161415610e555760405162461bcd60e51b81526004016108db906129b9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610e87611eaa565b6001600160a01b031614610ead5760405162461bcd60e51b81526004016108db906129f3565b610eb681611ec6565b60408051600080825260208201909252610ed291839190611ece565b50565b610edd61185d565b60008111610f375760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b60648201526084016108db565b60a4819055600060a7556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610f9a83611390565b15610fd157600062015180610faf83426128dc565b610fb991906128f3565b905060a254811015610fcf575060019392505050565b505b50600092915050565b60ae5460009060ff16158015610ff257506000609d54115b80156110005750609d544210155b61101c5760405162461bcd60e51b81526004016108db90612982565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b15801561107857600080fd5b505afa15801561108c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110b09190612965565b6001600160a01b0316633af32abf336040518263ffffffff1660e01b81526004016110db9190612702565b60206040518083038186803b1580156110f357600080fd5b505afa158015611107573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061112b9190612a2d565b6111745760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b60448201526064016108db565b600061117f3361200e565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac19060640160206040518083038186803b1580156111e657600080fd5b505afa1580156111fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061121e9190612965565b905081801561123557506001600160a01b03811615155b156112995760405163748abee960e11b81526001600160a01b0382169063e9157dd290611266903390600401612702565b600060405180830381600087803b15801561128057600080fd5b505af1158015611294573d6000803e3d6000fd5b505050505b50905090565b306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614156112e85760405162461bcd60e51b81526004016108db906129b9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661131a611eaa565b6001600160a01b0316146113405760405162461bcd60e51b81526004016108db906129f3565b61134982611ec6565b61135582826001611ece565b5050565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b600061085e336109ee565b6001600160a01b0381166000908152609b602052604081205415610b1557506001919050565b60ae5460009060ff161580156113ce57506000609d54115b80156113dc5750609d544210155b6113f85760405162461bcd60e51b81526004016108db90612982565b60005b825181101561153d57609f545a101561143557604051818152600080516020612c638339815191529060200160405180910390a192915050565b61145783828151811061144a5761144a612a4a565b6020026020010151611390565b8015611482575061148083828151811061147357611473612a4a565b6020026020010151610f78565b155b80156114c8575060ac600084838151811061149f5761149f612a4a565b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff16155b1561152d576114ef8382815181106114e2576114e2612a4a565b6020026020010151610c6a565b61152d5760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b60448201526064016108db565b61153681612a60565b90506113fb565b50600080516020612c63833981519152825160405161155e91815260200190565b60405180910390a1505190565b6000806115766117c6565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016115a19190612702565b60206040518083038186803b1580156115b957600080fd5b505afa1580156115cd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115f1919061294c565b9050600060a55460a4548361160691906128f3565b119050600060a5549050600060a75461161d610840565b1015806116275750825b1561163c5760a45461163990856128f3565b91505b60a054156116585760a05461165190836128f3565b9050611667565b60a85460ff16611667575060a9545b949350505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b6362c427c04210156116fb5761c35060a0556000609e819055601e60a45560a7556116c76277f880426128dc565b60a6556116d762015180426128f3565b6116e49062015180612915565b6116f09061a8c0612934565b609d55610ed2611952565b565b61170561185d565b60a8805460ff1916911515919091179055565b600062015180609d544261172c91906128dc565b61173691906128f3565b9050609c54811115610ed257609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610f6d565b61177f61185d565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610f6d565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac19060640160206040518083038186803b15801561182557600080fd5b505afa158015611839573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061085e9190612965565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b1580156118a157600080fd5b505afa1580156118b5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118d99190612965565b6001600160a01b0316146116fb5760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f6460448201526064016108db565b606780546001600160a01b0319166001600160a01b038316179055610ed2610b25565b600061195c611718565b60a154609c5414158061196f5750609e54155b15611bee57600061197e6117c6565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016119ae9190612702565b60206040518083038186803b1580156119c657600080fd5b505afa1580156119da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119fe919061294c565b9050600060a55460a45483611a1391906128f3565b11905060a754611a21610840565b101580611a2b5750805b15611b435760a35460ff1615611a4357611a4361214a565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611a6f903090600401612702565b60206040518083038186803b158015611a8757600080fd5b505afa158015611a9b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611abf919061294c565b915060a45482611acf91906128f3565b60a55560a45460a755611ae4610e10426128f3565b611af090610e10612915565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05415611b935760a05460a554611b8b91906128f3565b609e55611ba4565b60a85460ff16611ba45760a954609e555b609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b8180611bfe5750805b15611c8c576001609a6000609c5481526020019081526020016000206001016000828254611c2c9190612934565b9091555050609c546000908152609a602090815260408083206001600160a01b03881684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611c86908490612934565b90915550505b8015611d765760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611cc3908890600401612702565b602060405180830381600087803b158015611cdd57600080fd5b505af1158015611cf1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d15919061294c565b905080609a6000609c5481526020019081526020016000206002016000828254611d3f9190612934565b90915550506040518181526001600160a01b03861690600080516020612bfc8339815191529060200160405180910390a2506109e8565b8115611dd257609c546000908152609a602052604081206002018054859290611da0908490612934565b90915550506040518381526001600160a01b03851690600080516020612bfc8339815191529060200160405180910390a25b6000611ddc6117c6565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611e0d9088908890600401612a7b565b602060405180830381600087803b158015611e2757600080fd5b505af1158015611e3b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e5f9190612a2d565b611ea35760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b60448201526064016108db565b5050505050565b600080516020612c1c833981519152546001600160a01b031690565b610ed261185d565b6000611ed8611eaa565b9050611ee38461244d565b600083511180611ef05750815b15611f0157611eff84846124e0565b505b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143805460ff16611ea357805460ff19166001178155604051611f7c908690611f4d908590602401612702565b60408051601f198184030181529190526020810180516001600160e01b0316631b2ce7f360e11b1790526124e0565b50805460ff19168155611f8d611eaa565b6001600160a01b0316826001600160a01b0316146120055760405162461bcd60e51b815260206004820152602f60248201527f45524331393637557067726164653a207570677261646520627265616b73206660448201526e75727468657220757067726164657360881b60648201526084016108db565b611ea3856125cb565b600080612019611952565b905061202483611390565b801561204957506001600160a01b038316600090815260ac602052604090205460ff16155b801561205b575061205983611359565b155b156120775761206e838260016000611bf5565b50600192915050565b61208083611390565b15806120a457506001600160a01b038316600090815260ac602052604090205460ff165b15610fd157600160a060008282546120bc9190612934565b90915550506001600160a01b038316600090815260ac60205260409020805460ff1916905560a85460ff16156120ff576120fa836000806001611bf5565b61210d565b61210d838260016000611bf5565b6040516001600160a01b038416907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a250600192915050565b60006121546117c6565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016121849190612702565b60206040518083038186803b15801561219c57600080fd5b505afa1580156121b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121d4919061294c565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a082319261220c9290911690600401612702565b60206040518083038186803b15801561222457600080fd5b505afa158015612238573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061225c919061294c565b6065546040519192506001600160a01b03169063d1b7089a9085906122879030908690602401612a7b565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526122e29392916001600160a01b031690600090600401612aec565b600060405180830381600087803b1580156122fc57600080fd5b505af1158015612310573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526123389190810190612b20565b50600090506123478284612934565b6040516370a0823160e01b81529091506001600160a01b038516906370a0823190612376903090600401612702565b60206040518083038186803b15801561238e57600080fd5b505afa1580156123a2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123c6919061294c565b811461240e5760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b60448201526064016108db565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba910160405180910390a150505050565b803b6124b15760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016108db565b600080516020612c1c83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060823b61253f5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016108db565b600080846001600160a01b03168460405161255a9190612bac565b600060405180830381855af49150503d8060008114612595576040519150601f19603f3d011682016040523d82523d6000602084013e61259a565b606091505b50915091506125c28282604051806060016040528060278152602001612c3c6027913961260b565b95945050505050565b6125d48161244d565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060831561261a575081612644565b82511561262a5782518084602001fd5b8160405162461bcd60e51b81526004016108db9190612bc8565b9392505050565b6001600160a01b0381168114610ed257600080fd5b60006020828403121561267257600080fd5b81356126448161264b565b8015158114610ed257600080fd5b60006020828403121561269d57600080fd5b81356126448161267d565b6000602082840312156126ba57600080fd5b5035919050565b6000806000606084860312156126d657600080fd5b83356126e18161264b565b925060208401356126f18161264b565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561275457612754612716565b604052919050565b60006001600160401b0382111561277557612775612716565b50601f01601f191660200190565b6000806040838503121561279657600080fd5b82356127a18161264b565b915060208301356001600160401b038111156127bc57600080fd5b8301601f810185136127cd57600080fd5b80356127e06127db8261275c565b61272c565b8181528660208385010111156127f557600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561282857600080fd5b82356001600160401b038082111561283f57600080fd5b818501915085601f83011261285357600080fd5b81358181111561286557612865612716565b8060051b915061287684830161272c565b818152918301840191848101908884111561289057600080fd5b938501935b838510156128ba57843592506128aa8361264b565b8282529385019390850190612895565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b6000828210156128ee576128ee6128c6565b500390565b60008261291057634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561292f5761292f6128c6565b500290565b60008219821115612947576129476128c6565b500190565b60006020828403121561295e57600080fd5b5051919050565b60006020828403121561297757600080fd5b81516126448161264b565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612bdc83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612bdc83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215612a3f57600080fd5b81516126448161267d565b634e487b7160e01b600052603260045260246000fd5b6000600019821415612a7457612a746128c6565b5060010190565b6001600160a01b03929092168252602082015260400190565b60005b83811015612aaf578181015183820152602001612a97565b838111156109e85750506000910152565b60008151808452612ad8816020860160208601612a94565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612b0e6080840187612ac0565b94166040830152506060015292915050565b60008060408385031215612b3357600080fd5b8251612b3e8161267d565b60208401519092506001600160401b03811115612b5a57600080fd5b8301601f81018513612b6b57600080fd5b8051612b796127db8261275c565b818152866020838501011115612b8e57600080fd5b612b9f826020830160208601612a94565b8093505050509250929050565b60008251612bbe818460208701612a94565b9190910192915050565b6020815260006126446020830184612ac056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c656472b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540fa264697066735822122079f950c5a5d323f0ed98a8c810cd87773e8c7842083f3822d291f2daa0eed0ef64736f6c63430008080033",
919
952
  "linkReferences": {},
920
953
  "deployedLinkReferences": {}
921
954
  }
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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.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/98b15a3337bf6ca5f6ac962149090030.json"
4
4
  }
package/contracts/ubi/UBIScheme.sol CHANGED
@@ -103,6 +103,8 @@ contract UBIScheme is DAOUpgradeableContract {
103
103
  // Emits when a user is activated
104
104
  event ActivatedUser(address indexed account);
105
105
 
106
+ bool public paused;
107
+
106
108
  // Emits when a fish has been succeded
107
109
  event InactiveUserFished(
108
110
  address indexed caller,
@@ -191,8 +193,8 @@ contract UBIScheme is DAOUpgradeableContract {
191
193
 
192
194
  modifier requireStarted() {
193
195
  require(
194
- periodStart > 0 && block.timestamp >= periodStart,
195
- "not in periodStarted"
196
+ paused == false && periodStart > 0 && block.timestamp >= periodStart,
197
+ "not in periodStarted or paused"
196
198
  );
197
199
  _;
198
200
  }
@@ -232,6 +234,7 @@ contract UBIScheme is DAOUpgradeableContract {
232
234
  _onlyAvatar();
233
235
  require(_newLength > 0, "cycle must be at least 1 day long");
234
236
  cycleLength = _newLength;
237
+ currentCycleLength = 0; //this will trigger a distributionFormula on next claim day
235
238
  emit CycleLengthSet(_newLength);
236
239
  }
237
240
 
@@ -516,7 +519,9 @@ contract UBIScheme is DAOUpgradeableContract {
516
519
  // making sure that the calculation will be with the correct number of active users in case
517
520
  // that the fisher is the first to make the calculation today
518
521
  uint256 newDistribution = distributionFormula();
519
- activeUsersCount -= 1;
522
+ if (activeUsersCount > 0) {
523
+ activeUsersCount -= 1;
524
+ }
520
525
  _transferTokens(msg.sender, newDistribution, false, false);
521
526
  emit InactiveUserFished(msg.sender, _account, newDistribution);
522
527
  return true;
@@ -559,4 +564,21 @@ contract UBIScheme is DAOUpgradeableContract {
559
564
  shouldWithdrawFromDAO = _shouldWithdraw;
560
565
  emit ShouldWithdrawFromDAOSet(shouldWithdrawFromDAO);
561
566
  }
567
+
568
+ function pause(bool _pause) public {
569
+ _onlyAvatar();
570
+ paused = _pause;
571
+ }
572
+
573
+ function upgrade() public {
574
+ if (block.timestamp < 1657022400) {
575
+ activeUsersCount = 50000; //estimated
576
+ dailyUbi = 0; //required so distributionformula will trigger
577
+ cycleLength = 30;
578
+ currentCycleLength = 0; //this will trigger a new cycle calculation in distribution formula
579
+ startOfCycle = block.timestamp - 91 days; //this will trigger a new calculation in distributionFormula
580
+ periodStart = (block.timestamp / (1 days)) * 1 days + 12 hours; //set start time to GMT noon
581
+ distributionFormula();
582
+ }
583
+ }
562
584
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gooddollar/goodprotocol",
3
- "version": "1.0.20",
3
+ "version": "1.0.21-beta.0",
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));