@gooddollar/goodprotocol 1.0.0-beta.32 → 1.0.0-beta.42

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 (167) hide show
  1. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  2. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  3. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  4. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  5. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  6. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  7. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  8. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  9. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  10. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  11. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  12. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  13. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  14. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  15. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  16. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  17. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  18. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  19. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  20. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  21. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  22. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  23. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  24. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  25. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  26. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  27. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.json +2 -2
  28. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  29. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.json +60 -21
  30. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  31. package/artifacts/contracts/governance/GReputation.sol/GReputation.json +2 -2
  32. package/artifacts/contracts/governance/GovarnanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  33. package/artifacts/contracts/governance/GovarnanceStaking.sol/GovernanceStaking.json +2 -2
  34. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  35. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  36. package/artifacts/contracts/governance/Reputation.sol/Reputation.json +2 -2
  37. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  38. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.json +2 -2
  39. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  40. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.json +2 -2
  41. package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.dbg.json +1 -1
  42. package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.json +2 -2
  43. package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.dbg.json +1 -1
  44. package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.json +2 -2
  45. package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.dbg.json +1 -1
  46. package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.json +2 -2
  47. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  48. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.json +2 -2
  49. package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.dbg.json +1 -1
  50. package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.json +2 -2
  51. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  52. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.json +2 -2
  53. package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.dbg.json +1 -1
  54. package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.json +2 -2
  55. package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.dbg.json +1 -1
  56. package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.json +2 -2
  57. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  58. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +6 -6
  59. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  60. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.json +2 -2
  61. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  62. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.json +2 -2
  63. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  64. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.json +2 -2
  65. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  66. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.json +2 -2
  67. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  68. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
  69. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  70. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.json +2 -2
  71. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  72. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.json +2 -2
  73. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  74. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.json +2 -2
  75. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +4 -0
  76. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.json +224 -0
  77. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +4 -0
  78. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.json +198 -0
  79. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  80. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.json +2 -2
  81. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  82. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.json +2 -2
  83. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  84. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.json +2 -2
  85. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  86. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.json +2 -2
  87. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  88. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.json +2 -2
  89. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  90. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.json +2 -2
  91. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  92. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.json +2 -2
  93. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  94. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.json +2 -2
  95. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  96. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.json +2 -2
  97. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  98. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.json +2 -2
  99. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  100. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  101. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.json +2 -2
  102. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  103. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.json +2 -2
  104. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  105. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +2 -2
  106. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  107. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.json +2 -2
  108. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  109. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  110. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.json +2 -2
  111. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  112. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +3 -3
  113. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  114. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +4 -4
  115. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  116. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +4 -4
  117. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  118. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +6 -6
  119. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  120. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +2 -2
  121. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  122. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.json +2 -2
  123. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  124. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.json +2 -2
  125. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  126. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.json +2 -2
  127. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  128. package/artifacts/contracts/utils/DSMath.sol/DSMath.json +2 -2
  129. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  130. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.json +2 -2
  131. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  132. package/artifacts/contracts/utils/NameService.sol/NameService.json +2 -2
  133. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  134. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  135. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.json +7 -2
  136. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  137. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.json +7 -2
  138. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +4 -0
  139. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.json +95 -0
  140. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +4 -0
  141. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.json +185 -0
  142. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  143. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json +2 -2
  144. package/contracts/governance/CompoundVotingMachine.sol +99 -83
  145. package/contracts/governance/GovarnanceStaking.sol +3 -5
  146. package/contracts/mocks/UpgradableMocks.sol +31 -0
  147. package/contracts/utils/DAOUpgradeableContract.sol +1 -1
  148. package/contracts/utils/ProtocolUpgrade.sol +7 -14
  149. package/contracts/utils/ProtocolUpgradeFuse.sol +2 -2
  150. package/contracts/utils/ProxyFactory1967.sol +153 -0
  151. package/hardhat.config.ts +1 -1
  152. package/package.json +8 -8
  153. package/releases/deploy-settings.json +3 -3
  154. package/releases/deployment.json +1 -1
  155. package/releases/olddao.json +1 -1
  156. package/scripts/gdx/gdxAirdropCalculation.ts +11 -10
  157. package/scripts/governance/airdropCalculation.ts +235 -65
  158. package/scripts/releaser.js +11 -5
  159. package/scripts/upgradeToV2/upgradeToV2.ts +353 -228
  160. package/test/governance/CompoundVotingMachine.daoscheme.ts +124 -10
  161. package/test/governance/CompoundVotingMachine.guardian.test.ts +38 -7
  162. package/test/localOldDaoDeploy.ts +24 -24
  163. package/test/staking/DonationsStaking.test.ts +13 -12
  164. package/test/utils/ProxyFactory.test.ts +102 -0
  165. package/tsconfig.json +1 -1
  166. package/yarn.lock +253 -32
  167. package/test/simulateInterest.ts +0 -85
package/yarn.lock CHANGED
@@ -1127,6 +1127,16 @@
1127
1127
  ethereumjs-util "^7.1.0"
1128
1128
  merkle-patricia-tree "^4.2.0"
1129
1129
 
