Merge pull request #19 from anoma/tiago/rm-fee-unshielding

remove fee unshielding

chain/src/entity/tx_notes_index.rs

@@ -4,16 +4,11 @@ use orm::notes_index::NotesIndexInsertDb;
 use shared::indexed_tx::IndexedTx;
 
 #[derive(Default, Clone, Debug)]
-pub struct TxNoteMap(BTreeMap<IndexedTx, (bool, usize)>);
+pub struct TxNoteMap(BTreeMap<IndexedTx, usize>);
 
 impl TxNoteMap {
-    pub fn insert(
-        &mut self,
-        indexed_tx: IndexedTx,
-        is_fee_unshielding: bool,
-        note_pos: usize,
-    ) {
-        self.0.insert(indexed_tx, (is_fee_unshielding, note_pos));
+    pub fn insert(&mut self, indexed_tx: IndexedTx, note_pos: usize) {
+        self.0.insert(indexed_tx, note_pos);
     }
 
     pub fn is_empty(&self) -> bool {
@@ -30,9 +25,8 @@ impl TxNoteMap {
                         block_index,
                         masp_tx_index,
                     },
-                    &(is_fee_unshielding, note_pos),
+                    &note_pos,
                 )| NotesIndexInsertDb {
-                    is_fee_unshielding,
                     block_index: block_index.0 as i32,
                     note_position: note_pos as i32,
                     block_height: block_height.0 as i32,

chain/src/services/masp.rs

@@ -17,8 +17,7 @@ pub fn update_witness_map(
     shielded: &namada_core::masp_primitives::transaction::Transaction,
 ) -> anyhow::Result<()> {
     let mut note_pos = commitment_tree.size();
-    tx_notes_index
-        .insert(indexed_tx, false /* is_fee_unshielding */, note_pos);
+    tx_notes_index.insert(indexed_tx, note_pos);
 
     for so in shielded
         .sapling_bundle()

orm/migrations/2024-04-17-131702_notes_map/up.sql

@@ -1,7 +1,6 @@
 CREATE TABLE notes_index (
   note_position INT PRIMARY KEY,
   block_index INT NOT NULL,
-  is_fee_unshielding BOOLEAN NOT NULL,
   block_height INT NOT NULL,
   masp_tx_index INT NOT NULL
 );

orm/src/notes_index.rs

@@ -8,7 +8,6 @@ use crate::schema::notes_index;
 #[diesel(check_for_backend(diesel::pg::Pg))]
 pub struct NotesIndexDb {
     pub block_index: i32,
-    pub is_fee_unshielding: bool,
     pub note_position: i32,
     pub block_height: i32,
     pub masp_tx_index: i32,
@@ -19,7 +18,6 @@ pub struct NotesIndexDb {
 #[diesel(check_for_backend(diesel::pg::Pg))]
 pub struct NotesIndexInsertDb {
     pub block_index: i32,
-    pub is_fee_unshielding: bool,
     pub note_position: i32,
     pub block_height: i32,
     pub masp_tx_index: i32,

orm/src/schema.rs

@@ -27,7 +27,6 @@ diesel::table! {
     notes_index (note_position) {
         note_position -> Int4,
         block_index -> Int4,
-        is_fee_unshielding -> Bool,
         block_height -> Int4,
         masp_tx_index -> Int4,
     }

shared/src/extracted_masp_tx.rs

@@ -4,6 +4,5 @@ use namada_core::masp_primitives::transaction::Transaction;
 
 #[derive(Debug, Clone)]
 pub struct ExtractedMaspTx {
-    pub fee_unshielding: Option<(BTreeSet<String>, Transaction)>,
     pub inner_tx: Option<(BTreeSet<String>, Transaction)>,
 }

shared/src/transaction.rs

@@ -15,7 +15,6 @@ use crate::tx_index::MaspTxIndex;
 pub struct Transaction {
     pub hash: Id,
     pub masp_txs: Vec<(MaspTxIndex, NamadaMaspTransaction)>,
-    pub fee_unshielding_tx: Option<NamadaMaspTransaction>, // TODO
 }
 
 impl Transaction {
@@ -72,7 +71,6 @@ impl Transaction {
         Some(Transaction {
             masp_txs,
             hash: Id::from(transaction_id),
-            fee_unshielding_tx: None,
         })
     }
 }

swagger.yml

@@ -147,9 +147,6 @@ components:
           items:
             type: object
             properties:
-              is_fee_unshielding:
-                type: boolean
-                description: Whether this is a fee unshielding.
               block_height:
                 type: integer
                 minimum: 0

webserver/src/response/notes_index.rs

@@ -7,28 +7,25 @@ pub struct NotesIndexResponse {
 
 #[derive(Clone, Debug, Deserialize, Serialize, Default)]
 pub struct Note {
-    pub is_fee_unshielding: bool,
     pub block_height: u64,
     pub block_index: u64,
     pub masp_tx_index: u64,
     pub note_position: u64,
 }
 
 impl NotesIndexResponse {
-    pub fn new(notes_index: Vec<(bool, u64, u64, u64, u64)>) -> Self {
+    pub fn new(notes_index: Vec<(u64, u64, u64, u64)>) -> Self {
         Self {
             notes_index: notes_index
                 .into_iter()
                 .map(
                     |(
-                        is_fee_unshielding,
                         block_height,
                         block_index,
                         masp_tx_index,
                         note_position,
                     )| {
                         Note {
-                            is_fee_unshielding,
                             block_height,
                             block_index,
                             masp_tx_index,

webserver/src/service/notes_index.rs

@@ -18,15 +18,14 @@ impl NotesIndexService {
     pub async fn get_notes_index(
         &self,
         from_block_height: u64,
-    ) -> anyhow::Result<Vec<(bool, u64, u64, u64, u64)>> {
+    ) -> anyhow::Result<Vec<(u64, u64, u64, u64)>> {
         Ok(self
             .notes_index_repo
             .get_notes_index(from_block_height as i32)
             .await?
             .into_iter()
             .map(|notes_index_entry| {
                 (
-                    notes_index_entry.is_fee_unshielding,
                     notes_index_entry.block_height as u64,
                     notes_index_entry.block_index as u64,
                     notes_index_entry.masp_tx_index as u64,