fix comments

Author: OBorce

Cargo.lock

@@ -206,6 +206,23 @@ def init_mintlayer_types():
                 ]
             },
 
+            "PoolAdditionalInfo": {
+                "type": "struct",
+                "type_mapping": [
+                    ["staker_balance", "Amount"],
+                ]
+            },
+
+            "OrderAdditionalInfo": {
+                "type": "struct",
+                "type_mapping": [
+                    ["initially_asked", "OutputValue"],
+                    ["initially_given", "OutputValue"],
+                    ["ask_balance", "Amount"],
+                    ["give_balance", "Amount"],
+                ]
+            },
+
             "InfoId": {
                 "type": "enum",
                 "type_mapping": [
@@ -216,11 +233,11 @@ def init_mintlayer_types():
             },
 
             "TxAdditionalInfo": {
-                "type": "enum",
+                "type": "struct",
                 "type_mapping": [
-                    ["TokenInfo", "TokenAdditionalInfo"],
-                    ["PoolInfo", "(Amount)"],
-                    ["OrderInfo", ""], # TODO
+                    ["token_info", "BTreeMap<H256, TokenAdditionalInfo>"],
+                    ["pool_info", "BTreeMap<H256, PoolAdditionalInfo>"],
+                    ["order_info", "BTreeMap<H256, OrderAdditionalInfo>"],
                 ],
             },
 
@@ -248,7 +265,7 @@ def init_mintlayer_types():
                     ["input_utxos", "Vec<Option<TxOutput>>"],
                     ["destinations", "Vec<Option<Destination>>"],
                     ["htlc_secrets", "Vec<Option<[u8; 32]>>"],
-                    ["additional_infos", "BTreeMap<InfoId, TxAdditionalInfo>"],
+                    ["additional_infos", "TxAdditionalInfo"],
                 ]
             },
 

test/functional/test_framework/__init__.py

@@ -187,7 +187,7 @@ async def async_test(self):
                 'input_utxos': alice_htlc_outputs,
                 'destinations': [refund_dest_obj, alice_htlc_change_dest],
                 'htlc_secrets': [None, None],
-                'additional_infos': []
+                'additional_infos': {'token_info': [], 'pool_info': [], 'order_info': []}
             }
             alice_refund_tx_hex = scalecodec.base.RuntimeConfiguration().create_scale_object('PartiallySignedTransaction').encode(alice_refund_ptx).to_hex()[2:]
 
@@ -216,7 +216,7 @@ async def async_test(self):
                 'input_utxos': bob_htlc_outputs,
                 'destinations': [refund_dest_obj, bob_htlc_change_dest],
                 'htlc_secrets': [None, None],
-                'additional_infos': []
+                'additional_infos': {'token_info': [], 'pool_info': [], 'order_info': []}
             }
             bob_refund_tx_hex = scalecodec.base.RuntimeConfiguration().create_scale_object('PartiallySignedTransaction').encode(bob_refund_ptx).to_hex()[2:]
 

test/functional/wallet_htlc_refund.py

@@ -38,9 +38,7 @@ use utils::ensure;
 pub use utxo_selector::UtxoSelectorError;
 use wallet_types::account_id::AccountPrefixedId;
 use wallet_types::account_info::{StandaloneAddressDetails, StandaloneAddresses};
-use wallet_types::partially_signed_transaction::{
-    InfoId, PartiallySignedTransaction, TxAdditionalInfo,
-};
+use wallet_types::partially_signed_transaction::{PartiallySignedTransaction, TxAdditionalInfo};
 use wallet_types::with_locked::WithLocked;
 
 use crate::account::utxo_selector::{select_coins, OutputGroup};
@@ -634,7 +632,7 @@ impl<K: AccountKeyChains> Account<K> {
         change_addresses: BTreeMap<Currency, Address<Destination>>,
         median_time: BlockTimestamp,
         fee_rate: CurrentFeeRate,
-        additional_utxo_infos: BTreeMap<InfoId, TxAdditionalInfo>,
+        additional_info: TxAdditionalInfo,
     ) -> WalletResult<(PartiallySignedTransaction, BTreeMap<Currency, Amount>)> {
         let mut request = self.select_inputs_for_send_request(
             request,
@@ -648,7 +646,7 @@ impl<K: AccountKeyChains> Account<K> {
         )?;
 
         let fees = request.get_fees();
-        let ptx = request.into_partially_signed_tx(additional_utxo_infos)?;
+        let ptx = request.into_partially_signed_tx(additional_info)?;
 
         Ok((ptx, fees))
     }

wallet/src/account/mod.rs

@@ -29,9 +29,7 @@ use common::primitives::{Amount, BlockHeight};
 use crypto::vrf::VRFPublicKey;
 use utils::ensure;
 use wallet_types::currency::Currency;
-use wallet_types::partially_signed_transaction::{
-    InfoId, PartiallySignedTransaction, TxAdditionalInfo,
-};
+use wallet_types::partially_signed_transaction::{PartiallySignedTransaction, TxAdditionalInfo};
 
 use crate::account::PoolData;
 use crate::destination_getters::{get_tx_output_destination, HtlcSpendingCondition};
@@ -292,7 +290,7 @@ impl SendRequest {
 
     pub fn into_partially_signed_tx(
         self,
-        additional_info: BTreeMap<InfoId, TxAdditionalInfo>,
+        additional_info: TxAdditionalInfo,
     ) -> WalletResult<PartiallySignedTransaction> {
         let num_inputs = self.inputs.len();
         let destinations = self.destinations.into_iter().map(Some).collect();

wallet/src/send_request/mod.rs

@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::collections::BTreeMap;
 use std::ops::{Add, Div, Mul, Sub};
 
 use super::*;
@@ -42,6 +41,7 @@ use serialization::Encode;
 use test_utils::random::{make_seedable_rng, Seed};
 use wallet_storage::{DefaultBackend, Store, Transactional};
 use wallet_types::account_info::DEFAULT_ACCOUNT_INDEX;
+use wallet_types::partially_signed_transaction::TxAdditionalInfo;
 use wallet_types::seed_phrase::StoreSeedPhrase;
 use wallet_types::KeyPurpose::{Change, ReceiveFunds};
 
@@ -436,7 +436,7 @@ fn sign_transaction(#[case] seed: Seed) {
         .with_inputs_and_destinations(acc_inputs.into_iter().zip(acc_dests.clone()))
         .with_outputs(outputs);
     let destinations = req.destinations().to_vec();
-    let additional_info = BTreeMap::new();
+    let additional_info = TxAdditionalInfo::new();
     let ptx = req.into_partially_signed_tx(additional_info).unwrap();
 
     let mut signer = SoftwareSigner::new(chain_config.clone(), DEFAULT_ACCOUNT_INDEX);
@@ -687,7 +687,7 @@ fn fixed_signatures() {
         .with_inputs_and_destinations(acc_inputs.into_iter().zip(acc_dests.clone()))
         .with_outputs(outputs);
     let destinations = req.destinations().to_vec();
-    let additional_info = BTreeMap::new();
+    let additional_info = TxAdditionalInfo::new();
     let ptx = req.into_partially_signed_tx(additional_info).unwrap();
 
     let utxos_ref = utxos