1130
+ "@ethereumjs/block@^3.5.0", "@ethereumjs/block@^3.5.1":
1131
+ version "3.5.1"
1132
+ resolved "https://registry.yarnpkg.com/@ethereumjs/block/-/block-3.5.1.tgz#59737d393503249aa750c37dfc83896234f4e175"
1133
+ integrity sha512-MoY9bHKABOBK6BW0v1N1Oc0Cve4x/giX67M3TtrVBUsKQTj2eznLGKpydoitxWSZ+WgKKSVhfRMzbCGRwk7T5w==
1134
+ dependencies:
1135
+ "@ethereumjs/common" "^2.5.0"
1136
+ "@ethereumjs/tx" "^3.3.1"
1137
+ ethereumjs-util "^7.1.1"
1138
+ merkle-patricia-tree "^4.2.1"
1139
+
1130
1140
  "@ethereumjs/blockchain@^5.4.0":
1131
1141
  version "5.4.0"
1132
1142
  resolved "https://registry.yarnpkg.com/@ethereumjs/blockchain/-/blockchain-5.4.0.tgz#28d712627d3442b2bb1f50dd5acba7cde1021993"
@@ -1142,6 +1152,21 @@
1142
1152
  rlp "^2.2.4"
1143
1153
  semaphore-async-await "^1.5.1"
1144
1154
 
1155
+ "@ethereumjs/blockchain@^5.4.1":
1156
+ version "5.4.2"
1157
+ resolved "https://registry.yarnpkg.com/@ethereumjs/blockchain/-/blockchain-5.4.2.tgz#5074e0a0157818762a5f5175ea0bd93c5455fe32"
1158
+ integrity sha512-AOAAwz/lw2lciG9gf5wHi7M/qknraXXnLR66lYgbQ04qfyFC3ZE5x/5rLVm1Vu+kfJLlKrYZTmA0IbOkc7kvgw==
1159
+ dependencies:
1160
+ "@ethereumjs/block" "^3.5.1"
1161
+ "@ethereumjs/common" "^2.5.0"
1162
+ "@ethereumjs/ethash" "^1.1.0"
1163
+ debug "^2.2.0"
1164
+ ethereumjs-util "^7.1.1"
1165
+ level-mem "^5.0.1"
1166
+ lru-cache "^5.1.1"
1167
+ rlp "^2.2.4"
1168
+ semaphore-async-await "^1.5.1"
1169
+
1145
1170
  "@ethereumjs/common@^2.3.0", "@ethereumjs/common@^2.4.0":
1146
1171
  version "2.4.0"
1147
1172
  resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.4.0.tgz#2d67f6e6ba22246c5c89104e6b9a119fb3039766"
@@ -1150,6 +1175,14 @@
1150
1175
  crc-32 "^1.2.0"
1151
1176
  ethereumjs-util "^7.1.0"
1152
1177
 
1178
+ "@ethereumjs/common@^2.5.0":
1179
+ version "2.5.0"
1180
+ resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.5.0.tgz#ec61551b31bef7a69d1dc634d8932468866a4268"
1181
+ integrity sha512-DEHjW6e38o+JmB/NO3GZBpW4lpaiBpkFgXF6jLcJ6gETBYpEyaA5nTimsWBUJR3Vmtm/didUEbNjajskugZORg==
1182
+ dependencies:
1183
+ crc-32 "^1.2.0"
1184
+ ethereumjs-util "^7.1.1"
1185
+
1153
1186
  "@ethereumjs/ethash@^1.0.0":
1154
1187
  version "1.0.0"
1155
1188
  resolved "https://registry.yarnpkg.com/@ethereumjs/ethash/-/ethash-1.0.0.tgz#4e77f85b37be1ade5393e8719bdabac3e796ddaa"
@@ -1160,6 +1193,17 @@
1160
1193
  ethereumjs-util "^7.0.7"
1161
1194
  miller-rabin "^4.0.0"
1162
1195
 
1196
+ "@ethereumjs/ethash@^1.1.0":
1197
+ version "1.1.0"
1198
+ resolved "https://registry.yarnpkg.com/@ethereumjs/ethash/-/ethash-1.1.0.tgz#7c5918ffcaa9cb9c1dc7d12f77ef038c11fb83fb"
1199
+ integrity sha512-/U7UOKW6BzpA+Vt+kISAoeDie1vAvY4Zy2KF5JJb+So7+1yKmJeJEHOGSnQIj330e9Zyl3L5Nae6VZyh2TJnAA==
1200
+ dependencies:
1201
+ "@ethereumjs/block" "^3.5.0"
1202
+ "@types/levelup" "^4.3.0"
1203
+ buffer-xor "^2.0.1"
1204
+ ethereumjs-util "^7.1.1"
1205
+ miller-rabin "^4.0.0"
1206
+
1163
1207
  "@ethereumjs/tx@^3.2.1", "@ethereumjs/tx@^3.3.0":
1164
1208
  version "3.3.0"
1165
1209
  resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.0.tgz#14ed1b7fa0f28e1cd61e3ecbdab824205f6a4378"
@@ -1168,22 +1212,30 @@
1168
1212
  "@ethereumjs/common" "^2.4.0"
1169
1213
  ethereumjs-util "^7.1.0"
1170
1214
 
