feat: Update circuits structs with gas info

Adds gas limits, max fee per gas, actual fee per gas, and gas used to circuit structs. These structs are not populated for now, they are just defined.
AztecProtocol · Apr 10, 2024 · 62aa993 · 62aa993
1 parent b4a6f17
commit 62aa993
Show file tree

Hide file tree

Showing 64 changed files with 944 additions and 225 deletions.
diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol
@@ -90,29 +90,33 @@ library Constants {
   uint256 internal constant MAX_NOTES_PER_PAGE = 10;
   uint256 internal constant VIEW_NOTE_ORACLE_RETURN_LENGTH = 212;
   uint256 internal constant AZTEC_ADDRESS_LENGTH = 1;
-  uint256 internal constant CALL_CONTEXT_LENGTH = 7;
+  uint256 internal constant CALL_CONTEXT_LENGTH = 18;
+  uint256 internal constant GAS_SETTINGS_LENGTH = 10;
+  uint256 internal constant DIMENSION_GAS_SETTINGS_LENGTH = 3;
+  uint256 internal constant GAS_FEES_LENGTH = 3;
+  uint256 internal constant GAS_USED_LENGTH = 3;
   uint256 internal constant CONTENT_COMMITMENT_LENGTH = 4;
   uint256 internal constant CONTRACT_INSTANCE_LENGTH = 6;
   uint256 internal constant CONTRACT_STORAGE_READ_LENGTH = 2;
   uint256 internal constant CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH = 2;
   uint256 internal constant ETH_ADDRESS_LENGTH = 1;
   uint256 internal constant FUNCTION_DATA_LENGTH = 2;
   uint256 internal constant FUNCTION_LEAF_PREIMAGE_LENGTH = 5;
-  uint256 internal constant GLOBAL_VARIABLES_LENGTH = 6;
-  uint256 internal constant HEADER_LENGTH = 20;
+  uint256 internal constant GLOBAL_VARIABLES_LENGTH = 9;
+  uint256 internal constant HEADER_LENGTH = 23;
   uint256 internal constant L1_TO_L2_MESSAGE_LENGTH = 6;
   uint256 internal constant L2_TO_L1_MESSAGE_LENGTH = 2;
   uint256 internal constant MAX_BLOCK_NUMBER_LENGTH = 2;
   uint256 internal constant NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH = 4;
   uint256 internal constant NULLIFIER_KEY_VALIDATION_REQUEST_CONTEXT_LENGTH = 5;
   uint256 internal constant PARTIAL_STATE_REFERENCE_LENGTH = 6;
-  uint256 internal constant PRIVATE_CALL_STACK_ITEM_LENGTH = 207;
-  uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 204;
-  uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 195;
+  uint256 internal constant PRIVATE_CALL_STACK_ITEM_LENGTH = 221;
+  uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 218;
+  uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 209;
   uint256 internal constant STATE_REFERENCE_LENGTH = 8;
   uint256 internal constant TX_CONTEXT_DATA_LENGTH = 4;
   uint256 internal constant TX_REQUEST_LENGTH = 8;
-  uint256 internal constant ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH = 11;
+  uint256 internal constant ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH = 22;
   uint256 internal constant GET_NOTES_ORACLE_RETURN_LENGTH = 674;
   uint256 internal constant NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 2048;
   uint256 internal constant NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP = 2048;

diff --git a/l1-contracts/src/core/libraries/HeaderLib.sol b/l1-contracts/src/core/libraries/HeaderLib.sol
@@ -48,6 +48,9 @@ import {Hash} from "./Hash.sol";
  *  | 0x0194                                                                           | 0x20         |     timestamp
  *  | 0x01b4                                                                           | 0x14         |     coinbase
  *  | 0x01c8                                                                           | 0x20         |     feeRecipient
+ *  | 0x01e8                                                                           | 0x20         |     gasFees.feePerDaGas
+ *  | 0x0208                                                                           | 0x20         |     gasFees.feePerL1Gas
+ *  | 0x0228                                                                           | 0x20         |     gasFees.feePerL2Gas
  *  |                                                                                  |              |   }
  *  |                                                                                  |              | }
  *  | ---                                                                              | ---          | ---
