feat: use ec internally

__tests__/account.test.ts

@@ -1,7 +1,5 @@
-import { getStarkKey, pedersen, sign } from '@noble/curves/stark';
-
 import typedDataExample from '../__mocks__/typedDataExample.json';
-import { Account, Contract, Provider, number, stark } from '../src';
+import { Account, Contract, Provider, ec, number, stark } from '../src';
 import { parseUDCEvent } from '../src/utils/events';
 import { calculateContractAddressFromHash, feeTransactionVersion } from '../src/utils/hash';
 import { cleanHex, hexToDecimalString, toBigInt, toHex } from '../src/utils/number';
@@ -241,11 +239,11 @@ describe('deploy and test Wallet', () => {
         '1893860513534673656759973582609638731665558071107553163765293299136715951024';
       const whitelistingPrivateKey =
         '301579081698031303837612923223391524790804435085778862878979120159194507372';
-      const hashed = pedersen(
-        pedersen(toBigInt('18925'), toBigInt('1922775124')),
+      const hashed = ec.starkCurve.pedersen(
+        ec.starkCurve.pedersen(toBigInt('18925'), toBigInt('1922775124')),
         toBigInt(account.address)
       );
-      const signed = sign(hashed, toHex(whitelistingPrivateKey));
+      const signed = ec.starkCurve.sign(hashed, toHex(whitelistingPrivateKey));
 
       const { transaction_hash } = await account.execute([
         {
@@ -408,7 +406,7 @@ describe('deploy and test Wallet', () => {
       await provider.waitForTransaction(declareAccount.transaction_hash);
 
       const privateKey = stark.randomAddress();
-      starkKeyPub = getStarkKey(privateKey);
+      starkKeyPub = privateKey;
       precalculatedAddress = calculateContractAddressFromHash(
         starkKeyPub,
         accountClassHash,

__tests__/utils/ellipticalCurve.test.ts

@@ -1,5 +1,4 @@
-import { getPublicKey, getStarkKey, pedersen, sign, verify } from '@noble/curves/stark';
-
+import { ec } from '../../src';
 import { StarknetChainId } from '../../src/constants';
 import {
   calculateTransactionHash,
@@ -10,18 +9,18 @@ import { fromCallsToExecuteCalldataWithNonce } from '../../src/utils/transaction
 
 test('getKeyPair()', () => {
   const privateKey = '0x019800ea6a9a73f94aee6a3d2edf018fc770443e90c7ba121e8303ec6b349279';
-  const starkKey = getStarkKey(privateKey);
+  const starkKey = ec.starkCurve.getStarkKey(privateKey);
   // somehow needed, returns error else
   expect(starkKey).toBe('0x33f45f07e1bd1a51b45fc24ec8c8c9908db9e42191be9e169bfcac0c0d99745');
 });
 
 test('pedersen()', () => {
-  const own = pedersen('0x12773', '0x872362');
+  const own = ec.starkCurve.pedersen('0x12773', '0x872362');
   expect(own).toMatchSnapshot();
 });
 
 test('pedersen() with 0', () => {
-  const own = pedersen('0x12773', '0x0');
+  const own = ec.starkCurve.pedersen('0x12773', '0x0');
   expect(own).toMatchSnapshot();
 });
 
@@ -65,7 +64,7 @@ test('hashMessage()', () => {
     `"0x6d1706bd3d1ba7c517be2a2a335996f63d4738e2f182144d078a1dd9997062e"`
   );
 
-  const { r, s } = sign(hashMsg, privateKey);
+  const { r, s } = ec.starkCurve.sign(hashMsg, privateKey);
 
   expect(r.toString()).toMatchInlineSnapshot(
     `"1427981024487605678086498726488552139932400435436186597196374630267616399345"`
@@ -79,8 +78,8 @@ test('verify signed message()', () => {
   const pk = '0x019800ea6a9a73f94aee6a3d2edf018fc770443e90c7ba121e8303ec6b349279';
   const account = '0x33f45f07e1bd1a51b45fc24ec8c8c9908db9e42191be9e169bfcac0c0d99745';
   const price = '1';
-  const hashMsg = pedersen(account, price);
-  const signature = sign(hashMsg, pk);
-  const pubKey = getPublicKey(pk);
-  expect(verify(signature.toDERHex(), hashMsg, pubKey)).toBe(true);
+  const hashMsg = ec.starkCurve.pedersen(account, price);
+  const signature = ec.starkCurve.sign(hashMsg, pk);
+  const pubKey = ec.starkCurve.getPublicKey(pk);
+  expect(ec.starkCurve.verify(signature.toDERHex(), hashMsg, pubKey)).toBe(true);
 });

__tests__/utils/utils.test.ts

@@ -1,8 +1,6 @@
 import fs from 'fs';
 
-import { pedersen } from '@noble/curves/stark';
-
-import { constants, hash, json, number, stark } from '../../src';
+import { constants, ec, hash, json, number, stark } from '../../src';
 import { Block } from '../../src/provider/utils';
 
 const { IS_BROWSER } = constants;
@@ -110,7 +108,7 @@ describe('calculateContractAddressFromHash()', () => {
     const classHash = '0x55187E68C60664A947048E0C9E5322F9BF55F7D435ECDCF17ED75724E77368F';
 
     // Any type of salt can be used. It depends on the dApp what kind of salt it wants to use.
-    const salt = pedersen(ethAddress, daiAddress);
+    const salt = ec.starkCurve.pedersen(ethAddress, daiAddress);
 
     const res = hash.calculateContractAddressFromHash(
       salt,

src/account/default.ts

@@ -1,5 +1,3 @@
-import { pedersen } from '@noble/curves/stark';
-
 import { UDC, ZERO } from '../constants';
 import { ProviderInterface, ProviderOptions } from '../provider';
 import { Provider } from '../provider/default';
@@ -31,6 +29,7 @@ import {
   UniversalDeployerContractPayload,
 } from '../types';
 import { EstimateFeeBulk, TransactionSimulation } from '../types/account';
+import { starkCurve } from '../utils/ec';
 import { parseUDCEvent } from '../utils/events';
 import {
   calculateContractAddressFromHash,
@@ -409,7 +408,7 @@ export class Account extends Provider implements AccountInterface {
           ],
         },
         address: calculateContractAddressFromHash(
-          unique ? pedersen(this.address, deploySalt) : deploySalt,
+          unique ? starkCurve.pedersen(this.address, deploySalt) : deploySalt,
           classHash,
           compiledConstructorCallData,
           unique ? UDC.ADDRESS : 0

src/signer/default.ts

@@ -1,7 +1,6 @@
-import { getStarkKey, sign, utils } from '@noble/curves/stark';
-
 import { Abi, Call, DeclareSignerDetails, InvocationsSignerDetails, Signature } from '../types';
 import { DeployAccountSignerDetails } from '../types/signer';
+import { starkCurve } from '../utils/ec';
 import { buf2hex } from '../utils/encode';
 import {
   calculateDeclareTransactionHash,
@@ -16,17 +15,17 @@ import { SignerInterface } from './interface';
 export class Signer implements SignerInterface {
   protected pk: Uint8Array | string;
 
-  constructor(pk: Uint8Array | string = utils.randomPrivateKey()) {
+  constructor(pk: Uint8Array | string = starkCurve.utils.randomPrivateKey()) {
     this.pk = pk instanceof Uint8Array ? buf2hex(pk) : toHex(pk);
   }
 
   public async getPubKey(): Promise<string> {
-    return getStarkKey(this.pk);
+    return starkCurve.getStarkKey(this.pk);
   }
 
   public async signMessage(typedData: TypedData, accountAddress: string): Promise<Signature> {
     const msgHash = getMessageHash(typedData, accountAddress);
-    return sign(msgHash, this.pk);
+    return starkCurve.sign(msgHash, this.pk);
   }
 
   public async signTransaction(
@@ -50,7 +49,7 @@ export class Signer implements SignerInterface {
       transactionsDetail.nonce
     );
 
-    return sign(msgHash, this.pk);
+    return starkCurve.sign(msgHash, this.pk);
   }
 
   public async signDeployAccountTransaction({
@@ -74,7 +73,7 @@ export class Signer implements SignerInterface {
       nonce
     );
 
-    return sign(msgHash, this.pk);
+    return starkCurve.sign(msgHash, this.pk);
   }
 
   public async signDeclareTransaction(
@@ -90,6 +89,6 @@ export class Signer implements SignerInterface {
       nonce
     );
 
-    return sign(msgHash, this.pk);
+    return starkCurve.sign(msgHash, this.pk);
   }
 }

src/utils/ec.ts

@@ -1,2 +1,2 @@
-export * as stark from '@noble/curves/stark';
+export * as starkCurve from '@noble/curves/stark';
 export * as weierstrass from '@noble/curves/abstract/weierstrass';

src/utils/hash.ts

@@ -1,11 +1,11 @@
-import { keccak, pedersen } from '@noble/curves/stark';
 /* eslint-disable no-param-reassign */
 /* eslint-disable import/extensions */
 import { keccak256 } from 'ethereum-cryptography/keccak.js';
 import { hexToBytes } from 'ethereum-cryptography/utils.js';
 
 import { API_VERSION, MASK_250, StarknetChainId, TransactionHashPrefix } from '../constants';
 import { CompiledContract, RawCalldata } from '../types/lib';
+import { starkCurve } from './ec';
 import { addHexPrefix, buf2hex, removeHexPrefix, utf8ToArray } from './encode';
 import { parse, stringify } from './json';
 import {
@@ -74,7 +74,7 @@ export function getSelector(value: string) {
 
 export function computeHashOnElements(data: BigNumberish[]): string {
   return [...data, data.length]
-    .reduce((x: BigNumberish, y: BigNumberish) => pedersen(toBigInt(x), toBigInt(y)), 0)
+    .reduce((x: BigNumberish, y: BigNumberish) => starkCurve.pedersen(toBigInt(x), toBigInt(y)), 0)
     .toString();
 }
 
@@ -246,7 +246,7 @@ export default function computeHintedClassHash(compiledContract: CompiledContrac
       [false, '']
     )[1];
 
-  return addHexPrefix(keccak(utf8ToArray(serialisedJson)).toString(16));
+  return addHexPrefix(starkCurve.keccak(utf8ToArray(serialisedJson)).toString(16));
 }
 
 // Computes the class hash of a given contract class

src/utils/merkle.ts

@@ -1,5 +1,4 @@
-import { pedersen } from '@noble/curves/stark';
-
+import { starkCurve } from './ec';
 import { toBigInt } from './number';
 
 export class MerkleTree {
@@ -34,7 +33,7 @@ export class MerkleTree {
 
   static hash(a: string, b: string) {
     const [aSorted, bSorted] = [toBigInt(a), toBigInt(b)].sort((x, y) => (x >= y ? 1 : -1));
-    return pedersen(aSorted, bSorted);
+    return starkCurve.pedersen(aSorted, bSorted);
   }
 
   public getProof(leaf: string, branch = this.leaves, hashPath: string[] = []): string[] {