1171
- "@ethereumjs/vm@^5.5.0":
1172
- version "5.5.0"
1173
- resolved "https://registry.yarnpkg.com/@ethereumjs/vm/-/vm-5.5.0.tgz#d389c5792320ef28c51366a643b8ab9d64e10a31"
1174
- integrity sha512-h6Kr6WqKUP8nVuEzCWPWEPrC63v7HFwt3gRuK7CJiyg9S0iWSBKUA/YVD4YgaSVACuxUfWaOBbwV5uGVupm5PQ==
1215
+ "@ethereumjs/tx@^3.3.1":
1216
+ version "3.3.2"
1217
+ resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.2.tgz#348d4624bf248aaab6c44fec2ae67265efe3db00"
1218
+ integrity sha512-6AaJhwg4ucmwTvw/1qLaZUX5miWrwZ4nLOUsKyb/HtzS3BMw/CasKhdi1ims9mBKeK9sOJCH4qGKOBGyJCeeog==
1175
1219
  dependencies:
1176
- "@ethereumjs/block" "^3.4.0"
1177
- "@ethereumjs/blockchain" "^5.4.0"
1178
- "@ethereumjs/common" "^2.4.0"
1179
- "@ethereumjs/tx" "^3.3.0"
1220
+ "@ethereumjs/common" "^2.5.0"
1221
+ ethereumjs-util "^7.1.2"
1222
+
1223
+ "@ethereumjs/vm@^5.5.2":
1224
+ version "5.5.3"
1225
+ resolved "https://registry.yarnpkg.com/@ethereumjs/vm/-/vm-5.5.3.tgz#dc8b30dd35efb589db093592600207660fa8dada"
1226
+ integrity sha512-0k5OreWnlgXYs54wohgO11jtGI05GDasj2EYxzuaStxTi15CS3vow5wGYELC1pG9xngE1F/mFmKi/f14XRuDow==
1227
+ dependencies:
1228
+ "@ethereumjs/block" "^3.5.0"
1229
+ "@ethereumjs/blockchain" "^5.4.1"
1230
+ "@ethereumjs/common" "^2.5.0"
1231
+ "@ethereumjs/tx" "^3.3.1"
1180
1232
  async-eventemitter "^0.2.4"
1181
1233
  core-js-pure "^3.0.1"
1182
1234
  debug "^2.2.0"
1183
- ethereumjs-util "^7.1.0"
1235
+ ethereumjs-util "^7.1.1"
1184
1236
  functional-red-black-tree "^1.0.1"
1185
1237
  mcl-wasm "^0.7.1"
1186
- merkle-patricia-tree "^4.2.0"
1238
+ merkle-patricia-tree "^4.2.1"
1187
1239
  rustbn.js "~0.2.0"
1188
1240
  util.promisify "^1.0.1"
1189
1241
 
@@ -1232,6 +1284,21 @@
1232
1284
  "@ethersproject/properties" "^5.4.0"
1233
1285
  "@ethersproject/strings" "^5.4.0"
1234
1286
 
1287
+ "@ethersproject/abi@5.4.1":
1288
+ version "5.4.1"
1289
+ resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.4.1.tgz#6ac28fafc9ef6f5a7a37e30356a2eb31fa05d39b"
1290
+ integrity sha512-9mhbjUk76BiSluiiW4BaYyI58KSbDMMQpCLdsAR+RsT2GyATiNYxVv+pGWRrekmsIdY3I+hOqsYQSTkc8L/mcg==
1291
+ dependencies:
1292
+ "@ethersproject/address" "^5.4.0"
1293
+ "@ethersproject/bignumber" "^5.4.0"
1294
+ "@ethersproject/bytes" "^5.4.0"
1295
+ "@ethersproject/constants" "^5.4.0"
1296
+ "@ethersproject/hash" "^5.4.0"
1297
+ "@ethersproject/keccak256" "^5.4.0"
1298
+ "@ethersproject/logger" "^5.4.0"
1299
+ "@ethersproject/properties" "^5.4.0"
1300
+ "@ethersproject/strings" "^5.4.0"
1301
+
1235
1302
  "@ethersproject/abstract-provider@5.4.0", "@ethersproject/abstract-provider@^5.4.0":
1236
1303
  version "5.4.0"
1237
1304
  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.4.0.tgz#415331031b0f678388971e1987305244edc04e1d"
@@ -1245,6 +1312,19 @@
1245
1312
  "@ethersproject/transactions" "^5.4.0"
1246
1313
  "@ethersproject/web" "^5.4.0"
1247
1314
 
1315
+ "@ethersproject/abstract-provider@5.4.1":
1316
+ version "5.4.1"
1317
+ resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.4.1.tgz#e404309a29f771bd4d28dbafadcaa184668c2a6e"
1318
+ integrity sha512-3EedfKI3LVpjSKgAxoUaI+gB27frKsxzm+r21w9G60Ugk+3wVLQwhi1LsEJAKNV7WoZc8CIpNrATlL1QFABjtQ==
1319
+ dependencies:
1320
+ "@ethersproject/bignumber" "^5.4.0"
1321
+ "@ethersproject/bytes" "^5.4.0"
1322
+ "@ethersproject/logger" "^5.4.0"
1323
+ "@ethersproject/networks" "^5.4.0"
1324
+ "@ethersproject/properties" "^5.4.0"
1325
+ "@ethersproject/transactions" "^5.4.0"
1326
+ "@ethersproject/web" "^5.4.0"
1327
+
1248
1328
  "@ethersproject/abstract-signer@5.4.0", "@ethersproject/abstract-signer@^5.4.0":
1249
1329
  version "5.4.0"
1250
1330
  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.4.0.tgz#cd5f50b93141ee9f9f49feb4075a0b3eafb57d65"
