fix: align InstructionBuilderTypes string values with WASM output

lcovar · lcovar · commit c071f3cfd5db · 2026-02-13T22:27:30.000-08:00
BTC-0 TICKET: BTC-0
diff --git a/modules/sdk-coin-sol/src/lib/constants.ts b/modules/sdk-coin-sol/src/lib/constants.ts
@@ -66,17 +66,17 @@ export enum ValidInstructionTypesEnum {
 // Internal instructions types
 export enum InstructionBuilderTypes {
   CreateNonceAccount = 'CreateNonceAccount',
-  StakingActivate = 'Activate',
-  StakingDeactivate = 'Deactivate',
-  StakingWithdraw = 'Withdraw',
+  StakingActivate = 'StakingActivate',
+  StakingDeactivate = 'StakingDeactivate',
+  StakingWithdraw = 'StakingWithdraw',
   Transfer = 'Transfer',
   Memo = 'Memo',
   NonceAdvance = 'NonceAdvance',
   CreateAssociatedTokenAccount = 'CreateAssociatedTokenAccount',
   CloseAssociatedTokenAccount = 'CloseAssociatedTokenAccount',
   TokenTransfer = 'TokenTransfer',
-  StakingAuthorize = 'Authorize',
-  StakingDelegate = 'Delegate',
+  StakingAuthorize = 'StakingAuthorize',
+  StakingDelegate = 'StakingDelegate',
   SetComputeUnitLimit = 'SetComputeUnitLimit',
   SetPriorityFee = 'SetPriorityFee',
   MintTo = 'MintTo',
diff --git a/modules/sdk-coin-sol/src/lib/explainUtil.ts b/modules/sdk-coin-sol/src/lib/explainUtil.ts
@@ -9,6 +9,7 @@ export interface ExplainedOutputs {
   tokenEnablements: ITokenEnablement[];
   outputAmount: bigint;
   memo?: string;
+  ataOwnerMap: Record<string, string>;
 }
 
 /**
@@ -29,6 +30,7 @@ export function extractOutputsFromInstructions(
   const outputs: TransactionRecipient[] = [];
   const inputs: Array<{ address: string; value: string; coin?: string }> = [];
   const tokenEnablements: ITokenEnablement[] = [];
+  const ataOwnerMap: Record<string, string> = {};
   let outputAmount = 0n;
   let memo: string | undefined;
 
@@ -76,6 +78,7 @@ export function extractOutputsFromInstructions(
         break;
 
       case InstructionBuilderTypes.CreateAssociatedTokenAccount:
+        ataOwnerMap[instr.params.ataAddress] = instr.params.ownerAddress;
         if (resolveTokenName) {
           tokenEnablements.push({
             address: instr.params.ataAddress,
@@ -91,5 +94,5 @@ export function extractOutputsFromInstructions(
     }
   }
 
-  return { outputs, inputs, tokenEnablements, outputAmount, memo };
+  return { outputs, inputs, tokenEnablements, outputAmount, memo, ataOwnerMap };
 }
diff --git a/modules/sdk-coin-sol/src/lib/iface.ts b/modules/sdk-coin-sol/src/lib/iface.ts
@@ -289,6 +289,7 @@ export interface TransactionExplanation extends BaseTransactionExplanation {
   stakingDelegate?: StakingDelegateParams;
   inputs?: Array<{ address: string; value: string; coin?: string }>;
   feePayer?: string;
+  ataOwnerMap?: Record<string, string>;
 }
 
 export class TokenAssociateRecipient {
diff --git a/modules/sdk-coin-sol/src/lib/utils.ts b/modules/sdk-coin-sol/src/lib/utils.ts
@@ -332,7 +332,11 @@ export function getTransactionType(transaction: SolTransaction): TransactionType
   if (memoData?.includes('WalletConnectDefiCustomTx')) {
     return TransactionType.CustomTx;
   }
-  if (instructions.filter((instruction) => getInstructionType(instruction) === 'Deactivate').length === 0) {
+  if (
+    instructions.filter(
+      (instruction) => getInstructionType(instruction) === ValidInstructionTypesEnum.StakingDeactivate
+    ).length === 0
+  ) {
     for (const instruction of instructions) {
       const instructionType = getInstructionType(instruction);
       // Check if memo instruction is there and if it contains 'PrepareForRevoke' because Marinade staking deactivate transaction will have this
diff --git a/modules/sdk-coin-sol/src/sol.ts b/modules/sdk-coin-sol/src/sol.ts
@@ -1783,7 +1783,7 @@ export function explainSolTransaction(
   const { instructions: combinedInstructions, transactionType } = combineWasmInstructionsFromBytes(txBytes);
 
   const resolveTokenName = (addr: string) => findTokenName(addr, undefined, true);
-  const { outputs, tokenEnablements, outputAmount, memo } = extractOutputsFromInstructions(
+  const { outputs, tokenEnablements, outputAmount, memo, ataOwnerMap } = extractOutputsFromInstructions(
     combinedInstructions,
     params.coinName,
     resolveTokenName
@@ -1838,5 +1838,6 @@ export function explainSolTransaction(
     blockhash: parsed.nonce,
     durableNonce,
     tokenEnablements,
+    ataOwnerMap,
   };
 }
diff --git a/modules/sdk-coin-sol/test/unit/transactionBuilder/StakingWithdrawBuilder.ts b/modules/sdk-coin-sol/test/unit/transactionBuilder/StakingWithdrawBuilder.ts
@@ -32,7 +32,7 @@ describe('Sol Staking Withdraw Builder', () => {
       should.equal(Utils.isValidRawTransaction(rawTx), true);
       txJson.instructionsData.should.deepEqual([
         {
-          type: 'Withdraw',
+          type: 'StakingWithdraw',
           params: {
             fromAddress: wallet.pub,
             stakingAddress: stakeAccount.pub,
@@ -58,7 +58,7 @@ describe('Sol Staking Withdraw Builder', () => {
       const txJson = tx.toJson();
       txJson.instructionsData.should.deepEqual([
         {
-          type: 'Withdraw',
+          type: 'StakingWithdraw',
           params: {
             fromAddress: wallet.pub,
             stakingAddress: stakeAccount.pub,
@@ -84,7 +84,7 @@ describe('Sol Staking Withdraw Builder', () => {
       const txJson = tx.toJson();
       txJson.instructionsData.should.deepEqual([
         {
-          type: 'Withdraw',
+          type: 'StakingWithdraw',
           params: {
             fromAddress: wallet.pub,
             stakingAddress: stakeAccount.pub,
@@ -109,7 +109,7 @@ describe('Sol Staking Withdraw Builder', () => {
       const txJson = tx.toJson();
       txJson.instructionsData.should.deepEqual([
         {
-          type: 'Withdraw',
+          type: 'StakingWithdraw',
           params: {
             fromAddress: wallet.pub,
             stakingAddress: stakeAccount.pub,
diff --git a/modules/sdk-coin-sol/test/unit/transactionBuilder/stakingActivateBuilder.ts b/modules/sdk-coin-sol/test/unit/transactionBuilder/stakingActivateBuilder.ts
@@ -95,7 +95,7 @@ describe('Sol Staking Activate Builder', () => {
           ]
         : []),
       {
-        type: 'Activate',
+        type: 'StakingActivate',
         params: {
           fromAddress: wallet.pub,
           stakingAddress: stakeAccount.pub,
diff --git a/modules/sdk-coin-sol/test/unit/transactionBuilder/stakingDeactivateBuilder.ts b/modules/sdk-coin-sol/test/unit/transactionBuilder/stakingDeactivateBuilder.ts
@@ -107,7 +107,7 @@ describe('Sol Staking Deactivate Builder', () => {
           ]
         : []),
       ...stakingAddresses.map((stakingAddress) => ({
-        type: 'Deactivate',
+        type: 'StakingDeactivate',
         params: {
           stakingAddress,
           amount: undefined,
@@ -213,7 +213,7 @@ describe('Sol Staking Deactivate Builder', () => {
         should.equal(Utils.isValidRawTransaction(rawTx), true);
         txJson.instructionsData.should.deepEqual([
           {
-            type: 'Deactivate',
+            type: 'StakingDeactivate',
             params: {
               fromAddress: wallet.pub,
               stakingAddress: stakeAccount.pub,
@@ -271,7 +271,7 @@ describe('Sol Staking Deactivate Builder', () => {
                 type: 'Memo',
               },
               {
-                type: 'Deactivate',
+                type: 'StakingDeactivate',
                 params: {
                   fromAddress: '',
                   stakingAddress: '',
@@ -327,7 +327,7 @@ describe('Sol Staking Deactivate Builder', () => {
             const txJson = tx.toJson();
             txJson.instructionsData.should.deepEqual([
               {
-                type: 'Deactivate',
+                type: 'StakingDeactivate',
                 params: {
                   fromAddress: wallet.pub,
                   stakingAddress: JITO_STAKE_POOL_ADDRESS,
diff --git a/modules/sdk-coin-sol/test/unit/transactionBuilder/stakingDelegateBuilder.ts b/modules/sdk-coin-sol/test/unit/transactionBuilder/stakingDelegateBuilder.ts
@@ -29,7 +29,7 @@ describe('Sol Staking Delegate Builder', () => {
       should.equal(Utils.isValidRawTransaction(rawTx), true);
       txJson.instructionsData.should.deepEqual([
         {
-          type: 'Delegate',
+          type: 'StakingDelegate',
           params: {
             fromAddress: wallet.pub,
             stakingAddress: stakeAccount.pub,
@@ -70,15 +70,15 @@ describe('Sol Staking Delegate Builder', () => {
       should.equal(Utils.isValidRawTransaction(rawTx), true);
       txJson.instructionsData.should.deepEqual([
         {
-          type: 'Delegate',
+          type: 'StakingDelegate',
           params: {
             fromAddress: wallet.pub,
             stakingAddress: stakeAccount.pub,
             validator: validator.pub,
           },
         },
         {
-          type: 'Delegate',
+          type: 'StakingDelegate',
           params: {
             fromAddress: wallet.pub,
             stakingAddress: splitAccount.pub,
@@ -119,7 +119,7 @@ describe('Sol Staking Delegate Builder', () => {
       should.equal(Utils.isValidRawTransaction(rawTx), true);
       txJson.instructionsData.should.deepEqual([
         {
-          type: 'Delegate',
+          type: 'StakingDelegate',
           params: {
             fromAddress: wallet.pub,
             stakingAddress: stakeAccount.pub,
diff --git a/modules/sdk-coin-sol/test/unit/transactionBuilder/transactionBuilder.ts b/modules/sdk-coin-sol/test/unit/transactionBuilder/transactionBuilder.ts
@@ -102,7 +102,7 @@ describe('Sol Transaction Builder', async () => {
     jsonTx.numSignatures.should.equal(2);
     jsonTx.instructionsData.should.deepEqual([
       {
-        type: 'Activate',
+        type: 'StakingActivate',
         params: {
           fromAddress: '5hr5fisPi6DXNuuRpm5XUbzpiEnmdyxXuBDTwzwZj5Pe',
           stakingAddress: '7dRuGFbU2y2kijP6o1LYNzVyz4yf13MooqoionCzv5Za',
diff --git a/modules/sdk-coin-sol/test/unit/wasmTransaction.ts b/modules/sdk-coin-sol/test/unit/wasmTransaction.ts
@@ -125,7 +125,7 @@ describe('WasmTransaction', () => {
 
       const txJson = wasmTx.toJson();
       txJson.instructionsData.should.have.length(1);
-      txJson.instructionsData[0].type.should.equal('Activate'); // StakingActivate
+      txJson.instructionsData[0].type.should.equal('StakingActivate');
     });
   });
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ export interface ExplainedOutputs {`
`9`	`9`	`tokenEnablements: ITokenEnablement[];`
`10`	`10`	`outputAmount: bigint;`
`11`	`11`	`memo?: string;`
	`12`	`+ ataOwnerMap: Record<string, string>;`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`/**`
`@@ -29,6 +30,7 @@ export function extractOutputsFromInstructions(`
`29`	`30`	`const outputs: TransactionRecipient[] = [];`
`30`	`31`	`const inputs: Array<{ address: string; value: string; coin?: string }> = [];`
`31`	`32`	`const tokenEnablements: ITokenEnablement[] = [];`
	`33`	`+ const ataOwnerMap: Record<string, string> = {};`
`32`	`34`	`let outputAmount = 0n;`
`33`	`35`	`let memo: string \| undefined;`
`34`	`36`
`@@ -76,6 +78,7 @@ export function extractOutputsFromInstructions(`
`76`	`78`	`break;`
`77`	`79`
`78`	`80`	`case InstructionBuilderTypes.CreateAssociatedTokenAccount:`
	`81`	`+ ataOwnerMap[instr.params.ataAddress] = instr.params.ownerAddress;`
`79`	`82`	`if (resolveTokenName) {`
`80`	`83`	`tokenEnablements.push({`
`81`	`84`	`address: instr.params.ataAddress,`
`@@ -91,5 +94,5 @@ export function extractOutputsFromInstructions(`
`91`	`94`	`}`
`92`	`95`	`}`
`93`	`96`
`94`		`- return { outputs, inputs, tokenEnablements, outputAmount, memo };`
	`97`	`+ return { outputs, inputs, tokenEnablements, outputAmount, memo, ataOwnerMap };`
`95`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,7 @@ export interface TransactionExplanation extends BaseTransactionExplanation {`
`289`	`289`	`stakingDelegate?: StakingDelegateParams;`
`290`	`290`	`inputs?: Array<{ address: string; value: string; coin?: string }>;`
`291`	`291`	`feePayer?: string;`
	`292`	`+ ataOwnerMap?: Record<string, string>;`
`292`	`293`	`}`
`293`	`294`
`294`	`295`	`export class TokenAssociateRecipient {`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ describe('Sol Staking Activate Builder', () => {`
`95`	`95`	`]`
`96`	`96`	`: []),`
`97`	`97`	`{`
`98`		`- type: 'Activate',`
	`98`	`+ type: 'StakingActivate',`
`99`	`99`	`params: {`
`100`	`100`	`fromAddress: wallet.pub,`
`101`	`101`	`stakingAddress: stakeAccount.pub,`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ describe('Sol Transaction Builder', async () => {`
`102`	`102`	`jsonTx.numSignatures.should.equal(2);`
`103`	`103`	`jsonTx.instructionsData.should.deepEqual([`
`104`	`104`	`{`
`105`		`- type: 'Activate',`
	`105`	`+ type: 'StakingActivate',`
`106`	`106`	`params: {`
`107`	`107`	`fromAddress: '5hr5fisPi6DXNuuRpm5XUbzpiEnmdyxXuBDTwzwZj5Pe',`
`108`	`108`	`stakingAddress: '7dRuGFbU2y2kijP6o1LYNzVyz4yf13MooqoionCzv5Za',`