feat(solana-wallet-snap): bump solana kit v6.9

eslint-suppressions.json

@@ -115,11 +115,6 @@
       "count": 1
     }
   },
-  "packages/bitcoin-wallet-snap/src/store/InMemoryCache.test.ts": {
-    "@typescript-eslint/no-explicit-any": {
-      "count": 1
-    }
-  },
   "packages/bitcoin-wallet-snap/src/use-cases/SendFlowUseCases.test.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 1
@@ -187,14 +182,6 @@
       "count": 5
     }
   },
-  "packages/solana-wallet-snap/src/core/components/ActionHeader/ActionHeader.tsx": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 1
-    },
-    "@typescript-eslint/no-shadow": {
-      "count": 1
-    }
-  },
   "packages/solana-wallet-snap/src/core/fees/FeeCalculator.test.ts": {
     "@typescript-eslint/no-explicit-any": {
       "count": 1
@@ -263,7 +250,7 @@
   },
   "packages/solana-wallet-snap/src/core/sdk-extensions/transaction-messages.ts": {
     "@typescript-eslint/explicit-function-return-type": {
-      "count": 4
+      "count": 3
     },
     "@typescript-eslint/no-unused-vars": {
       "count": 1
@@ -408,22 +395,6 @@
       "count": 1
     }
   },
-  "packages/solana-wallet-snap/src/core/services/nft/NftService.test.ts": {
-    "@typescript-eslint/no-unused-vars": {
-      "count": 1
-    },
-    "jest/no-disabled-tests": {
-      "count": 1
-    }
-  },
-  "packages/solana-wallet-snap/src/core/services/nft/NftService.ts": {
-    "@typescript-eslint/no-unused-vars": {
-      "count": 1
-    },
-    "no-unused-private-class-members": {
-      "count": 2
-    }
-  },
   "packages/solana-wallet-snap/src/core/services/send/ISendTransactionBuilder.ts": {
     "import-x/no-named-as-default": {
       "count": 1
@@ -575,17 +546,6 @@
       "count": 1
     }
   },
-  "packages/solana-wallet-snap/src/core/services/token-prices/TokenPrices.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 1
-    },
-    "@typescript-eslint/prefer-nullish-coalescing": {
-      "count": 2
-    },
-    "import-x/no-named-as-default": {
-      "count": 1
-    }
-  },
   "packages/solana-wallet-snap/src/core/services/transaction-scan/TransactionScan.ts": {
     "no-restricted-syntax": {
       "count": 5
@@ -641,11 +601,6 @@
       "count": 1
     }
   },
-  "packages/solana-wallet-snap/src/core/test/mocks/market-data.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 1
-    }
-  },
   "packages/solana-wallet-snap/src/core/test/mocks/startMockSolanaRpc.test.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 1
@@ -673,41 +628,6 @@
       "count": 1
     }
   },
-  "packages/solana-wallet-snap/src/core/test/mocks/transactions-data/address-1/transaction-2.ts": {
-    "@typescript-eslint/no-unused-vars": {
-      "count": 1
-    }
-  },
-  "packages/solana-wallet-snap/src/core/test/mocks/transactions-data/address-1/transaction-3.ts": {
-    "@typescript-eslint/no-unused-vars": {
-      "count": 1
-    }
-  },
-  "packages/solana-wallet-snap/src/core/test/mocks/transactions-data/address-1/transaction-4.ts": {
-    "@typescript-eslint/no-unused-vars": {
-      "count": 1
-    }
-  },
-  "packages/solana-wallet-snap/src/core/test/mocks/transactions-data/address-2/transaction-1.ts": {
-    "@typescript-eslint/no-unused-vars": {
-      "count": 1
-    }
-  },
-  "packages/solana-wallet-snap/src/core/test/mocks/transactions-data/address-2/transaction-2.ts": {
-    "@typescript-eslint/no-unused-vars": {
-      "count": 1
-    }
-  },
-  "packages/solana-wallet-snap/src/core/test/mocks/transactions-data/address-2/transaction-3.ts": {
-    "@typescript-eslint/no-unused-vars": {
-      "count": 1
-    }
-  },
-  "packages/solana-wallet-snap/src/core/test/mocks/transactions-data/address-2/transaction-4.ts": {
-    "@typescript-eslint/no-unused-vars": {
-      "count": 1
-    }
-  },
   "packages/solana-wallet-snap/src/core/test/mocks/transactions-data/native-sol-transfer-to-self.ts": {
     "@typescript-eslint/no-unused-vars": {
       "count": 1
@@ -748,11 +668,6 @@
       "count": 1
     }
   },