@@ -1256,6 +1336,17 @@
1256
1336
  "@ethersproject/logger" "^5.4.0"
1257
1337
  "@ethersproject/properties" "^5.4.0"
1258
1338
 
1339
+ "@ethersproject/abstract-signer@5.4.1":
1340
+ version "5.4.1"
1341
+ resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.4.1.tgz#e4e9abcf4dd4f1ba0db7dff9746a5f78f355ea81"
1342
+ integrity sha512-SkkFL5HVq1k4/25dM+NWP9MILgohJCgGv5xT5AcRruGz4ILpfHeBtO/y6j+Z3UN/PAjDeb4P7E51Yh8wcGNLGA==
1343
+ dependencies:
1344
+ "@ethersproject/abstract-provider" "^5.4.0"
1345
+ "@ethersproject/bignumber" "^5.4.0"
1346
+ "@ethersproject/bytes" "^5.4.0"
1347
+ "@ethersproject/logger" "^5.4.0"
1348
+ "@ethersproject/properties" "^5.4.0"
1349
+
1259
1350
  "@ethersproject/address@5.4.0", "@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.2", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.4.0":
1260
1351
  version "5.4.0"
1261
1352
  resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.4.0.tgz#ba2d00a0f8c4c0854933b963b9a3a9f6eb4a37a3"
@@ -1291,6 +1382,15 @@
1291
1382
  "@ethersproject/logger" "^5.4.0"
1292
1383
  bn.js "^4.11.9"
1293
1384
 
1385
+ "@ethersproject/bignumber@5.4.2":
1386
+ version "5.4.2"
1387
+ resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.4.2.tgz#44232e015ae4ce82ac034de549eb3583c71283d8"
1388
+ integrity sha512-oIBDhsKy5bs7j36JlaTzFgNPaZjiNDOXsdSgSpXRucUl+UA6L/1YLlFeI3cPAoodcenzF4nxNPV13pcy7XbWjA==
1389
+ dependencies:
1390
+ "@ethersproject/bytes" "^5.4.0"
1391
+ "@ethersproject/logger" "^5.4.0"
1392
+ bn.js "^4.11.9"
1393
+
1294
1394
  "@ethersproject/bytes@5.4.0", "@ethersproject/bytes@>=5.0.0-beta.129", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.4.0":
1295
1395
  version "5.4.0"
1296
1396
  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.4.0.tgz#56fa32ce3bf67153756dbaefda921d1d4774404e"
@@ -1321,6 +1421,22 @@
1321
1421
  "@ethersproject/properties" "^5.4.0"
1322
1422
  "@ethersproject/transactions" "^5.4.0"
1323
1423
 
1424
+ "@ethersproject/contracts@5.4.1":
1425
+ version "5.4.1"
1426
+ resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.4.1.tgz#3eb4f35b7fe60a962a75804ada2746494df3e470"
1427
+ integrity sha512-m+z2ZgPy4pyR15Je//dUaymRUZq5MtDajF6GwFbGAVmKz/RF+DNIPwF0k5qEcL3wPGVqUjFg2/krlCRVTU4T5w==
1428
+ dependencies:
1429
+ "@ethersproject/abi" "^5.4.0"
1430
+ "@ethersproject/abstract-provider" "^5.4.0"
1431
+ "@ethersproject/abstract-signer" "^5.4.0"
1432
+ "@ethersproject/address" "^5.4.0"
1433
+ "@ethersproject/bignumber" "^5.4.0"
1434
+ "@ethersproject/bytes" "^5.4.0"
1435
+ "@ethersproject/constants" "^5.4.0"
1436
+ "@ethersproject/logger" "^5.4.0"
1437
+ "@ethersproject/properties" "^5.4.0"
1438
+ "@ethersproject/transactions" "^5.4.0"
1439
+
1324
1440
  "@ethersproject/hash@5.4.0", "@ethersproject/hash@>=5.0.0-beta.128", "@ethersproject/hash@^5.0.4", "@ethersproject/hash@^5.4.0":
1325
1441
  version "5.4.0"
1326
1442
  resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.4.0.tgz#d18a8e927e828e22860a011f39e429d388344ae0"
@@ -1385,6 +1501,11 @@
1385
1501
  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.4.0.tgz#f39adadf62ad610c420bcd156fd41270e91b3ca9"
1386
1502
  integrity sha512-xYdWGGQ9P2cxBayt64d8LC8aPFJk6yWCawQi/4eJ4+oJdMMjEBMrIcIMZ9AxhwpPVmnBPrsB10PcXGmGAqgUEQ==
1387
1503
 
1504
+ "@ethersproject/logger@5.4.1":
1505
+ version "5.4.1"
1506
+ resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.4.1.tgz#503bd33683538b923c578c07d1c2c0dd18672054"
1507
+ integrity sha512-DZ+bRinnYLPw1yAC64oRl0QyVZj43QeHIhVKfD/+YwSz4wsv1pfwb5SOFjz+r710YEWzU6LrhuSjpSO+6PeE4A==
1508
+
1388
1509
  "@ethersproject/networks@5.4.1", "@ethersproject/networks@^5.4.0":
1389
1510
  version "5.4.1"
1390
1511
  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.4.1.tgz#2ce83b8e42aa85216e5d277a7952d97b6ce8d852"
@@ -1392,6 +1513,13 @@
1392
1513
  dependencies:
1393
1514
  "@ethersproject/logger" "^5.4.0"
1394
1515
 
