starknet 2.3.0 → 2.6.0

package/src/provider/default.ts

@@ -3,6 +3,7 @@ import urljoin from 'url-join';
 
 import {
   AddTransactionResponse,
+  BlockNumber,
   CallContractResponse,
   CallContractTransaction,
   CompiledContract,
@@ -11,6 +12,7 @@ import {
   GetContractAddressesResponse,
   GetTransactionResponse,
   GetTransactionStatusResponse,
+  Signature,
   Transaction,
 } from '../types';
 import { parse, stringify } from '../utils/json';
@@ -18,7 +20,7 @@ import { BigNumberish, toBN, toHex } from '../utils/number';
 import { compressProgram, formatSignature, randomAddress } from '../utils/stark';
 import { ProviderInterface } from './interface';
 
-type NetworkName = 'mainnet-alpha' | 'georli-alpha';
+type NetworkName = 'mainnet-alpha' | 'goerli-alpha';
 
 type ProviderOptions =
   | {
@@ -39,7 +41,7 @@ export class Provider implements ProviderInterface {
 
   public gatewayUrl: string;
 
-  constructor(optionsOrProvider: ProviderOptions | Provider = { network: 'georli-alpha' }) {
+  constructor(optionsOrProvider: ProviderOptions | Provider = { network: 'goerli-alpha' }) {
     if (optionsOrProvider instanceof Provider) {
       this.baseUrl = optionsOrProvider.baseUrl;
       this.feederGatewayUrl = optionsOrProvider.feederGatewayUrl;
@@ -59,7 +61,7 @@ export class Provider implements ProviderInterface {
     switch (name) {
       case 'mainnet-alpha':
         return 'https://alpha-mainnet.starknet.io';
-      case 'georli-alpha':
+      case 'goerli-alpha':
       default:
         return 'https://alpha4.starknet.io';
     }
@@ -83,20 +85,20 @@ export class Provider implements ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L17-L25)
    *
-   * @param invokeTx - transaction to be invoked
-   * @param blockId
+   * @param invokeTransaction - transaction to be invoked
+   * @param blockNumber
    * @returns the result of the function on the smart contract.
    */
   public async callContract(
-    invokeTx: CallContractTransaction,
-    blockId?: number
+    invokeTransaction: CallContractTransaction,
+    blockNumber: BlockNumber = null
   ): Promise<CallContractResponse> {
     const { data } = await axios.post<CallContractResponse>(
-      urljoin(this.feederGatewayUrl, 'call_contract', `?blockId=${blockId ?? 'null'}`),
+      urljoin(this.feederGatewayUrl, 'call_contract', `?blockNumber=${blockNumber}`),
       {
         signature: [],
         calldata: [],
-        ...invokeTx,
+        ...invokeTransaction,
       }
     );
     return data;
@@ -107,12 +109,12 @@ export class Provider implements ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L27-L31)
    *
-   * @param blockId
-   * @returns the block object { block_id, previous_block_id, state_root, status, timestamp, transaction_receipts, transactions }
+   * @param blockNumber
+   * @returns the block object { block_number, previous_block_number, state_root, status, timestamp, transaction_receipts, transactions }
    */
-  public async getBlock(blockId?: number): Promise<GetBlockResponse> {
+  public async getBlock(blockNumber: BlockNumber = null): Promise<GetBlockResponse> {
     const { data } = await axios.get<GetBlockResponse>(
-      urljoin(this.feederGatewayUrl, 'get_block', `?blockId=${blockId ?? 'null'}`)
+      urljoin(this.feederGatewayUrl, 'get_block', `?blockNumber=${blockNumber}`)
     );
     return data;
   }
@@ -123,15 +125,18 @@ export class Provider implements ProviderInterface {
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L33-L36)
    *
    * @param contractAddress
-   * @param blockId
+   * @param blockNumber
    * @returns Bytecode and ABI of compiled contract
    */
-  public async getCode(contractAddress: string, blockId?: number): Promise<GetCodeResponse> {
+  public async getCode(
+    contractAddress: string,
+    blockNumber: BlockNumber = null
+  ): Promise<GetCodeResponse> {
     const { data } = await axios.get<GetCodeResponse>(
       urljoin(
         this.feederGatewayUrl,
         'get_code',
-        `?contractAddress=${contractAddress}&blockId=${blockId ?? 'null'}`
+        `?contractAddress=${contractAddress}&blockNumber=${blockNumber}`
       )
     );
     return data;
@@ -145,19 +150,19 @@ export class Provider implements ProviderInterface {
    *
    * @param contractAddress
    * @param key - from getStorageVarAddress('<STORAGE_VARIABLE_NAME>') (WIP)
-   * @param blockId
+   * @param blockNumber
    * @returns the value of the storage variable
    */
   public async getStorageAt(
     contractAddress: string,
     key: number,
-    blockId?: number
+    blockNumber: BlockNumber = null
   ): Promise<object> {
     const { data } = await axios.get<object>(
       urljoin(
         this.feederGatewayUrl,
         'get_storage_at',
-        `?contractAddress=${contractAddress}&key=${key}&blockId=${blockId ?? 'null'}`
+        `?contractAddress=${contractAddress}&key=${key}&blockNumber=${blockNumber}`
       )
     );
     return data;
@@ -169,7 +174,7 @@ export class Provider implements ProviderInterface {
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L48-L52)
    *
    * @param txHash
-   * @returns the transaction status object { block_id, tx_status: NOT_RECEIVED | RECEIVED | PENDING | REJECTED | ACCEPTED_ONCHAIN }
+   * @returns the transaction status object { block_number, tx_status: NOT_RECEIVED | RECEIVED | PENDING | REJECTED | ACCEPTED_ONCHAIN }
    */
   public async getTransactionStatus(txHash: BigNumberish): Promise<GetTransactionStatusResponse> {
     const txHashBn = toBN(txHash);
@@ -189,7 +194,7 @@ export class Provider implements ProviderInterface {
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L54-L58)
    *
    * @param txHash
-   * @returns the transacton object { transaction_id, status, transaction, block_id?, block_number?, transaction_index?, transaction_failure_reason? }
+   * @returns the transacton object { transaction_id, status, transaction, block_number?, block_number?, transaction_index?, transaction_failure_reason? }
    */
   public async getTransaction(txHash: BigNumberish): Promise<GetTransactionResponse> {
     const txHashBn = toBN(txHash);
@@ -204,17 +209,19 @@ export class Provider implements ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  public async addTransaction(tx: Transaction): Promise<AddTransactionResponse> {
-    const signature = tx.type === 'INVOKE_FUNCTION' && formatSignature(tx.signature);
-    const contract_address_salt = tx.type === 'DEPLOY' && toHex(toBN(tx.contract_address_salt));
+  public async addTransaction(transaction: Transaction): Promise<AddTransactionResponse> {
+    const signature =
+      transaction.type === 'INVOKE_FUNCTION' && formatSignature(transaction.signature);
+    const contract_address_salt =
+      transaction.type === 'DEPLOY' && toHex(toBN(transaction.contract_address_salt));
 
     const { data } = await axios.post<AddTransactionResponse>(
       urljoin(this.gatewayUrl, 'add_transaction'),
       stringify({
-        ...tx, // the tx can contain BigInts, so we use our own `stringify`
+        ...transaction, // the tx can contain BigInts, so we use our own `stringify`
         ...(Array.isArray(signature) && { signature }), // not needed on deploy tx
         ...(contract_address_salt && { contract_address_salt }), // not needed on invoke tx
       }),
@@ -263,7 +270,7 @@ export class Provider implements ProviderInterface {
     contractAddress: string,
     entrypointSelector: string,
     calldata?: string[],
-    signature?: [BigNumberish, BigNumberish]
+    signature?: Signature
   ): Promise<AddTransactionResponse> {
     return this.addTransaction({
       type: 'INVOKE_FUNCTION',
@@ -276,16 +283,15 @@ export class Provider implements ProviderInterface {
 
   public async waitForTx(txHash: BigNumberish, retryInterval: number = 8000) {
     let onchain = false;
+    await wait(retryInterval);
+
     while (!onchain) {
       // eslint-disable-next-line no-await-in-loop
       await wait(retryInterval);
       // eslint-disable-next-line no-await-in-loop
       const res = await this.getTransactionStatus(txHash);
 
-      if (
-        res.tx_status === 'ACCEPTED_ONCHAIN' ||
-        (res.tx_status === 'PENDING' && res.block_hash !== 'pending') // This is needed as of today. In the future there will be a different status for pending transactions.
-      ) {
+      if (res.tx_status === 'ACCEPTED_ON_L1' || res.tx_status === 'ACCEPTED_ON_L2') {
         onchain = true;
       } else if (res.tx_status === 'REJECTED') {
         throw Error('REJECTED');

package/src/provider/interface.ts

@@ -1,5 +1,6 @@
 import type {
   AddTransactionResponse,
+  BlockNumber,
   CallContractResponse,
   CallContractTransaction,
   CompiledContract,
@@ -8,6 +9,7 @@ import type {
   GetContractAddressesResponse,
   GetTransactionResponse,
   GetTransactionStatusResponse,
+  Signature,
   Transaction,
 } from '../types';
 import type { BigNumberish } from '../utils/number';
@@ -32,13 +34,13 @@ export abstract class ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L17-L25)
    *
-   * @param invokeTx - transaction to be invoked
-   * @param blockId
+   * @param invokeTransaction - transaction to be invoked
+   * @param blockNumber
    * @returns the result of the function on the smart contract.
    */
   public abstract callContract(
-    invokeTx: CallContractTransaction,
-    blockId?: number
+    invokeTransaction: CallContractTransaction,
+    blockNumber?: BlockNumber
   ): Promise<CallContractResponse>;
 
   /**
@@ -46,10 +48,10 @@ export abstract class ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L27-L31)
    *
-   * @param blockId
-   * @returns the block object { block_id, previous_block_id, state_root, status, timestamp, transaction_receipts, transactions }
+   * @param blockNumber
+   * @returns the block object { block_number, previous_block_number, state_root, status, timestamp, transaction_receipts, transactions }
    */
-  public abstract getBlock(blockId?: number): Promise<GetBlockResponse>;
+  public abstract getBlock(blockNumber?: BlockNumber): Promise<GetBlockResponse>;
 
   /**
    * Gets the code of the deployed contract.
@@ -57,10 +59,13 @@ export abstract class ProviderInterface {
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L33-L36)
    *
    * @param contractAddress
-   * @param blockId
+   * @param blockNumber
    * @returns Bytecode and ABI of compiled contract
    */
-  public abstract getCode(contractAddress: string, blockId?: number): Promise<GetCodeResponse>;
+  public abstract getCode(
+    contractAddress: string,
+    blockNumber?: BlockNumber
+  ): Promise<GetCodeResponse>;
 
   // TODO: add proper type
   /**
@@ -70,13 +75,13 @@ export abstract class ProviderInterface {
    *
    * @param contractAddress
    * @param key - from getStorageVarAddress('<STORAGE_VARIABLE_NAME>') (WIP)
-   * @param blockId
+   * @param blockNumber
    * @returns the value of the storage variable
    */
   public abstract getStorageAt(
     contractAddress: string,
     key: number,
-    blockId?: number
+    blockNumber?: BlockNumber
   ): Promise<object>;
 
   /**
@@ -85,7 +90,7 @@ export abstract class ProviderInterface {
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L48-L52)
    *
    * @param txHash
-   * @returns the transaction status object { block_id, tx_status: NOT_RECEIVED | RECEIVED | PENDING | REJECTED | ACCEPTED_ONCHAIN }
+   * @returns the transaction status object { block_number, tx_status: NOT_RECEIVED | RECEIVED | PENDING | REJECTED | ACCEPTED_ONCHAIN }
    */
   public abstract getTransactionStatus(txHash: BigNumberish): Promise<GetTransactionStatusResponse>;
 
@@ -95,7 +100,7 @@ export abstract class ProviderInterface {
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/feeder_gateway/feeder_gateway_client.py#L54-L58)
    *
    * @param txHash
-   * @returns the transacton object { transaction_id, status, transaction, block_id?, block_number?, transaction_index?, transaction_failure_reason? }
+   * @returns the transacton object { transaction_id, status, transaction, block_number?, block_number?, transaction_index?, transaction_failure_reason? }
    */
   public abstract getTransaction(txHash: BigNumberish): Promise<GetTransactionResponse>;
 
@@ -104,10 +109,10 @@ export abstract class ProviderInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  public abstract addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+  public abstract addTransaction(transaction: Transaction): Promise<AddTransactionResponse>;
 
   /**
    * Deploys a given compiled contract (json) to starknet
@@ -135,7 +140,7 @@ export abstract class ProviderInterface {
     contractAddress: string,
     entrypointSelector: string,
     calldata?: string[],
-    signature?: [BigNumberish, BigNumberish]
+    signature?: Signature
   ): Promise<AddTransactionResponse>;
 
   public abstract waitForTx(txHash: BigNumberish, retryInterval?: number): Promise<void>;

package/src/signer/default.ts

@@ -1,12 +1,13 @@
 import assert from 'minimalistic-assert';
 
 import { Provider } from '../provider';
-import { AddTransactionResponse, KeyPair, Transaction } from '../types';
+import { AddTransactionResponse, KeyPair, Signature, Transaction } from '../types';
 import { sign } from '../utils/ellipticCurve';
 import { addHexPrefix } from '../utils/encode';
 import { hashMessage } from '../utils/hash';
 import { toBN } from '../utils/number';
 import { getSelectorFromName } from '../utils/stark';
+import { TypedData, getMessageHash } from '../utils/typedData';
 import { SignerInterface } from './interface';
 
 export class Signer extends Provider implements SignerInterface {
@@ -25,45 +26,76 @@ export class Signer extends Provider implements SignerInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  public override async addTransaction(tx: Transaction): Promise<AddTransactionResponse> {
-    if (tx.type === 'DEPLOY') return super.addTransaction(tx);
+  public override async addTransaction(transaction: Transaction): Promise<AddTransactionResponse> {
+    if (transaction.type === 'DEPLOY') return super.addTransaction(transaction);
 
-    assert(!tx.signature, "Adding signatures to a signer tx currently isn't supported");
+    assert(
+      !transaction.signature,
+      "Adding signatures to a signer transaction currently isn't supported"
+    );
 
-    const { result } = await this.callContract({
-      contract_address: this.address,
-      entry_point_selector: getSelectorFromName('get_nonce'),
-    });
-    const nonceBn = toBN(result[0]);
-    const calldataDecimal = (tx.calldata || []).map((x) => toBN(x).toString());
+    let nonceBn;
+    if (transaction.nonce) {
+      nonceBn = toBN(transaction.nonce);
+    } else {
+      const { result } = await this.callContract({
+        contract_address: this.address,
+        entry_point_selector: getSelectorFromName('get_nonce'),
+      });
+      nonceBn = toBN(result[0]);
+    }
+
+    const calldataDecimal = (transaction.calldata || []).map((x) => toBN(x).toString());
 
     const msgHash = addHexPrefix(
       hashMessage(
         this.address,
-        tx.contract_address,
-        tx.entry_point_selector,
+        transaction.contract_address,
+        transaction.entry_point_selector,
         calldataDecimal,
         nonceBn.toString()
       )
     );
 
-    const { r, s } = sign(this.keyPair, msgHash);
+    const signature = sign(this.keyPair, msgHash);
 
     return super.addTransaction({
       type: 'INVOKE_FUNCTION',
       entry_point_selector: getSelectorFromName('execute'),
       calldata: [
-        tx.contract_address,
-        tx.entry_point_selector,
+        transaction.contract_address,
+        transaction.entry_point_selector,
         calldataDecimal.length.toString(),
         ...calldataDecimal,
         nonceBn.toString(),
       ].map((x) => toBN(x).toString()),
       contract_address: this.address,
-      signature: [r, s],
+      signature,
     });
   }
+
+  /**
+   * Sign an JSON object with the starknet private key and return the signature
+   *
+   * @param json - JSON object to be signed
+   * @returns the signature of the JSON object
+   * @throws {Error} if the JSON object is not a valid JSON
+   */
+  public async signMessage(typedData: TypedData): Promise<Signature> {
+    return sign(this.keyPair, await this.hashMessage(typedData));
+  }
+
+  /**
+   * Hash a JSON object with pederson hash and return the hash
+   *
+   * @param json - JSON object to be hashed
+   * @returns the hash of the JSON object
+   * @throws {Error} if the JSON object is not a valid JSON
+   */
+  public async hashMessage(typedData: TypedData): Promise<string> {
+    return getMessageHash(typedData, this.address);
+  }
 }

package/src/signer/interface.ts

@@ -1,5 +1,6 @@
 import { Provider } from '../provider';
-import { AddTransactionResponse, Transaction } from '../types';
+import { AddTransactionResponse, Signature, Transaction } from '../types';
+import { TypedData } from '../utils/typedData/types';
 
 export abstract class SignerInterface extends Provider {
   public abstract address: string;
@@ -8,8 +9,30 @@ export abstract class SignerInterface extends Provider {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param tx - transaction to be invoked
+   * @param transaction - transaction to be invoked
    * @returns a confirmation of invoking a function on the starknet contract
    */
-  public abstract override addTransaction(tx: Transaction): Promise<AddTransactionResponse>;
+  public abstract override addTransaction(
+    transaction: Transaction
+  ): Promise<AddTransactionResponse>;
+
+  /**
+   * Sign an JSON object for off-chain usage with the starknet private key and return the signature
+   * This adds a message prefix so it cant be interchanged with transactions
+   *
+   * @param json - JSON object to be signed
+   * @returns the signature of the JSON object
+   * @throws {Error} if the JSON object is not a valid JSON
+   */
+  public abstract signMessage(typedData: TypedData): Promise<Signature>;
+
+  /**
+   * Hash a JSON object with pederson hash and return the hash
+   * This adds a message prefix so it cant be interchanged with transactions
+   *
+   * @param json - JSON object to be hashed
+   * @returns the hash of the JSON object
+   * @throws {Error} if the JSON object is not a valid JSON
+   */
+  public abstract hashMessage(typedData: TypedData): Promise<string>;
 }

package/src/types.ts

@@ -3,15 +3,21 @@ import type { ec as EC } from 'elliptic';
 import type { BigNumberish } from './utils/number';
 
 export type KeyPair = EC.KeyPair;
-export type Signature = EC.Signature;
+export type Signature = BigNumberish[];
 
 export type GetContractAddressesResponse = {
   Starknet: string;
   GpsStatementVerifier: string;
 };
 
-export type Status = 'NOT_RECEIVED' | 'RECEIVED' | 'PENDING' | 'REJECTED' | 'ACCEPTED_ONCHAIN';
-export type TxStatus = 'TRANSACTION_RECEIVED';
+export type Status =
+  | 'NOT_RECEIVED'
+  | 'RECEIVED'
+  | 'PENDING'
+  | 'ACCEPTED_ON_L2'
+  | 'ACCEPTED_ON_L1'
+  | 'REJECTED';
+export type TransactionStatus = 'TRANSACTION_RECEIVED';
 export type Type = 'DEPLOY' | 'INVOKE_FUNCTION';
 export type EntryPointType = 'EXTERNAL';
 export type CompressedProgram = string;
@@ -37,6 +43,7 @@ export type Abi = FunctionAbi | StructAbi;
 
 export type EntryPointsByType = object;
 export type Program = object;
+export type BlockNumber = 'pending' | null | number;
 
 export type CompiledContract = {
   abi: Abi[];
@@ -51,15 +58,17 @@ export type DeployTransaction = {
   contract_definition: CompressedCompiledContract;
   contract_address_salt: BigNumberish;
   constructor_calldata: string[];
+  nonce?: BigNumberish;
 };
 
 export type InvokeFunctionTransaction = {
   type: 'INVOKE_FUNCTION';
   contract_address: string;
-  signature?: [BigNumberish, BigNumberish];
+  signature?: Signature;
   entry_point_type?: EntryPointType;
   entry_point_selector: string;
   calldata?: string[];
+  nonce?: BigNumberish;
 };
 
 export type CallContractTransaction = Omit<InvokeFunctionTransaction, 'type'>;
@@ -87,7 +96,7 @@ export type GetBlockResponse = {
         payload: string[];
         from_address: string;
       }[];
-      block_number: number;
+      block_number: BlockNumber;
       status: Status;
       transaction_index: number;
     };
@@ -110,13 +119,13 @@ export type GetTransactionResponse = {
   status: Status;
   transaction: Transaction;
   block_hash: string;
-  block_number: number;
+  block_number: BlockNumber;
   transaction_index: number;
   transaction_hash: string;
 };
 
 export type AddTransactionResponse = {
-  code: TxStatus;
+  code: TransactionStatus;
   transaction_hash: string;
   address?: string;
 };

package/src/utils/ellipticCurve.ts

@@ -53,6 +53,17 @@ export function getStarkKey(keyPair: KeyPair): string {
   return addHexPrefix(sanitizeBytes((keyPair as any).pub.getX().toString(16), 2));
 }
 
+/**
+ * Takes a public key and casts it into `elliptic` KeyPair format.
+ *
+ * @param publicKey - public key which should get casted to a KeyPair
+ * @returns keyPair with public key only, which can be used to verify signatures, but cant sign anything
+ */
+export function getKeyPairFromPublicKey(publicKey: BigNumberish): KeyPair {
+  const publicKeyBn = toBN(publicKey);
+  return ec.keyFromPublic(removeHexPrefix(toHex(publicKeyBn)), 'hex');
+}
+
 /*
  Signs a message using the provided key.
  key should be an KeyPair with a valid private key.
@@ -69,7 +80,13 @@ export function sign(keyPair: KeyPair, msgHash: string): Signature {
   assertInRange(r, ONE, toBN(addHexPrefix(MAX_ECDSA_VAL)), 'r');
   assertInRange(s, ONE, toBN(addHexPrefix(EC_ORDER)), 's');
   assertInRange(w, ONE, toBN(addHexPrefix(MAX_ECDSA_VAL)), 'w');
-  return msgSignature;
+  return [r, s];
+}
+
+function chunkArray(arr: any[], n: number): any[][] {
+  return Array(Math.ceil(arr.length / n))
+    .fill('')
+    .map((_, i) => arr.slice(i * n, i * n + n));
 }
 
 /*
@@ -78,15 +95,20 @@ export function sign(keyPair: KeyPair, msgHash: string): Signature {
    msgSignature should be an Signature.
    Returns a boolean true if the verification succeeds.
   */
-export function verify(keyPair: KeyPair, msgHash: string, sig: Signature): boolean {
+export function verify(keyPair: KeyPair | KeyPair[], msgHash: string, sig: Signature): boolean {
+  const keyPairArray = Array.isArray(keyPair) ? keyPair : [keyPair];
   const msgHashBN = toBN(addHexPrefix(msgHash));
+  assert(sig.length % 2 === 0, 'Signature must be an array of length dividable by 2');
   assertInRange(msgHashBN, ZERO, toBN(addHexPrefix(MAX_ECDSA_VAL)), 'msgHash');
-  const { r, s } = sig;
-  const w = s.invm(ec.n!);
-  // Verify signature has valid length.
-  assertInRange(r, ONE, toBN(addHexPrefix(MAX_ECDSA_VAL)), 'r');
-  assertInRange(s, ONE, toBN(addHexPrefix(EC_ORDER)), 's');
-  assertInRange(w, ONE, toBN(addHexPrefix(MAX_ECDSA_VAL)), 'w');
+  assert(keyPairArray.length === sig.length / 2, 'Signature and keyPair length must be equal');
 
-  return keyPair.verify(fixMessage(msgHash), sig);
+  return chunkArray(sig, 2).every(([r, s], i) => {
+    const rBN = toBN(r);
+    const sBN = toBN(s);
+    const w = sBN.invm((ec as any).n);
+    assertInRange(rBN, ONE, toBN(addHexPrefix(MAX_ECDSA_VAL)), 'r');
+    assertInRange(sBN, ONE, toBN(addHexPrefix(EC_ORDER)), 's');
+    assertInRange(w, ONE, toBN(addHexPrefix(MAX_ECDSA_VAL)), 'w');
+    return ec.verify(fixMessage(msgHash), { r: rBN, s: sBN }, keyPairArray[i]) ?? false;
+  });
 }

package/src/utils/stark.ts

@@ -1,11 +1,11 @@
 import { gzip } from 'pako';
 
-import { CompressedProgram, Program } from '../types';
+import { CompressedProgram, Program, Signature } from '../types';
 import { genKeyPair, getStarkKey } from './ellipticCurve';
 import { addHexPrefix, btoaUniversal } from './encode';
 import { starknetKeccak } from './hash';
 import { stringify } from './json';
-import { BigNumberish, toBN, toHex } from './number';
+import { toBN, toHex } from './number';
 
 /**
  * Function to compress compiled cairo program
@@ -41,15 +41,11 @@ export function makeAddress(input: string): string {
   return addHexPrefix(input).toLowerCase();
 }
 
-export function formatSignature(sig?: [BigNumberish, BigNumberish]): [string, string] | [] {
+export function formatSignature(sig?: Signature): string[] {
   if (!sig) return [];
   try {
-    return sig.map((x) => toBN(x)).map((x) => x.toString()) as [string, string];
+    return sig.map((x) => toBN(x)).map((x) => x.toString());
   } catch (e) {
     return [];
   }
 }
-
-export function compileStructToCalldata<S extends { [k: string]: string }>(struct: S): string[] {
-  return Object.values(struct);
-}