rename amount to lamports

Author: Arrowana

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

@@ -76,15 +76,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;
 };
@@ -95,7 +95,7 @@ export function getCreateAccountWithSeedInstructionDataEncoder(): Encoder<Create
             ['discriminator', getU32Encoder()],
             ['base', getAddressEncoder()],
             ['seed', addEncoderSizePrefix(getUtf8Encoder(), getU64Encoder())],
-            ['amount', getU64Encoder()],
+            ['lamports', getU64Encoder()],
             ['space', getU64Encoder()],
             ['programAddress', getAddressEncoder()],
         ]),
@@ -108,7 +108,7 @@ export function getCreateAccountWithSeedInstructionDataDecoder(): Decoder<Create
         ['discriminator', getU32Decoder()],
         ['base', getAddressDecoder()],
         ['seed', addDecoderSizePrefix(getUtf8Decoder(), getU64Decoder())],
-        ['amount', getU64Decoder()],
+        ['lamports', getU64Decoder()],
         ['space', getU64Decoder()],
         ['programAddress', getAddressDecoder()],
     ]);
@@ -134,7 +134,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/src/generated/instructions/transfer.ts

@@ -57,15 +57,15 @@ export type TransferInstruction<
         ]
     >;
 
-export type TransferInstructionData = { discriminator: number; amount: bigint };
+export type TransferInstructionData = { discriminator: number; lamports: bigint };
 
