Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

override old accept_fee_base setting of 1000000 to new default 500000 #3539

Merged
merged 3 commits into from
Jan 6, 2021
Merged

override old accept_fee_base setting of 1000000 to new default 500000 #3539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a175f50
override old accept_fee_base setting of 1000000 to new default 500000
tromp Jan 6, 2021
23c5709
document exceptional accept_fee_base behaviour in grin-server.toml
tromp Jan 6, 2021
2dcdaf3
document more accurately
tromp Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/src/comments.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ fn comments() -> HashMap<String, String> {
"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(),
);
Expand Down
21 changes: 12 additions & 9 deletions src/bin/grin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down