chore: add AC for registering/removing subnets (#102)

Signed-off-by: Jawad Tariq <[email protected]>
topos-protocol · Sep 6, 2023 · 4375919 · 4375919
1 parent d9a291d
commit 4375919
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 57 deletions.
diff --git a/contracts/interfaces/IOwnable.sol b/contracts/interfaces/IOwnable.sol
diff --git a/contracts/topos-core/Ownable.sol b/contracts/topos-core/Ownable.sol
diff --git a/contracts/topos-core/SubnetRegistrator.sol b/contracts/topos-core/SubnetRegistrator.sol
@@ -2,9 +2,11 @@
 pragma solidity ^0.8.9;
 
 import "./Bytes32Sets.sol";
+import "@openzeppelin/contracts/access/Ownable.sol";
+
 type SubnetId is bytes32;
 
-contract SubnetRegistrator {
+contract SubnetRegistrator is Ownable {
     using Bytes32SetsLib for Bytes32SetsLib.Set;
 
     struct Subnet {
@@ -59,7 +61,7 @@ contract SubnetRegistrator {
         SubnetId subnetId,
         string calldata currencySymbol,
         uint256 chainId
-    ) public {
+    ) public onlyOwner {
         subnetSet.insert(SubnetId.unwrap(subnetId));
         Subnet storage subnet = subnets[subnetId];
         subnet.endpoint = endpoint;
@@ -72,7 +74,7 @@ contract SubnetRegistrator {
 
     /// @notice Remove an already registered subnet
     /// @param subnetId FROST public key of a subnet
-    function removeSubnet(SubnetId subnetId) public {
+    function removeSubnet(SubnetId subnetId) public onlyOwner {
         subnetSet.remove(SubnetId.unwrap(subnetId));
         delete subnets[subnetId];
         emit SubnetRemoved(subnetId);

diff --git a/scripts/deploy.ts b/scripts/deploy.ts
@@ -1,4 +1,5 @@
-import { providers, utils, Wallet } from 'ethers'
+/* eslint-disable no-case-declarations */
+import { ContractFactory, providers, utils, Wallet } from 'ethers'
 import fs from 'fs'
 
 import {
@@ -8,7 +9,14 @@ import {
 } from './const-addr-deployer'
 
 const main = async function (..._args: Arg[]) {
-  const [providerEndpoint, contractJsonPath, salt, gasLimit, ...args] = _args
+  const [
+    providerEndpoint,
+    contractJsonPath,
+    salt,
+    gasLimit,
+    deployConstant,
+    ...args
+  ] = _args
   const provider = new providers.JsonRpcProvider(<string>providerEndpoint)
   const privateKey = process.env.PRIVATE_KEY
 
@@ -39,17 +47,37 @@ const main = async function (..._args: Arg[]) {
     return
   }
 
-  const address = await deployContractConstant(
-    wallet,
-    contractJson,
-    <string>salt,
-    args,
-    <number>gasLimit
-  )
-    .then(({ address }) => address)
-    .catch(console.error)
-
-  console.log(address)
+  switch (deployConstant) {
+    case 'true':
+      const address = await deployContractConstant(
+        wallet,
+        contractJson,
+        <string>salt,
+        args,
+        <number>gasLimit
+      )
+        .then(({ address }) => address)
+        .catch(console.error)
+
+      console.log(address)
+      break
+    case 'false':
+      const contractFactory = new ContractFactory(
+        contractJson.abi,
+        contractJson.bytecode,
+        wallet
+      )
+      const contract = await contractFactory.deploy(...args, {
+        gasLimit: BigInt(gasLimit),
+      })
+      await contract.deployed()
+      console.log(contract.address)
+      break
+    default:
+      console.error(
+        `ERROR: Please provide a valid deployConstant flag! (true|false)`
+      )
+  }
 }
 
 const args = process.argv.slice(2)

diff --git a/test/topos-core/SubnetRegistrator.test.ts b/test/topos-core/SubnetRegistrator.test.ts
@@ -20,6 +20,22 @@ describe('SubnetRegistrator', () => {
   })
 
   describe('registerSubnet', () => {
+    it('reverts if non-admin tries to register a subnet', async () => {
+      const [, nonAdmin] = await ethers.getSigners()
+      await expect(
+        subnetRegistrator
+          .connect(nonAdmin)
+          .registerSubnet(
+            endpoint,
+            logoURL,
+            subnetName,
+            subnetId,
+            subnetCurrencySymbol,
+            chainId
+          )
+      ).to.be.revertedWith('Ownable: caller is not the owner')
+    })
+
     it('reverts if the subnet is already registered', async () => {
       await registerSubnet(
         endpoint,
@@ -114,6 +130,13 @@ describe('SubnetRegistrator', () => {
   })
 
   describe('removeSubnet', () => {
+    it('reverts if non-admin tries to remove a subnet', async () => {
+      const [, nonAdmin] = await ethers.getSigners()
+      await expect(
+        subnetRegistrator.connect(nonAdmin).removeSubnet(subnetId)
+      ).to.be.revertedWith('Ownable: caller is not the owner')
+    })
+
     it('reverts when removing a non-existent subnet', async () => {
       await expect(removeSubnet(subnetId)).to.be.revertedWith(
         'Bytes32Set: key does not exist in the set.'