refactor: code improvement

snapshot-labs · Jul 3, 2024 · 98a4cd8 · 98a4cd8
1 parent e5b8f2d
commit 98a4cd8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/verify/evm.ts b/src/verify/evm.ts
@@ -1,9 +1,9 @@
 import { verifyTypedData } from '@ethersproject/wallet';
 import { arrayify } from '@ethersproject/bytes';
-import { StaticJsonRpcProvider } from '@ethersproject/providers';
-import { getHash, SignaturePayload } from '.';
-import getProvider, { ProviderOptions } from '../utils/provider';
-import { call } from '../utils';
+import getProvider, { type ProviderOptions } from '../utils/provider';
+import utils, { call } from '../utils';
+import type { SignaturePayload } from '.';
+import type { StaticJsonRpcProvider } from '@ethersproject/providers';
 
 function isSameAddress(a: string, b: string) {
   return a.toLowerCase() === b.toLowerCase();
@@ -24,7 +24,7 @@ export default async function verify(
   } catch (e: any) {}
 
   const provider = getProvider(network, options);
-  const hash = getHash(data);
+  const hash = utils.getHash(data);
 
   if (await verifyDefault(address, sig, hash, provider)) return true;
 

diff --git a/src/verify/starknet.ts b/src/verify/starknet.ts
@@ -3,6 +3,14 @@ import abi from './starknet-account-abi.json';
 import type { SignaturePayload } from '.';
 import type { ProviderOptions } from '../utils/provider';
 
+const DEFAULT_STARKNET_RPC = 'https://starknet-mainnet.public.blastapi.io';
+
+function getProvider(options: ProviderOptions) {
+  return new RpcProvider({
+    nodeUrl: options?.broviderUrl ?? DEFAULT_STARKNET_RPC
+  });
+}
+
 export default async function verify(
   address: string,
   sig: string[],
@@ -11,12 +19,7 @@ export default async function verify(
 ): Promise<boolean> {
   const { domain, types, primaryType, message } =
     data as Required<SignaturePayload>;
-  const provider = new RpcProvider({
-    nodeUrl:
-      options?.broviderUrl ?? 'https://starknet-mainnet.public.blastapi.io'
-  });
-  const contractAccount = new Contract(abi, address, provider);
-
+  const contractAccount = new Contract(abi, address, getProvider(options));
   const hash = typedData.getMessageHash(
     { types, primaryType, domain, message },
     address