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 = "2ba6b293bdede769a1d9b4d1aecaede2ff7682dd", features = ["hash", "serde", "schemars"] }
+iota-sdk2 = { package = "iota-rust-sdk", git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "175d28d69a3ff8a4c1b936df5ef5d216672dfd26", 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-adapter-transactional-tests/tests/dev_inspect/load_old_object.exp

@@ -53,14 +53,14 @@ task 6, lines 47-48:
 //# programmable --sender A --inputs object(2,0)@2 0 --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,0)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2242000,  storage_rebate: 1261600, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2242000,  storage_rebate: 1261600, non_refundable_storage_fee: 0
 
 task 7, lines 50-54:
 //# programmable --sender A --inputs object(2,0)@3 112 --dev-inspect
 //> test::m::check(Input(0), Input(1))
 // dev-inspect with 'check' and _incorrect_ values
 mutated: object(_), object(2,0)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2242000,  storage_rebate: 1261600, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2242000,  storage_rebate: 1261600, non_refundable_storage_fee: 0
 
 task 8, lines 56-57:
 //# programmable --sender A --inputs object(2,0)@2 112 --dev-inspect

crates/iota-adapter-transactional-tests/tests/mvcc/child_of_child.exp

@@ -73,20 +73,20 @@ task 8, lines 88-89:
 //# programmable --sender A --inputs object(2,3)@2 0 0 vector[0] --dev-inspect
 //> test::m::check(Input(0), Input(1), Input(2), Input(3))
 mutated: object(_), object(2,3)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2257200,  storage_rebate: 1276800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2257200,  storage_rebate: 1276800, non_refundable_storage_fee: 0
 
 task 9, lines 91-92:
 //# programmable --sender A --inputs object(2,3)@3 1 2 vector[3] --dev-inspect
 //> test::m::check(Input(0), Input(1), Input(2), Input(3))
 mutated: object(_), object(2,3)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2257200,  storage_rebate: 1276800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2257200,  storage_rebate: 1276800, non_refundable_storage_fee: 0
 
 task 10, lines 94-98:
 //# programmable --sender A --inputs object(2,3)@4 1 2 vector[] --dev-inspect
 //> test::m::check(Input(0), Input(1), Input(2), Input(3))
 // dev-inspect with 'check' and _incorrect_ values
 mutated: object(_), object(2,3)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2257200,  storage_rebate: 1276800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2257200,  storage_rebate: 1276800, non_refundable_storage_fee: 0
 
 task 11, lines 100-101:
 //# programmable --sender A --inputs object(2,3)@3 0 0 vector[0] --dev-inspect

crates/iota-adapter-transactional-tests/tests/mvcc/find_all_uids.exp

@@ -199,20 +199,20 @@ task 8, lines 139-140:
 //# programmable --sender A --inputs object(2,8)@2 vector[0] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
 
 task 9, lines 142-143:
 //# programmable --sender A --inputs object(2,8)@3 vector[112] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
 
 task 10, lines 145-149:
 //# programmable --sender A --inputs object(2,8)@4 vector[] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 // dev-inspect with 'check' and _incorrect_ values
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
 
 task 11, lines 151-152:
 //# programmable --sender A --inputs object(2,8)@3 vector[0] --dev-inspect

crates/iota-adapter-transactional-tests/tests/mvcc/find_all_uids_dof.exp

@@ -199,20 +199,20 @@ task 8, lines 152-153:
 //# programmable --sender A --inputs object(2,8)@2 vector[0] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
 
 task 9, lines 155-156:
 //# programmable --sender A --inputs object(2,8)@3 vector[112] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
 
 task 10, lines 158-162:
 //# programmable --sender A --inputs object(2,8)@4 vector[] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 // dev-inspect with 'check' and _incorrect_ values
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3891200,  storage_rebate: 2910800, non_refundable_storage_fee: 0
 
 task 11, lines 164-165:
 //# programmable --sender A --inputs object(2,8)@3 vector[0] --dev-inspect

crates/iota-adapter-transactional-tests/tests/mvcc/find_all_uids_dof_enum.exp

@@ -247,21 +247,21 @@ task 8, lines 188-189:
 //# programmable --sender A --inputs object(2,8)@2 vector[0] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3952000,  storage_rebate: 2971600, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3952000,  storage_rebate: 2971600, non_refundable_storage_fee: 0
 
 task 9, lines 191-192:
 //# programmable --sender A --inputs object(2,8)@3 vector[112] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3952000,  storage_rebate: 2971600, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3952000,  storage_rebate: 2971600, non_refundable_storage_fee: 0
 
 task 10, lines 194-199:
 //# programmable --sender A --inputs object(2,8)@4 vector[] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 // dev-inspect with 'check' and _incorrect_ values
 // Should fail since the field exists but with a different field.
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3952000,  storage_rebate: 2971600, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3952000,  storage_rebate: 2971600, non_refundable_storage_fee: 0
 
 task 11, lines 200-203:
 //# programmable --sender A --inputs object(2,8)@3 vector[0] --dev-inspect

crates/iota-adapter-transactional-tests/tests/mvcc/find_all_uids_enums.exp

@@ -223,21 +223,21 @@ task 8, lines 155-156:
 //# programmable --sender A --inputs object(2,8)@2 vector[0] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3921600,  storage_rebate: 2941200, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3921600,  storage_rebate: 2941200, non_refundable_storage_fee: 0
 
 task 9, lines 158-159:
 //# programmable --sender A --inputs object(2,8)@3 vector[112] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3921600,  storage_rebate: 2941200, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3921600,  storage_rebate: 2941200, non_refundable_storage_fee: 0
 
 task 10, lines 161-166:
 //# programmable --sender A --inputs object(2,8)@4 vector[] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 // dev-inspect with 'check' and _incorrect_ values
 // Should fail since the field exists but with a different field.
 mutated: object(_), object(2,8)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 3921600,  storage_rebate: 2941200, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 3921600,  storage_rebate: 2941200, non_refundable_storage_fee: 0
 
 task 11, lines 167-170:
 //# programmable --sender A --inputs object(2,8)@3 vector[0] --dev-inspect

crates/iota-adapter-transactional-tests/tests/mvcc/find_all_uids_on_child.exp

@@ -70,20 +70,20 @@ task 8, lines 162-163:
 //# programmable --sender A --inputs object(2,9)@2 vector[0] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,9)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
 
 task 9, lines 165-166:
 //# programmable --sender A --inputs object(2,9)@3 vector[112] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,9)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
 
 task 10, lines 168-172:
 //# programmable --sender A --inputs object(2,9)@4 vector[] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 // dev-inspect with 'check' and _incorrect_ values
 mutated: object(_), object(2,9)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
 
 task 11, lines 174-175:
 //# programmable --sender A --inputs object(2,9)@3 vector[0] --dev-inspect

crates/iota-adapter-transactional-tests/tests/mvcc/find_all_uids_on_child_enum.exp

@@ -70,21 +70,21 @@ task 8, lines 241-242:
 //# programmable --sender A --inputs object(2,9)@2 vector[0] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,9)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
 
 task 9, lines 244-245:
 //# programmable --sender A --inputs object(2,9)@3 vector[112] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 mutated: object(_), object(2,9)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
 
 task 10, lines 247-252:
 //# programmable --sender A --inputs object(2,9)@4 vector[] --dev-inspect
 //> test::m::check(Input(0), Input(1))
 // dev-inspect with 'check' and _incorrect_ values
 // Should fail since the field exists but with a different field.
 mutated: object(_), object(2,9)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2219200,  storage_rebate: 1238800, non_refundable_storage_fee: 0
 
 task 11, lines 253-256:
 //# programmable --sender A --inputs object(2,9)@3 vector[0] --dev-inspect

crates/iota-adapter-transactional-tests/tests/mvcc/not_root_version.exp

@@ -92,7 +92,7 @@ task 10, lines 86-91:
 created: object(10,0)
 mutated: object(_), object(2,0)
 wrapped: object(6,1)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 4104000,  storage_rebate: 2401600, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 4104000,  storage_rebate: 2401600, non_refundable_storage_fee: 0
 
 task 11, lines 93-97:
 //# programmable --sender P2 --inputs object(2,0)@4 object(6,1)@3 1 --dev-inspect
@@ -102,7 +102,7 @@ task 11, lines 93-97:
 created: object(10,0)
 mutated: object(_), object(2,0)
 wrapped: object(6,1)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 4104000,  storage_rebate: 2401600, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 4104000,  storage_rebate: 2401600, non_refundable_storage_fee: 0
 
 task 12, lines 99-103:
 //# programmable --sender P2 --inputs object(2,0)@4 object(6,1)@2 1 --dev-inspect

crates/iota-adapter-transactional-tests/tests/mvcc/not_root_version_flipped_case.exp

@@ -80,7 +80,7 @@ task 8, lines 80-85:
 created: object(8,0)
 mutated: object(_), object(2,0)
 wrapped: object(4,1)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 4104000,  storage_rebate: 2401600, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 4104000,  storage_rebate: 2401600, non_refundable_storage_fee: 0
 
 task 9, lines 87-91:
 //# programmable --sender P2 --inputs object(2,0)@2 object(4,1)@2 0 --dev-inspect
@@ -90,7 +90,7 @@ task 9, lines 87-91:
 created: object(8,0)
 mutated: object(_), object(2,0)
 wrapped: object(4,1)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 4104000,  storage_rebate: 2401600, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 4104000,  storage_rebate: 2401600, non_refundable_storage_fee: 0
 
 task 10, lines 93-97:
 //# programmable --sender P2 --inputs object(2,0)@2 object(4,1)@2 1 --dev-inspect

crates/iota-adapter-transactional-tests/tests/mvcc/receive_object_dof.exp

@@ -210,20 +210,20 @@ task 18, lines 99-100:
 //# programmable --sender A --inputs object(2,2)@3 0 0 vector[0] --dev-inspect
 //> tto::M1::check(Input(0), Input(1), Input(2), Input(3))
 mutated: object(_), object(2,2)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2249600,  storage_rebate: 1269200, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2249600,  storage_rebate: 1269200, non_refundable_storage_fee: 0
 
 task 19, lines 102-103:
 //# programmable --sender A --inputs object(2,2)@4 1 2 vector[3] --dev-inspect
 //> tto::M1::check(Input(0), Input(1), Input(2), Input(3))
 mutated: object(_), object(2,2)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2249600,  storage_rebate: 1269200, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2249600,  storage_rebate: 1269200, non_refundable_storage_fee: 0
 
 task 20, lines 105-108:
 //# programmable --sender A --inputs object(2,2)@5 1 2 vector[] --dev-inspect
 //> tto::M1::check(Input(0), Input(1), Input(2), Input(3))
 // dev-inspect with 'check' and _incorrect_ values
 mutated: object(_), object(2,2)
-gas summary: computation_cost: 500000, computation_cost_burned: 500000, storage_cost: 2249600,  storage_rebate: 1269200, non_refundable_storage_fee: 0
+gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 2249600,  storage_rebate: 1269200, non_refundable_storage_fee: 0
 
 task 21, lines 110-111:
 //# programmable --sender A --inputs object(2,2)@4 0 0 vector[0] --dev-inspect

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

@@ -106,6 +106,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

@@ -176,6 +176,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,