starknet 4.5.0 → 4.7.0

package/src/types/api/rpc.ts

@@ -1,224 +1,46 @@
-import { StarknetChainId } from '../../constants';
-import { BlockIdentifier } from '../../provider/utils';
-import { Status } from '../lib';
-import { OPENRPC } from './openrpc';
+import { ADDRESS, FELT, OPENRPC } from './openrpc';
 
 export namespace RPC {
   export type Response = {
     id: number;
-    result: any;
     jsonrpc: string;
+    result?: any;
     error?: {
       code: string;
       message: string;
     };
   };
 
-  export type AddTransactionResponse = {
-    transaction_hash: string;
-  };
-
-  export type GetClassResponse = {
-    program: string;
-    entry_point_by_type: any;
-  };
-
-  export type DeclareResponse = {
-    transaction_hash: string;
-    class_hash: string;
-  };
-
-  export type EstimateFeeResponse = {
-    overall_fee: number;
-    gas_consumed: number;
-    gas_price: number;
-  };
-
-  export type GetBlockWithTxHashesResponse = OPENRPC.GetBlockWithTxHashesResponse;
-  export type GetBlockWithTxs = OPENRPC.GetBlockWithTxs;
-  export type GetStorageAtResponse = OPENRPC.GetStorageAtResponse;
-
-  export type GetTransactionReceiptResponse = {
-    txn_hash: string;
-    actual_fee: string;
-    status: Status;
-    status_data: string;
-    messages_sent: Array<MessageToL1>;
-    l1_origin_message: MessageToL2;
-    events: Array<StarknetEvent>;
-  };
-
-  interface CommonTransactionProperties {
-    txn_hash: string;
-    max_fee: string;
-    version: string;
-    nonce: string;
-    signature: Array<string>;
-  }
-
-  export interface InvokeTransactionResponse extends CommonTransactionProperties {
-    contract_address?: string;
-    entry_point_selector?: string;
-    calldata?: Array<string>;
-  }
-
-  export interface DeclareTransactionResponse extends CommonTransactionProperties {
-    contract_class?: GetClassResponse;
-    sender_address?: string;
-  }
-
-  export type GetTransactionByHashResponse = OPENRPC.GetTransactionByHashResponse;
-  export type GetTransactionByBlockIdAndIndex = OPENRPC.GetTransactionByBlockIdAndIndex;
-
+  export type ChainId = OPENRPC.CHAIN_ID;
+  export type CallResponse = OPENRPC.CallResponse;
+  export type ContractAddress = ADDRESS;
+  export type Felt = FELT;
+  export type Nonce = OPENRPC.Nonce;
+  export type ContractClass = OPENRPC.ContractClass;
+  export type StateUpdate = OPENRPC.StateUpdate;
+  export type Transaction = OPENRPC.Transaction;
+  export type PendingTransactions = OPENRPC.PendingTransactions;
+  export type TransactionHash = OPENRPC.TransactionHash;
+  export type Trace = OPENRPC.Trace;
+  export type Traces = OPENRPC.Traces;
+  export type BlockHash = OPENRPC.BlockHash;
+  export type BlockHashAndNumber = OPENRPC.BlockHashAndNumber;
+  export type GetClassResponse = OPENRPC.ContractClass;
+  export type EstimateFeeResponse = OPENRPC.EstimatedFee;
+  export type GetBlockWithTxHashesResponse = OPENRPC.BlockWithTxHashes;
+  export type GetBlockWithTxs = OPENRPC.BlockWithTxs;
+  export type GetStorageAtResponse = OPENRPC.Storage;
+  export type TransactionReceipt = OPENRPC.TransactionReceipt;
+  export type GetTransactionByHashResponse = OPENRPC.Transaction;
+  export type GetTransactionByBlockIdAndIndex = OPENRPC.Transaction;
   export type GetTransactionCountResponse = number;
-
-  export type GetBlockNumberResponse = number;
-
-  export type GetSyncingStatsResponse =
-    | {
-        starting_block_hash: string;
-        starting_block_num: string;
-        current_block_hash: string;
-        current_block_num: string;
-        highest_block_hash: string;
-        highest_block_num: string;
-      }
-    | boolean;
-
-  export type EventFilter = {
-    fromBlock: BlockIdentifier;
-    toBlock: BlockIdentifier;
-    address: string;
-    keys: string[];
-    page_size: number;
-    page_number: number;
-  };
-
-  export type GetEventsResponse = {
-    events: StarknetEmittedEvent[];
-    page_number: number;
-    is_last_page: number;
-  };
-
-  export type DeployContractResponse = {
-    transaction_hash: string;
-    contract_address: string;
-  };
-  // Other
-
-  export type StarknetEvent = {
-    from_address: string;
-    keys: string[];
-    data: string[];
-  };
-
-  export type StarknetEmittedEvent = {
-    event: StarknetEvent;
-    block_hash: string;
-    block_number: number;
-    transaction_hash: string;
-  };
-
-  export type MessageToL1 = {
-    to_address: string;
-    payload: string[];
-  };
-
-  export type MessageToL2 = {
-    from_address: string;
-    payload: string[];
-  };
-
-  export type Methods = {
-    starknet_getBlockWithTxHashes: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: GetBlockWithTxHashesResponse;
-    };
-    starknet_getBlockWithTxs: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: GetBlockWithTxs;
-    };
-    starknet_getNonce: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: string;
-    };
-    starknet_getStorageAt: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: GetStorageAtResponse;
-    };
-    starknet_getTransactionByHash: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: GetTransactionByHashResponse;
-    };
-    starknet_getTransactionByBlockIdAndIndex: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: GetTransactionByBlockIdAndIndex;
-    };
-    starknet_getTransactionReceipt: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: GetTransactionReceiptResponse;
-    };
-    starknet_getBlockTransactionCount: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: GetTransactionCountResponse;
-    };
-    starknet_call: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: string[];
-    };
-    starknet_estimateFee: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: EstimateFeeResponse;
-    };
-    starknet_blockNumber: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: GetBlockNumberResponse;
-    };
-    starknet_chainId: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: StarknetChainId;
-    };
-    starknet_syncing: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: GetSyncingStatsResponse;
-    };
-    starknet_getEvents: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: GetEventsResponse;
-    };
-    starknet_addInvokeTransaction: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: AddTransactionResponse;
-    };
-    starknet_addDeployTransaction: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: DeployContractResponse;
-    };
-    starknet_addDeclareTransaction: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: DeclareResponse;
-    };
-    starknet_getClassAt: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: any;
-    };
-  };
+  export type GetBlockNumberResponse = OPENRPC.BlockNumber;
+  export type GetSyncingStatsResponse = OPENRPC.SyncingStatus;
+  export type EventFilter = OPENRPC.EventFilter;
+  export type GetEventsResponse = OPENRPC.Events;
+  export type InvokedTransaction = OPENRPC.InvokedTransaction;
+  export type DeclaredTransaction = OPENRPC.DeclaredTransaction;
+  export type DeployedTransaction = OPENRPC.DeployedTransaction;
+
+  export type Methods = OPENRPC.Methods;
 }

