@snapshot-labs/snapshot.js 0.14.16 → 0.14.18

package/dist/src/sign/types.d.ts

@@ -163,24 +163,6 @@ export declare const voteStringTypes: {
         type: string;
     }[];
 };
-export declare const vote2Types: {
-    Vote: {
-        name: string;
-        type: string;
-    }[];
-};
-export declare const voteArray2Types: {
-    Vote: {
-        name: string;
-        type: string;
-    }[];
-};
-export declare const voteString2Types: {
-    Vote: {
-        name: string;
-        type: string;
-    }[];
-};
 export declare const followTypes: {
     Follow: {
         name: string;

package/dist/src/verify/starknet.d.ts

@@ -1,6 +1,5 @@
 import type { ProviderOptions } from '../utils/provider';
 import type { SignaturePayload } from '.';
-export type NetworkType = 'SN_MAIN' | 'SN_SEPOLIA';
 export declare function isStarknetMessage(data: SignaturePayload): boolean;
 export declare function getHash(data: SignaturePayload, address: string): string;
-export default function verify(address: string, sig: string[], data: SignaturePayload, network?: NetworkType, options?: ProviderOptions): Promise<boolean>;
+export default function verify(address: string, sig: string[], data: SignaturePayload, network?: string, options?: ProviderOptions): Promise<boolean>;

package/package.json

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

package/src/networks.json

@@ -2026,9 +2026,7 @@
     "explorer": {
       "url": "https://starkscan.co"
     },
-    "rpc": [
-      "https://starknet-mainnet.public.blastapi.io"
-    ],
+    "rpc": [],
     "start": 8446,
     "logo": "ipfs://bafkreihbjafyh7eud7r6e5743esaamifcttsvbspfwcrfoc5ykodjdi67m"
   },
@@ -2045,9 +2043,7 @@
     "explorer": {
       "url": "https://sepolia.starkscan.co"
     },
-    "rpc": [
-      "https://starknet-sepolia.public.blastapi.io"
-    ],
+    "rpc": [],
     "start": 7,
     "logo": "ipfs://bafkreihbjafyh7eud7r6e5743esaamifcttsvbspfwcrfoc5ykodjdi67m"
   }

package/src/sign/index.ts

@@ -25,9 +25,6 @@ import {
   voteTypes,
   voteArrayTypes,
   voteStringTypes,
-  vote2Types,
-  voteArray2Types,
-  voteString2Types,
   followTypes,
   subscribeTypes,
   unfollowTypes,
@@ -169,15 +166,14 @@ export default class Client {
     if (!message.reason) message.reason = '';
     if (!message.app) message.app = '';
     if (!message.metadata) message.metadata = '{}';
-    const type2 = message.proposal.startsWith('0x');
-    let type = type2 ? vote2Types : voteTypes;
+    let type = voteTypes;
     if (['approval', 'ranked-choice'].includes(message.type))
-      type = type2 ? voteArray2Types : voteArrayTypes;
+      type = voteArrayTypes;
     if (!isShutter && ['quadratic', 'weighted'].includes(message.type)) {
-      type = type2 ? voteString2Types : voteStringTypes;
+      type = voteStringTypes;
       message.choice = JSON.stringify(message.choice);
     }
-    if (isShutter) type = type2 ? voteString2Types : voteStringTypes;
+    if (isShutter) type = voteStringTypes;
     delete message.privacy;
     // @ts-ignore
     delete message.type;

package/src/sign/types.ts

@@ -197,7 +197,7 @@ export const cancelProposal2Types = {
     { name: 'from', type: 'string' },
     { name: 'space', type: 'string' },
     { name: 'timestamp', type: 'uint64' },
-    { name: 'proposal', type: 'bytes32' }
+    { name: 'proposal', type: 'string' }
   ]
 };
 
@@ -240,45 +240,6 @@ export const voteStringTypes = {
   ]
 };
 