-  "packages/solana-wallet-snap/src/core/test/mocks/transactions-data/swap-failed-transaction.ts": {
-    "@typescript-eslint/no-unused-vars": {
-      "count": 2
-    }
-  },
   "packages/solana-wallet-snap/src/core/test/mocks/transactions-data/swap-sol-to-obric.ts": {
     "@typescript-eslint/no-unused-vars": {
       "count": 1
@@ -778,11 +693,6 @@
       "count": 1
     }
   },
-  "packages/solana-wallet-snap/src/core/types/form.ts": {
-    "@typescript-eslint/no-explicit-any": {
-      "count": 1
-    }
-  },
   "packages/solana-wallet-snap/src/core/types/solana.ts": {
     "@typescript-eslint/no-explicit-any": {
       "count": 1
@@ -796,22 +706,6 @@
       "count": 1
     }
   },
-  "packages/solana-wallet-snap/src/core/utils/concurrency.test.ts": {
-    "promise/always-return": {
-      "count": 1
-    }
-  },
-  "packages/solana-wallet-snap/src/core/utils/concurrency.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 1
-    },
-    "@typescript-eslint/no-explicit-any": {
-      "count": 6
-    },
-    "promise/param-names": {
-      "count": 1
-    }
-  },
   "packages/solana-wallet-snap/src/core/utils/conversion.test.ts": {
     "import-x/no-named-as-default": {
       "count": 1
@@ -835,14 +729,6 @@
       "count": 1
     }
   },
-  "packages/solana-wallet-snap/src/core/utils/diffObjects.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 1
-    },
-    "@typescript-eslint/no-explicit-any": {
-      "count": 7
-    }
-  },
   "packages/solana-wallet-snap/src/core/utils/errors.test.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 1
@@ -885,19 +771,6 @@
       "count": 1
     }
   },
-  "packages/solana-wallet-snap/src/core/utils/formatFiatBalance.test.ts": {
-    "import-x/no-named-as-default": {
-      "count": 1
-    }
-  },
-  "packages/solana-wallet-snap/src/core/utils/formatFiatBalance.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 1
-    },
-    "import-x/no-named-as-default": {
-      "count": 1
-    }
-  },
   "packages/solana-wallet-snap/src/core/utils/fromTokenUnit.ts": {
     "import-x/no-named-as-default": {
       "count": 1
@@ -908,16 +781,6 @@
       "count": 1
     }
   },
-  "packages/solana-wallet-snap/src/core/utils/getAccountIdFromAddress.test.ts": {
-    "@typescript-eslint/no-explicit-any": {
-      "count": 2
-    }
-  },
-  "packages/solana-wallet-snap/src/core/utils/getClusterFromScope.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 1
-    }
-  },
   "packages/solana-wallet-snap/src/core/utils/getNetworkFromToken.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 1
@@ -959,16 +822,6 @@
       "count": 10
     }
   },
-  "packages/solana-wallet-snap/src/core/utils/toTokenUnit.test.ts": {
-    "import-x/no-named-as-default": {
-      "count": 1
-    }
-  },
-  "packages/solana-wallet-snap/src/core/utils/toTokenUnit.ts": {
-    "import-x/no-named-as-default": {
-      "count": 1
-    }
-  },
   "packages/solana-wallet-snap/src/core/utils/tokenToFiat.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 1

package.json

@@ -85,8 +85,6 @@
     "@metamask/snaps-execution-environments": "11.3.0",
     "@metamask/snaps-sdk": "12.0.1",
     "@metamask/snaps-utils": "12.6.0",
-    "@solana/addresses": "2.1.0",
-    "@solana/kit": "2.1.0",
     "@stellar/stellar-sdk/axios@npm:1.15.0": "1.18.1",
     "@types/react": "18.2.4",
     "@types/react-dom": "18.2.4",