@@ -71,13 +74,20 @@ library HeaderLib {
     PartialStateReference partialStateReference;
   }
 
+  struct GasFees {
+    uint256 feePerDaGas;
+    uint256 feePerL1Gas;
+    uint256 feePerL2Gas;
+  }
+
   struct GlobalVariables {
     uint256 chainId;
     uint256 version;
     uint256 blockNumber;
     uint256 timestamp;
     address coinbase;
     bytes32 feeRecipient;
+    GasFees gasFees;
   }
 
   struct ContentCommitment {
@@ -94,7 +104,7 @@ library HeaderLib {
     GlobalVariables globalVariables;
   }
 
-  uint256 private constant HEADER_LENGTH = 0x1e8; // Header byte length
+  uint256 private constant HEADER_LENGTH = 0x248; // Header byte length
 
   /**
    * @notice Validates the header
@@ -178,7 +188,10 @@ library HeaderLib {
     header.globalVariables.blockNumber = uint256(bytes32(_header[0x0174:0x0194]));
     header.globalVariables.timestamp = uint256(bytes32(_header[0x0194:0x01b4]));
     header.globalVariables.coinbase = address(bytes20(_header[0x01b4:0x01c8]));
-    header.globalVariables.feeRecipient = bytes32(_header[0x01c8:HEADER_LENGTH]);
+    header.globalVariables.feeRecipient = bytes32(_header[0x01c8:0x01e8]);
+    header.globalVariables.gasFees.feePerDaGas = uint256(bytes32(_header[0x01e8:0x0208]));
+    header.globalVariables.gasFees.feePerL1Gas = uint256(bytes32(_header[0x0208:0x0228]));
+    header.globalVariables.gasFees.feePerL2Gas = uint256(bytes32(_header[0x0228:0x0248]));
 
     return header;
   }

diff --git a/l1-contracts/test/decoders/Base.sol b/l1-contracts/test/decoders/Base.sol
@@ -51,11 +51,18 @@ contract DecoderBase is Test {
     StateReference stateReference;
   }
 
+  struct GasFees {
+    uint256 feePerDaGas;
+    uint256 feePerL1Gas;
+    uint256 feePerL2Gas;
+  }
+
   struct GlobalVariables {
     uint256 blockNumber;
     uint256 chainId;
     address coinbase;
     bytes32 feeRecipient;
+    GasFees gasFees;
     uint256 timestamp;
     uint256 version;
   }

diff --git a/l1-contracts/test/decoders/Decoders.t.sol b/l1-contracts/test/decoders/Decoders.t.sol
@@ -59,6 +59,17 @@ contract DecodersTest is DecoderBase {
         assertEq(
           header.globalVariables.feeRecipient, globalVariables.feeRecipient, "Invalid feeRecipient"
         );
+        assertEq(
+          header.globalVariables.gasFees.feePerDaGas,
+          globalVariables.gasFees.feePerDaGas,
+          "Invalid gasFees.feePerDaGas"
+        );
+        assertEq(
+          header.globalVariables.feeRecipient, globalVariables.feeRecipient, "Invalid feeRecipient"
+        );
+        assertEq(
+          header.globalVariables.feeRecipient, globalVariables.feeRecipient, "Invalid feeRecipient"
+        );
       }
 
       // ContentCommitment

diff --git a/l1-contracts/test/fixtures/empty_block_0.json b/l1-contracts/test/fixtures/empty_block_0.json
@@ -8,7 +8,7 @@
     "l2ToL1Messages": []
   },
   "block": {
-    "archive": "0x0335fb6ef6a421a73ba4b4f124f6bf1101333cdb1ade05bc7cac1e83885a8df4",
+    "archive": "0x2ea0c3d3ffef649532de4fb75c9135681ef65b926876b5ff37a4bacfb679f558",
     "body": "0x00000000",
     "txsEffectsHash": "0x00df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d2493896",
     "decodedHeader": {
@@ -23,12 +23,17 @@
         "chainId": 31337,
         "timestamp": 0,
         "version": 1,
-        "coinbase": "0x89c70d339816591366d159b0ea442faf8af62682",
-        "feeRecipient": "0x0ff93b075ef4b1480ce807a2c3c0b9ca9b3bca8de09a33ae658acb21e8107f50"
+        "coinbase": "0xf6a7844f33ced45fbfeaa9ba463a706b30d4c454",
+        "feeRecipient": "0x115f6d9664fe6497dec1741573007fcd96fc24124e05b2d415fe4e43e0de4d6e",
+        "gasFees": {
+          "feePerDaGas": 0,
+          "feePerL1Gas": 0,
+          "feePerL2Gas": 0
+        }
       },
       "lastArchive": {
         "nextAvailableLeafIndex": 1,
-        "root": "0x1e3523d3bd50ae6204e1ec2ee1bdf8af4c6217ec80900052d2cf4259379dd130"
+        "root": "0x05b0b6df52f1d47d0406318558052c89a174fbc9d615def82b3cc9ccc1937db8"
       },
       "stateReference": {
         "l1ToL2MessageTree": {
@@ -51,8 +56,8 @@
         }
       }
     },
-    "header": "0x1e3523d3bd50ae6204e1ec2ee1bdf8af4c6217ec80900052d2cf4259379dd13000000001000000000000000000000000000000000000000000000000000000000000000100df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d249389600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000800bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001000572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000800000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000089c70d339816591366d159b0ea442faf8af626820ff93b075ef4b1480ce807a2c3c0b9ca9b3bca8de09a33ae658acb21e8107f50",
-    "publicInputsHash": "0x00e2216979cc60a156f5a3ed2270286ad640960492fce44e17abc29d154bb01b",
+    "header": "0x05b0b6df52f1d47d0406318558052c89a174fbc9d615def82b3cc9ccc1937db800000001000000000000000000000000000000000000000000000000000000000000000100df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d249389600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000800bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001000572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000800000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000f6a7844f33ced45fbfeaa9ba463a706b30d4c454115f6d9664fe6497dec1741573007fcd96fc24124e05b2d415fe4e43e0de4d6e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+    "publicInputsHash": "0x000150a504a83df5a4a24f26081fb7397809f2ef5976b687fbdeefb5d42da7f3",
     "numTxs": 0
   }
 }
diff --git a/l1-contracts/test/fixtures/empty_block_1.json b/l1-contracts/test/fixtures/empty_block_1.json
@@ -8,7 +8,7 @@
     "l2ToL1Messages": []
   },
   "block": {
-    "archive": "0x220677d238ea4407e12e9c0caa76bf6753ecfa88d10a80107f73f6005b5d5c3b",
+    "archive": "0x20411bada543bf4a76e1e2b96c15059c7c81b81b4dec36b15102bcc72dfdebff",
     "body": "0x00000000",
     "txsEffectsHash": "0x00df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d2493896",
     "decodedHeader": {
@@ -21,14 +21,19 @@
       "globalVariables": {
         "blockNumber": 2,
         "chainId": 31337,
-        "timestamp": 1712154039,
+        "timestamp": 1712782698,
         "version": 1,
-        "coinbase": "0x89c70d339816591366d159b0ea442faf8af62682",
-        "feeRecipient": "0x0ff93b075ef4b1480ce807a2c3c0b9ca9b3bca8de09a33ae658acb21e8107f50"
+        "coinbase": "0xf6a7844f33ced45fbfeaa9ba463a706b30d4c454",
+        "feeRecipient": "0x115f6d9664fe6497dec1741573007fcd96fc24124e05b2d415fe4e43e0de4d6e",
+        "gasFees": {
+          "feePerDaGas": 0,
+          "feePerL1Gas": 0,
+          "feePerL2Gas": 0
+        }
       },
       "lastArchive": {
         "nextAvailableLeafIndex": 2,
-        "root": "0x0335fb6ef6a421a73ba4b4f124f6bf1101333cdb1ade05bc7cac1e83885a8df4"
+        "root": "0x2ea0c3d3ffef649532de4fb75c9135681ef65b926876b5ff37a4bacfb679f558"
       },
       "stateReference": {
         "l1ToL2MessageTree": {
@@ -51,8 +56,8 @@
         }
       }
     },
-    "header": "0x0335fb6ef6a421a73ba4b4f124f6bf1101333cdb1ade05bc7cac1e83885a8df400000002000000000000000000000000000000000000000000000000000000000000000100df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d249389600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000002016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000c00000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000660d65b789c70d339816591366d159b0ea442faf8af626820ff93b075ef4b1480ce807a2c3c0b9ca9b3bca8de09a33ae658acb21e8107f50",
-    "publicInputsHash": "0x00dbd8f31a147084243681f36208343c03b5415482040df2682a6ad175c3de0c",
+    "header": "0x2ea0c3d3ffef649532de4fb75c9135681ef65b926876b5ff37a4bacfb679f55800000002000000000000000000000000000000000000000000000000000000000000000100df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d249389600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000002016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000c00000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000006616fd6af6a7844f33ced45fbfeaa9ba463a706b30d4c454115f6d9664fe6497dec1741573007fcd96fc24124e05b2d415fe4e43e0de4d6e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+    "publicInputsHash": "0x00da6d809b78297d6f97202d0679da5a45cfbc2c6594eaeb3f0ac4deba7c6b2e",
     "numTxs": 0
   }
 }
diff --git a/l1-contracts/test/fixtures/mixed_block_0.json b/l1-contracts/test/fixtures/mixed_block_0.json
diff --git a/l1-contracts/test/fixtures/mixed_block_1.json b/l1-contracts/test/fixtures/mixed_block_1.json
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_init.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_init.nr
@@ -2,7 +2,8 @@ use crate::common;
 use dep::std::unsafe;
 use dep::types::{
     abis::{
-    combined_constant_data::CombinedConstantData, private_kernel::private_call_data::PrivateCallData,
+    gas_settings::GasSettings, combined_constant_data::CombinedConstantData,
+    private_kernel::private_call_data::PrivateCallData,
     kernel_circuit_public_inputs::{PrivateKernelCircuitPublicInputs, PrivateKernelCircuitPublicInputsBuilder},
     side_effect::{SideEffect, SideEffectLinkedToNoteHash}
 },
@@ -22,6 +23,7 @@ impl PrivateKernelInitCircuitPrivateInputs {
         public_inputs.constants = CombinedConstantData {
             historical_header: self.private_call.call_stack_item.public_inputs.historical_header,
             tx_context: self.tx_request.tx_context,
+            gas_settings: GasSettings::empty(), // TODO(palla/gas-in-circuits)
         };
         public_inputs.min_revertible_side_effect_counter = self.private_call.call_stack_item.public_inputs.min_revertible_side_effect_counter;
     }

diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis.nr
@@ -38,3 +38,7 @@ mod public_call_data;
 
 mod public_circuit_public_inputs;
 mod private_circuit_public_inputs;
+
+mod gas_fees;
+mod gas_settings;
+mod gas_used;
diff --git a/...oir-protocol-circuits/crates/types/src/abis/accumulated_data/combined_accumulated_data.nr b/...oir-protocol-circuits/crates/types/src/abis/accumulated_data/combined_accumulated_data.nr
@@ -2,7 +2,7 @@ use crate::{
     abis::{
     accumulated_data::public_accumulated_data::PublicAccumulatedData,
     public_data_update_request::PublicDataUpdateRequest,
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}, gas_used::GasUsed
 },
     constants::{
     MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX,
@@ -25,6 +25,8 @@ struct CombinedAccumulatedData {
     unencrypted_log_preimages_length: Field,
 
     public_data_update_requests: [PublicDataUpdateRequest; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+
+    gas_used: GasUsed,
 }
 
 impl CombinedAccumulatedData {
@@ -40,7 +42,8 @@ impl CombinedAccumulatedData {
             public_data_update_requests: array_merge(
                 non_revertible.public_data_update_requests,
                 revertible.public_data_update_requests
-            )
+            ),
+            gas_used: revertible.gas_used.add(non_revertible.gas_used)
         }
     }
 }
diff --git a/...noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data.nr b/...noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data.nr
@@ -1,4 +1,4 @@
-use crate::{abis::{call_request::CallRequest, side_effect::{SideEffect, SideEffectLinkedToNoteHash}}};
+use crate::{abis::{call_request::CallRequest, gas_used::GasUsed, side_effect::{SideEffect, SideEffectLinkedToNoteHash}}};
 use crate::constants::{
     MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
     MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX
@@ -19,4 +19,6 @@ struct PrivateAccumulatedData {
 
     private_call_stack: [CallRequest; MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX],
     public_call_stack: [CallRequest; MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX],
+
+    gas_used: GasUsed,
 }
diff --git a/...tocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data_builder.nr b/...tocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data_builder.nr
@@ -1,5 +1,6 @@
 use crate::{
     abis::{
+    gas_used::GasUsed,
     accumulated_data::{
     combined_accumulated_data::CombinedAccumulatedData,
     private_accumulated_data::PrivateAccumulatedData, public_accumulated_data::PublicAccumulatedData,
@@ -31,6 +32,8 @@ struct PrivateAccumulatedDataBuilder {
 
     private_call_stack: BoundedVec<CallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>,
     public_call_stack: BoundedVec<CallRequest, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX>,
+
+    gas_used: GasUsed
 }
 
 impl PrivateAccumulatedDataBuilder {
@@ -44,7 +47,8 @@ impl PrivateAccumulatedDataBuilder {
             encrypted_log_preimages_length: self.encrypted_log_preimages_length,
             unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
             private_call_stack: self.private_call_stack.storage,
-            public_call_stack: self.public_call_stack.storage
+            public_call_stack: self.public_call_stack.storage,
+            gas_used: self.gas_used
         }
     }
 
@@ -57,7 +61,8 @@ impl PrivateAccumulatedDataBuilder {
             unencrypted_logs_hash: self.unencrypted_logs_hash,
             encrypted_log_preimages_length: self.encrypted_log_preimages_length,
             unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
-            public_data_update_requests: unsafe::zeroed()
+            public_data_update_requests: unsafe::zeroed(),
+            gas_used: self.gas_used
         }
     }
 

diff --git a/.../noir-protocol-circuits/crates/types/src/abis/accumulated_data/public_accumulated_data.nr b/.../noir-protocol-circuits/crates/types/src/abis/accumulated_data/public_accumulated_data.nr
@@ -1,6 +1,6 @@
 use crate::{
     abis::{
-    call_request::CallRequest, public_data_update_request::PublicDataUpdateRequest,
+    call_request::CallRequest, public_data_update_request::PublicDataUpdateRequest, gas_used::GasUsed,
     side_effect::{SideEffect, SideEffectLinkedToNoteHash}
 },
     constants::{
@@ -25,4 +25,6 @@ struct PublicAccumulatedData {
     public_data_update_requests: [PublicDataUpdateRequest; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
 
     public_call_stack: [CallRequest; MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX],
+
+    gas_used: GasUsed,
 }
diff --git a/...otocol-circuits/crates/types/src/abis/accumulated_data/public_accumulated_data_builder.nr b/...otocol-circuits/crates/types/src/abis/accumulated_data/public_accumulated_data_builder.nr
@@ -1,7 +1,7 @@
 use crate::{
     abis::{
-    accumulated_data::public_accumulated_data::PublicAccumulatedData, call_request::CallRequest,
-    public_data_update_request::PublicDataUpdateRequest,
+    gas_used::GasUsed, accumulated_data::public_accumulated_data::PublicAccumulatedData,
+    call_request::CallRequest, public_data_update_request::PublicDataUpdateRequest,
     side_effect::{SideEffect, SideEffectLinkedToNoteHash}
 },
     constants::{
@@ -26,6 +26,8 @@ struct PublicAccumulatedDataBuilder {
     public_data_update_requests: BoundedVec<PublicDataUpdateRequest, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
 
     public_call_stack: BoundedVec<CallRequest, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX>,
+
+    gas_used: GasUsed,
 }
 
 impl PublicAccumulatedDataBuilder {
@@ -39,7 +41,8 @@ impl PublicAccumulatedDataBuilder {
             encrypted_log_preimages_length: self.encrypted_log_preimages_length,
             unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
             public_data_update_requests: self.public_data_update_requests.storage,
-            public_call_stack: self.public_call_stack.storage
+            public_call_stack: self.public_call_stack.storage,
+            gas_used: self.gas_used
         }
     }
 }