-export const vote2Types = {
-  Vote: [
-    { name: 'from', type: 'string' },
-    { name: 'space', type: 'string' },
-    { name: 'timestamp', type: 'uint64' },
-    { name: 'proposal', type: 'bytes32' },
-    { name: 'choice', type: 'uint32' },
-    { name: 'reason', type: 'string' },
-    { name: 'app', type: 'string' },
-    { name: 'metadata', type: 'string' }
-  ]
-};
-
-export const voteArray2Types = {
-  Vote: [
-    { name: 'from', type: 'string' },
-    { name: 'space', type: 'string' },
-    { name: 'timestamp', type: 'uint64' },
-    { name: 'proposal', type: 'bytes32' },
-    { name: 'choice', type: 'uint32[]' },
-    { name: 'reason', type: 'string' },
-    { name: 'app', type: 'string' },
-    { name: 'metadata', type: 'string' }
-  ]
-};
-
-export const voteString2Types = {
-  Vote: [
-    { name: 'from', type: 'string' },
-    { name: 'space', type: 'string' },
-    { name: 'timestamp', type: 'uint64' },
-    { name: 'proposal', type: 'bytes32' },
-    { name: 'choice', type: 'string' },
-    { name: 'reason', type: 'string' },
-    { name: 'app', type: 'string' },
-    { name: 'metadata', type: 'string' }
-  ]
-};
-
 export const followTypes = {
   Follow: [
     { name: 'from', type: 'address' },

package/src/verify/starknet.spec.ts

@@ -39,7 +39,7 @@ describe('verify/starknet', () => {
     ])('with a %s signature', (_, message, multisign = false) => {
       test('should return true if the signature is valid', () => {
         expect(
-          verify(message.address, message.sig, message.data, 'SN_MAIN')
+          verify(message.address, message.sig, message.data, '0x534e5f4d41494e')
         ).resolves.toBe(true);
       });
 
@@ -49,7 +49,7 @@ describe('verify/starknet', () => {
             validateAndParseAddress(message.address),
             message.sig,
             message.data,
-            'SN_MAIN'
+            '0x534e5f4d41494e'
           )
         ).resolves.toBe(true);
       });
@@ -57,13 +57,23 @@ describe('verify/starknet', () => {
       if (multisign) {
         test('should throw an error when verifying on a different network', () => {
           expect(
-            verify(message.address, message.sig, message.data, 'SN_SEPOLIA')
+            verify(
+              message.address,
+              message.sig,
+              message.data,
+              '0x534e5f5345504f4c4941'
+            )
           ).rejects.toThrowError();
         });
       } else {
         test('should return true when verifying on a different network', () => {
           expect(
-            verify(message.address, message.sig, message.data, 'SN_SEPOLIA')
+            verify(
+              message.address,
+              message.sig,
+              message.data,
+              '0x534e5f5345504f4c4941'
+            )
           ).resolves.toBe(true);
         });
       }
@@ -85,7 +95,7 @@ describe('verify/starknet', () => {
           '0x07f71118e351c02f6EC7099C8CDf93AED66CEd8406E94631cC91637f7D7F203A',
           starknetMessage.sig,
           starknetMessage.data,
-          'SN_MAIN'
+          '0x534e5f4d41494e'
         )
       ).rejects.toThrowError('Contract not deployed');
     });
@@ -96,7 +106,7 @@ describe('verify/starknet', () => {
           starknetMessage.address,
           ['1', '2'],
           starknetMessage.data,
-          'SN_MAIN'
+          '0x534e5f4d41494e'
         )
       ).resolves.toBe(false);
     });
@@ -106,13 +116,23 @@ describe('verify/starknet', () => {
       data.message.timestamp = 1234;
 
       expect(
-        verify(starknetMessage.address, starknetMessage.sig, data, 'SN_MAIN')
+        verify(
+          starknetMessage.address,
+          starknetMessage.sig,
+          data,
+          '0x534e5f4d41494e'
+        )
       ).resolves.toBe(false);
     });
 
     test('should return false when the signature is not valid', () => {
       expect(
-        verify(starknetMessage.address, ['1'], starknetMessage.data, 'SN_MAIN')
+        verify(
+          starknetMessage.address,
+          ['1'],
+          starknetMessage.data,
+          '0x534e5f4d41494e'
+        )
       ).resolves.toBe(false);
     });
   });

package/src/verify/starknet.ts

@@ -1,22 +1,7 @@
-import { RpcProvider, typedData, constants, TypedData } from 'starknet';
-import networks from '../networks.json';
+import { typedData, TypedData } from 'starknet';
 import type { ProviderOptions } from '../utils/provider';
 import type { SignaturePayload } from '.';
-
-export type NetworkType = 'SN_MAIN' | 'SN_SEPOLIA';
-
-const RPC_URLS: Record<NetworkType, string> = {
-  SN_MAIN: networks[constants.StarknetChainId.SN_MAIN]?.rpc?.[0],
-  SN_SEPOLIA: networks[constants.StarknetChainId.SN_SEPOLIA]?.rpc?.[0]
-};
-
-function getProvider(network: NetworkType, options: ProviderOptions) {
-  if (!RPC_URLS[network]) throw new Error('Invalid network');
-
-  return new RpcProvider({
-    nodeUrl: options?.broviderUrl ?? RPC_URLS[network]
-  });
-}
+import getProvider from '../utils/provider';
 
 export function isStarknetMessage(data: SignaturePayload): boolean {
   return !!data.primaryType && !!data.types.StarkNetDomain;
@@ -36,7 +21,7 @@ export default async function verify(
   address: string,
   sig: string[],
   data: SignaturePayload,
-  network: NetworkType = 'SN_MAIN',
+  network = '0x534e5f4d41494e',
   options: ProviderOptions = {}
 ): Promise<boolean> {
   try {