fix: cmint instruction data

Cargo.toml

@@ -232,7 +232,7 @@ groth16-solana = { version = "0.2.0" }
 bytemuck = { version = "1.19.0" }
 arrayvec = "0.7"
 tinyvec = "1.10.0"
-pinocchio-token-program = { git= "https://github.com/Lightprotocol/token", rev="1bf7a9e525e753c3eb7bbf9971a26efbc23e5c73" }
+pinocchio-token-program = { git= "https://github.com/Lightprotocol/token", rev="9ea04560a039d1a44f0411b5eaa7c0b79ed575ab" }
 # Math and crypto
 num-bigint = "0.4.6"
 tabled = "0.20"

js/compressed-token/src/v3/instructions/create-mint.ts

@@ -126,9 +126,6 @@ export function encodeCreateMintInstructionData(
         leafIndex: 0,
         proveByIndex: false,
         rootIndex: params.rootIndex,
-        compressedAddress: Array.from(compressedAddress.toBytes()),
-        tokenPoolBump: 0,
-        tokenPoolIndex: 0,
         maxTopUp: 0,
         createMint: {
             readOnlyAddressTrees: [0, 0, 0, 0],
@@ -144,6 +141,7 @@ export function encodeCreateMintInstructionData(
                 version: TokenDataVersion.ShaFlat,
                 cmintDecompressed: false,
                 mint: splMintPda,
+                compressedAddress: Array.from(compressedAddress.toBytes()),
             },
             mintAuthority: params.mintAuthority,
             freezeAuthority: params.freezeAuthority,

js/compressed-token/src/v3/instructions/mint-to-compressed.ts

@@ -53,9 +53,6 @@ function encodeCompressedMintToInstructionData(
         leafIndex: params.leafIndex,
         proveByIndex: true,
         rootIndex: params.rootIndex,
-        compressedAddress: Array.from(compressedAddress.toBytes()),
-        tokenPoolBump: 0,
-        tokenPoolIndex: 0,
         maxTopUp: 0,
         createMint: null,
         actions: [
@@ -78,6 +75,7 @@ function encodeCompressedMintToInstructionData(
                 version: params.mintData.version,
                 cmintDecompressed: params.mintData.cmintDecompressed,
                 mint: params.mintData.splMint,
+                compressedAddress: Array.from(compressedAddress.toBytes()),
             },
             mintAuthority: params.mintData.mintAuthority,
             freezeAuthority: params.mintData.freezeAuthority,

js/compressed-token/src/v3/instructions/mint-to.ts

@@ -51,9 +51,6 @@ function encodeMintToCTokenInstructionData(
         leafIndex: params.leafIndex,
         proveByIndex: true,
         rootIndex: params.rootIndex,
-        compressedAddress: Array.from(compressedAddress.toBytes()),
-        tokenPoolBump: 0,
-        tokenPoolIndex: 0,
         maxTopUp: 0,
         createMint: null,
         actions: [
@@ -73,6 +70,7 @@ function encodeMintToCTokenInstructionData(
                 version: params.mintData.version,
                 cmintDecompressed: params.mintData.cmintDecompressed,
                 mint: params.mintData.splMint,
+                compressedAddress: Array.from(compressedAddress.toBytes()),
             },
             mintAuthority: params.mintData.mintAuthority,
             freezeAuthority: params.mintData.freezeAuthority,

js/compressed-token/src/v3/instructions/update-metadata.ts

@@ -100,9 +100,6 @@ function encodeUpdateMetadataInstructionData(
         leafIndex: params.leafIndex,
         proveByIndex: params.proof === null,
         rootIndex: params.rootIndex,
-        compressedAddress: Array.from(compressedAddress.toBytes()),
-        tokenPoolBump: 0,
-        tokenPoolIndex: 0,
         maxTopUp: 0,
         createMint: null,
         actions: [convertActionToBorsh(params.action)],
@@ -115,6 +112,7 @@ function encodeUpdateMetadataInstructionData(
                 version: mintInterface.mintContext!.version,
                 cmintDecompressed: mintInterface.mintContext!.cmintDecompressed,
                 mint: mintInterface.mintContext!.splMint,
+                compressedAddress: Array.from(compressedAddress.toBytes()),
             },
             mintAuthority: mintInterface.mint.mintAuthority,
             freezeAuthority: mintInterface.mint.freezeAuthority,

js/compressed-token/src/v3/instructions/update-mint.ts

@@ -73,9 +73,6 @@ function encodeUpdateMintInstructionData(
         leafIndex: params.leafIndex,
         proveByIndex: params.proveByIndex,
         rootIndex: params.rootIndex,
-        compressedAddress: Array.from(compressedAddress.toBytes()),
-        tokenPoolBump: 0,
-        tokenPoolIndex: 0,
         maxTopUp: 0,
         createMint: null,
         actions: [action],
@@ -89,6 +86,7 @@ function encodeUpdateMintInstructionData(
                 cmintDecompressed:
                     params.mintInterface.mintContext!.cmintDecompressed,
                 mint: params.mintInterface.mintContext!.splMint,
+                compressedAddress: Array.from(compressedAddress.toBytes()),
             },
             mintAuthority: params.mintInterface.mint.mintAuthority,
             freezeAuthority: params.mintInterface.mint.freezeAuthority,

js/compressed-token/src/v3/layout/layout-mint-action.ts

@@ -37,8 +37,6 @@ export const UpdateAuthorityLayout = struct([
     option(publicKey(), 'newAuthority'),
 ]);
 
-export const CreateSplMintActionLayout = struct([u8('mintBump')]);
-
 export const MintToCTokenActionLayout = struct([
     u8('accountIndex'),
     u64('amount'),
@@ -74,7 +72,6 @@ export const ActionLayout = rustEnum([
     MintToCompressedActionLayout.replicate('mintToCompressed'),
     UpdateAuthorityLayout.replicate('updateMintAuthority'),
     UpdateAuthorityLayout.replicate('updateFreezeAuthority'),
-    CreateSplMintActionLayout.replicate('createSplMint'),
     MintToCTokenActionLayout.replicate('mintToCToken'),
     UpdateMetadataFieldActionLayout.replicate('updateMetadataField'),
     UpdateMetadataAuthorityActionLayout.replicate('updateMetadataAuthority'),
@@ -145,6 +142,7 @@ export const CompressedMintMetadataLayout = struct([
     u8('version'),
     bool('cmintDecompressed'),
     publicKey('mint'),
+    array(u8(), 32, 'compressedAddress'),
 ]);
 
 export const CompressedMintInstructionDataLayout = struct([
@@ -160,9 +158,6 @@ export const MintActionCompressedInstructionDataLayout = struct([
     u32('leafIndex'),
     bool('proveByIndex'),
     u16('rootIndex'),
-    array(u8(), 32, 'compressedAddress'),
-    u8('tokenPoolBump'),
-    u8('tokenPoolIndex'),
     u16('maxTopUp'),
     option(CreateMintLayout, 'createMint'),
     vec(ActionLayout, 'actions'),
@@ -176,7 +171,6 @@ const ActionLayoutV1 = rustEnum([
     MintToCompressedActionLayout.replicate('mintToCompressed'),
     UpdateAuthorityLayout.replicate('updateMintAuthority'),
     UpdateAuthorityLayout.replicate('updateFreezeAuthority'),
-    CreateSplMintActionLayout.replicate('createSplMint'),
     MintToCTokenActionLayout.replicate('mintToCToken'),
     UpdateMetadataFieldActionLayout.replicate('updateMetadataField'),
     UpdateMetadataAuthorityActionLayout.replicate('updateMetadataAuthority'),
@@ -233,10 +227,6 @@ export interface UpdateAuthority {
     newAuthority: PublicKey | null;
 }
 
-export interface CreateSplMintAction {
-    mintBump: number;
-}
-
 export interface MintToCTokenAction {
     accountIndex: number;
     amount: bigint;
@@ -274,7 +264,6 @@ export type Action =
     | { mintToCompressed: MintToCompressedAction }
     | { updateMintAuthority: UpdateAuthority }
     | { updateFreezeAuthority: UpdateAuthority }
-    | { createSplMint: CreateSplMintAction }
     | { mintToCToken: MintToCTokenAction }
     | { updateMetadataField: UpdateMetadataFieldAction }
     | { updateMetadataAuthority: UpdateMetadataAuthorityAction }
@@ -320,6 +309,7 @@ export interface CompressedMintMetadata {
     version: number;
     cmintDecompressed: boolean;
     mint: PublicKey;
+    compressedAddress: number[];
 }
 
 export interface CompressedMintInstructionData {
@@ -335,9 +325,6 @@ export interface MintActionCompressedInstructionData {
     leafIndex: number;
     proveByIndex: boolean;
     rootIndex: number;
-    compressedAddress: number[];
-    tokenPoolBump: number;
-    tokenPoolIndex: number;
     maxTopUp: number;
     createMint: CreateMint | null;
     actions: Action[];

js/compressed-token/src/v3/layout/layout-mint.ts

@@ -157,12 +157,16 @@ export interface CompressionInfo {
     rentSponsor: PublicKey;
     /** Last slot rent was claimed */
     lastClaimedSlot: bigint;
+    /** Rent exemption lamports paid at account creation */
+    rentExemptionPaid: number;
+    /** Reserved for future use */
+    reserved: number;
     /** Rent configuration */
     rentConfig: RentConfig;
 }
 
 /** Byte length of CompressionInfo */
-export const COMPRESSION_INFO_SIZE = 88; // 2 + 1 + 1 + 4 + 32 + 32 + 8 + 8
+export const COMPRESSION_INFO_SIZE = 96; // 2 + 1 + 1 + 4 + 32 + 32 + 8 + 4 + 4 + 8
 
 /**
  * Calculate the byte length of a TokenMetadata extension from buffer.
@@ -256,6 +260,12 @@ function deserializeCompressionInfo(
     const lastClaimedSlot = buffer.readBigUInt64LE(offset);
     offset += 8;
 
+    // Read rent_exemption_paid (u32) and _reserved (u32)
+    const rentExemptionPaid = buffer.readUInt32LE(offset);
+    offset += 4;
+    const reserved = buffer.readUInt32LE(offset);
+    offset += 4;
+
     // Read RentConfig (8 bytes)
     const baseRent = buffer.readUInt16LE(offset);
     offset += 2;
@@ -284,6 +294,8 @@ function deserializeCompressionInfo(
         compressionAuthority,
         rentSponsor,
         lastClaimedSlot,
+        rentExemptionPaid,
+        reserved,
         rentConfig,
     };
 
@@ -416,6 +428,12 @@ function serializeCompressionInfo(compression: CompressionInfo): Buffer {
     buffer.writeBigUInt64LE(compression.lastClaimedSlot, offset);
     offset += 8;
 
+    // Write rent_exemption_paid (u32) and _reserved (u32)
+    buffer.writeUInt32LE(compression.rentExemptionPaid, offset);
+    offset += 4;
+    buffer.writeUInt32LE(compression.reserved, offset);
+    offset += 4;
+
     // Write RentConfig (8 bytes)
     buffer.writeUInt16LE(compression.rentConfig.baseRent, offset);
     offset += 2;

js/compressed-token/src/v3/layout/layout-transfer2.ts

@@ -190,6 +190,8 @@ const CompressionInfoLayout = struct([
     array(u8(), 32, 'compressionAuthority'),
     array(u8(), 32, 'rentSponsor'),
     u64('lastClaimedSlot'),
+    u32('rentExemptionPaid'),
+    u32('reserved'),
     RentConfigLayout.replicate('rentConfig'),
 ]);
 
@@ -255,6 +257,8 @@ function serializeExtensionInstructionData(
             ),
             rentSponsor: Array.from(ext.data.rentSponsor.toBytes()),
             lastClaimedSlot: bn(ext.data.lastClaimedSlot.toString()),
+            rentExemptionPaid: ext.data.rentExemptionPaid,
+            reserved: ext.data.reserved,
             rentConfig: ext.data.rentConfig,
         };
         offset += CompressionInfoLayout.encode(data, buffer, offset);

js/compressed-token/tests/e2e/unwrap.test.ts

@@ -94,6 +94,7 @@ describe('createUnwrapInstruction', () => {
             mint,
             BigInt(1000),
             tokenPoolInfo!,
+            TEST_TOKEN_DECIMALS,
         );
 
         expect(ix).toBeDefined();
@@ -125,6 +126,7 @@ describe('createUnwrapInstruction', () => {
             mint,
             BigInt(500),
             tokenPoolInfo!,
+            TEST_TOKEN_DECIMALS,
             feePayer.publicKey,
         );