setting contracts as core on deployment

MSalman6 · Aug 28, 2024 · d2fd833 · d2fd833
1 parent e104429
commit d2fd833
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/contracts/DiamondDao.sol b/contracts/DiamondDao.sol
@@ -127,6 +127,7 @@ contract DiamondDao is IDiamondDao, Initializable, ReentrancyGuardUpgradeable, V
         address _validatorSet,
         address _stakingHbbft,
         address _reinsertPot,
+        address _txPermission,
         uint256 _createProposalFee,
         uint64 _startTimestamp
     ) external initializer {
@@ -174,6 +175,9 @@ contract DiamondDao is IDiamondDao, Initializable, ReentrancyGuardUpgradeable, V
         );
 
         isCoreContract[address(this)] = true;
+        isCoreContract[_stakingHbbft] = true;
+        isCoreContract[_txPermission] = true;
+        isCoreContract[_reinsertPot] = true;
      }
 
     function setCreateProposalFee(uint256 _fee) external onlyGovernance withinAllowedRange(_fee) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/deploy.ts b/scripts/deploy.ts
@@ -16,6 +16,7 @@ async function deploy() {
     "0x1000000000000000000000000000000000000001", // ValidatorSetHbbf
     "0x1100000000000000000000000000000000000001", // StakingHbbft
     "0x2000000000000000000000000000000000000001", // _reinsertPot
+    "0x4000000000000000000000000000000000000001", // _txPermission,
     createProposalFee,
     startTimestamp,
   ]);

diff --git a/scripts/deployForChainSpec.ts b/scripts/deployForChainSpec.ts
@@ -35,6 +35,7 @@ async function compileProxy() {
         "0x1000000000000000000000000000000000000001", //address _validatorSet,
         "0x1100000000000000000000000000000000000001", //address _stakingHbbft,
         "0x2000000000000000000000000000000000000001", //address _reinsertPot,
+        "0x4000000000000000000000000000000000000001", //address _txPermission,
         ethers.parseEther("1"),//uint256 _createProposalFee,
         startTimeBigInt //uint64 _startTimestamp
     ];

diff --git a/test/DiamondDao.spec.ts b/test/DiamondDao.spec.ts
@@ -63,6 +63,7 @@ describe("DiamondDao contract", function () {
       await mockValidatorSet.getAddress(),
       await mockStaking.getAddress(),
       reinsertPot.address,
+      ethers.ZeroAddress,
       createProposalFee,
       startTime + 1
     ], {
@@ -151,6 +152,7 @@ describe("DiamondDao contract", function () {
           ethers.ZeroAddress,
           users[1].address,
           users[2].address,
+          ethers.ZeroAddress,
           createProposalFee,
           startTime + 1
         ], {
@@ -168,6 +170,7 @@ describe("DiamondDao contract", function () {
           users[1].address,
           ethers.ZeroAddress,
           users[2].address,
+          ethers.ZeroAddress,
           createProposalFee,
           startTime + 1
         ], {
@@ -185,6 +188,7 @@ describe("DiamondDao contract", function () {
           users[1].address,
           users[2].address,
           ethers.ZeroAddress,
+          ethers.ZeroAddress,
           createProposalFee,
           startTime + 1
         ], {
@@ -202,6 +206,7 @@ describe("DiamondDao contract", function () {
           users[1].address,
           users[2].address,
           users[3].address,
+          ethers.ZeroAddress,
           0n,
           startTime + 1
         ], {
@@ -219,6 +224,7 @@ describe("DiamondDao contract", function () {
           users[1].address,
           users[2].address,
           users[3].address,
+          ethers.ZeroAddress,
           createProposalFee,
           startTime - 10
         ], {
@@ -235,6 +241,7 @@ describe("DiamondDao contract", function () {
         users[1].address,
         users[2].address,
         users[3].address,
+        ethers.ZeroAddress,
         createProposalFee,
         startTime + 1
       ], {
@@ -248,6 +255,7 @@ describe("DiamondDao contract", function () {
           users[1].address,
           users[2].address,
           users[3].address,
+          ethers.ZeroAddress,
           createProposalFee,
           startTime + 1
         )
@@ -452,6 +460,7 @@ describe("DiamondDao contract", function () {
         await mockValidatorSet.getAddress(),
         await mockValidatorSet.getAddress(),
         await mockValidatorSet.getAddress(),
+        ethers.ZeroAddress,
         createProposalFee,
         startTime + 1
       ], {

diff --git a/test/ProposalExecution.spec.ts b/test/ProposalExecution.spec.ts
@@ -51,6 +51,7 @@ describe("DAO proposal execution", function () {
       await mockValidatorSet.getAddress(),
       await mockStaking.getAddress(),
       reinsertPot.address,
+      ethers.ZeroAddress,
       createProposalFee,
       startTime + 10
     ], {

diff --git a/test/ProposalFinalization.spec.ts b/test/ProposalFinalization.spec.ts
@@ -65,6 +65,7 @@ describe("Proposal Acceptance Threshold", function () {
       await mockValidatorSet.getAddress(),
       await mockStaking.getAddress(),
       reinsertPot.address,
+      ethers.ZeroAddress,
       createProposalFee,
       startTime + 10
     ], {

diff --git a/test/ProposalValueGuards.spec.ts b/test/ProposalValueGuards.spec.ts
@@ -56,6 +56,7 @@ describe("DAO Ecosystem Paramater Change Value Guards Test", function () {
       await mockValidatorSet.getAddress(),
       await mockStaking.getAddress(),
       reinsertPot.address,
+      ethers.ZeroAddress,
       createProposalFee,
       startTime + 10
     ], {