Skip to content

Commit

Permalink
set the default fee_per_kb to 80000
Browse files Browse the repository at this point in the history
We set it in the config file the first time we copy it over from EC, and also in simple_config.fee_per_kb for user who start the program the first time without having EC on the same system.
  • Loading branch information
PiRK committed Nov 23, 2020
1 parent 48b3883 commit 8ef7aab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions electroncash/migrate_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ def migrate_data_from_ec():
config["auto_connect"] = DEFAULT_AUTO_CONNECT
config["server"] = ""

# Set a fee_per_kb adapted to the current mempool situation
if "fee_per_kb" in config:
config["fee_per_kb"] = 80000

# Delete rpcuser and password. These will be generated on
# the first connection with jsonrpclib.Server
if "rpcuser" in config:
Expand Down
3 changes: 2 additions & 1 deletion electroncash/simple_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,8 @@ def fee_per_kb(self):
if retval is None:
retval = self.get('fee_per_kb')
if retval is None:
retval = 1000 # New wallet
# New wallet (value adapted to November 2020 mempool situation)
retval = 80000
return retval

def has_custom_fee_rate(self):
Expand Down

0 comments on commit 8ef7aab

Please sign in to comment.