fix: FeePayment conversion (#389)

Author: jbcaron

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Next release
 
+- fix: FeePayment conversion
 - fix(block_production): get l2-to-l1 messages recursively from the call tree
 - refactor: replace starknet-rs BlockId with types-rs BlockId and remove redundant mp_block::BlockId
 - feat(fgw): added `add_transaction` for gateway client

crates/client/sync/test-data/block_724130.json

@@ -4,7 +4,10 @@ use mp_receipt::{Event, L1Gas, MsgToL1};
 use serde::{Deserialize, Serialize};
 use starknet_types_core::felt::Felt;
 
-use crate::transaction::{DeployAccountTransaction, DeployTransaction, L1HandlerTransaction, Transaction};
+use crate::transaction::{
+    DeclareTransaction, DeployAccountTransaction, DeployTransaction, InvokeTransaction, L1HandlerTransaction,
+    Transaction,
+};
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
 #[serde(deny_unknown_fields)]
@@ -49,20 +52,20 @@ impl ConfirmedReceipt {
 
     pub fn into_mp(self, tx: &Transaction) -> mp_receipt::TransactionReceipt {
         match tx {
-            Transaction::Invoke(_) => mp_receipt::TransactionReceipt::Invoke(self.into_mp_invoke()),
+            Transaction::Invoke(tx) => mp_receipt::TransactionReceipt::Invoke(self.into_mp_invoke(tx)),
             Transaction::L1Handler(tx) => mp_receipt::TransactionReceipt::L1Handler(self.into_mp_l1_handler(tx)),
-            Transaction::Declare(_) => mp_receipt::TransactionReceipt::Declare(self.into_mp_declare()),
+            Transaction::Declare(tx) => mp_receipt::TransactionReceipt::Declare(self.into_mp_declare(tx)),
             Transaction::Deploy(tx) => mp_receipt::TransactionReceipt::Deploy(self.into_mp_deploy(tx)),
             Transaction::DeployAccount(tx) => {
                 mp_receipt::TransactionReceipt::DeployAccount(self.into_mp_deploy_account(tx))
             }
         }
     }
 
-    fn into_mp_invoke(self) -> mp_receipt::InvokeTransactionReceipt {
+    fn into_mp_invoke(self, tx: &InvokeTransaction) -> mp_receipt::InvokeTransactionReceipt {
         mp_receipt::InvokeTransactionReceipt {
             transaction_hash: self.transaction_hash,
-            actual_fee: self.actual_fee.into(),
+            actual_fee: fee_payment(self.actual_fee, tx.version()),
             messages_sent: self.l2_to_l1_messages,
             events: self.events,
             execution_resources: self.execution_resources.into(),
@@ -86,18 +89,18 @@ impl ConfirmedReceipt {
         mp_receipt::L1HandlerTransactionReceipt {
             message_hash: message_hash.try_into().unwrap_or_default(),
             transaction_hash: self.transaction_hash,
-            actual_fee: self.actual_fee.into(),
+            actual_fee: fee_payment(self.actual_fee, tx.version()),
             messages_sent: self.l2_to_l1_messages,
             events: self.events,
             execution_resources: self.execution_resources.into(),
             execution_result: execution_result(self.execution_status, self.revert_error),
         }
     }
 
-    fn into_mp_declare(self) -> mp_receipt::DeclareTransactionReceipt {
+    fn into_mp_declare(self, tx: &DeclareTransaction) -> mp_receipt::DeclareTransactionReceipt {
         mp_receipt::DeclareTransactionReceipt {
             transaction_hash: self.transaction_hash,
-            actual_fee: self.actual_fee.into(),
+            actual_fee: fee_payment(self.actual_fee, tx.version()),
             messages_sent: self.l2_to_l1_messages,
             events: self.events,
             execution_resources: self.execution_resources.into(),
@@ -108,7 +111,7 @@ impl ConfirmedReceipt {
     fn into_mp_deploy(self, tx: &DeployTransaction) -> mp_receipt::DeployTransactionReceipt {
         mp_receipt::DeployTransactionReceipt {
             transaction_hash: self.transaction_hash,
-            actual_fee: self.actual_fee.into(),
+            actual_fee: fee_payment(self.actual_fee, tx.version()),
             messages_sent: self.l2_to_l1_messages,
             events: self.events,
             execution_resources: self.execution_resources.into(),
@@ -120,7 +123,7 @@ impl ConfirmedReceipt {
     fn into_mp_deploy_account(self, tx: &DeployAccountTransaction) -> mp_receipt::DeployAccountTransactionReceipt {
         mp_receipt::DeployAccountTransactionReceipt {
             transaction_hash: self.transaction_hash,
-            actual_fee: self.actual_fee.into(),
+            actual_fee: fee_payment(self.actual_fee, tx.version()),
             messages_sent: self.l2_to_l1_messages,
             events: self.events,
             execution_resources: self.execution_resources.into(),
@@ -290,3 +293,10 @@ pub enum ExecutionStatus {
     Succeeded,
     Reverted,
 }
+
+fn fee_payment(fee: Felt, tx_version: u8) -> mp_receipt::FeePayment {
+    mp_receipt::FeePayment {
+        amount: fee,
+        unit: if tx_version < 3 { mp_receipt::PriceUnit::Wei } else { mp_receipt::PriceUnit::Fri },
+    }
+}

crates/primitives/gateway/src/receipt.rs

@@ -80,6 +80,16 @@ impl Transaction {
             }
         }
     }
+
+    pub fn version(&self) -> u8 {
+        match self {
+            Transaction::Invoke(tx) => tx.version(),
+            Transaction::L1Handler(tx) => tx.version(),
+            Transaction::Declare(tx) => tx.version(),
+            Transaction::Deploy(tx) => tx.version(),
+            Transaction::DeployAccount(tx) => tx.version(),
+        }
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -94,6 +104,16 @@ pub enum InvokeTransaction {
     V3(InvokeTransactionV3),
 }
 
+impl InvokeTransaction {
+    pub fn version(&self) -> u8 {
+        match self {
+            InvokeTransaction::V0(_) => 0,
+            InvokeTransaction::V1(_) => 1,
+            InvokeTransaction::V3(_) => 3,
+        }
+    }
+}
+
 impl From<InvokeTransaction> for mp_transactions::InvokeTransaction {
     fn from(tx: InvokeTransaction) -> Self {
         match tx {
@@ -242,6 +262,12 @@ pub struct L1HandlerTransaction {
     pub version: Felt,
 }
 
+impl L1HandlerTransaction {
+    pub fn version(&self) -> u8 {
+        0
+    }
+}
+
 impl L1HandlerTransaction {
     pub fn new(transaction: mp_transactions::L1HandlerTransaction, hash: Felt) -> Self {
         Self {
@@ -281,6 +307,17 @@ pub enum DeclareTransaction {
     V3(DeclareTransactionV3),
 }
 
+impl DeclareTransaction {
+    pub fn version(&self) -> u8 {
+        match self {
+            DeclareTransaction::V0(_) => 0,
+            DeclareTransaction::V1(_) => 1,
+            DeclareTransaction::V2(_) => 2,
+            DeclareTransaction::V3(_) => 3,
+        }
+    }
+}
+
 impl From<DeclareTransaction> for mp_transactions::DeclareTransaction {
     fn from(tx: DeclareTransaction) -> Self {
         match tx {
@@ -474,6 +511,12 @@ pub struct DeployTransaction {
     pub version: Felt,
 }
 
+impl DeployTransaction {
+    pub fn version(&self) -> u8 {
+        0
+    }
+}
+
 impl DeployTransaction {
     pub fn new(transaction: mp_transactions::DeployTransaction, hash: Felt, contract_address: Felt) -> Self {
         Self {
@@ -506,6 +549,15 @@ pub enum DeployAccountTransaction {
     V3(DeployAccountTransactionV3),
 }
 
+impl DeployAccountTransaction {
+    pub fn version(&self) -> u8 {
+        match self {
+            DeployAccountTransaction::V1(_) => 1,
+            DeployAccountTransaction::V3(_) => 3,
+        }
+    }
+}
+
 impl From<DeployAccountTransaction> for mp_transactions::DeployAccountTransaction {
     fn from(tx: DeployAccountTransaction) -> Self {
         match tx {

crates/primitives/gateway/src/transaction.rs

@@ -226,13 +226,6 @@ pub struct FeePayment {
     pub unit: PriceUnit,
 }
 
-// FIXME: this conversion is outdated with transaction V3, see https://github.com/madara-alliance/madara/issues/385
-impl From<Felt> for FeePayment {
-    fn from(fee: Felt) -> Self {
-        Self { amount: fee, unit: PriceUnit::Wei }
-    }
-}
-
 #[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum PriceUnit {
     #[default]