diff --git a/config/src/comments.rs b/config/src/comments.rs index ac71c0cd0..078f78661 100644 --- a/config/src/comments.rs +++ b/config/src/comments.rs @@ -323,6 +323,7 @@ fn comments() -> HashMap { "accept_fee_base".to_string(), " #base fee that's accepted into the pool +#a setting to 1000000 will be overridden to 500000 to respect the fixfees RFC " .to_string(), ); diff --git a/src/bin/grin.rs b/src/bin/grin.rs index 5cd07aa50..bcd3d33e0 100644 --- a/src/bin/grin.rs +++ b/src/bin/grin.rs @@ -160,15 +160,18 @@ fn real_main() -> i32 { global::init_global_nrd_enabled(true); } } - global::init_global_accept_fee_base( - config - .members - .as_ref() - .unwrap() - .server - .pool_config - .accept_fee_base, - ); + let afb = config + .members + .as_ref() + .unwrap() + .server + .pool_config + .accept_fee_base; + let fix_afb = match afb { + 1_000_000 => 500_000, + _ => afb, + }; + global::init_global_accept_fee_base(fix_afb); info!("Accept Fee Base: {:?}", global::get_accept_fee_base()); global::init_global_future_time_limit(config.members.unwrap().server.future_time_limit); info!("Future Time Limit: {:?}", global::get_future_time_limit());