1516
+ "@ethersproject/networks@5.4.2":
1517
+ version "5.4.2"
1518
+ resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.4.2.tgz#2247d977626e97e2c3b8ee73cd2457babde0ce35"
1519
+ integrity sha512-eekOhvJyBnuibfJnhtK46b8HimBc5+4gqpvd1/H9LEl7Q7/qhsIhM81dI9Fcnjpk3jB1aTy6bj0hz3cifhNeYw==
1520
+ dependencies:
1521
+ "@ethersproject/logger" "^5.4.0"
1522
+
1395
1523
  "@ethersproject/pbkdf2@5.4.0", "@ethersproject/pbkdf2@^5.4.0":
1396
1524
  version "5.4.0"
1397
1525
  resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.4.0.tgz#ed88782a67fda1594c22d60d0ca911a9d669641c"
@@ -1407,6 +1535,13 @@
1407
1535
  dependencies:
1408
1536
  "@ethersproject/logger" "^5.4.0"
1409
1537
 
1538
+ "@ethersproject/properties@5.4.1":
1539
+ version "5.4.1"
1540
+ resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.4.1.tgz#9f051f976ce790142c6261ccb7b826eaae1f2f36"
1541
+ integrity sha512-cyCGlF8wWlIZyizsj2PpbJ9I7rIlUAfnHYwy/T90pdkSn/NFTa5YWZx2wTJBe9V7dD65dcrrEMisCRUJiq6n3w==
1542
+ dependencies:
1543
+ "@ethersproject/logger" "^5.4.0"
1544
+
1410
1545
  "@ethersproject/providers@5.4.2":
1411
1546
  version "5.4.2"
1412
1547
  resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.4.2.tgz#73df9767869a31bd88d9e27e78cff96364b8fbed"
@@ -1432,6 +1567,31 @@
1432
1567
  bech32 "1.1.4"
1433
1568
  ws "7.4.6"
1434
1569
 
1570
+ "@ethersproject/providers@5.4.5":
1571
+ version "5.4.5"
1572
+ resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.4.5.tgz#eb2ea2a743a8115f79604a8157233a3a2c832928"
1573
+ integrity sha512-1GkrvkiAw3Fj28cwi1Sqm8ED1RtERtpdXmRfwIBGmqBSN5MoeRUHuwHPppMtbPayPgpFcvD7/Gdc9doO5fGYgw==
1574
+ dependencies:
1575
+ "@ethersproject/abstract-provider" "^5.4.0"
1576
+ "@ethersproject/abstract-signer" "^5.4.0"
1577
+ "@ethersproject/address" "^5.4.0"
1578
+ "@ethersproject/basex" "^5.4.0"
1579
+ "@ethersproject/bignumber" "^5.4.0"
1580
+ "@ethersproject/bytes" "^5.4.0"
1581
+ "@ethersproject/constants" "^5.4.0"
1582
+ "@ethersproject/hash" "^5.4.0"
1583
+ "@ethersproject/logger" "^5.4.0"
1584
+ "@ethersproject/networks" "^5.4.0"
1585
+ "@ethersproject/properties" "^5.4.0"
1586
+ "@ethersproject/random" "^5.4.0"
1587
+ "@ethersproject/rlp" "^5.4.0"
1588
+ "@ethersproject/sha2" "^5.4.0"
1589
+ "@ethersproject/strings" "^5.4.0"
1590
+ "@ethersproject/transactions" "^5.4.0"
1591
+ "@ethersproject/web" "^5.4.0"
1592
+ bech32 "1.1.4"
1593
+ ws "7.4.6"
1594
+
1435
1595
  "@ethersproject/random@5.4.0", "@ethersproject/random@^5.4.0":
1436
1596
  version "5.4.0"
1437
1597
  resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.4.0.tgz#9cdde60e160d024be39cc16f8de3b9ce39191e16"
@@ -1986,7 +2146,7 @@
1986
2146
  "@nodelib/fs.scandir" "2.1.5"
1987
2147
  fastq "^1.6.0"
1988
2148
 
1989
- "@nomiclabs/hardhat-ethers@*":
2149
+ "@nomiclabs/hardhat-ethers@^2.0.2":
1990
2150
  version "2.0.2"
1991
2151
  resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.0.2.tgz#c472abcba0c5185aaa4ad4070146e95213c68511"
1992
2152
  integrity sha512-6quxWe8wwS4X5v3Au8q1jOvXYEPkS1Fh+cME5u6AwNdnI4uERvPlVjlgRWzpnb+Rrt1l/cEqiNRH9GlsBMSDQg==
@@ -2012,10 +2172,10 @@
2012
2172
  "@types/sinon-chai" "^3.2.3"
2013
2173
  "@types/web3" "1.0.19"
2014
2174
 
2015
- "@openzeppelin/contracts-upgradeable@^4.1.0":
2016
- version "4.2.0"
2017
- resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.2.0.tgz#3b12d6fe9d51e563c8a6ae39c96c1d32c5d0fa4a"
2018
- integrity sha512-vn0hoUqQzgOLzLZwFgh+w/D5hzJHX8F7X/7t/gZdSQYIEXMyGpXUwkr5A3eoAeoc42f/n7yDhwusvBmNknM41Q==
2175
+ "@openzeppelin/contracts-upgradeable@^4.3.2":
2176
+ version "4.3.2"
2177
+ resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.3.2.tgz#92df481362e366c388fc02133cf793029c744cea"
2178
+ integrity sha512-i/pOaOtcqDk4UqsrOv735uYyTbn6dvfiuVu5hstsgV6c4ZKUtu88/31zT2BzkCg+3JfcwOfgg2TtRKVKKZIGkQ==
2019
2179
 
