Merge branch 'develop' into test/default-nodes-rpc-version

CHANGELOG.md

@@ -1,3 +1,9 @@
+# [6.7.0](https://github.com/starknet-io/starknet.js/compare/v6.6.6...v6.7.0) (2024-04-03)
+
+### Features
+
+- readme & trigger release ([5341c42](https://github.com/starknet-io/starknet.js/commit/5341c42da8bf5d2f82e4446a60b5e4fdc9c4e2fe))
+
 ## [6.6.6](https://github.com/starknet-io/starknet.js/compare/v6.6.5...v6.6.6) (2024-03-25)
 
 ### Bug Fixes

README.md

@@ -42,8 +42,11 @@ Install starknet with `npm`
 # latest official release (main branch)
 $ npm install starknet
 
-# or for latest pre-release version (develop branch):
+# or for latest pre-release version (develop branch)
 $ npm install starknet@next
+
+# or for latest beta release version (beta branch)
+$ npm install starknet@beta
 ```
 
 Import `starknet` and use the [API](https://www.starknetjs.com/docs/API/).

package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknet",
-  "version": "6.6.6",
+  "version": "6.7.0",
   "description": "JavaScript library for Starknet",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -99,6 +99,7 @@
     "isomorphic-fetch": "^3.0.0",
     "lossless-json": "^4.0.1",
     "pako": "^2.0.4",
+    "starknet-types": "^0.0.4",
     "ts-mixer": "^6.0.3",
     "url-join": "^4.0.1"
   },

src/account/default.ts

@@ -628,6 +628,8 @@ export class Account extends Provider implements AccountInterface {
           unit: 'FRI',
           suggestedMaxFee: ZERO,
           resourceBounds: estimateFeeToBounds(ZERO),
+          data_gas_consumed: 0n,
+          data_gas_price: 0n,
         };
         break;
     }

src/index.ts

@@ -43,6 +43,7 @@ export * from './utils/calldata/enum';
 export * from './utils/contract';
 export * from './utils/events';
 export * from './utils/transactionReceipt';
+export * as wallet from './wallet/connect';
 
 /**
  * Deprecated

src/types/provider/response.ts

@@ -121,6 +121,8 @@ export interface EstimateFeeResponse {
   unit: PRICE_UNIT;
   suggestedMaxFee: bigint;
   resourceBounds: ResourceBounds;
+  data_gas_consumed: bigint;
+  data_gas_price: bigint;
 }
 
 export type EstimateFeeResponseBulk = Array<EstimateFeeResponse>;

src/types/typedData.ts

@@ -1,50 +1,9 @@
-export enum TypedDataRevision {
-  Active = '1',
-  Legacy = '0',
-}
-
-export type StarknetEnumType = {
-  name: string;
-  type: 'enum';
-  contains: string;
-};
-
-export type StarknetMerkleType = {
-  name: string;
-  type: 'merkletree';
-  contains: string;
-};
-
-/**
- * A single type, as part of a struct. The `type` field can be any of the EIP-712 supported types.
- *
- * Note that the `uint` and `int` aliases like in Solidity, and fixed point numbers are not supported by the EIP-712
- * standard.
- */
-export type StarknetType =
-  | {
-      name: string;
-      type: string;
-    }
-  | StarknetEnumType
-  | StarknetMerkleType;
-
-/**
- * The EIP712 domain struct. Any of these fields are optional, but it must contain at least one field.
- */
-export interface StarknetDomain extends Record<string, unknown> {
-  name?: string;
-  version?: string;
-  chainId?: string | number;
-  revision?: string;
-}
-
-/**
- * The complete typed data, with all the structs, domain data, primary type of the message, and the message itself.
- */
-export interface TypedData {
-  types: Record<string, StarknetType[]>;
-  primaryType: string;
-  domain: StarknetDomain;
-  message: Record<string, unknown>;
-}
+// Reexport types from package
+export {
+  TypedDataRevision,
+  type StarknetEnumType,
+  type StarknetMerkleType,
+  type StarknetType,
+  type StarknetDomain,
+  type TypedData,
+} from 'starknet-types';

src/utils/responseParser/rpc.ts

@@ -6,20 +6,20 @@ import {
   BlockWithTxHashes,
   ContractClassPayload,
   ContractClassResponse,
-  TransactionReceipt,
   EstimateFeeResponse,
   EstimateFeeResponseBulk,
-  GetBlockResponse,
   FeeEstimate,
+  GetBlockResponse,
+  GetTxReceiptResponseWithoutHelper,
+  RpcProviderOptions,
   SimulateTransactionResponse,
   SimulatedTransaction,
-  RpcProviderOptions,
-  GetTxReceiptResponseWithoutHelper,
+  TransactionReceipt,
 } from '../../types/provider';
 import { toBigInt } from '../num';
+import { isString } from '../shortString';
 import { estimateFeeToBounds, estimatedFeeToMaxFee } from '../stark';
 import { ResponseParser } from '.';
-import { isString } from '../shortString';
 
 export class RPCResponseParser
   implements
@@ -80,6 +80,8 @@ export class RPCResponseParser
       unit: val.unit,
       suggestedMaxFee: this.estimatedFeeToMaxFee(val.overall_fee),
       resourceBounds: this.estimateFeeToBounds(val),
+      data_gas_consumed: val.data_gas_consumed ? toBigInt(val.data_gas_consumed) : 0n,
+      data_gas_price: val.data_gas_price ? toBigInt(val.data_gas_price) : 0n,
     };
   }
 
@@ -91,6 +93,8 @@ export class RPCResponseParser
       unit: val.unit,
       suggestedMaxFee: this.estimatedFeeToMaxFee(val.overall_fee),
       resourceBounds: this.estimateFeeToBounds(val),
+      data_gas_consumed: val.data_gas_consumed ? toBigInt(val.data_gas_consumed) : 0n,
+      data_gas_price: val.data_gas_price ? toBigInt(val.data_gas_price) : 0n,
     }));
   }
 

src/wallet/account.ts

@@ -3,9 +3,9 @@ import {
   type AddStarknetChainParameters,
   type NetworkChangeEventHandler,
   type WatchAssetParameters,
-} from 'get-starknet-core';
+} from 'starknet-types';
+
 import { Account, AccountInterface } from '../account';
-import { StarknetChainId } from '../constants';
 import { ProviderInterface } from '../provider';
 import {
   AllowArray,
@@ -37,6 +37,7 @@ import {
   watchAsset,
 } from './connect';
 import { StarknetWalletProvider } from './types';
+import { StarknetChainId } from '../constants';
 
 // Represent 'Selected Active' Account inside Connected Wallet
 export class WalletAccount extends Account implements AccountInterface {

src/wallet/connect.ts

@@ -9,7 +9,7 @@ import {
   type StarknetChainId,
   type StarknetWindowObject,
   type TypedData,
-} from 'get-starknet-core';
+} from 'starknet-types';
 
 /**
  * Request Permission for wallet account, return addresses that are allowed by user

src/wallet/index.ts

@@ -1,2 +1 @@
 export * from './account';
-export * from './connect';

src/wallet/types.ts

@@ -1,4 +1,4 @@
-import { type RpcMessage, type StarknetWindowObject } from 'get-starknet-core';
+import { type RpcMessage, type StarknetWindowObject } from 'starknet-types';
 
 // ---- TT Request Handler
 export type RpcCall = Omit<RpcMessage, 'result'>;