@gooddollar/goodprotocol 1.0.2-beta.5 → 1.0.3-beta.2

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 (112) 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/IAdminWallet.dbg.json +1 -1
  11. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  12. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  13. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  14. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  15. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  16. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  17. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  18. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  19. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  20. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  21. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  22. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  23. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  24. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  25. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  26. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  27. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  28. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  29. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  30. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.json +20 -2
  31. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  32. package/artifacts/contracts/governance/GovarnanceStaking.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/governance/StakersDistribution.sol/StakersDistribution.json +2 -2
  37. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  38. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  39. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  40. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  41. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +2 -2
  42. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  43. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  44. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  45. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  46. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  47. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
  48. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  49. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  50. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  51. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  52. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  53. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  54. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  55. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  56. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  57. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  58. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  59. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  60. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  61. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  62. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  63. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  64. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  65. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  66. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  67. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +2 -2
  68. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  69. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  70. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  71. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.json +2 -2
  72. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  73. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +2 -2
  74. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  75. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +2 -2
  76. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  77. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +2 -2
  78. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  79. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +2 -2
  80. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  81. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +15 -2
  82. package/artifacts/contracts/unaudited-foundation/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  83. package/artifacts/contracts/unaudited-foundation/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  84. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  85. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  86. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  87. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  88. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  89. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  90. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  91. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  92. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  93. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  94. package/contracts/governance/CompoundVotingMachine.sol +10 -2
  95. package/contracts/staking/UniswapV2SwapHelper.sol +0 -1
  96. package/contracts/ubi/UBIScheme.sol +20 -4
  97. package/hardhat.config.ts +16 -2
  98. package/package.json +1 -1
  99. package/releases/deploy-settings.json +9 -5
  100. package/releases/deployment.json +427 -330
  101. package/releases/olddao.json +406 -1
  102. package/scripts/upgradeToV2/upgradeToV2.ts +58 -34
  103. package/test/governance/CompoundVotingMachine.castvote.test.ts +0 -3
  104. package/test/governance/CompoundVotingMachine.daoscheme.ts +0 -9
  105. package/test/governance/CompoundVotingMachine.guardian.test.ts +10 -5
  106. package/test/governance/CompoundVotingMachine.propose.test.ts +0 -3
  107. package/test/governance/CompoundVotingMachine.state.test.ts +0 -3
  108. package/test/helpers.ts +30 -30
  109. package/test/ubi/UBIScheme.test.ts +6 -17
  110. package/test/ubi/UBISchemeCycle.test.ts +3 -4
  111. package/test/utils/ProtocolUpgrade.test.ts +19 -1
  112. package/truffle-config.js +21 -3
package/truffle-config.js CHANGED
@@ -69,7 +69,25 @@ module.exports = {
69
69
  confirmations: 2, // # of confs to wait between deployments. (default: 0)
70
70
  timeoutBlocks: 200, // # of blocks before a deployment times out (minimum/default: 50)
71
71
  skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
72
+ },
73
+ fuse: {
74
+ provider: () => new HDWalletProvider(mnemonic, `https://rpc.fuse.io`),
75
+ network_id: 122, // Ropsten's id
76
+ gas: 8000000, // Ropsten has a lower block limit than mainnet
77
+ confirmations: 1, // # of confs to wait between deployments. (default: 0)
78
+ timeoutBlocks: 20, // # of blocks before a deployment times out (minimum/default: 50)
79
+ skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
80
+ },
81
+ fusespark: {
82
+ provider: () =>
83
+ new HDWalletProvider(mnemonic, `https://rpc.fusespark.io`),
84
+ network_id: 123, // Ropsten's id
85
+ gas: 8000000, // Ropsten has a lower block limit than mainnet
86
+ confirmations: 1, // # of confs to wait between deployments. (default: 0)
87
+ timeoutBlocks: 20, // # of blocks before a deployment times out (minimum/default: 50)
88
+ skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
72
89
  }
90
+
73
91
  // Useful for private networks
74
92
  // private: {
75
93
  // provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
@@ -86,12 +104,12 @@ module.exports = {
86
104
  // Configure your compilers
87
105
  compilers: {
88
106
  solc: {
89
- version: "0.8.3", // Fetch exact version from solc-bin (default: truffle's version)
107
+ version: "0.8.8", // Fetch exact version from solc-bin (default: truffle's version)
90
108
  settings: {
91
109
  // See the solidity docs for advice about optimization and evmVersion
92
110
  optimizer: {
93
111
  enabled: true,
94
- runs: 200
112
+ runs: 0
95
113
  }
96
114
  }
97
115
  }
@@ -109,5 +127,5 @@ module.exports = {
109
127
  api_keys: {
110
128
  etherscan: process.env.ETHERSCAN_KEY
111
129
  },
112
- plugins: ["truffle-plugin-verify"]
130
+ plugins: ["truffle-source-verify"]
113
131
  };