Allow TSS to call updateTssAndConnectorAddresses

zeta-chain · Jun 29, 2022 · 0035046 · 0035046
1 parent db87337
commit 0035046
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/packages/protocol-contracts/contracts/Zeta.non-eth.sol b/packages/protocol-contracts/contracts/Zeta.non-eth.sol
@@ -30,7 +30,7 @@ contract ZetaNonEth is ERC20Burnable, ZetaErrors {
     }
 
     function updateTssAndConnectorAddresses(address tssAddress_, address connectorAddress_) external {
-        if (msg.sender != tssAddressUpdater) revert CallerIsNotTssUpdater(msg.sender);
+        if (msg.sender != tssAddressUpdater && msg.sender != tssAddress) revert CallerIsNotTssOrUpdater(msg.sender);
         if (tssAddress_ == address(0) || connectorAddress_ == address(0)) revert InvalidAddress();
 
         tssAddress = tssAddress_;

diff --git a/packages/protocol-contracts/contracts/interfaces/ZetaErrors.sol b/packages/protocol-contracts/contracts/interfaces/ZetaErrors.sol
@@ -8,6 +8,8 @@ interface ZetaErrors {
 
     error CallerIsNotTssUpdater(address caller);
 
+    error CallerIsNotTssOrUpdater(address caller);
+
     error InvalidAddress();
 
     error ZetaTransferError();

diff --git a/packages/protocol-contracts/test/Zeta.non-eth.spec.ts b/packages/protocol-contracts/test/Zeta.non-eth.spec.ts
@@ -57,12 +57,12 @@ describe("ZetaNonEth tests", () => {
   });
 
   describe("updateTssAndConnectorAddresses", () => {
-    it("Should revert if the caller is not tssAddressUpdater", async () => {
+    it("Should revert if the caller is not tssAddressUpdater or TSS", async () => {
       expect(
         zetaTokenNonEthContract
           .connect(randomSigner)
-          .updateTssAndConnectorAddresses(tssSigner.address, zetaConnectorNonEthContract.address)
-      ).to.be.revertedWith(`CallerIsNotTssUpdater("${randomSigner.address}")`);
+          .updateTssAndConnectorAddresses(randomSigner.address, zetaConnectorNonEthContract.address)
+      ).to.be.revertedWith(`CallerIsNotTssOrUpdater("${randomSigner.address}")`);
     });
 
     it("Should change the addresses if the caller is tssAddressUpdater", async () => {
@@ -73,6 +73,17 @@ describe("ZetaNonEth tests", () => {
       expect(await zetaTokenNonEthContract.tssAddress()).to.equal(randomSigner.address);
       expect(await zetaTokenNonEthContract.connectorAddress()).to.equal(randomSigner.address);
     });
+
+    it("Should change the addresses if the caller is TSS", async () => {
+      await (
+        await zetaTokenNonEthContract
+          .connect(tssSigner)
+          .updateTssAndConnectorAddresses(randomSigner.address, randomSigner.address)
+      ).wait();
+
+      expect(await zetaTokenNonEthContract.tssAddress()).to.equal(randomSigner.address);
+      expect(await zetaTokenNonEthContract.connectorAddress()).to.equal(randomSigner.address);
+    });
   });
 
   describe("renounceTssAddressUpdater", () => {