feat: upgrade to sarknet.js v6.11.0 (#296)

* feat: starknet.js v6.11.0 * feat: enable serving debug-ui * style: enable prettier on index.html + css style * revert: packages/starknet-snap/index.html * revert: package.json root * feat: v6.11.0 starknet.js in wallet-ui and get-starknet * revert: package.json starknet-snap lint scope * fix: warning message when building wallet-ui * feat: sarknet.js v6.11.0 on get-starknet * revert: starknet-snap/utils/keyPair.ts * revert: wallet-ui package.json remove craco * revert: craco.config.js removed * chore: update yarn.lock * chore: pin starknet version in snap * revert: get-starknet execute use invocationsDetails * chore: lint + prettier * chore: pin starknet version in get-starknet and wallet-ui
Consensys · Jul 30, 2024 · e298244 · e298244
1 parent 73113b4
commit e298244
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 171 deletions.
diff --git a/packages/get-starknet/package.json b/packages/get-starknet/package.json
@@ -53,6 +53,6 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "starknet": "^5.14.0"
+    "starknet": "6.11.0"
   }
 }
diff --git a/packages/get-starknet/src/accounts.ts b/packages/get-starknet/src/accounts.ts
@@ -36,10 +36,13 @@ export class MetaMaskAccount extends Account {
 
   async execute(
     calls: AllowArray<Call>,
-    abis?: Abi[] | undefined,
+    abisOrTransactionsDetail?: Abi[] | InvocationsDetails,
     transactionsDetail?: InvocationsDetails,
   ): Promise<InvokeFunctionResponse> {
-    return this.#snap.execute(this.#address, calls, abis, transactionsDetail);
+    if (!transactionsDetail) {
+      return this.#snap.execute(this.#address, calls, undefined, abisOrTransactionsDetail as InvocationsDetails);
+    }
+    return this.#snap.execute(this.#address, calls, abisOrTransactionsDetail as Abi[], transactionsDetail);
   }
 
   async signMessage(typedData: TypedData): Promise<Signature> {

diff --git a/packages/get-starknet/src/wallet.ts b/packages/get-starknet/src/wallet.ts
@@ -117,9 +117,7 @@ export class MetaMaskSnapWallet implements IStarknetWindowObject {
 
   async #getRPCProvider(network: { chainId: string; nodeUrl: string }) {
     return new Provider({
-      rpc: {
-        nodeUrl: network.nodeUrl,
-      },
+      nodeUrl: network.nodeUrl,
     });
   }
 

diff --git a/packages/starknet-snap/package.json b/packages/starknet-snap/package.json
@@ -43,7 +43,7 @@
     "async-mutex": "^0.3.2",
     "ethereum-unit-converter": "^0.0.17",
     "ethers": "^5.5.1",
-    "starknet": "6.7.0",
+    "starknet": "6.11.0",
     "starknet_v4.22.0": "npm:[email protected]"
   },
   "devDependencies": {

diff --git a/packages/starknet-snap/snap.manifest.json b/packages/starknet-snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/ConsenSys/starknet-snap.git"
   },
   "source": {
-    "shasum": "QTghmF19ZVAMHyKpyNlzjdwLvzrP6RHVWLfZzZHjynU=",
+    "shasum": "uG3NeaD7Ky06SZo9Hnx1KWn5EjavmUJC5VBSY/sqctM=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/starknet-snap/src/index.ts b/packages/starknet-snap/src/index.ts
@@ -55,7 +55,6 @@ import {
   ETHER_MAINNET,
   ETHER_SEPOLIA_TESTNET,
   PRELOADED_TOKENS,
-  STARKNET_INTEGRATION_NETWORK,
   STARKNET_MAINNET_NETWORK,
   STARKNET_SEPOLIA_TESTNET_NETWORK,
   STARKNET_TESTNET_NETWORK,
@@ -89,8 +88,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => {
   logger.log(`${request.method}:\nrequestParams: ${toJson(requestParams)}`);
 
   try {
-    const isDev = Boolean(requestParams?.isDev);
-
     if (request.method === 'ping') {
       logger.log('pong');
       return 'pong';
@@ -120,16 +117,12 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => {
     }
     // pre-inserted the default networks and tokens
     await upsertNetwork(STARKNET_MAINNET_NETWORK, snap, saveMutex, state);
-    if (isDev) {
-      await upsertNetwork(STARKNET_INTEGRATION_NETWORK, snap, saveMutex, state);
-    } else {
-      await upsertNetwork(
-        STARKNET_SEPOLIA_TESTNET_NETWORK,
-        snap,
-        saveMutex,
-        state,
-      );
-    }
+    await upsertNetwork(
+      STARKNET_SEPOLIA_TESTNET_NETWORK,
+      snap,
+      saveMutex,
+      state,
+    );
 
     // remove the testnet network (migration)
     await removeNetwork(STARKNET_TESTNET_NETWORK, snap, saveMutex, state);

diff --git a/packages/starknet-snap/src/types/snapApi.ts b/packages/starknet-snap/src/types/snapApi.ts
@@ -54,7 +54,6 @@ export type ApiRequestParams =
 
 export type BaseRequestParams = {
   chainId?: string;
-  isDev?: boolean;
   debugLevel?: string;
 };
 

diff --git a/packages/starknet-snap/src/utils/constants.ts b/packages/starknet-snap/src/utils/constants.ts
@@ -71,15 +71,6 @@ export const STARKNET_SEPOLIA_TESTNET_NETWORK: Network = {
   accountClassHash: '', // from argent-x repo
 };
 
-export const STARKNET_INTEGRATION_NETWORK: Network = {
-  name: 'Goerli Integration',
-  chainId: constants.StarknetChainId.SN_GOERLI,
-  baseUrl: 'https://external.integration.starknet.io',
-  nodeUrl: '',
-  voyagerUrl: '',
-  accountClassHash: '',
-};
-
 export const ETHER_MAINNET: Erc20Token = {
   address: '0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7',
   name: 'Ether',
@@ -182,7 +173,6 @@ export const PRELOADED_TOKENS = [
 export const PRELOADED_NETWORKS = [
   STARKNET_MAINNET_NETWORK,
   STARKNET_SEPOLIA_TESTNET_NETWORK,
-  STARKNET_INTEGRATION_NETWORK,
 ];
 
 export const PROXY_CONTRACT_HASH =

diff --git a/packages/starknet-snap/test/constants.test.ts b/packages/starknet-snap/test/constants.test.ts
@@ -83,7 +83,7 @@ export const Cairo1Account1: AccContract = {
     '0x5bc00132b8f2fc0f673dc232594b26727e712b204a2716f9dc28a8c5f607b5e',
   publicKey:
     '0x019e59f349e1aa813ab4556c5836d0472e5e1ae82d1e5c3b3e8aabfeb290befd',
-  chainId: constants.StarknetChainId.SN_GOERLI,
+  chainId: constants.StarknetChainId.SN_SEPOLIA,
 };
 
 export const token0: Erc20Token = {

diff --git a/packages/wallet-ui/package.json b/packages/wallet-ui/package.json
@@ -65,7 +65,7 @@
     "react-redux": "^8.0.1",
     "redux-persist": "^6.0.0",
     "semver": "^7.5.2",
-    "starknet": "^4.22.0",
+    "starknet": "6.11.0",
     "styled-components": "^5.3.5",
     "toastr2": "^3.0.0-alpha.18",
     "web-vitals": "^2.1.4"

diff --git a/packages/wallet-ui/src/components/ui/molecule/AmountInput/AmountInput.stories.tsx b/packages/wallet-ui/src/components/ui/molecule/AmountInput/AmountInput.stories.tsx
@@ -11,7 +11,7 @@ export default {
 const asset = {
   address: '0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7',
   amount: BigNumber.from('1000000000000000000'),
-  chainId: constants.StarknetChainId.TESTNET,
+  chainId: constants.StarknetChainId.SN_SEPOLIA,
   decimals: 18,
   name: 'Ether',
   symbol: 'ETH',

diff --git a/...s/wallet-ui/src/components/ui/molecule/AssetsList/AssetListItem/AssetListItem.stories.tsx b/...s/wallet-ui/src/components/ui/molecule/AssetsList/AssetListItem/AssetListItem.stories.tsx
@@ -12,7 +12,7 @@ export default {
 const asset: Erc20TokenBalance = {
   address: '0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7',
   amount: BigNumber.from('1000000000000000000'),
-  chainId: constants.StarknetChainId.TESTNET,
+  chainId: constants.StarknetChainId.SN_SEPOLIA,
   decimals: 18,
   name: 'Ether',
   symbol: 'ETH',

diff --git a/packages/wallet-ui/src/utils/constants.ts b/packages/wallet-ui/src/utils/constants.ts
@@ -4,7 +4,7 @@ import { constants } from 'starknet';
 export const SEPOLIA_CHAINID = '0x534e5f5345504f4c4941';
 
 export const TOKENS: any = {
-  [constants.StarknetChainId.MAINNET]: {
+  [constants.StarknetChainId.SN_MAIN]: {
     '0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7': {
       coingeckoId: 'ethereum',
     },

diff --git a/packages/wallet-ui/src/utils/utils.ts b/packages/wallet-ui/src/utils/utils.ts
@@ -28,7 +28,7 @@ export const openExplorerTab = (
 ) => {
   let explorerUrl = STARKNET_SEPOLIA_TESTNET_EXPLORER;
   switch (chainId) {
-    case constants.StarknetChainId.MAINNET:
+    case constants.StarknetChainId.SN_MAIN:
       explorerUrl = STARKNET_MAINNET_EXPLORER;
       break;
     case SEPOLIA_CHAINID: