add TxInputWithAdditionalInfo

Author: OBorce

src/tx_input.rs

@@ -15,7 +15,10 @@
 
 use parity_scale_codec::{Decode, Encode};
 
-use crate::{AccountCommand, AccountNonce, AccountOutPoint, OrderAccountCommand, UtxoOutPoint};
+use crate::{
+    AccountCommand, AccountNonce, AccountOutPoint, Amount, OrderAccountCommand, OutputValue,
+    SighashInputCommitment, TxOutput, UtxoOutPoint,
+};
 
 #[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, strum::EnumDiscriminants)]
 #[strum_discriminants(name(TxInputTag), derive(strum::EnumIter))]
@@ -32,3 +35,86 @@ pub enum TxInput {
     #[codec(index = 3)]
     OrderAccountCommand(OrderAccountCommand),
 }
+
+#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode)]
+pub struct AdditionalOrderInfo {
+    pub initially_asked: OutputValue,
+    pub initially_given: OutputValue,
+    pub ask_balance: Amount,
+    pub give_balance: Amount,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode)]
+pub enum AdditionalUtxoInfo {
+    Utxo(TxOutput),
+    PoolData {
+        utxo: TxOutput,
+        staker_balance: Amount,
+    },
+}
+
+impl From<AdditionalUtxoInfo> for SighashInputCommitment {
+    fn from(value: AdditionalUtxoInfo) -> Self {
+        match value {
+            AdditionalUtxoInfo::Utxo(output) => SighashInputCommitment::Utxo(output),
+            AdditionalUtxoInfo::PoolData {
+                utxo,
+                staker_balance,
+            } => SighashInputCommitment::ProduceBlockFromStakeUtxo {
+                utxo,
+                staker_balance,
+            },
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, strum::EnumDiscriminants)]
+#[strum_discriminants(name(TxInputWithAdditionalDataTag), derive(strum::EnumIter))]
+pub enum TxInputWithAdditionalInfo {
+    #[codec(index = 0)]
+    Utxo(UtxoOutPoint, AdditionalUtxoInfo),
+
+    #[codec(index = 1)]
+    Account(AccountOutPoint),
+
+    #[codec(index = 2)]
+    AccountCommand(AccountNonce, AccountCommand),
+
+    #[codec(index = 3)]
+    OrderAccountCommand(OrderAccountCommand, AdditionalOrderInfo),
+}
+
+impl TxInputWithAdditionalInfo {
+    pub fn into_input_and_commitment(self) -> (TxInput, SighashInputCommitment) {
+        match self {
+            TxInputWithAdditionalInfo::Utxo(utxo, info) => (TxInput::Utxo(utxo), info.into()),
+            TxInputWithAdditionalInfo::Account(acc) => {
+                (TxInput::Account(acc), SighashInputCommitment::None)
+            }
+            TxInputWithAdditionalInfo::AccountCommand(nonce, cmd) => (
+                TxInput::AccountCommand(nonce, cmd),
+                SighashInputCommitment::None,
+            ),
+            TxInputWithAdditionalInfo::OrderAccountCommand(cmd, info) => {
+                let commitment = match &cmd {
+                    OrderAccountCommand::FillOrder(_, _) => {
+                        SighashInputCommitment::FillOrderAccountCommand {
+                            initially_asked: info.initially_asked,
+                            initially_given: info.initially_given,
+                        }
+                    }
+                    OrderAccountCommand::ConcludeOrder(_) => {
+                        SighashInputCommitment::ConcludeOrderAccountCommand {
+                            initially_asked: info.initially_asked,
+                            initially_given: info.initially_given,
+                            ask_balance: info.ask_balance,
+                            give_balance: info.give_balance,
+                        }
+                    }
+                    OrderAccountCommand::FreezeOrder(_) => SighashInputCommitment::None,
+                };
+                (TxInput::OrderAccountCommand(cmd), commitment)
+            }
+        }
+    }
+}