feat(protocol): PCR-2 fixed base fee

Cargo.toml

@@ -414,7 +414,7 @@ iota-rosetta = { path = "crates/iota-rosetta" }
 iota-rpc-loadgen = { path = "crates/iota-rpc-loadgen" }
 iota-sdk = { path = "crates/iota-sdk" }
 # core-types with json format for REST API
-iota-sdk2 = { package = "iota-rust-sdk", git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "d605da95029e74376f0f39a95526bb1a5c0ebd7a", features = ["hash", "serde", "schemars"] }
+iota-sdk2 = { package = "iota-rust-sdk", git = "ssh://git@github.com/iotaledger/iota-rust-sdk.git", rev = "d97fd865b1826fe4af79901cce9b179614a0faa7", features = ["hash", "serde", "schemars"] }
 iota-simulator = { path = "crates/iota-simulator" }
 iota-snapshot = { path = "crates/iota-snapshot" }
 iota-source-validation = { path = "crates/iota-source-validation" }

crates/iota-analytics-indexer/src/handlers/checkpoint_handler.rs

@@ -104,6 +104,7 @@ impl CheckpointHandler {
             end_of_epoch: end_of_epoch_data.is_some(),
             total_gas_cost,
             computation_cost: epoch_rolling_gas_cost_summary.computation_cost,
+            computation_cost_burned: epoch_rolling_gas_cost_summary.computation_cost_burned,
             storage_cost: epoch_rolling_gas_cost_summary.storage_cost,
             storage_rebate: epoch_rolling_gas_cost_summary.storage_rebate,
             non_refundable_storage_fee: epoch_rolling_gas_cost_summary.non_refundable_storage_fee,

crates/iota-analytics-indexer/src/handlers/transaction_handler.rs

@@ -174,6 +174,7 @@ impl TransactionHandler {
             gas_budget: txn_data.gas_budget(),
             total_gas_cost: gas_summary.net_gas_usage(),
             computation_cost: gas_summary.computation_cost,
+            computation_cost_burned: gas_summary.computation_cost_burned,
             storage_cost: gas_summary.storage_cost,
             storage_rebate: gas_summary.storage_rebate,
             non_refundable_storage_fee: gas_summary.non_refundable_storage_fee,

crates/iota-analytics-indexer/src/store/bq/schemas/checkpoint.sql

@@ -9,6 +9,7 @@ CREATE TABLE IF NOT EXISTS chaindata.CHECKPOINT
     end_of_epoch                        BOOL            NOT NULL,
     total_gas_cost                      NUMERIC(20, 0)  NOT NULL,
     computation_cost                    NUMERIC(20, 0)  NOT NULL,
+    computation_cost_burned             NUMERIC(20, 0)  NOT NULL,
     storage_cost                        NUMERIC(20, 0)  NOT NULL,
     storage_rebate                      NUMERIC(20, 0)  NOT NULL,
     non_refundable_storage_fee          NUMERIC(20, 0)  NOT NULL,

crates/iota-analytics-indexer/src/store/bq/schemas/transaction.sql

@@ -31,6 +31,7 @@ CREATE TABLE IF NOT EXISTS chaindata.TRANSACTION
     gas_budget                 NUMERIC(20, 0) NOT NULL,
     total_gas_cost             NUMERIC(20, 0) NOT NULL,
     computation_cost           NUMERIC(20, 0) NOT NULL,
+    computation_cost_burned    NUMERIC(20, 0) NOT NULL,
     storage_cost               NUMERIC(20, 0) NOT NULL,
     storage_rebate             NUMERIC(20, 0) NOT NULL,
     non_refundable_storage_fee NUMERIC(20, 0) NOT NULL,

crates/iota-analytics-indexer/src/store/snowflake/schemas/checkpoint.sql

@@ -12,6 +12,7 @@ CREATE
     end_of_epoch                        BOOLEAN       NOT NULL,
     total_gas_cost                      NUMBER(20, 0) NOT NULL,
     computation_cost                    NUMBER(20, 0) NOT NULL,
+    computation_cost_burned             NUMBER(20, 0) NOT NULL,
     storage_cost                        NUMBER(20, 0) NOT NULL,
     storage_rebate                      NUMBER(20, 0) NOT NULL,
     non_refundable_storage_fee          NUMBER(20, 0) NOT NULL,
@@ -45,7 +46,7 @@ CREATE
     INTEGRATION = 'CHECKPOINTS_DATA_LOADER_NOTIFICATION'
     AS
         COPY INTO CHECKPOINT (checkpoint_digest, sequence_number, epoch, timestamp_ms, previous_checkpoint_digest,
-                              end_of_epoch, total_gas_cost, computation_cost, storage_cost, storage_rebate,
+                              end_of_epoch, total_gas_cost, computation_cost, computation_cost_burned, storage_cost, storage_rebate,
                               non_refundable_storage_fee, total_transaction_blocks, total_transactions,
                               total_successful_transaction_blocks, total_successful_transactions,
                               network_total_transaction, validator_signature)
@@ -57,6 +58,7 @@ CREATE
                          t.$1:end_of_epoch                        as end_of_epoch,
                          t.$1:total_gas_cost                      as total_gas_cost,
                          t.$1:computation_cost                    as computation_cost,
+                         t.$1:computation_cost_burned             as computation_cost_burned,
                          t.$1:storage_cost                        as storage_cost,
                          t.$1:storage_rebate                      as storage_rebate,
                          t.$1:non_refundable_storage_fee          as non_refundable_storage_fee,

crates/iota-analytics-indexer/src/store/snowflake/schemas/transaction.sql

@@ -31,6 +31,7 @@ CREATE OR REPLACE TABLE TRANSACTION
     gas_budget                 NUMBER(20, 0) NOT NULL,
     total_gas_cost             NUMBER(20, 0) NOT NULL,
     computation_cost           NUMBER(20, 0) NOT NULL,
+    computation_cost_burned    NUMBER(20, 0) NOT NULL,
     storage_cost               NUMBER(20, 0) NOT NULL,
     storage_rebate             NUMBER(20, 0) NOT NULL,
     non_refundable_storage_fee NUMBER(20, 0) NOT NULL,
@@ -66,7 +67,7 @@ CREATE
                                input, shared_input, gas_coins,
                                created, mutated, deleted, transfers, split_coins, merge_coins, publish, upgrade, others,
                                move_calls, packages, gas_owner, gas_object_id, gas_object_sequence, gas_object_digest,
-                               gas_budget, total_gas_cost, computation_cost, storage_cost, storage_rebate,
+                               gas_budget, total_gas_cost, computation_cost, computation_cost_burned, storage_cost, storage_rebate,
                                non_refundable_storage_fee,
                                gas_price, raw_transaction, has_zklogin_sig, has_upgraded_multisig
             )
@@ -101,6 +102,7 @@ CREATE
                          t.$1:gas_budget                 as gas_budget,
                          t.$1:total_gas_cost             as total_gas_cost,
                          t.$1:computation_cost           as computation_cost,
+                         t.$1:computation_cost_burned    as computation_cost_burned,
                          t.$1:storage_cost               as storage_cost,
                          t.$1:storage_rebate             as storage_rebate,
                          t.$1:non_refundable_storage_fee as non_refundable_storage_fee,

crates/iota-analytics-indexer/src/tables.rs

@@ -29,6 +29,7 @@ pub(crate) struct CheckpointEntry {
     // gas stats
     pub(crate) total_gas_cost: i64,
     pub(crate) computation_cost: u64,
+    pub(crate) computation_cost_burned: u64,
     pub(crate) storage_cost: u64,
     pub(crate) storage_rebate: u64,
     pub(crate) non_refundable_storage_fee: u64,
@@ -87,6 +88,7 @@ pub(crate) struct TransactionEntry {
     pub(crate) gas_budget: u64,
     pub(crate) total_gas_cost: i64,
     pub(crate) computation_cost: u64,
+    pub(crate) computation_cost_burned: u64,
     pub(crate) storage_cost: u64,
     pub(crate) storage_rebate: u64,
     pub(crate) non_refundable_storage_fee: u64,

crates/iota-core/src/authority.rs

@@ -65,7 +65,7 @@ use iota_types::{
         TransactionEvents, VerifiedCertifiedTransactionEffects, VerifiedSignedTransactionEffects,
     },
     error::{ExecutionError, IotaError, IotaResult, UserInputError},
-    event::{Event, EventID, SystemEpochInfoEventV1},
+    event::{Event, EventID, SystemEpochInfoEvent, SystemEpochInfoEventV1, SystemEpochInfoEventV2},
     executable_transaction::VerifiedExecutableTransaction,
     execution_config_utils::to_binary_config,
     execution_status::ExecutionStatus,
@@ -1727,6 +1727,7 @@ impl AuthorityState {
 
         // make a gas object if one was not provided
         let mut gas_object_refs = transaction.gas().to_vec();
+        let reference_gas_price = epoch_store.reference_gas_price();
         let ((gas_status, checked_input_objects), mock_gas) = if transaction.gas().is_empty() {
             let sender = transaction.sender();
             // use a 1B iota coin
@@ -1744,7 +1745,7 @@ impl AuthorityState {
             (
                 iota_transaction_checks::check_transaction_input_with_given_gas(
                     epoch_store.protocol_config(),
-                    epoch_store.reference_gas_price(),
+                    reference_gas_price,
                     &transaction,
                     input_objects,
                     receiving_objects,
@@ -1757,7 +1758,7 @@ impl AuthorityState {
             (
                 iota_transaction_checks::check_transaction_input(
                     epoch_store.protocol_config(),
-                    epoch_store.reference_gas_price(),
+                    reference_gas_price,
                     &transaction,
                     input_objects,
                     &receiving_objects,
@@ -1984,7 +1985,7 @@ impl AuthorityState {
             if transaction.gas().is_empty() {
                 iota_transaction_checks::check_transaction_input_with_given_gas(
                     epoch_store.protocol_config(),
-                    epoch_store.reference_gas_price(),
+                    reference_gas_price,
                     &transaction,
                     input_objects,
                     receiving_objects,
@@ -1994,7 +1995,7 @@ impl AuthorityState {
             } else {
                 iota_transaction_checks::check_transaction_input(
                     epoch_store.protocol_config(),
-                    epoch_store.reference_gas_price(),
+                    reference_gas_price,
                     &transaction,
                     input_objects,
                     &receiving_objects,
@@ -4506,7 +4507,7 @@ impl AuthorityState {
         epoch_start_timestamp_ms: CheckpointTimestamp,
     ) -> anyhow::Result<(
         IotaSystemState,
-        Option<SystemEpochInfoEventV1>,
+        Option<SystemEpochInfoEvent>,
         TransactionEffects,
     )> {
         let mut txns = Vec::new();
@@ -4568,6 +4569,7 @@ impl AuthorityState {
             next_epoch_protocol_version,
             gas_cost_summary.storage_cost,
             gas_cost_summary.computation_cost,
+            gas_cost_summary.computation_cost_burned,
             gas_cost_summary.storage_rebate,
             gas_cost_summary.non_refundable_storage_fee,
             epoch_start_timestamp_ms,
@@ -4589,6 +4591,7 @@ impl AuthorityState {
             ?next_epoch_protocol_version,
             ?next_epoch_system_packages,
             computation_cost=?gas_cost_summary.computation_cost,
+            computation_cost_burned=?gas_cost_summary.computation_cost_burned,
             storage_cost=?gas_cost_summary.storage_cost,
             storage_rebate=?gas_cost_summary.storage_rebate,
             non_refundable_storage_fee=?gas_cost_summary.non_refundable_storage_fee,
@@ -4632,15 +4635,28 @@ impl AuthorityState {
             self.prepare_certificate(&execution_guard, &executable_tx, input_objects, epoch_store)?;
         let system_obj = get_iota_system_state(&temporary_store.written)
             .expect("change epoch tx must write to system object");
-        // Find the SystemEpochInfoEventV1 emitted by the advance_epoch transaction.
+        // Find the SystemEpochInfoEvent emitted by the advance_epoch transaction.
         let system_epoch_info_event = temporary_store
             .events
             .data
             .iter()
-            .find(|event| event.is_system_epoch_info_event())
+            .find(|event| {
+                event.is_system_epoch_info_event_v1() || event.is_system_epoch_info_event_v2()
+            })
             .map(|event| {
-                bcs::from_bytes::<SystemEpochInfoEventV1>(&event.contents)
-                    .expect("event deserialization should succeed as type was pre-validated")
+                if event.is_system_epoch_info_event_v1() {
+                    SystemEpochInfoEvent::V1(
+                        bcs::from_bytes::<SystemEpochInfoEventV1>(&event.contents).expect(
+                            "event deserialization should succeed as type was pre-validated",
+                        ),
+                    )
+                } else {
+                    SystemEpochInfoEvent::V2(
+                        bcs::from_bytes::<SystemEpochInfoEventV2>(&event.contents).expect(
+                            "event deserialization should succeed as type was pre-validated",
+                        ),
+                    )
+                }
             });
         // The system epoch info event can be `None` in case if the `advance_epoch`
         // Move function call failed and was executed in the safe mode.

crates/iota-core/src/authority/authority_per_epoch_store.rs

@@ -1092,7 +1092,12 @@ impl AuthorityPerEpochStore {
     }
 
     pub fn reference_gas_price(&self) -> u64 {
-        self.epoch_start_state().reference_gas_price()
+        // Determine what to use as reference gas price based on protocol config.
+        if self.protocol_config().protocol_defined_base_fee() {
+            self.protocol_config().base_gas_price()
+        } else {
+            self.epoch_start_state().reference_gas_price()
+        }
     }
 
     pub fn protocol_version(&self) -> ProtocolVersion {

crates/iota-core/src/checkpoints/checkpoint_executor/tests.rs

@@ -466,7 +466,7 @@ async fn sync_end_of_epoch_checkpoint(
             epoch_commitments: vec![ECMHLiveObjectSetDigest::default().into()],
             // Do not simulate supply changes in tests.
             // We would need to build this checkpoint after the below execution of advance_epoch to
-            // obtain this number from the SystemEpochInfoEventV1.
+            // obtain this number from the SystemEpochInfoEvent.
             epoch_supply_change: 0,
         }),
     );

crates/iota-core/src/checkpoints/mod.rs

@@ -33,7 +33,7 @@ use iota_types::{
     digests::{CheckpointContentsDigest, CheckpointDigest},
     effects::{TransactionEffects, TransactionEffectsAPI},
     error::{IotaError, IotaResult},
-    event::SystemEpochInfoEventV1,
+    event::SystemEpochInfoEvent,
     executable_transaction::VerifiedExecutableTransaction,
     gas::GasCostSummary,
     iota_system_state::{
@@ -1452,8 +1452,13 @@ impl CheckpointBuilder {
                 // SAFETY: The number of minted and burnt tokens easily fit into an i64 and due
                 // to those small numbers, no overflows will occur during conversion or
                 // subtraction.
-                let epoch_supply_change = system_epoch_info_event.map_or(0, |event| {
-                    event.minted_tokens_amount as i64 - event.burnt_tokens_amount as i64
+                let epoch_supply_change = system_epoch_info_event.map_or(0, |event| match event {
+                    SystemEpochInfoEvent::V1(event) => {
+                        event.minted_tokens_amount as i64 - event.burnt_tokens_amount as i64
+                    }
+                    SystemEpochInfoEvent::V2(event) => {
+                        event.minted_tokens_amount as i64 - event.burnt_tokens_amount as i64
+                    }
                 });
 
                 let committee = system_state_obj
@@ -1581,7 +1586,7 @@ impl CheckpointBuilder {
         checkpoint_effects: &mut Vec<TransactionEffects>,
         signatures: &mut Vec<Vec<GenericSignature>>,
         checkpoint: CheckpointSequenceNumber,
-    ) -> anyhow::Result<(IotaSystemState, Option<SystemEpochInfoEventV1>)> {
+    ) -> anyhow::Result<(IotaSystemState, Option<SystemEpochInfoEvent>)> {
         let (system_state, system_epoch_info_event, effects) = self
             .state
             .create_and_execute_advance_epoch_tx(

crates/iota-core/src/rest_index.rs

@@ -187,14 +187,14 @@ impl IndexStoreTables {
 
         // Iterate through available, executed checkpoints that have yet to be pruned
         // to initialize checkpoint and transaction based indexes.
-        if let Some(highest_executed_checkpint) =
+        if let Some(highest_executed_checkpoint) =
             checkpoint_store.get_highest_executed_checkpoint_seq_number()?
         {
             let lowest_available_checkpoint = checkpoint_store
                 .get_highest_pruned_checkpoint_seq_number()?
                 .saturating_add(1);
 
-            let checkpoint_range = lowest_available_checkpoint..=highest_executed_checkpint;
+            let checkpoint_range = lowest_available_checkpoint..=highest_executed_checkpoint;
 
             info!(
                 "Indexing {} checkpoints in range {checkpoint_range:?}",

crates/iota-core/src/unit_tests/authority_tests.rs

@@ -327,6 +327,8 @@ async fn test_dev_inspect_object_by_bytes() {
     assert_eq!(effects.mutated().len(), 1);
     assert!(effects.deleted().is_empty());
     assert!(effects.gas_cost_summary().computation_cost > 0);
+    assert!(effects.gas_cost_summary().computation_cost_burned > 0);
+
     let mut results = results.unwrap();
     assert_eq!(results.len(), 1);
     let exec_results = results.pop().unwrap();
@@ -395,6 +397,7 @@ async fn test_dev_inspect_object_by_bytes() {
     assert_eq!(effects.mutated().len(), 1);
     assert!(effects.deleted().is_empty());
     assert!(effects.gas_cost_summary().computation_cost > 0);
+    assert!(effects.gas_cost_summary().computation_cost_burned > 0);
 
     let mut results = results.unwrap();
     assert_eq!(results.len(), 1);
@@ -499,6 +502,7 @@ async fn test_dev_inspect_unowned_object() {
     assert_eq!(effects.mutated().len(), 2);
     assert!(effects.deleted().is_empty());
     assert!(effects.gas_cost_summary().computation_cost > 0);
+    assert!(effects.gas_cost_summary().computation_cost_burned > 0);
 
     let mut results = results.unwrap();
     assert_eq!(results.len(), 1);
@@ -613,6 +617,8 @@ async fn test_dev_inspect_dynamic_field() {
     // nothing is deleted
     assert!(effects.deleted().is_empty());
     assert!(effects.gas_cost_summary().computation_cost > 0);
+    assert!(effects.gas_cost_summary().computation_cost_burned > 0);
+
     assert_eq!(results.len(), 1);
     let exec_results = results.pop().unwrap();
     let IotaExecutionResult {