Remove bit_offset in API.

Author: silathdiir

mp2-v1/src/api.rs

@@ -216,9 +216,6 @@ pub struct SlotInput {
     pub(crate) slot: u8,
     /// The offset in bytes where to extract this column in a given EVM word
     pub(crate) byte_offset: usize,
-    /// The starting offset in `byte_offset` of the bits to be extracted for this column.
-    /// The column bits will start at `byte_offset * 8 + bit_offset`.
-    pub(crate) bit_offset: usize,
     /// The length (in bits) of the field to extract in the EVM word
     pub(crate) length: usize,
     /// At which EVM word is this column extracted from. For simple variables,
@@ -230,30 +227,19 @@ pub struct SlotInput {
 impl From<&ColumnInfo> for SlotInput {
     fn from(column_info: &ColumnInfo) -> Self {
         let slot = u8::try_from(column_info.slot.to_canonical_u64()).unwrap();
-        let [byte_offset, bit_offset, length] = [
-            column_info.byte_offset,
-            column_info.bit_offset,
-            column_info.length,
-        ]
-        .map(|f| usize::try_from(f.to_canonical_u64()).unwrap());
+        let [byte_offset, length] = [column_info.byte_offset, column_info.length]
+            .map(|f| usize::try_from(f.to_canonical_u64()).unwrap());
         let evm_word = u32::try_from(column_info.evm_word.to_canonical_u64()).unwrap();
 
-        SlotInput::new(slot, byte_offset, bit_offset, length, evm_word)
+        SlotInput::new(slot, byte_offset, length, evm_word)
     }
 }
 
 impl SlotInput {
-    pub fn new(
-        slot: u8,
-        byte_offset: usize,
-        bit_offset: usize,
-        length: usize,
-        evm_word: u32,
-    ) -> Self {
+    pub fn new(slot: u8, byte_offset: usize, length: usize, evm_word: u32) -> Self {
         Self {
             slot,
             byte_offset,
-            bit_offset,
             length,
             evm_word,
         }
@@ -267,10 +253,6 @@ impl SlotInput {
         self.byte_offset
     }
 
-    pub fn bit_offset(&self) -> usize {
-        self.bit_offset
-    }
-
     pub fn length(&self) -> usize {
         self.length
     }
@@ -354,7 +336,7 @@ pub fn compute_table_info(
                 input.slot,
                 id,
                 input.byte_offset,
-                input.bit_offset,
+                0, // bit_offset
                 input.length,
                 input.evm_word,
             )

mp2-v1/src/values_extraction/gadgets/column_info.rs

@@ -69,7 +69,7 @@ impl ColumnInfo {
             slot_input.slot,
             identifier,
             slot_input.byte_offset,
-            slot_input.bit_offset,
+            0, // bit_offset
             slot_input.length,
             slot_input.evm_word,
         )

mp2-v1/src/values_extraction/mod.rs

@@ -102,7 +102,7 @@ pub fn identifier_block_column() -> u64 {
 /// Compute identifier for value column.
 ///
 /// The value column could be either simple or mapping slot.
-/// `id = H(slot || byte_offset || bit_offset || length || evm_word || contract_address || chain_id)[0]`
+/// `id = H(slot || byte_offset || length || evm_word || contract_address || chain_id)[0]`
 pub fn identifier_for_value_column(
     input: &SlotInput,
     contract_address: &Address,
@@ -111,7 +111,6 @@ pub fn identifier_for_value_column(
 ) -> u64 {
     let inputs = once(input.slot)
         .chain(input.byte_offset.to_be_bytes())
-        .chain(input.bit_offset.to_be_bytes())
         .chain(input.length.to_be_bytes())
         .chain(input.evm_word.to_be_bytes())
         .chain(contract_address.0.to_vec())

mp2-v1/tests/common/cases/indexing.rs

@@ -994,10 +994,10 @@ impl LargeStruct {
 
     pub fn slot_inputs(slot: u8) -> Vec<SlotInput> {
         vec![
-            SlotInput::new(slot, 0, 0, 256, 0),
+            SlotInput::new(slot, 0, 256, 0),
             // Big-endian layout
-            SlotInput::new(slot, 16, 0, 128, 1),
-            SlotInput::new(slot, 0, 0, 128, 1),
+            SlotInput::new(slot, 16, 128, 1),
+            SlotInput::new(slot, 0, 128, 1),
         ]
     }
 

mp2-v1/tests/common/cases/table_source.rs

@@ -416,13 +416,13 @@ impl SingleValuesExtractionArgs {
     pub fn slot_inputs() -> Vec<SlotInput> {
         vec![
             // bool
-            SlotInput::new(SINGLE_SLOTS[0], 0, 0, 256, 0),
+            SlotInput::new(SINGLE_SLOTS[0], 0, 256, 0),
             // uint256
-            SlotInput::new(SINGLE_SLOTS[1], 0, 0, 256, 0),
+            SlotInput::new(SINGLE_SLOTS[1], 0, 256, 0),
             // string
-            SlotInput::new(SINGLE_SLOTS[2], 0, 0, 256, 0),
+            SlotInput::new(SINGLE_SLOTS[2], 0, 256, 0),
             // address
-            SlotInput::new(SINGLE_SLOTS[3], 0, 0, 256, 0),
+            SlotInput::new(SINGLE_SLOTS[3], 0, 256, 0),
         ]
     }
     pub fn table_info(contract: &Contract) -> Vec<ColumnInfo> {
@@ -656,7 +656,7 @@ impl MappingValuesExtractionArgs {
         }
     }
     pub fn slot_input() -> SlotInput {
-        SlotInput::new(MAPPING_SLOT, 0, 0, 256, 0)
+        SlotInput::new(MAPPING_SLOT, 0, 256, 0)
     }
     pub async fn init_contract_data(
         &mut self,