@snapshot-labs/snapshot.js 0.14.1 → 0.14.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapshot-labs/snapshot.js",
-  "version": "0.14.1",
+  "version": "0.14.3",
   "repository": "snapshot-labs/snapshot.js",
   "license": "MIT",
   "main": "dist/snapshot.cjs.js",

package/src/multicall/index.ts

@@ -1,16 +1,8 @@
-import { constants } from 'starknet';
 import multicallEvm from './evm';
 import multicallStarknet from './starknet';
 import Multicaller from './multicaller';
 import networks from '../networks.json';
 
-type NetworkId = keyof typeof networks;
-
-const STARKNET_CHAIN_IDS: NetworkId[] = [
-  constants.StarknetChainId.SN_MAIN,
-  constants.StarknetChainId.SN_SEPOLIA
-] as const;
-
 const MULTICALLS_FN = {
   evm: multicallEvm,
   starknet: multicallStarknet
@@ -35,9 +27,7 @@ async function multicall(
   delete multicallOptions.limit;
   delete multicallOptions.multicallAddress;
 
-  const protocol = STARKNET_CHAIN_IDS.includes(network as NetworkId)
-    ? 'starknet'
-    : 'evm';
+  const protocol = networks[network]?.starknet ? 'starknet' : 'evm';
 
   return MULTICALLS_FN[protocol](
     address,

package/src/networks.json

@@ -1972,31 +1972,35 @@
     "logo": "ipfs://QmNnGPr1CNvj12SSGzKARtUHv9FyEfE5nES73U4vBWQSJL"
   },
   "0x534e5f4d41494e": {
-    "key": "sn",
+    "key": "0x534e5f4d41494e",
     "name": "Starknet",
     "shortName": "Starknet",
     "chainId": "0x534e5f4d41494e",
     "network": "mainnet",
+    "starknet": true,
+    "broviderId": "sn",
     "multicall": "0x05754af3760f3356da99aea5c3ec39ccac7783d925a19666ebbeca58ff0087f4",
     "explorer": {
       "url": "https://starkscan.co"
     },
-    "rpc": [],
+    "rpc": ["https://starknet-mainnet.public.blastapi.io"],
     "start": 8446,
     "logo": "ipfs://bafkreihbjafyh7eud7r6e5743esaamifcttsvbspfwcrfoc5ykodjdi67m"
   },
   "0x534e5f5345504f4c4941": {
-    "key": "sn-sep",
-    "name": "Starknet Testnet",
+    "key": "0x534e5f5345504f4c4941",
+    "name": "Starknet Sepolia",
     "shortName": "testnet",
     "chainId": "0x534e5f5345504f4c4941",
     "network": "testnet",
+    "starknet": true,
+    "broviderId": "sn-sep",
     "testnet": true,
     "multicall": "0x05754af3760f3356da99aea5c3ec39ccac7783d925a19666ebbeca58ff0087f4",
     "explorer": {
       "url": "https://sepolia.starkscan.co"
     },
-    "rpc": [],
+    "rpc": ["https://starknet-sepolia.public.blastapi.io"],
     "start": 7,
     "logo": "ipfs://bafkreihbjafyh7eud7r6e5743esaamifcttsvbspfwcrfoc5ykodjdi67m"
   }

package/src/utils/provider.ts

@@ -13,7 +13,6 @@ type ProviderType = 'evm' | 'starknet';
 
 const DEFAULT_BROVIDER_URL = 'https://rpc.snapshot.org' as const;
 const DEFAULT_TIMEOUT = 25000 as const;
-const STARKNET_BROVIDER_KEYS: string[] = ['sn', 'sn-sep'] as const;
 
 const providerMemo = new Map<string, ProviderInstance>();
 
@@ -39,12 +38,11 @@ function getBroviderNetworkId(network: string | number): string {
   if (!config) {
     throw new Error(`Network '${network}' is not supported`);
   }
-  return String(config.key);
+  return config.broviderId || String(network);
 }
 
-function getProviderType(networkId: string): ProviderType {
-  const isStarknet = STARKNET_BROVIDER_KEYS.includes(networkId);
-  return isStarknet ? 'starknet' : 'evm';
+function getProviderType(network: string | number): ProviderType {
+  return networks[network]?.starknet ? 'starknet' : 'evm';
 }
 
 function createMemoKey(
@@ -68,7 +66,7 @@ export default function getProvider(
     return memoized;
   }
 
-  const providerType = getProviderType(networkId);
+  const providerType = getProviderType(network);
   const provider = providerFnMap[providerType](networkId, normalizedOptions);
 
   providerMemo.set(memoKey, provider);

package/src/verify/starknet.ts

@@ -1,13 +1,14 @@
-import { Contract, RpcProvider, typedData } from 'starknet';
+import { Contract, RpcProvider, typedData, constants } from 'starknet';
 import { BigNumber } from '@ethersproject/bignumber';
+import networks from '../networks.json';
 import type { SignaturePayload } from '.';
 import type { ProviderOptions } from '../utils/provider';
 
 export type NetworkType = 'SN_MAIN' | 'SN_SEPOLIA';
 
 const RPC_URLS: Record<NetworkType, string> = {
-  SN_MAIN: 'https://starknet-mainnet.public.blastapi.io',
-  SN_SEPOLIA: 'https://starknet-sepolia.public.blastapi.io'
+  SN_MAIN: networks[constants.StarknetChainId.SN_MAIN]?.rpc?.[0],
+  SN_SEPOLIA: networks[constants.StarknetChainId.SN_SEPOLIA]?.rpc?.[0]
 };
 
 const ABI = [