Add tests

Author: Arrowana

clients/js/src/generated/instructions/createAccountWithSeed.ts

@@ -81,15 +81,15 @@ export type CreateAccountWithSeedInstructionData = {
   discriminator: number;
   base: Address;
   seed: string;
-  amount: bigint;
+  lamports: bigint;
   space: bigint;
   programAddress: Address;
 };
 
 export type CreateAccountWithSeedInstructionDataArgs = {
   base: Address;
   seed: string;
-  amount: number | bigint;
+  lamports: number | bigint;
   space: number | bigint;
   programAddress: Address;
 };
@@ -100,7 +100,7 @@ export function getCreateAccountWithSeedInstructionDataEncoder(): Encoder<Create
       ['discriminator', getU32Encoder()],
       ['base', getAddressEncoder()],
       ['seed', addEncoderSizePrefix(getUtf8Encoder(), getU64Encoder())],
-      ['amount', getU64Encoder()],
+      ['lamports', getU64Encoder()],
       ['space', getU64Encoder()],
       ['programAddress', getAddressEncoder()],
     ]),
@@ -116,7 +116,7 @@ export function getCreateAccountWithSeedInstructionDataDecoder(): Decoder<Create
     ['discriminator', getU32Decoder()],
     ['base', getAddressDecoder()],
     ['seed', addDecoderSizePrefix(getUtf8Decoder(), getU64Decoder())],
-    ['amount', getU64Decoder()],
+    ['lamports', getU64Decoder()],
     ['space', getU64Decoder()],
     ['programAddress', getAddressDecoder()],
   ]);
@@ -142,7 +142,7 @@ export type CreateAccountWithSeedInput<
   baseAccount?: TransactionSigner<TAccountBaseAccount>;
   base: CreateAccountWithSeedInstructionDataArgs['base'];
   seed: CreateAccountWithSeedInstructionDataArgs['seed'];
-  amount: CreateAccountWithSeedInstructionDataArgs['amount'];
+  lamports: CreateAccountWithSeedInstructionDataArgs['lamports'];
   space: CreateAccountWithSeedInstructionDataArgs['space'];
   programAddress: CreateAccountWithSeedInstructionDataArgs['programAddress'];
 };

clients/js/test/createAccountWithSeed.test.ts

@@ -0,0 +1,82 @@
+import {
+  appendTransactionMessageInstruction,
+  createAddressWithSeed,
+  fetchEncodedAccount,
+  generateKeyPairSigner,
+  KeyPairSigner,
+  pipe,
+} from '@solana/kit';
+import test, { ExecutionContext } from 'ava';
+import { getCreateAccountWithSeedInstruction } from '../src';
+import {
+  createDefaultSolanaClient,
+  createDefaultTransaction,
+  generateKeyPairSignerWithSol,
+  signAndSendTransaction,
+} from './_setup';
+
+async function createAccountWithSeedTest(
+  t: ExecutionContext<unknown>,
+  baseIsPayer: boolean
+) {
+  const client = createDefaultSolanaClient();
+  const space = 42n;
+  const [payer, program, lamports] = await Promise.all([
+    generateKeyPairSignerWithSol(client),
+    generateKeyPairSigner(),
+    client.rpc.getMinimumBalanceForRentExemption(space).send(),
+  ]);
+  let baseAccount = await generateKeyPairSigner();
+
+  if (baseIsPayer) {
+    baseAccount = payer;
+  }
+
+  const programAddress = program.address;
+  const SEED = '123456789';
+  const newAccount = await createAddressWithSeed({
+    baseAddress: baseAccount.address,
+    programAddress,
+    seed: SEED,
+  });
+
+  let extraArgs: {} | { baseAccount: KeyPairSigner<string> } = {};
+  if (!baseIsPayer) {
+    extraArgs = { baseAccount };
+  }
+
+  // When we call createAccountWithSeed in a transaction.
+  const createAccount = getCreateAccountWithSeedInstruction({
+    payer,
+    newAccount,
+    base: baseAccount.address,
+    seed: SEED,
+    space,
+    lamports,
+    programAddress,
+    ...extraArgs,
+  });
+  await pipe(
+    await createDefaultTransaction(client, payer),
+    (tx) => appendTransactionMessageInstruction(createAccount, tx),
+    (tx) => signAndSendTransaction(client, tx)
+  );
+
+  // Then we expect the following account data.
+  const fetchedAccount = await fetchEncodedAccount(client.rpc, newAccount);
+  t.deepEqual(fetchedAccount, {
+    executable: false,
+    lamports,
+    programAddress,
+    address: newAccount,
+    data: new Uint8Array(Array.from({ length: 42 }, () => 0)),
+    exists: true,
+    space: 42n,
+  });
+}
+
+test('it creates a new empty account when base is not payer', (t) =>
+  createAccountWithSeedTest(t, false));
+
+test('it creates a new empty account when base is payer', (t) =>
+  createAccountWithSeedTest(t, true));