2020
2180
  "@openzeppelin/hardhat-upgrades@1.7.0":
2021
2181
  version "1.7.0"
@@ -7408,6 +7568,18 @@ ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.0.3, ethereu
7408
7568
  ethjs-util "0.1.6"
7409
7569
  rlp "^2.2.4"
7410
7570
 
7571
+ ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.2:
7572
+ version "7.1.2"
7573
+ resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.2.tgz#cfd79a9a3f5cdc042d1abf29964de9caf10ec238"
7574
+ integrity sha512-xCV3PTAhW8Q2k88XZn9VcO4OrjpeXAlDm5LQTaOLp81SjNSSY6+MwuGXrx6vafOMheWSmZGxIXUbue5e9UvUBw==
7575
+ dependencies:
7576
+ "@types/bn.js" "^5.1.0"
7577
+ bn.js "^5.1.2"
7578
+ create-hash "^1.1.2"
7579
+ ethereum-cryptography "^0.1.3"
7580
+ ethjs-util "0.1.6"
7581
+ rlp "^2.2.4"
7582
+
7411
7583
  ethereumjs-vm@4.2.0:
7412
7584
  version "4.2.0"
7413
7585
  resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-4.2.0.tgz#e885e861424e373dbc556278f7259ff3fca5edab"
@@ -7512,7 +7684,7 @@ ethers@^4.0.32, ethers@^4.0.40:
7512
7684
  uuid "2.0.1"
7513
7685
  xmlhttprequest "1.8.0"
7514
7686
 
7515
- ethers@^5.0.0, ethers@^5.0.1, ethers@^5.0.2, ethers@^5.4.1:
7687
+ ethers@^5.0.0, ethers@^5.0.1, ethers@^5.0.2:
7516
7688
  version "5.4.2"
7517
7689
  resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.4.2.tgz#91368e4d9c39f1111157de1c2aa1d8c1616c0f7b"
7518
7690
  integrity sha512-JcFcNWjULzhm4tMp5cZKnU45zqN/c7rqabIITiUiQzZuP7LcYSD4WAbADo4Ja6G2orU4d/PbhAWGHGtAKYrB4Q==
@@ -7548,6 +7720,42 @@ ethers@^5.0.0, ethers@^5.0.1, ethers@^5.0.2, ethers@^5.4.1:
7548
7720
  "@ethersproject/web" "5.4.0"
7549
7721
  "@ethersproject/wordlists" "5.4.0"
7550
7722
 
7723
+ ethers@^5.4.7:
7724
+ version "5.4.7"
7725
+ resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.4.7.tgz#0fd491a5da7c9793de2d6058d76b41b1e7efba8f"
7726
+ integrity sha512-iZc5p2nqfWK1sj8RabwsPM28cr37Bpq7ehTQ5rWExBr2Y09Sn1lDKZOED26n+TsZMye7Y6mIgQ/1cwpSD8XZew==
7727
+ dependencies:
7728
+ "@ethersproject/abi" "5.4.1"
7729
+ "@ethersproject/abstract-provider" "5.4.1"
7730
+ "@ethersproject/abstract-signer" "5.4.1"
7731
+ "@ethersproject/address" "5.4.0"
7732
+ "@ethersproject/base64" "5.4.0"
7733
+ "@ethersproject/basex" "5.4.0"
7734
+ "@ethersproject/bignumber" "5.4.2"
7735
+ "@ethersproject/bytes" "5.4.0"
7736
+ "@ethersproject/constants" "5.4.0"
7737
+ "@ethersproject/contracts" "5.4.1"
7738
+ "@ethersproject/hash" "5.4.0"
7739
+ "@ethersproject/hdnode" "5.4.0"
7740
+ "@ethersproject/json-wallets" "5.4.0"
7741
+ "@ethersproject/keccak256" "5.4.0"
7742
+ "@ethersproject/logger" "5.4.1"
7743
+ "@ethersproject/networks" "5.4.2"
7744
+ "@ethersproject/pbkdf2" "5.4.0"
7745
+ "@ethersproject/properties" "5.4.1"
7746
+ "@ethersproject/providers" "5.4.5"
7747
+ "@ethersproject/random" "5.4.0"
7748
+ "@ethersproject/rlp" "5.4.0"
7749
+ "@ethersproject/sha2" "5.4.0"
7750
+ "@ethersproject/signing-key" "5.4.0"
7751
+ "@ethersproject/solidity" "5.4.0"
7752
+ "@ethersproject/strings" "5.4.0"
7753
+ "@ethersproject/transactions" "5.4.0"
7754
+ "@ethersproject/units" "5.4.0"
7755
+ "@ethersproject/wallet" "5.4.0"
7756
+ "@ethersproject/web" "5.4.0"
7757
+ "@ethersproject/wordlists" "5.4.0"
7758
+
7551
7759
  ethjs-abi@0.2.0:
7552
7760
  version "0.2.0"
7553
7761
  resolved "https://registry.yarnpkg.com/ethjs-abi/-/ethjs-abi-0.2.0.tgz#d3e2c221011520fc499b71682036c14fcc2f5b25"
