Rename LamportsUnsafeBeyond2Pow53Minus1 to Lamports

Author: lorisleiva

packages/renderers-js/e2e/system/src/generated/accounts/nonce.ts

@@ -29,7 +29,7 @@ import {
   type Encoder,
   type FetchAccountConfig,
   type FetchAccountsConfig,
-  type LamportsUnsafeBeyond2Pow53Minus1,
+  type Lamports,
   type MaybeAccount,
   type MaybeEncodedAccount,
 } from '@solana/web3.js';
@@ -49,15 +49,15 @@ export type Nonce = {
   state: NonceState;
   authority: Address;
   blockhash: Address;
-  lamportsPerSignature: LamportsUnsafeBeyond2Pow53Minus1;
+  lamportsPerSignature: Lamports;
 };
 
 export type NonceArgs = {
   version: NonceVersionArgs;
   state: NonceStateArgs;
   authority: Address;
   blockhash: Address;
-  lamportsPerSignature: LamportsUnsafeBeyond2Pow53Minus1;
+  lamportsPerSignature: Lamports;
 };
 
 export function getNonceEncoder(): Encoder<NonceArgs> {

packages/renderers-js/e2e/system/src/generated/instructions/createAccount.ts

@@ -29,7 +29,7 @@ import {
   type IInstruction,
   type IInstructionWithAccounts,
   type IInstructionWithData,
-  type LamportsUnsafeBeyond2Pow53Minus1,
+  type Lamports,
   type ReadonlyUint8Array,
   type TransactionSigner,
   type WritableSignerAccount,
@@ -70,13 +70,13 @@ export type CreateAccountInstruction<
 
 export type CreateAccountInstructionData = {
   discriminator: number;
-  lamports: LamportsUnsafeBeyond2Pow53Minus1;
+  lamports: Lamports;
   space: bigint;
   programAddress: Address;
 };
 
 export type CreateAccountInstructionDataArgs = {
-  lamports: LamportsUnsafeBeyond2Pow53Minus1;
+  lamports: Lamports;
   space: number | bigint;
   programAddress: Address;
 };

packages/renderers-js/e2e/system/test/createAccount.test.ts

@@ -52,5 +52,6 @@ test('it creates a new empty account', async (t) => {
     address: newAccount.address,
     data: new Uint8Array(Array.from({ length: 42 }, () => 0)),
     exists: true,
+    space: 42n,
   });
 });

packages/renderers-js/e2e/token/src/generated/instructions/createAccount.ts

@@ -29,7 +29,7 @@ import {
   type IInstruction,
   type IInstructionWithAccounts,
   type IInstructionWithData,
-  type LamportsUnsafeBeyond2Pow53Minus1,
+  type Lamports,
   type ReadonlyUint8Array,
   type TransactionSigner,
   type WritableSignerAccount,
@@ -70,13 +70,13 @@ export type CreateAccountInstruction<
 
 export type CreateAccountInstructionData = {
   discriminator: number;
-  lamports: LamportsUnsafeBeyond2Pow53Minus1;
+  lamports: Lamports;
   space: bigint;
   programAddress: Address;
 };
 
 export type CreateAccountInstructionDataArgs = {
-  lamports: LamportsUnsafeBeyond2Pow53Minus1;
+  lamports: Lamports;
   space: number | bigint;
   programAddress: Address;
 };

packages/renderers-js/src/getTypeManifestVisitor.ts

@@ -719,11 +719,8 @@ export function getTypeManifestVisitor(input: {
                 visitSolAmountType({ number }, { self }) {
                     const numberManifest = visit(number, self);
 
-                    const lamportsType = 'LamportsUnsafeBeyond2Pow53Minus1';
-                    const lamportsImport = new ImportMap().add(
-                        'solanaRpcTypes',
-                        'type LamportsUnsafeBeyond2Pow53Minus1',
-                    );
+                    const lamportsType = 'Lamports';
+                    const lamportsImport = new ImportMap().add('solanaRpcTypes', 'type Lamports');
 
                     return {
                         ...numberManifest,

packages/renderers-js/test/types/solAmount.test.ts

@@ -17,20 +17,14 @@ test('it renders size prefix codecs', async () => {
 
     // Then we expect the following types and codecs to be exported.
     await renderMapContains(renderMap, 'types/myType.ts', [
-        'export type MyType = LamportsUnsafeBeyond2Pow53Minus1',
+        'export type MyType = Lamports',
         'export type MyTypeArgs = MyType',
         'export function getMyTypeEncoder(): Encoder<MyTypeArgs> { return getLamportsEncoder(getU64Encoder()); }',
         'export function getMyTypeDecoder(): Decoder<MyType> { return getLamportsDecoder(getU64Decoder()); }',
     ]);
 
     // And we expect the following type and codec imports.
     await renderMapContainsImports(renderMap, 'types/myType.ts', {
-        '@solana/web3.js': [
-            'LamportsUnsafeBeyond2Pow53Minus1',
-            'getLamportsEncoder',
-            'getLamportsDecoder',
-            'getU64Encoder',
-            'getU64Decoder',
-        ],
+        '@solana/web3.js': ['Lamports', 'getLamportsEncoder', 'getLamportsDecoder', 'getU64Encoder', 'getU64Decoder'],
     });
 });