packages/solana-wallet-snap/CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- **BREAKING** Update the Solana Name Service integration to SNS SDK v1 and the Kit 6.9-compatible Solana program clients
 - Migrate `trackError` and `withCatchAndThrowSnapError` to `@metamask/snap-networks-utils` `createSnapErrorHandling`, and add `getSnapProvider` for Snap RPC access
 - Extract Snap-owned assets domain logic into `SnapAssetsAdapter`; `AssetsService` is a thin facade that delegates metadata, market data, fetch, persist, and account asset reads through the adapter (no Core routing yet). ([#121](https://github.com/MetaMask/internal-snaps/pull/121))
 - Align `AssetsService` read API with `snap-networks-utils` / AssetsController shapes by adding `getAccountAssetByID`, `getAccountAssetsByIDs`, `getAccountAssetsByScope`, and `getAccountAssets`, and routing Keyring and Send through them (still Snap-owned storage). ([#120](https://github.com/MetaMask/internal-snaps/pull/120))

packages/solana-wallet-snap/package.json

@@ -62,12 +62,12 @@
     "@metamask/superstruct": "^3.4.1",
     "@metamask/utils": "^11.11.0",
     "@noble/ed25519": "2.1.0",
-    "@solana-name-service/sns-sdk-kit": "0.9.0-beta",
-    "@solana-program/compute-budget": "0.7.0",
-    "@solana-program/system": "0.7.0",
-    "@solana-program/token": "0.5.1",
-    "@solana-program/token-2022": "^0.5.0",
-    "@solana/kit": "2.1.0",
+    "@solana-name-service/sns-sdk-kit": "^1.0.0",
+    "@solana-program/compute-budget": "^0.15.0",
+    "@solana-program/system": "^0.12.0",
+    "@solana-program/token": "^0.14.0",
+    "@solana-program/token-2022": "^0.12.0",
+    "@solana/kit": "^6.9.0",
     "@testing-library/jest-dom": "^6.6.2",
     "@types/express": "^5.0.0",
     "@types/lodash": "^4.17.15",

packages/solana-wallet-snap/src/core/fees/FeeCalculator.ts

@@ -4,7 +4,6 @@ import {
 } from '@solana-program/compute-budget';
 import type {
   CompiledTransactionMessage,
-  IInstructionWithData,
   Transaction as KitTransaction,
   Lamports,
 } from '@solana/kit';
@@ -184,9 +183,8 @@ export class FeeCalculator {
       return 0;
     }
 
-    return parseSetComputeUnitLimitInstruction(
-      computeUnitLimitInstruction as IInstructionWithData<Uint8Array>,
-    ).data.units;
+    return parseSetComputeUnitLimitInstruction(computeUnitLimitInstruction).data
+      .units;
   }
 
   static #getComputeUnitPriceMicroLamportsPerComputeUnit(
@@ -201,9 +199,8 @@ export class FeeCalculator {
       return 0n;
     }
 
-    return parseSetComputeUnitPriceInstruction(
-      computeUnitPriceInstruction as IInstructionWithData<Uint8Array>,
-    ).data.microLamports;
+    return parseSetComputeUnitPriceInstruction(computeUnitPriceInstruction).data
+      .microLamports;
   }
 
   /**

packages/solana-wallet-snap/src/core/fees/normalizers/normalizeCompiledTransactionMessage.test.ts

@@ -38,6 +38,7 @@ describe('normalizeCompiledTransactionMessage', () => {
           ]),
         },
       ],
+      version: 0,
     } as unknown as CompiledTransactionMessage;
 
     const result = normalizeCompiledTransactionMessage(
@@ -79,4 +80,23 @@ describe('normalizeCompiledTransactionMessage', () => {
       ],
     });
   });
+
+  it('throws an error if the program address index is out of bounds', () => {
+    const mockCompiledTransactionMessage: CompiledTransactionMessage = {
+      staticAccounts: [address('3i5JeuZuUxeKtVysUnwQNGerJP2bSMX9fTFfS4Nxe3Br')],
+      instructions: [
+        {
+          programAddressIndex: 1,
+          data: new Uint8Array([0, 139, 203, 23, 160, 77, 48, 130, 0]),
+        },
+      ],
+      version: 0,
+    } as unknown as CompiledTransactionMessage;
+
+    expect(() =>
+      normalizeCompiledTransactionMessage(mockCompiledTransactionMessage),
+    ).toThrow(
+      'Transaction message contains an instruction with an invalid program address index.',
+    );
+  });
 });