@@ -8463,7 +8671,7 @@ functional-red-black-tree@^1.0.1, functional-red-black-tree@~1.0.1:
8463
8671
  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
8464
8672
  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
8465
8673
 
8466
- ganache-cli@^6.11.0:
8674
+ ganache-cli@^6.12.2:
8467
8675
  version "6.12.2"
8468
8676
  resolved "https://registry.yarnpkg.com/ganache-cli/-/ganache-cli-6.12.2.tgz#c0920f7db0d4ac062ffe2375cb004089806f627a"
8469
8677
  integrity sha512-bnmwnJDBDsOWBUP8E/BExWf85TsdDEFelQSzihSJm9VChVO1SHp94YXLP5BlA4j/OTxp0wR4R1Tje9OHOuAJVw==
@@ -8999,16 +9207,16 @@ hardhat-gas-reporter@^1.0.4:
8999
9207
  eth-gas-reporter "^0.2.20"
9000
9208
  sha1 "^1.1.1"
9001
9209
 
9002
- hardhat@2.4.3:
9003
- version "2.4.3"
9004
- resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.4.3.tgz#093373b383eacec0d3e7fb223353b2f0cb9f2802"
9005
- integrity sha512-xgbnhEnmaKau8xT6wPJlzoyMLAZyxQoElACQQCyEeAY1DURpZbYwjIQUywmL/ZNv3QEl38Yqu/n8mPOc2HXyGA==
9210
+ hardhat@^2.6.4:
9211
+ version "2.6.4"
9212
+ resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.6.4.tgz#9ff3f139f697bfc4e14836a3fef3ca4c62357d65"
9213
+ integrity sha512-6QNfu1FptjtyGJ+jBR7LMX7AMY9gWWw9kAUD7v0YZNZH1ZBgsZdMHqXKiSzO5pLQXo+fy9zZovKAUNYbjQ/1fw==
9006
9214
  dependencies:
9007
9215
  "@ethereumjs/block" "^3.4.0"
9008
9216
  "@ethereumjs/blockchain" "^5.4.0"
9009
9217
  "@ethereumjs/common" "^2.4.0"
9010
9218
  "@ethereumjs/tx" "^3.3.0"
9011
- "@ethereumjs/vm" "^5.5.0"
9219
+ "@ethereumjs/vm" "^5.5.2"
9012
9220
  "@ethersproject/abi" "^5.1.2"
9013
9221
  "@sentry/node" "^5.18.1"
9014
9222
  "@solidity-parser/parser" "^0.11.0"
@@ -11452,6 +11660,19 @@ merkle-patricia-tree@^4.2.0:
11452
11660
  rlp "^2.2.4"
11453
11661
  semaphore-async-await "^1.5.1"
11454
11662
 
11663
+ merkle-patricia-tree@^4.2.1:
11664
+ version "4.2.1"
11665
+ resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-4.2.1.tgz#fc43e7b162e597a0720ccdd702bf1d49765691d2"
11666
+ integrity sha512-25reMgrT8PhJy0Ba0U7fMZD2oobS1FPWB9vQa0uBpJYIQYYuFXEHoqEkTqA/UzX+s9br3pmUVVY/TOsFt/x0oQ==
11667
+ dependencies:
11668
+ "@types/levelup" "^4.3.0"
11669
+ ethereumjs-util "^7.1.0"
11670
+ level-mem "^5.0.1"
11671
+ level-ws "^2.0.0"
11672
+ readable-stream "^3.6.0"
11673
+ rlp "^2.2.4"
11674
+ semaphore-async-await "^1.5.1"
11675
+
11455
11676
  merkle-tree-solidity@*:
11456
11677
  version "1.0.8"
11457
11678
  resolved "https://registry.yarnpkg.com/merkle-tree-solidity/-/merkle-tree-solidity-1.0.8.tgz#c4dc7bdad03270ca16c72cadc8b0e616dfc3a77a"
@@ -12457,10 +12678,10 @@ opencollective-postinstall@^2.0.0:
12457
12678
  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
12458
12679
  integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
12459
12680
 
12460
- openzeppelin-solidity@^4.0.0:
12461
- version "4.2.0"
12462
- resolved "https://registry.yarnpkg.com/openzeppelin-solidity/-/openzeppelin-solidity-4.2.0.tgz#a5e24eabc7c7117afa328aea558561d8106e2181"
12463
- integrity sha512-b+VN5y9c0tdd4D/hFLHMH5QKBfj/V2mzKqQ5PyB4xXE7Y7UAf5Xia/nDzBZ5CHDCnkMGdQXlEg+iDV2cQnitfg==
12681
+ openzeppelin-solidity@^4.3.2:
12682
+ version "4.3.2"
12683
+ resolved "https://registry.yarnpkg.com/openzeppelin-solidity/-/openzeppelin-solidity-4.3.2.tgz#30ab3cb813166a070b8e46d7ac719aefa4571921"
12684
+ integrity sha512-k20olEz9A58yq3zwFZgOJoe9vWodKaFsMjajpou1NiqzuxuDfIdaGL3/xLcn/48J0AmvqsxHrcgI3WHq370J+w==
12464
12685
 
12465
12686
  optimism@^0.16.0:
12466
12687
  version "0.16.1"
@@ -14856,18 +15077,18 @@ solidity-ast@^0.4.15:
14856
15077
  resolved "https://registry.yarnpkg.com/solidity-ast/-/solidity-ast-0.4.26.tgz#6e644bdb897c245dd07695a63ffa95edfe02c11f"