-export type TransferInstructionDataArgs = { amount: number | bigint };
+export type TransferInstructionDataArgs = { lamports: number | bigint };
 
 export function getTransferInstructionDataEncoder(): FixedSizeEncoder<TransferInstructionDataArgs> {
     return transformEncoder(
         getStructEncoder([
             ['discriminator', getU32Encoder()],
-            ['amount', getU64Encoder()],
+            ['lamports', getU64Encoder()],
         ]),
         value => ({ ...value, discriminator: TRANSFER_DISCRIMINATOR }),
     );
@@ -74,7 +74,7 @@ export function getTransferInstructionDataEncoder(): FixedSizeEncoder<TransferIn
 export function getTransferInstructionDataDecoder(): FixedSizeDecoder<TransferInstructionData> {
     return getStructDecoder([
         ['discriminator', getU32Decoder()],
-        ['amount', getU64Decoder()],
+        ['lamports', getU64Decoder()],
     ]);
 }
 
@@ -88,7 +88,7 @@ export function getTransferInstructionDataCodec(): FixedSizeCodec<
 export type TransferInput<TAccountSource extends string = string, TAccountDestination extends string = string> = {
     source: TransactionSigner<TAccountSource>;
     destination: Address<TAccountDestination>;
-    amount: TransferInstructionDataArgs['amount'];
+    lamports: TransferInstructionDataArgs['lamports'];
 };
 
 export function getTransferInstruction<

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

@@ -67,18 +67,18 @@ export type TransferWithSeedInstruction<
 
 export type TransferWithSeedInstructionData = {
     discriminator: number;
-    amount: bigint;
+    lamports: bigint;
     fromSeed: string;
     fromOwner: Address;
 };
 
-export type TransferWithSeedInstructionDataArgs = { amount: number | bigint; fromSeed: string; fromOwner: Address };
+export type TransferWithSeedInstructionDataArgs = { lamports: number | bigint; fromSeed: string; fromOwner: Address };
 
 export function getTransferWithSeedInstructionDataEncoder(): Encoder<TransferWithSeedInstructionDataArgs> {
     return transformEncoder(
         getStructEncoder([
             ['discriminator', getU32Encoder()],
-            ['amount', getU64Encoder()],
+            ['lamports', getU64Encoder()],
             ['fromSeed', addEncoderSizePrefix(getUtf8Encoder(), getU64Encoder())],
             ['fromOwner', getAddressEncoder()],
         ]),
@@ -89,7 +89,7 @@ export function getTransferWithSeedInstructionDataEncoder(): Encoder<TransferWit
 export function getTransferWithSeedInstructionDataDecoder(): Decoder<TransferWithSeedInstructionData> {
     return getStructDecoder([
         ['discriminator', getU32Decoder()],
-        ['amount', getU64Decoder()],
+        ['lamports', getU64Decoder()],
         ['fromSeed', addDecoderSizePrefix(getUtf8Decoder(), getU64Decoder())],
         ['fromOwner', getAddressDecoder()],
     ]);
@@ -110,7 +110,7 @@ export type TransferWithSeedInput<
     source: Address<TAccountSource>;
     baseAccount: TransactionSigner<TAccountBaseAccount>;
     destination: Address<TAccountDestination>;
-    amount: TransferWithSeedInstructionDataArgs['amount'];
+    lamports: TransferWithSeedInstructionDataArgs['lamports'];
     fromSeed: TransferWithSeedInstructionDataArgs['fromSeed'];
     fromOwner: TransferWithSeedInstructionDataArgs['fromOwner'];
 };

clients/js/test/createAccountWithSeed.test.ts

@@ -26,7 +26,7 @@ it('creates a new empty account when base is not payer', async () => {
             base: baseAccount.address,
             seed,
             space,
-            amount: rent,
+            lamports: rent,
             programAddress: program.address,
         })
         .sendTransaction();
@@ -66,7 +66,7 @@ it('creates a new empty account when base is payer', async () => {
             base: client.payer.address,
             seed,
             space,
-            amount: rent,
+            lamports: rent,
             programAddress: program.address,
         })
         .sendTransaction();

clients/js/test/parseSystemInstruction.test.ts

@@ -16,7 +16,7 @@ it('parses a transfer SOL instruction', () => {
     const transferInstruction = getTransferInstruction({
         source,
         destination,
-        amount: 1_000_000_000,
+        lamports: 1_000_000_000,
     });
 
     // When we parse this instruction.
@@ -37,7 +37,7 @@ it('parses a transfer SOL instruction', () => {
         },
     });
     expect(parsedInstruction.data).toStrictEqual({
-        amount: 1_000_000_000n,
+        lamports: 1_000_000_000n,
         discriminator: TRANSFER_DISCRIMINATOR,
     });
 });

clients/js/test/transfer.test.ts

@@ -13,7 +13,7 @@ it('transfers SOL from one account to another', async () => {
     await client.airdrop(source.address, lamports(3_000_000_000n));
 
     // When the source account transfers 1 SOL to the destination account.
-    await client.system.instructions.transfer({ source, destination, amount: 1_000_000_000 }).sendTransaction();
+    await client.system.instructions.transfer({ source, destination, lamports: 1_000_000_000 }).sendTransaction();
 
     // Then the source account now has exactly 2 SOL.
     const { value: sourceBalance } = await client.rpc.getBalance(source.address, { commitment: 'confirmed' }).send();
@@ -31,7 +31,7 @@ it('parses the accounts and the data of an existing transfer SOL instruction', a
     const transfer = getTransferInstruction({
         source,
         destination,
-        amount: 1_000_000_000,
+        lamports: 1_000_000_000,
     });
 
     // When we parse this instruction.
@@ -43,6 +43,6 @@ it('parses the accounts and the data of an existing transfer SOL instruction', a
     expect(parsedTransfer.accounts.source.signer).toBe(source);
     expect(parsedTransfer.accounts.destination.address).toBe(destination);
     expect(parsedTransfer.accounts.destination.role).toBe(AccountRole.WRITABLE);
-    expect(parsedTransfer.data.amount).toBe(1_000_000_000n);
+    expect(parsedTransfer.data.lamports).toBe(1_000_000_000n);
     expect(parsedTransfer.programAddress).toBe('11111111111111111111111111111111');
 });

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

@@ -88,7 +88,7 @@ impl Default for CreateAccountWithSeedInstructionData {
 pub struct CreateAccountWithSeedInstructionArgs {
     pub base: Address,
     pub seed: U64PrefixedStr,
-    pub amount: u64,
+    pub lamports: u64,
     pub space: u64,
     pub program_address: Address,
 }
@@ -113,7 +113,7 @@ pub struct CreateAccountWithSeedBuilder {
     base_account: Option<solana_address::Address>,
     base: Option<Address>,
     seed: Option<U64PrefixedStr>,
-    amount: Option<u64>,
+    lamports: Option<u64>,
     space: Option<u64>,
     program_address: Option<Address>,
     __remaining_accounts: Vec<solana_instruction::AccountMeta>,
@@ -150,8 +150,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)]
@@ -189,7 +189,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
@@ -331,7 +331,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(),
@@ -371,8 +371,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)]
@@ -422,7 +422,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
@@ -458,7 +462,7 @@ struct CreateAccountWithSeedCpiBuilderInstruction<'a, 'b> {
     base_account: Option<&'b solana_account_info::AccountInfo<'a>>,
     base: Option<Address>,
     seed: Option<U64PrefixedStr>,
-    amount: Option<u64>,
+    lamports: Option<u64>,
     space: Option<u64>,
     program_address: Option<Address>,
     /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`.

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

@@ -71,7 +71,7 @@ impl Default for TransferInstructionData {
 
 #[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
 pub struct TransferInstructionArgs {
-    pub amount: u64,
+    pub lamports: u64,
 }
 
 impl TransferInstructionArgs {
@@ -90,7 +90,7 @@ impl TransferInstructionArgs {
 pub struct TransferBuilder {
     source: Option<solana_address::Address>,
     destination: Option<solana_address::Address>,
-    amount: Option<u64>,
+    lamports: Option<u64>,
     __remaining_accounts: Vec<solana_instruction::AccountMeta>,
 }
 
@@ -109,8 +109,8 @@ impl TransferBuilder {
         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
     }
     /// Add an additional account to the instruction.
@@ -135,7 +135,7 @@ impl TransferBuilder {
             destination: self.destination.expect("destination is not set"),
         };
         let args = TransferInstructionArgs {
-            amount: self.amount.clone().expect("amount is not set"),
+            lamports: self.lamports.clone().expect("lamports is not set"),
         };
 
         accounts.instruction_with_remaining_accounts(args, &self.__remaining_accounts)
@@ -252,7 +252,7 @@ impl<'a, 'b> TransferCpiBuilder<'a, 'b> {
             __program: program,
             source: None,
             destination: None,
-            amount: None,
+            lamports: None,
             __remaining_accounts: Vec::new(),
         });
         Self { instruction }
@@ -271,8 +271,8 @@ impl<'a, 'b> TransferCpiBuilder<'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
     }
     /// Add an additional account to the instruction.
@@ -310,7 +310,11 @@ impl<'a, 'b> TransferCpiBuilder<'a, 'b> {
     #[allow(clippy::vec_init_then_push)]
     pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult {
         let args = TransferInstructionArgs {
-            amount: self.instruction.amount.clone().expect("amount is not set"),
+            lamports: self
+                .instruction
+                .lamports
+                .clone()
+                .expect("lamports is not set"),
         };
         let instruction = TransferCpi {
             __program: self.instruction.__program,
@@ -335,7 +339,7 @@ struct TransferCpiBuilderInstruction<'a, 'b> {
     __program: &'b solana_account_info::AccountInfo<'a>,
     source: Option<&'b solana_account_info::AccountInfo<'a>>,
     destination: Option<&'b solana_account_info::AccountInfo<'a>>,
-    amount: Option<u64>,
+    lamports: Option<u64>,
     /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`.
     __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>,
 }