chore: apply RPC v0.7.0-rc2 updates

starknet-io · Mar 7, 2024 · e644b5c · e644b5c
1 parent 57a8709
commit e644b5c
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 59 deletions.
diff --git a/__tests__/schemas/component.json b/__tests__/schemas/component.json
@@ -216,6 +216,13 @@
           "l1_gas_price": {
             "$ref": "#/components/schemas/RESOURCE_PRICE"
           },
+          "l1_data_gas_price": {
+            "$ref": "#/components/schemas/RESOURCE_PRICE"
+          },
+          "l1_da_mode": {
+            "type": "string",
+            "enum": ["BLOB", "CALLDATA"]
+          },
           "starknet_version": {
             "type": "string"
           }
@@ -225,6 +232,8 @@
           "timestamp",
           "sequencer_address",
           "l1_gas_price",
+          "l1_data_gas_price",
+          "l1_da_mode",
           "starknet_version"
         ]
       },

diff --git a/src/types/api/rpcspec_0_7/components.ts b/src/types/api/rpcspec_0_7/components.ts
@@ -159,7 +159,7 @@ export type BLOCK_BODY_WITH_TXS = {
 export type BLOCK_BODY_WITH_RECEIPTS = {
   transactions: {
     transaction: TXN;
-    receipt: TXN_RECEIPT_IN_BLOCK;
+    receipt: TXN_RECEIPT;
   }[];
 };
 
@@ -181,6 +181,8 @@ export type PENDING_BLOCK_HEADER = {
   timestamp: number;
   sequencer_address: FELT;
   l1_gas_price: RESOURCE_PRICE;
+  l1_data_gas_price: RESOURCE_PRICE;
+  l1_da_mode: 'BLOB' | 'CALLDATA';
   starknet_version: string;
 };
 
@@ -407,53 +409,25 @@ export type COMMON_RECEIPT_PROPERTIES = {
   actual_fee: FEE_PAYMENT;
   execution_status: TXN_EXECUTION_STATUS;
   finality_status: TXN_FINALITY_STATUS;
-  block_hash: BLOCK_HASH;
-  block_number: BLOCK_NUMBER;
   messages_sent: MSG_TO_L1[];
   revert_reason?: string;
   events: EVENT[];
   execution_resources: EXECUTION_RESOURCES;
 };
 
-export type TXN_RECEIPT_IN_BLOCK = PENDING_TXN_RECEIPT;
-
-export type PENDING_COMMON_RECEIPT_PROPERTIES = {
-  transaction_hash: TXN_HASH;
-  actual_fee: FEE_PAYMENT;
-  messages_sent: MSG_TO_L1[];
-  events: EVENT[];
-  revert_reason?: string;
-  finality_status: TXN_FINALITY_STATUS;
-  execution_status: TXN_EXECUTION_STATUS;
-  execution_resources: EXECUTION_RESOURCES;
-};
-
 export type INVOKE_TXN_RECEIPT = {
   type: 'INVOKE';
 } & COMMON_RECEIPT_PROPERTIES;
 
-export type PENDING_INVOKE_TXN_RECEIPT = {
-  type: 'INVOKE';
-} & PENDING_COMMON_RECEIPT_PROPERTIES;
-
 export type DECLARE_TXN_RECEIPT = {
   type: 'DECLARE';
 } & COMMON_RECEIPT_PROPERTIES;
 
-export type PENDING_DECLARE_TXN_RECEIPT = {
-  type: 'DECLARE';
-} & PENDING_COMMON_RECEIPT_PROPERTIES;
-
 export type DEPLOY_ACCOUNT_TXN_RECEIPT = {
   type: 'DEPLOY_ACCOUNT';
   contract_address: FELT;
 } & COMMON_RECEIPT_PROPERTIES;
 
-export type PENDING_DEPLOY_ACCOUNT_TXN_RECEIPT = {
-  type: 'DEPLOY_ACCOUNT';
-  contract_address: FELT;
-} & PENDING_COMMON_RECEIPT_PROPERTIES;
-
 export type DEPLOY_TXN_RECEIPT = {
   type: 'DEPLOY';
   contract_address: FELT;
@@ -464,23 +438,17 @@ export type L1_HANDLER_TXN_RECEIPT = {
   message_hash: NUM_AS_HEX;
 } & COMMON_RECEIPT_PROPERTIES;
 
-export type PENDING_L1_HANDLER_TXN_RECEIPT = {
-  type: 'L1_HANDLER';
-  message_hash: NUM_AS_HEX;
-} & PENDING_COMMON_RECEIPT_PROPERTIES;
-
 export type TXN_RECEIPT =
   | INVOKE_TXN_RECEIPT
   | L1_HANDLER_TXN_RECEIPT
   | DECLARE_TXN_RECEIPT
   | DEPLOY_TXN_RECEIPT
   | DEPLOY_ACCOUNT_TXN_RECEIPT;
 
-export type PENDING_TXN_RECEIPT =
-  | PENDING_INVOKE_TXN_RECEIPT
-  | PENDING_L1_HANDLER_TXN_RECEIPT
-  | PENDING_DECLARE_TXN_RECEIPT
-  | PENDING_DEPLOY_ACCOUNT_TXN_RECEIPT;
+export type TXN_RECEIPT_WITH_BLOCK_INFO = TXN_RECEIPT & {
+  block_hash?: BLOCK_HASH;
+  block_number?: BLOCK_NUMBER;
+};
 
 export type MSG_TO_L1 = {
   from_address: FELT;

diff --git a/src/types/api/rpcspec_0_7/nonspec.ts b/src/types/api/rpcspec_0_7/nonspec.ts
@@ -26,7 +26,6 @@ import {
   PENDING_BLOCK_WITH_TXS,
   PENDING_BLOCK_WITH_TX_HASHES,
   PENDING_STATE_UPDATE,
-  PENDING_TXN_RECEIPT,
   PRICE_UNIT,
   REPLACED_CLASS,
   RESOURCE_BOUNDS_MAPPING,
@@ -39,6 +38,7 @@ import {
   TXN_EXECUTION_STATUS,
   TXN_HASH,
   TXN_RECEIPT,
+  TXN_RECEIPT_WITH_BLOCK_INFO,
   TXN_STATUS,
 } from './components';
 
@@ -87,9 +87,9 @@ export type Nonce = FELT;
 export type TransactionHash = TXN_HASH;
 export type TransactionTrace = TRANSACTION_TRACE;
 export type BlockHash = BLOCK_HASH;
-export type TransactionReceipt = TXN_RECEIPT | PENDING_TXN_RECEIPT;
-export type Receipt = TXN_RECEIPT;
-export type PendingReceipt = PENDING_TXN_RECEIPT;
+export type TransactionReceipt = TXN_RECEIPT_WITH_BLOCK_INFO;
+export type Receipt = TXN_RECEIPT_WITH_BLOCK_INFO & BlockHashAndNumber;
+export type PendingReceipt = TXN_RECEIPT;
 export type EventFilter = EVENT_FILTER & RESULT_PAGE_REQUEST;
 export type SimulationFlags = Array<SIMULATION_FLAG>;
 export type L1Message = MSG_FROM_L1;

diff --git a/src/types/provider/spec.ts b/src/types/provider/spec.ts
@@ -60,34 +60,41 @@ export type PRICE_UNIT = Merge<SPEC06.PRICE_UNIT, SPEC07.PRICE_UNIT>;
 export type RESOURCE_PRICE = Merge<SPEC06.RESOURCE_PRICE, SPEC07.RESOURCE_PRICE>;
 export type SIMULATION_FLAG = Merge<SPEC06.SIMULATION_FLAG, SPEC07.SIMULATION_FLAG>;
 
-export type INVOKE_TXN_RECEIPT = Merge<SPEC06.INVOKE_TXN_RECEIPT, SPEC07.INVOKE_TXN_RECEIPT>;
+export type STATE_UPDATE = Merge<SPEC06.STATE_UPDATE, SPEC07.STATE_UPDATE>;
+export type PENDING_STATE_UPDATE = Merge<SPEC06.PENDING_STATE_UPDATE, SPEC07.PENDING_STATE_UPDATE>;
+
+export type INVOKE_TXN_RECEIPT = Merge<
+  SPEC06.INVOKE_TXN_RECEIPT,
+  SPEC07.INVOKE_TXN_RECEIPT & RPC07.BlockHashAndNumber
+>;
+export type DECLARE_TXN_RECEIPT = Merge<
+  SPEC06.DECLARE_TXN_RECEIPT,
+  SPEC07.DECLARE_TXN_RECEIPT & RPC07.BlockHashAndNumber
+>;
+export type DEPLOY_ACCOUNT_TXN_RECEIPT = Merge<
+  SPEC06.DEPLOY_ACCOUNT_TXN_RECEIPT,
+  SPEC07.DEPLOY_ACCOUNT_TXN_RECEIPT & RPC07.BlockHashAndNumber
+>;
+export type L1_HANDLER_TXN_RECEIPT = Merge<
+  SPEC06.L1_HANDLER_TXN_RECEIPT,
+  SPEC07.L1_HANDLER_TXN_RECEIPT & RPC07.BlockHashAndNumber
+>;
 export type PENDING_INVOKE_TXN_RECEIPT = Merge<
   SPEC06.PENDING_INVOKE_TXN_RECEIPT,
-  SPEC07.PENDING_INVOKE_TXN_RECEIPT
+  SPEC07.INVOKE_TXN_RECEIPT
 >;
-export type DECLARE_TXN_RECEIPT = Merge<SPEC06.DECLARE_TXN_RECEIPT, SPEC07.DECLARE_TXN_RECEIPT>;
 export type PENDING_DECLARE_TXN_RECEIPT = Merge<
   SPEC06.PENDING_DECLARE_TXN_RECEIPT,
-  SPEC07.PENDING_DECLARE_TXN_RECEIPT
->;
-export type DEPLOY_ACCOUNT_TXN_RECEIPT = Merge<
-  SPEC06.DEPLOY_ACCOUNT_TXN_RECEIPT,
-  SPEC07.DEPLOY_ACCOUNT_TXN_RECEIPT
+  SPEC07.DECLARE_TXN_RECEIPT
 >;
 export type PENDING_DEPLOY_ACCOUNT_TXN_RECEIPT = Merge<
   SPEC06.PENDING_DEPLOY_ACCOUNT_TXN_RECEIPT,
-  SPEC07.PENDING_DEPLOY_ACCOUNT_TXN_RECEIPT
->;
-export type L1_HANDLER_TXN_RECEIPT = Merge<
-  SPEC06.L1_HANDLER_TXN_RECEIPT,
-  SPEC07.L1_HANDLER_TXN_RECEIPT
+  SPEC07.DEPLOY_ACCOUNT_TXN_RECEIPT
 >;
 export type PENDING_L1_HANDLER_TXN_RECEIPT = Merge<
   SPEC06.PENDING_L1_HANDLER_TXN_RECEIPT,
-  SPEC07.PENDING_L1_HANDLER_TXN_RECEIPT
+  SPEC07.L1_HANDLER_TXN_RECEIPT
 >;
-export type STATE_UPDATE = Merge<SPEC06.STATE_UPDATE, SPEC07.STATE_UPDATE>;
-export type PENDING_STATE_UPDATE = Merge<SPEC06.PENDING_STATE_UPDATE, SPEC07.PENDING_STATE_UPDATE>;
 
 export type BlockWithTxHashes = Merge<RPC06.BlockWithTxHashes, RPC07.BlockWithTxHashes>;
 export type ContractClassPayload = Merge<RPC06.ContractClass, RPC07.ContractClass>;