feat: remove old version constants, default types api rpc

__tests__/account.test.ts

@@ -96,7 +96,7 @@ describe('deploy and test Wallet', () => {
 
     expect(result).toMatchSchemaRef('EstimateFee');
     expect(innerInvokeEstFeeSpy.mock.calls[0][1].version).toBe(
-      constants.BN_FEE_TRANSACTION_VERSION_1
+      BigInt(constants.TRANSACTION_VERSION.F1)
     );
     innerInvokeEstFeeSpy.mockClear();
   });

__tests__/utils/ellipticalCurve.test.ts

@@ -50,7 +50,7 @@ test('hashMessage()', () => {
 
   const hashMsg = calculateTransactionHash(
     account,
-    constants.BN_TRANSACTION_VERSION_1,
+    BigInt(constants.TRANSACTION_VERSION.V1),
     calldata,
     maxFee,
     StarknetChainId.SN_GOERLI,

src/account/default.ts

@@ -45,7 +45,7 @@ import {
   ETransactionVersion,
   ETransactionVersion2,
   ETransactionVersion3,
-} from '../types/api/rpc';
+} from '../types/api';
 import { CallData } from '../utils/calldata';
 import { extractContractHashes, isSierra } from '../utils/contract';
 import { starkCurve } from '../utils/ec';

src/channel/rpc_0_6.ts

@@ -1,10 +1,4 @@
-import {
-  HEX_STR_TRANSACTION_VERSION_1,
-  HEX_STR_TRANSACTION_VERSION_2,
-  HEX_STR_TRANSACTION_VERSION_3,
-  NetworkName,
-  StarknetChainId,
-} from '../constants';
+import { NetworkName, StarknetChainId } from '../constants';
 import { LibraryError } from '../provider/errors';
 import {
   AccountInvocationItem,
@@ -24,6 +18,7 @@ import {
   getSimulateTransactionOptions,
   waitForTransactionOptions,
 } from '../types';
+import { ETransactionVersion } from '../types/api';
 import { CallData } from '../utils/calldata';
 import { isSierra } from '../utils/contract';
 import fetch from '../utils/fetchPonyfill';
@@ -401,7 +396,7 @@ export class RpcChannel {
           calldata: CallData.toHex(functionInvocation.calldata),
           type: RPC.ETransactionType.INVOKE,
           max_fee: toHex(details.maxFee || 0),
-          version: HEX_STR_TRANSACTION_VERSION_1,
+          version: ETransactionVersion.V1,
           signature: signatureToHexArray(functionInvocation.signature),
           nonce: toHex(details.nonce),
         },
@@ -413,7 +408,7 @@ export class RpcChannel {
           type: RPC.ETransactionType.INVOKE,
           sender_address: functionInvocation.contractAddress,
           calldata: CallData.toHex(functionInvocation.calldata),
-          version: HEX_STR_TRANSACTION_VERSION_3,
+          version: ETransactionVersion.V3,
           signature: signatureToHexArray(functionInvocation.signature),
           nonce: toHex(details.nonce),
           resource_bounds: details.resourceBounds,
@@ -444,7 +439,7 @@ export class RpcChannel {
             entry_points_by_type: contract.entry_points_by_type,
             abi: contract.abi,
           },
-          version: HEX_STR_TRANSACTION_VERSION_1,
+          version: ETransactionVersion.V1,
           max_fee: toHex(details.maxFee || 0),
           signature: signatureToHexArray(signature),
           sender_address: senderAddress,
@@ -463,7 +458,7 @@ export class RpcChannel {
             abi: contract.abi,
           },
           compiled_class_hash: compiledClassHash || '',
-          version: HEX_STR_TRANSACTION_VERSION_2,
+          version: ETransactionVersion.V2,
           max_fee: toHex(details.maxFee || 0),
           signature: signatureToHexArray(signature),
           sender_address: senderAddress,
@@ -477,7 +472,7 @@ export class RpcChannel {
           type: RPC.ETransactionType.DECLARE,
           sender_address: senderAddress,
           compiled_class_hash: compiledClassHash || '',
-          version: HEX_STR_TRANSACTION_VERSION_3,
+          version: ETransactionVersion.V3,
           signature: signatureToHexArray(signature),
           nonce: toHex(details.nonce),
           contract_class: {
@@ -515,7 +510,7 @@ export class RpcChannel {
           contract_address_salt: toHex(addressSalt || 0),
           type: RPC.ETransactionType.DEPLOY_ACCOUNT,
           max_fee: toHex(details.maxFee || 0),
-          version: HEX_STR_TRANSACTION_VERSION_1,
+          version: ETransactionVersion.V1,
           signature: signatureToHexArray(signature),
           nonce: toHex(details.nonce),
         },
@@ -525,7 +520,7 @@ export class RpcChannel {
       promise = this.fetchEndpoint('starknet_addDeployAccountTransaction', {
         deploy_account_transaction: {
           type: RPC.ETransactionType.DEPLOY_ACCOUNT,
-          version: HEX_STR_TRANSACTION_VERSION_3,
+          version: ETransactionVersion.V3,
           signature: signatureToHexArray(signature),
           nonce: toHex(details.nonce),
           contract_address_salt: toHex(addressSalt || 0),

src/constants.ts

@@ -1,19 +1,18 @@
+import { ETransactionVersion } from './types/api';
+
 export { IS_BROWSER } from './utils/encode';
 
 /**
  * Cairo Felt support storing max 31 character
  */
 export const TEXT_TO_FELT_MAX_LEN = 31;
 
-export const HEX_STR_TRANSACTION_VERSION_1 = '0x1';
-export const HEX_STR_TRANSACTION_VERSION_2 = '0x2';
-export const HEX_STR_TRANSACTION_VERSION_3 = '0x3';
-export const BN_TRANSACTION_VERSION_1 = 1n;
-export const BN_TRANSACTION_VERSION_2 = 2n;
-export const BN_TRANSACTION_VERSION_3 = 3n;
-export const BN_FEE_TRANSACTION_VERSION_1 = 2n ** 128n + BN_TRANSACTION_VERSION_1;
-export const BN_FEE_TRANSACTION_VERSION_2 = 2n ** 128n + BN_TRANSACTION_VERSION_2;
-export const BN_FEE_TRANSACTION_VERSION_3 = 2n ** 128n + BN_TRANSACTION_VERSION_3;
+/**
+ * Alternatively use directly from api specification
+ * types.RPC.ETransactionVersion
+ * For BN do BigInt(TRANSACTION_VERSION.*)
+ */
+export { ETransactionVersion as TRANSACTION_VERSION };
 
 export const ZERO = 0n;
 export const MASK_250 = 2n ** 250n - 1n; // 2 ** 250 - 1

src/signer/default.ts

@@ -12,7 +12,7 @@ import {
   V3DeployAccountSignerDetails,
   V3InvocationsSignerDetails,
 } from '../types';
-import { ETransactionVersion2, ETransactionVersion3 } from '../types/api/rpc';
+import { ETransactionVersion2, ETransactionVersion3 } from '../types/api';
 import { CallData } from '../utils/calldata';
 import { starkCurve } from '../utils/ec';
 import { buf2hex } from '../utils/encode';

src/types/account.ts

@@ -1,4 +1,4 @@
-import { ETransactionVersion } from './api/rpc';
+import { ETransactionVersion } from './api';
 import { BigNumberish, BlockIdentifier, V3TransactionDetails } from './lib';
 import { DeclareTransactionReceiptResponse, EstimateFeeResponse } from './provider';
 

src/types/api/rpcspec_0_6/nonspec.ts

@@ -142,6 +142,10 @@ export enum EDAMode {
   L2,
 }
 
+/**
+ * V_ Transaction versions HexString
+ * F_ Fee Transaction Versions HexString (2 ** 128 + TRANSACTION_VERSION)
+ */
 export enum ETransactionVersion {
   V0 = '0x0',
   V1 = '0x1',
@@ -153,6 +157,9 @@ export enum ETransactionVersion {
   F3 = '0x100000000000000000000000000000003',
 }
 
+/**
+ * Old Transaction Versions
+ */
 export enum ETransactionVersion2 {
   V0 = '0x0',
   V1 = '0x1',
@@ -162,6 +169,9 @@ export enum ETransactionVersion2 {
   F2 = '0x100000000000000000000000000000002',
 }
 
+/**
+ * V3 Transaction Versions
+ */
 export enum ETransactionVersion3 {
   V3 = '0x3',
   F3 = '0x100000000000000000000000000000003',

src/types/index.ts

@@ -7,7 +7,7 @@ export * from './signer';
 export * from './typedData';
 export * from './cairoEnum';
 
-export * as RPC from './api/rpc';
+export * as RPC from './api';
 export {
   CallL1Handler,
   DeployedContractItem,

src/types/lib/index.ts

@@ -1,6 +1,6 @@
 import { StarknetChainId } from '../../constants';
 import { weierstrass } from '../../utils/ec';
-import { EDataAvailabilityMode, ResourceBounds } from '../api/rpc';
+import { EDataAvailabilityMode, ResourceBounds } from '../api';
 import { CairoEnum } from '../cairoEnum';
 import { CompiledContract, CompiledSierraCasm, ContractClass } from './contract';
 

src/types/provider/response.ts

@@ -3,7 +3,7 @@
  * Intersection (sequencer response ∩ (∪ rpc responses))
  */
 
-import * as RPC from '../api/rpc';
+import * as RPC from '../api';
 import * as Sequencer from '../api/sequencer';
 import {
   AllowArray,

src/types/signer.ts

@@ -1,5 +1,5 @@
 import { StarknetChainId } from '../constants';
-import { ETransactionVersion, ETransactionVersion2, ETransactionVersion3 } from './api/rpc';
+import { ETransactionVersion, ETransactionVersion2, ETransactionVersion3 } from './api';
 import {
   BigNumberish,
   CairoVersion,

src/utils/hash/transactionHash/index.ts

@@ -10,7 +10,7 @@ import {
   ETransactionVersion2,
   ETransactionVersion3,
   ResourceBounds,
-} from '../../../types/api/rpc';
+} from '../../../types/api';
 import {
   calculateDeclareTransactionHash as v2calculateDeclareTransactionHash,
   calculateDeployAccountTransactionHash as v2calculateDeployAccountTransactionHash,

src/utils/hash/transactionHash/v3.ts

@@ -6,7 +6,7 @@ import { poseidonHashMany } from '@scure/starknet';
 
 import { StarknetChainId, TransactionHashPrefix } from '../../../constants';
 import { BigNumberish, Calldata } from '../../../types';
-import { EDAMode, ResourceBounds } from '../../../types/api/rpc';
+import { EDAMode, ResourceBounds } from '../../../types/api';
 import { toHex } from '../../num';
 import { encodeShortString } from '../../shortString';
 

src/utils/provider.ts

@@ -1,10 +1,4 @@
-import {
-  BN_FEE_TRANSACTION_VERSION_3,
-  HEX_STR_TRANSACTION_VERSION_3,
-  NetworkName,
-  RPC_GOERLI_NODES,
-  RPC_MAINNET_NODES,
-} from '../constants';
+import { NetworkName, RPC_GOERLI_NODES, RPC_MAINNET_NODES } from '../constants';
 import {
   BigNumberish,
   BlockIdentifier,
@@ -20,6 +14,7 @@ import {
   SierraContractClass,
   V3TransactionDetails,
 } from '../types';
+import { ETransactionVersion } from '../types/api';
 import { isSierra } from './contract';
 import { formatSpaces } from './hash';
 import { parse, stringify } from './json';
@@ -187,8 +182,6 @@ export function defStateUpdate(
 }
 
 export function isV3Tx(details: InvocationsDetailsWithNonce): details is V3TransactionDetails {
-  const version = details.version ? toHex(details.version) : HEX_STR_TRANSACTION_VERSION_3;
-  return (
-    version === HEX_STR_TRANSACTION_VERSION_3 || version === toHex(BN_FEE_TRANSACTION_VERSION_3)
-  );
+  const version = details.version ? toHex(details.version) : ETransactionVersion.V3;
+  return version === ETransactionVersion.V3 || version === ETransactionVersion.F3;
 }

src/utils/stark.ts

@@ -9,7 +9,7 @@ import {
   Program,
   Signature,
 } from '../types';
-import { EDAMode, EDataAvailabilityMode, ResourceBounds } from '../types/api/rpc';
+import { EDAMode, EDataAvailabilityMode, ResourceBounds } from '../types/api';
 import { addHexPrefix, arrayBufferToString, atobUniversal, btoaUniversal } from './encode';
 import { parse, stringify } from './json';
 import {

src/utils/transaction.ts

@@ -1,11 +1,3 @@
-import {
-  BN_FEE_TRANSACTION_VERSION_1,
-  BN_FEE_TRANSACTION_VERSION_2,
-  BN_FEE_TRANSACTION_VERSION_3,
-  BN_TRANSACTION_VERSION_1,
-  BN_TRANSACTION_VERSION_2,
-  BN_TRANSACTION_VERSION_3,
-} from '../constants';
 import {
   BigNumberish,
   CairoVersion,
@@ -15,6 +7,7 @@ import {
   ParsedStruct,
   RawArgs,
 } from '../types';
+import { ETransactionVersion } from '../types/api';
 import { CallData } from './calldata';
 import { getSelectorFromName } from './hash';
 import { toBigInt } from './num';
@@ -107,9 +100,9 @@ export const getExecuteCalldata = (calls: Call[], cairoVersion: CairoVersion = '
 export function getVersionsByType(versionType?: 'fee' | 'transaction') {
   return versionType === 'fee'
     ? {
-        v1: BN_FEE_TRANSACTION_VERSION_1,
-        v2: BN_FEE_TRANSACTION_VERSION_2,
-        v3: BN_FEE_TRANSACTION_VERSION_3,
+        v1: ETransactionVersion.F1,
+        v2: ETransactionVersion.F2,
+        v3: ETransactionVersion.F3,
       }
-    : { v1: BN_TRANSACTION_VERSION_1, v2: BN_TRANSACTION_VERSION_2, v3: BN_TRANSACTION_VERSION_3 };
+    : { v1: ETransactionVersion.V1, v2: ETransactionVersion.V2, v3: ETransactionVersion.V3 };
 }