package/src/types/api/sequencer.ts

@@ -95,9 +95,8 @@ export namespace Sequencer {
     contract_address: string;
     signature?: Signature;
     entry_point_type?: EntryPointType;
-    entry_point_selector: string;
     calldata?: RawCalldata;
-    nonce?: BigNumberish;
+    nonce: BigNumberish;
     max_fee?: BigNumberish;
     version?: BigNumberish;
   };
@@ -118,6 +117,7 @@ export namespace Sequencer {
 
   export interface InvokeFunctionTransactionResponse extends InvokeFunctionTransaction {
     transaction_hash: string;
+    entry_point_selector: string;
   }
 
   export type TransactionResponse =
@@ -202,12 +202,17 @@ export namespace Sequencer {
   export type CallContractTransaction = Omit<
     InvokeFunctionTransaction,
     'type' | 'entry_point_type' | 'nonce'
-  >;
+  > & { entry_point_selector: string };
 
   export type CallContractResponse = {
     result: string[];
   };
 
+  export type EstimateFeeTransaction = Omit<
+    InvokeFunctionTransaction,
+    'max_fee' | 'entry_point_type'
+  >;
+
   // Support 0.9.1 changes in a backward-compatible way
   export type EstimateFeeResponse =
     | {
@@ -259,6 +264,14 @@ export namespace Sequencer {
       REQUEST: never;
       RESPONSE: TransactionReceiptResponse;
     };
+    get_nonce: {
+      QUERY: {
+        contractAddress: string;
+        blockIdentifier: BlockIdentifier;
+      };
+      REQUEST: never;
+      RESPONSE: BigNumberish;
+    };
     get_storage_at: {
       QUERY: {
         contractAddress: string;
@@ -294,7 +307,7 @@ export namespace Sequencer {
       QUERY: {
         blockIdentifier: BlockIdentifier;
       };
-      REQUEST: CallContractTransaction;
+      REQUEST: EstimateFeeTransaction;
       RESPONSE: EstimateFeeResponse;
     };
     get_class_by_hash: {

package/src/types/lib.ts

@@ -9,7 +9,7 @@ export type RawCalldata = BigNumberish[];
 export type DeployContractPayload = {
   contract: CompiledContract | string;
   constructorCalldata?: RawCalldata;
-  addressSalt?: BigNumberish;
+  addressSalt?: string;
 };
 
 export type DeclareContractPayload = {
@@ -17,14 +17,14 @@ export type DeclareContractPayload = {
   version?: BigNumberish;
 };
 
-export type Invocation = {
+export type CallDetails = {
   contractAddress: string;
-  entrypoint: string;
   calldata?: RawCalldata;
-  signature?: Signature;
 };
 
-export type Call = Omit<Invocation, 'signature'>;
+export type Invocation = CallDetails & { signature?: Signature };
+
+export type Call = CallDetails & { entrypoint: string };
 
 export type InvocationsDetails = {
   nonce?: BigNumberish;
@@ -32,6 +32,8 @@ export type InvocationsDetails = {
   version?: BigNumberish;
 };
 
+export type InvocationsDetailsWithNonce = InvocationsDetails & { nonce: BigNumberish };
+
 export type Status =
   | 'NOT_RECEIVED'
   | 'RECEIVED'

package/src/types/provider.ts

@@ -4,7 +4,8 @@
  */
 import BN from 'bn.js';
 
-import { Abi, CompressedProgram, EntryPointsByType, RawCalldata, Signature, Status } from './lib';
+import { RPC } from './api/rpc';
+import { Abi, CompressedProgram, RawCalldata, Signature, Status } from './lib';
 
 export interface GetBlockResponse {
   timestamp: number;
@@ -44,7 +45,7 @@ export interface ContractEntryPoint {
 
 export interface ContractClass {
   program: CompressedProgram;
-  entry_points_by_type: EntryPointsByType;
+  entry_points_by_type: RPC.ContractClass['entry_points_by_type'];
   abi?: Abi;
 }
 

package/src/utils/hash.ts

@@ -17,7 +17,7 @@ import { ec } from './ellipticCurve';
 import { addHexPrefix, buf2hex, removeHexPrefix, utf8ToArray } from './encode';
 import { BigNumberish, toBN, toFelt, toHex } from './number';
 
-export const transactionVersion = 0;
+export const transactionVersion = 1;
 export const feeTransactionVersion = toBN(2).pow(toBN(128)).add(toBN(transactionVersion));
 
 export function keccakBn(value: BigNumberish): string {
@@ -124,22 +124,23 @@ export function calculateDeployTransactionHash(
   );
 }
 
-export function calculcateTransactionHash(
+export function calculateTransactionHash(
   contractAddress: BigNumberish,
   version: BigNumberish,
-  entryPointSelector: BigNumberish,
   calldata: BigNumberish[],
   maxFee: BigNumberish,
-  chainId: StarknetChainId
+  chainId: StarknetChainId,
+  nonce: BigNumberish
 ): string {
   return calculateTransactionHashCommon(
     TransactionHashPrefix.INVOKE,
     version,
     contractAddress,
-    entryPointSelector,
+    0,
     calldata,
     maxFee,
-    chainId
+    chainId,
+    [nonce]
   );
 }
 

package/src/utils/responseParser/rpc.ts

@@ -4,13 +4,10 @@
  */
 import {
   CallContractResponse,
-  DeclareContractResponse,
-  DeployContractResponse,
   EstimateFeeResponse,
   GetBlockResponse,
   GetTransactionReceiptResponse,
   GetTransactionResponse,
-  InvokeFunctionResponse,
 } from '../../types';
 import { RPC } from '../../types/api';
 import { toBN } from '../number';
@@ -24,7 +21,17 @@ type GetTransactionByHashResponse = RPC.GetTransactionByHashResponse & {
   [key: string]: any;
 };
 
-export class RPCResponseParser extends ResponseParser {
+type TransactionReceipt = RPC.TransactionReceipt & {
+  [key: string]: any;
+};
+
+export class RPCResponseParser
+  implements
+    Omit<
+      ResponseParser,
+      'parseDeclareContractResponse' | 'parseDeployContractResponse' | 'parseInvokeFunctionResponse'
+    >
+{
   public parseGetBlockResponse(res: RpcGetBlockResponse): GetBlockResponse {
     return {
       timestamp: res.timestamp,
@@ -41,7 +48,6 @@ export class RPCResponseParser extends ResponseParser {
     return {
       calldata: res.calldata || [],
       contract_address: res.contract_address,
-      entry_point_selector: res.entry_point_selector,
       max_fee: res.max_fee,
       nonce: res.nonce,
       signature: res.signature || [],
@@ -51,10 +57,10 @@ export class RPCResponseParser extends ResponseParser {
   }
 
   public parseGetTransactionReceiptResponse(
-    res: RPC.GetTransactionReceiptResponse
+    res: TransactionReceipt
   ): GetTransactionReceiptResponse {
     return {
-      transaction_hash: res.txn_hash,
+      transaction_hash: res.transaction_hash,
       actual_fee: res.actual_fee,
       status: res.status,
       status_data: res.status_data,
@@ -77,24 +83,4 @@ export class RPCResponseParser extends ResponseParser {
       result: res,
     };
   }
-
-  public parseInvokeFunctionResponse(res: RPC.AddTransactionResponse): InvokeFunctionResponse {
-    return {
-      transaction_hash: res.transaction_hash,
-    };
-  }
-
-  public parseDeployContractResponse(res: RPC.DeployContractResponse): DeployContractResponse {
-    return {
-      transaction_hash: res.transaction_hash,
-      contract_address: res.contract_address,
-    };
-  }
-
-  public parseDeclareContractResponse(res: RPC.DeclareResponse): DeclareContractResponse {
-    return {
-      transaction_hash: res.transaction_hash,
-      class_hash: res.class_hash,
-    };
-  }
 }