port reset nonce from release branch (#104)

Author: skosito

programs/gateway/src/contexts.rs

@@ -237,6 +237,18 @@ pub struct UpdateAuthority<'info> {
     pub pda: Account<'info, Pda>,
 }
 
+/// Instruction context for resetting the PDA nonce.
+#[derive(Accounts)]
+pub struct ResetNonce<'info> {
+    /// The account of the signer performing the update.
+    #[account(mut)]
+    pub signer: Signer<'info>,
+
+    /// Gateway PDA.
+    #[account(mut, seeds = [b"meta"], bump)]
+    pub pda: Account<'info, Pda>,
+}
+
 /// Instruction context for pausing or unpausing deposits.
 #[derive(Accounts)]
 pub struct UpdatePaused<'info> {

programs/gateway/src/instructions/admin.rs

@@ -1,5 +1,7 @@
 use crate::{
-    contexts::{Initialize, Unwhitelist, UpdateAuthority, UpdatePaused, UpdateTss, Whitelist},
+    contexts::{
+        Initialize, ResetNonce, Unwhitelist, UpdateAuthority, UpdatePaused, UpdateTss, Whitelist,
+    },
     state::InstructionId,
     utils::{
         recover_and_verify_eth_address, validate_message_hash, verify_and_update_nonce,
@@ -162,3 +164,14 @@ pub fn unwhitelist_spl_mint(
 
     Ok(())
 }
+
+// Resets the PDA authority. Caller is authority stored in PDA.
+pub fn reset_nonce(ctx: Context<ResetNonce>, new_nonce: u64) -> Result<()> {
+    verify_authority(&ctx.accounts.signer.key(), &ctx.accounts.pda)?;
+    let pda = &mut ctx.accounts.pda;
+    pda.nonce = new_nonce;
+
+    msg!("PDA nonce reset: new nonce = {}", new_nonce);
+
+    Ok(())
+}

programs/gateway/src/lib.rs

@@ -223,6 +223,15 @@ pub mod gateway {
         instructions::admin::update_authority(ctx, new_authority_address)
     }
 
+    /// Resets the PDA nonce. Caller is authority stored in PDA.
+    ///
+    /// # Arguments
+    /// * `ctx` - The instruction context.
+    /// * `new_nonce` - The new nonce.
+    pub fn reset_nonce(ctx: Context<ResetNonce>, new_nonce: u64) -> Result<()> {
+        instructions::admin::reset_nonce(ctx, new_nonce)
+    }
+
     /// Whitelists a new SPL token. Caller is TSS.
     /// # Arguments
     /// * `ctx` - The instruction context.

tests/gateway.ts

@@ -3149,6 +3149,14 @@ describe("Gateway", () => {
     }
   });
 
+  it("Reset nonce", async () => {
+    await gatewayProgram.methods.resetNonce(new anchor.BN(1000)).rpc();
+    const pdaAccountDataAfter = await gatewayProgram.account.pda.fetch(
+      pdaAccount
+    );
+    expect(pdaAccountDataAfter.nonce.toNumber()).to.equal(1000);
+  });
+
   const newAuthority = anchor.web3.Keypair.generate();
   it("Update authority", async () => {
     await gatewayProgram.methods.updateAuthority(newAuthority.publicKey).rpc();
@@ -3163,4 +3171,14 @@ describe("Gateway", () => {
       expect(err.message).to.include("SignerIsNotAuthority");
     }
   });
+
+  it("Reset nonce fails if wrong authority", async () => {
+    try {
+      await gatewayProgram.methods.resetNonce(new anchor.BN(1000)).rpc();
+      throw new Error("Expected error not thrown");
+    } catch (err) {
+      expect(err).to.be.instanceof(anchor.AnchorError);
+      expect(err.message).to.include("SignerIsNotAuthority");
+    }
+  });
 });