14857
15078
  integrity sha512-UR9Ip3QoiEvNON5lOA28JNEzKT+1fLFA4xpIbZSEl4CEnYr/a4Pj0qMJh0652UQ51pKplI/nncZsDOMzdHdCcg==
14858
15079
 
14859
- solidity-coverage@*:
14860
- version "0.7.16"
14861
- resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.7.16.tgz#c8c8c46baa361e2817bbf275116ddd2ec90a55fb"
14862
- integrity sha512-ttBOStywE6ZOTJmmABSg4b8pwwZfYKG8zxu40Nz+sRF5bQX7JULXWj/XbX0KXps3Fsp8CJXg8P29rH3W54ipxw==
15080
+ solidity-coverage@^0.7.17:
15081
+ version "0.7.17"
15082
+ resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.7.17.tgz#5139de8f6666d4755d88f453d8e35632a7bb3444"
15083
+ integrity sha512-Erw2hd2xdACAvDX8jUdYkmgJlIIazGznwDJA5dhRaw4def2SisXN9jUjneeyOZnl/E7j6D3XJYug4Zg9iwodsg==
14863
15084
  dependencies:
14864
- "@solidity-parser/parser" "^0.12.0"
15085
+ "@solidity-parser/parser" "^0.13.2"
14865
15086
  "@truffle/provider" "^0.2.24"
14866
15087
  chalk "^2.4.2"
14867
15088
  death "^1.1.0"
14868
15089
  detect-port "^1.3.0"
14869
15090
  fs-extra "^8.1.0"
14870
- ganache-cli "^6.11.0"
15091
+ ganache-cli "^6.12.2"
14871
15092
  ghost-testrpc "^0.0.2"
14872
15093
  global-modules "^2.0.0"
14873
15094
  globby "^10.0.1"
@@ -1,85 +0,0 @@
1
- import fse from "fs-extra";
2
- import { ethers, network as networkData } from "hardhat";
3
- import settings from "../releases/deploy-settings.json";
4
- import deployment from "../releases/deployment.json";
5
- import { increaseTime, advanceBlocks } from "./helpers";
6
-
7
- /**
8
- * helper script to simulate enough days of interest transfer and claiming
9
- * so we can test fishing of inactive user accounts
10
- */
11
-
12
- const waitTX = async (tx) => {
13
- return (await tx).wait();
14
- };
15
- const simulate = async function () {
16
- const network = networkData.name;
17
- const networkSettings = { ...settings["default"], ...settings[network] };
18
- const accounts = await ethers.getSigners();
19
-
20
- let addresses = deployment[network];
21
- let mainnetAddresses = deployment[`${network}-mainnet`];
22
- console.log({ addresses, network });
23
- const identity = await ethers.getContractAt("IIdentity", addresses.Identity);
24
- await Promise.all(
25
- accounts.slice(0, 10).map((a) =>
26
- identity
27
- .addWhitelistedWithDID(a.address, a.address + Math.random())
28
- .then((_) => _.wait())
29
- .catch((_) => _)
30
- )
31
- );
32
- const dai = await ethers.getContractAt("DAIMock", mainnetAddresses.DAI);
33
- const cDAI = await ethers.getContractAt("cDAIMock", mainnetAddresses.cDAI);
34
- const simpleStaking = mainnetAddresses.StakingContracts[0][0];
35
- const goodFundManager = await ethers.getContractAt(
36
- "GoodFundManager",
37
- mainnetAddresses.GoodFundManager
38
- );
39
- const ubi = await ethers.getContractAt("UBIScheme", addresses.UBIScheme);
40
-
41
- console.log("transaction count:", await accounts[0].getTransactionCount());
42
- await increaseTime(60 * 60 * 24).catch((e) =>
43
- console.log("nextday failed", e)
44
- );
45
- await waitTX(
46
- dai.approve(cDAI.address, ethers.utils.parseUnits("300000000000", "ether"))
47
- );
48
- await waitTX(
49
- dai.allocateTo(
50
- accounts[0].address,
51
- ethers.utils.parseUnits("300000000000", "ether")
52
- )
53
- );
54
- await waitTX(
55
- cDAI["mint(uint256)"](ethers.utils.parseUnits("300000000000", "ether"))
56
- );
57
-
58
- for (let day = 0; day < 15; day++) {
59
- const cdaiBalance = await cDAI
60
- .balanceOf(accounts[0].address)
61
- .then((_) => _.toString());
62
- console.log("transfering cdai to staking day:", { day, cdaiBalance });
63
-
64
- await waitTX(
65
- cDAI.transfer(simpleStaking, ethers.utils.parseUnits("30", "gwei")) //300 cdai
66
- );
67
- let stakingBalance = await cDAI
68
- .balanceOf(simpleStaking)
69
- .then((_) => _.toString());
70
-
71
- console.log("collecting interest...", { stakingBalance });
72
-
73
- await goodFundManager.collectInterest([simpleStaking]);
74
-
75
- console.log("claiming");
76
-
77
- await ubi.connect(accounts[day > 9 ? 9 : day]).claim();
78
-
79
- await increaseTime(60 * 60 * 24).catch((e) =>
80
- console.log("nextday failed", e)
81
- );
82
- }
83
- };
84
-
85
- simulate().catch(console.log);