Merge pull request fedimint#6290 from bradleystachurski/fix-relative-…

…fee-upgrade-tests

fix(devimint): add LegacyFeeConsensus to support upgrade tests

devimint/src/federation/config.rs

@@ -18,8 +18,9 @@ use fedimint_wallet_client::config::{
 use fedimint_wallet_server::WalletInit;
 use fedimintd::default_esplora_server;
 use fedimintd::envs::FM_DISABLE_META_MODULE_ENV;
+use legacy_types::{LegacyFeeConsensus, LegacyMintGenParams, LegacyMintGenParamsConsensus};
 
-use crate::version_constants::VERSION_0_4_0_ALPHA;
+use crate::version_constants::{VERSION_0_4_0_ALPHA, VERSION_0_5_0_ALPHA};
 
 /// Duplicate default fedimint module setup
 pub fn attach_default_module_init_params(
@@ -29,39 +30,51 @@ pub fn attach_default_module_init_params(
     finality_delay: u32,
     fedimintd_version: &semver::Version,
 ) {
-    module_init_params
-        .attach_config_gen_params(
-            LightningInit::kind(),
-            LightningGenParams {
-                local: LightningGenParamsLocal {
-                    bitcoin_rpc: bitcoin_rpc.clone(),
-                },
-                consensus: LightningGenParamsConsensus { network },
+    module_init_params.attach_config_gen_params(
+        LightningInit::kind(),
+        LightningGenParams {
+            local: LightningGenParamsLocal {
+                bitcoin_rpc: bitcoin_rpc.clone(),
             },
-        )
-        .attach_config_gen_params(
+            consensus: LightningGenParamsConsensus { network },
+        },
+    );
+
+    // TODO(support:v0.4): v0.5 introduced relative fees for the mint module by
+    // changing the field names for FeeConsensus. We need to support the old fields
+    // in devimint since fedimint-cli uses JSON encoding for admin dkg
+    if fedimintd_version >= &VERSION_0_5_0_ALPHA {
+        module_init_params.attach_config_gen_params(
             MintInit::kind(),
             MintGenParams {
                 local: EmptyGenParams::default(),
                 consensus: MintGenParamsConsensus::new(2, FeeConsensus::zero()),
             },
         )
-        .attach_config_gen_params(
-            WalletInit::kind(),
-            WalletGenParams {
-                local: WalletGenParamsLocal {
-                    bitcoin_rpc: bitcoin_rpc.clone(),
-                },
-                consensus: WalletGenParamsConsensus {
-                    network,
-                    // TODO this is not very elegant, but I'm planning to get rid of it in a next
-                    // commit anyway
-                    finality_delay,
-                    client_default_bitcoin_rpc: default_esplora_server(network),
-                    fee_consensus: fedimint_wallet_client::config::FeeConsensus::default(),
-                },
+    } else {
+        module_init_params.attach_config_gen_params(
+            MintInit::kind(),
+            LegacyMintGenParams {
+                local: EmptyGenParams::default(),
+                consensus: LegacyMintGenParamsConsensus::new(2, LegacyFeeConsensus::default()),
             },
-        );
+        )
+    };
+
+    module_init_params.attach_config_gen_params(
+        WalletInit::kind(),
+        WalletGenParams {
+            local: WalletGenParamsLocal {
+                bitcoin_rpc: bitcoin_rpc.clone(),
+            },
+            consensus: WalletGenParamsConsensus {
+                network,
+                finality_delay,
+                client_default_bitcoin_rpc: default_esplora_server(network),
+                fee_consensus: fedimint_wallet_client::config::FeeConsensus::default(),
+            },
+        },
+    );
 
     // TODO(support:v0.3): v0.4 introduced lnv2 modules, so we need to skip
     // attaching the module for old fedimintd versions
@@ -90,3 +103,58 @@ pub fn attach_default_module_init_params(
             .attach_config_gen_params(UnknownInit::kind(), UnknownGenParams::default());
     }
 }
+
+mod legacy_types {
+    use fedimint_core::config::EmptyGenParams;
+    use fedimint_core::encoding::{Decodable, Encodable};
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Debug, Clone, Serialize, Deserialize)]
+    pub struct LegacyMintGenParams {
+        pub local: EmptyGenParams,
+        pub consensus: LegacyMintGenParamsConsensus,
+    }
+
+    #[derive(Debug, Clone, Eq, PartialEq, Hash, Serialize, Deserialize, Encodable, Decodable)]
+    pub struct LegacyFeeConsensus {
+        pub note_issuance_abs: fedimint_core::Amount,
+        pub note_spend_abs: fedimint_core::Amount,
+    }
+
+    impl Default for LegacyFeeConsensus {
+        fn default() -> Self {
+            Self {
+                note_issuance_abs: fedimint_core::Amount::ZERO,
+                note_spend_abs: fedimint_core::Amount::ZERO,
+            }
+        }
+    }
+
+    #[derive(Debug, Clone, Serialize, Deserialize)]
+    pub struct LegacyMintGenParamsConsensus {
+        denomination_base: u16,
+        fee_consensus: LegacyFeeConsensus,
+    }
+
+    impl LegacyMintGenParamsConsensus {
+        pub fn new(denomination_base: u16, fee_consensus: LegacyFeeConsensus) -> Self {
+            Self {
+                denomination_base,
+                fee_consensus,
+            }
+        }
+    }
+
+    impl fedimint_core::config::ModuleInitParams for LegacyMintGenParams {
+        type Local = EmptyGenParams;
+        type Consensus = LegacyMintGenParamsConsensus;
+
+        fn from_parts(local: Self::Local, consensus: Self::Consensus) -> Self {
+            Self { local, consensus }
+        }
+
+        fn to_parts(self) -> (Self::Local, Self::Consensus) {
+            (self.local, self.consensus)
+        }
+    }
+}