clients/rust/src/generated/instructions/create_account_with_seed.rs

@@ -84,7 +84,7 @@ impl Default for CreateAccountWithSeedInstructionData {
 pub struct CreateAccountWithSeedInstructionArgs {
     pub base: Pubkey,
     pub seed: U64PrefixString,
-    pub amount: u64,
+    pub lamports: u64,
     pub space: u64,
     pub program_address: Pubkey,
 }
@@ -103,7 +103,7 @@ pub struct CreateAccountWithSeedBuilder {
     base_account: Option<solana_program::pubkey::Pubkey>,
     base: Option<Pubkey>,
     seed: Option<U64PrefixString>,
-    amount: Option<u64>,
+    lamports: Option<u64>,
     space: Option<u64>,
     program_address: Option<Pubkey>,
     __remaining_accounts: Vec<solana_program::instruction::AccountMeta>,
@@ -143,8 +143,8 @@ impl CreateAccountWithSeedBuilder {
         self
     }
     #[inline(always)]
-    pub fn amount(&mut self, amount: u64) -> &mut Self {
-        self.amount = Some(amount);
+    pub fn lamports(&mut self, lamports: u64) -> &mut Self {
+        self.lamports = Some(lamports);
         self
     }
     #[inline(always)]
@@ -185,7 +185,7 @@ impl CreateAccountWithSeedBuilder {
         let args = CreateAccountWithSeedInstructionArgs {
             base: self.base.clone().expect("base is not set"),
             seed: self.seed.clone().expect("seed is not set"),
-            amount: self.amount.clone().expect("amount is not set"),
+            lamports: self.lamports.clone().expect("lamports is not set"),
             space: self.space.clone().expect("space is not set"),
             program_address: self
                 .program_address
@@ -339,7 +339,7 @@ impl<'a, 'b> CreateAccountWithSeedCpiBuilder<'a, 'b> {
             base_account: None,
             base: None,
             seed: None,
-            amount: None,
+            lamports: None,
             space: None,
             program_address: None,
             __remaining_accounts: Vec::new(),
@@ -379,8 +379,8 @@ impl<'a, 'b> CreateAccountWithSeedCpiBuilder<'a, 'b> {
         self
     }
     #[inline(always)]
-    pub fn amount(&mut self, amount: u64) -> &mut Self {
-        self.instruction.amount = Some(amount);
+    pub fn lamports(&mut self, lamports: u64) -> &mut Self {
+        self.instruction.lamports = Some(lamports);
         self
     }
     #[inline(always)]
@@ -437,7 +437,11 @@ impl<'a, 'b> CreateAccountWithSeedCpiBuilder<'a, 'b> {
         let args = CreateAccountWithSeedInstructionArgs {
             base: self.instruction.base.clone().expect("base is not set"),
             seed: self.instruction.seed.clone().expect("seed is not set"),
-            amount: self.instruction.amount.clone().expect("amount is not set"),
+            lamports: self
+                .instruction
+                .lamports
+                .clone()
+                .expect("lamports is not set"),
             space: self.instruction.space.clone().expect("space is not set"),
             program_address: self
                 .instruction
@@ -473,7 +477,7 @@ struct CreateAccountWithSeedCpiBuilderInstruction<'a, 'b> {
     base_account: Option<&'b solana_program::account_info::AccountInfo<'a>>,
     base: Option<Pubkey>,
     seed: Option<U64PrefixString>,
-    amount: Option<u64>,
+    lamports: Option<u64>,
     space: Option<u64>,
     program_address: Option<Pubkey>,
     /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`.

program/idl.json

@@ -296,7 +296,7 @@
           },
           {
             "kind": "instructionArgumentNode",
-            "name": "amount",
+            "name": "lamports",
             "type": {
               "kind": "numberTypeNode",
               "format": "u64",