token-swap: Use find_program_address on-chain during init (#2363)

Author: joncinque

token-swap/js/cli/token-swap-test.ts

@@ -19,8 +19,8 @@ import {Numberu64} from '../dist';
 let tokenSwap: TokenSwap;
 // authority of the token and accounts
 let authority: PublicKey;
-// nonce used to generate the authority public key
-let nonce: number;
+// bump seed used to generate the authority public key
+let bumpSeed: number;
 // owner of the user accounts
 let owner: Account;
 // Token pool
@@ -95,7 +95,7 @@ export async function createTokenSwap(
   owner = await newAccountWithLamports(connection, 1000000000);
   const tokenSwapAccount = new Account();
 
-  [authority, nonce] = await PublicKey.findProgramAddress(
+  [authority, bumpSeed] = await PublicKey.findProgramAddress(
     [tokenSwapAccount.publicKey.toBuffer()],
     TOKEN_SWAP_PROGRAM_ID,
   );
@@ -161,7 +161,6 @@ export async function createTokenSwap(
     tokenAccountPool,
     TOKEN_SWAP_PROGRAM_ID,
     TOKEN_PROGRAM_ID,
-    nonce,
     TRADING_FEE_NUMERATOR,
     TRADING_FEE_DENOMINATOR,
     OWNER_TRADING_FEE_NUMERATOR,

token-swap/js/src/index.ts

@@ -57,7 +57,7 @@ export class Numberu64 extends BN {
 export const TokenSwapLayout = BufferLayout.struct([
   BufferLayout.u8('version'),
   BufferLayout.u8('isInitialized'),
-  BufferLayout.u8('nonce'),
+  BufferLayout.u8('bumpSeed'),
   Layout.publicKey('tokenProgramId'),
   Layout.publicKey('tokenAccountA'),
   Layout.publicKey('tokenAccountB'),
@@ -180,7 +180,6 @@ export class TokenSwap {
     tokenAccountPool: PublicKey,
     tokenProgramId: PublicKey,
     swapProgramId: PublicKey,
-    nonce: number,
     tradeFeeNumerator: number,
     tradeFeeDenominator: number,
     ownerTradeFeeNumerator: number,
@@ -204,7 +203,6 @@ export class TokenSwap {
     ];
     const commandDataLayout = BufferLayout.struct([
       BufferLayout.u8('instruction'),
-      BufferLayout.u8('nonce'),
       BufferLayout.nu64('tradeFeeNumerator'),
       BufferLayout.nu64('tradeFeeDenominator'),
       BufferLayout.nu64('ownerTradeFeeNumerator'),
@@ -228,7 +226,6 @@ export class TokenSwap {
       const encodeLength = commandDataLayout.encode(
         {
           instruction: 0, // InitializeSwap instruction
-          nonce,
           tradeFeeNumerator,
           tradeFeeDenominator,
           ownerTradeFeeNumerator,
@@ -334,7 +331,6 @@ export class TokenSwap {
    * @param payer Pays for the transaction
    * @param tokenSwapAccount The token swap account
    * @param authority The authority over the swap and accounts
-   * @param nonce The nonce used to generate the authority
    * @param tokenAccountA: The token swap's Token A account
    * @param tokenAccountB: The token swap's Token B account
    * @param poolToken The pool token
@@ -359,7 +355,6 @@ export class TokenSwap {
     tokenAccountPool: PublicKey,
     swapProgramId: PublicKey,
     tokenProgramId: PublicKey,
-    nonce: number,
     tradeFeeNumerator: number,
     tradeFeeDenominator: number,
     ownerTradeFeeNumerator: number,
@@ -421,7 +416,6 @@ export class TokenSwap {
       tokenAccountPool,
       tokenProgramId,
       swapProgramId,
-      nonce,
       tradeFeeNumerator,
       tradeFeeDenominator,
       ownerTradeFeeNumerator,

token-swap/program/fuzz/src/native_token_swap.rs

@@ -19,7 +19,7 @@ use solana_program::{bpf_loader, entrypoint::ProgramResult, pubkey::Pubkey, syst
 
 pub struct NativeTokenSwap {
     pub user_account: NativeAccountData,
-    pub nonce: u8,
+    pub bump_seed: u8,
     pub authority_account: NativeAccountData,
     pub fees: Fees,
     pub swap_curve: SwapCurve,
@@ -51,7 +51,7 @@ impl NativeTokenSwap {
         user_account.is_signer = true;
         let mut swap_account =
             NativeAccountData::new(SwapVersion::LATEST_LEN, spl_token_swap::id());
-        let (authority_key, nonce) = Pubkey::find_program_address(
+        let (authority_key, bump_seed) = Pubkey::find_program_address(
             &[&swap_account.key.to_bytes()[..]],
             &spl_token_swap::id(),
         );
@@ -86,7 +86,6 @@ impl NativeTokenSwap {
             &pool_mint_account.key,
             &pool_fee_account.key,
             &pool_token_account.key,
-            nonce,
             fees.clone(),
             swap_curve.clone(),
         )
@@ -109,7 +108,7 @@ impl NativeTokenSwap {
 
         Self {
             user_account,
-            nonce,
+            bump_seed,
             authority_account,
             fees,
             swap_curve,

token-swap/program/src/error.rs

@@ -12,7 +12,7 @@ pub enum SwapError {
     #[error("Swap account already in use")]
     AlreadyInUse,
     /// The program address provided doesn't match the value generated by the program.
-    #[error("Invalid program address generated from nonce and key")]
+    #[error("Invalid program address generated from bump seed and key")]
     InvalidProgramAddress,
     /// The owner of the input isn't set to the program address generated by the program.
     #[error("Input account owner is not the program address")]

token-swap/program/src/instruction.rs

@@ -20,8 +20,6 @@ use arbitrary::Arbitrary;
 #[repr(C)]
 #[derive(Debug, PartialEq)]
 pub struct Initialize {
-    /// nonce used to create valid program address
-    pub nonce: u8,
     /// all swap fees
     pub fees: Fees,
     /// swap curve info for pool, including CurveType and anything
@@ -195,16 +193,11 @@ impl SwapInstruction {
         let (&tag, rest) = input.split_first().ok_or(SwapError::InvalidInstruction)?;
         Ok(match tag {
             0 => {
-                let (&nonce, rest) = rest.split_first().ok_or(SwapError::InvalidInstruction)?;
                 if rest.len() >= Fees::LEN {
                     let (fees, rest) = rest.split_at(Fees::LEN);
                     let fees = Fees::unpack_unchecked(fees)?;
                     let swap_curve = SwapCurve::unpack_unchecked(rest)?;
-                    Self::Initialize(Initialize {
-                        nonce,
-                        fees,
-                        swap_curve,
-                    })
+                    Self::Initialize(Initialize { fees, swap_curve })
                 } else {
                     return Err(SwapError::InvalidInstruction.into());
                 }
@@ -275,13 +268,8 @@ impl SwapInstruction {
     pub fn pack(&self) -> Vec<u8> {
         let mut buf = Vec::with_capacity(size_of::<Self>());
         match &*self {
-            Self::Initialize(Initialize {
-                nonce,
-                fees,
-                swap_curve,
-            }) => {
+            Self::Initialize(Initialize { fees, swap_curve }) => {
                 buf.push(0);
-                buf.push(*nonce);
                 let mut fees_slice = [0u8; Fees::LEN];
                 Pack::pack_into_slice(fees, &mut fees_slice[..]);
                 buf.extend_from_slice(&fees_slice);
@@ -351,15 +339,10 @@ pub fn initialize(
     pool_pubkey: &Pubkey,
     fee_pubkey: &Pubkey,
     destination_pubkey: &Pubkey,
-    nonce: u8,
     fees: Fees,
     swap_curve: SwapCurve,
 ) -> Result<Instruction, ProgramError> {
-    let init_data = SwapInstruction::Initialize(Initialize {
-        nonce,
-        fees,
-        swap_curve,
-    });
+    let init_data = SwapInstruction::Initialize(Initialize { fees, swap_curve });
     let data = init_data.pack();
 
     let accounts = vec![
@@ -606,21 +589,16 @@ mod tests {
             host_fee_numerator,
             host_fee_denominator,
         };
-        let nonce: u8 = 255;
         let amp: u64 = 1;
         let curve_type = CurveType::Stable;
         let calculator = Box::new(StableCurve { amp });
         let swap_curve = SwapCurve {
             curve_type,
             calculator,
         };
-        let check = SwapInstruction::Initialize(Initialize {
-            nonce,
-            fees,
-            swap_curve,
-        });
+        let check = SwapInstruction::Initialize(Initialize { fees, swap_curve });
         let packed = check.pack();
-        let mut expect = vec![0u8, nonce];
+        let mut expect = vec![0u8];
         expect.extend_from_slice(&trade_fee_numerator.to_le_bytes());
         expect.extend_from_slice(&trade_fee_denominator.to_le_bytes());
         expect.extend_from_slice(&owner_trade_fee_numerator.to_le_bytes());