-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[tx]: BIP 125 replace-by-fee (RBF) support:
* create replaceable transactions with 'mmgen-txcreate' and 'mmgen-txdo'
using the '--rbf' option
* create replacement transactions from existing MMGen transactions
using the new, optionally scriptable 'mmgen-txbump' command
* Bitcoind must be started with the '-walletrbf' option to enable RBF
functionality
[tx]: Command scriptability:
* New '--yes' option makes 'txbump' and 'txsign' fully non-interactive
and 'txcreate' and 'txsend' mostly non-interactive
[tx]: Satoshis-per-byte format:
* Tx fees, both on the command line and at the interactive prompt, may be
specified either as absolute BTC amounts or in satoshis-per-byte format
(an integer followed by the letter 's')
[tx]: Fees
* Completely reworked fee-handling code with better fee checking
* default tx fee eliminated, max_tx_fee configurable in mmgen.cfg
Bugfixes and usability improvements:
* 'mmgen-tool listaddresses' now list addresses from multiple seeds
correctly
* Improved user interaction with all 'mmgen-tx*' commands- Loading branch information
Showing
16 changed files
with
553 additions
and
151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #!/usr/bin/env python | ||
|
|
||
| # mmgen = Multi-Mode GENerator, command-line Bitcoin cold storage solution | ||
| # Copyright (C)2013-2016 Philemon <mmgen-py@yandex.com> | ||
| # | ||
| # This program is free software: you can redistribute it and/or modify it under | ||
| # the terms of the GNU General Public License as published by the Free Software | ||
| # Foundation, either version 3 of the License, or (at your option) any later | ||
| # version. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, but WITHOUT | ||
| # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | ||
| # details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License along with | ||
| # this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| """ | ||
| mmgen-txbump: Increase the fee on a replaceable (RBF) MMGen transaction, and | ||
| optionally sign and send it. | ||
| """ | ||
|
|
||
| from mmgen.main import launch | ||
| launch("txbump") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| #!/usr/bin/env python | ||
| # | ||
| # mmgen = Multi-Mode GENerator, command-line Bitcoin cold storage solution | ||
| # Copyright (C)2013-2016 Philemon <mmgen-py@yandex.com> | ||
| # | ||
| # This program is free software: you can redistribute it and/or modify | ||
| # it under the terms of the GNU General Public License as published by | ||
| # the Free Software Foundation, either version 3 of the License, or | ||
| # (at your option) any later version. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| """ | ||
| mmgen-txbump: Increase the fee on a replaceable (replace-by-fee) MMGen | ||
| transaction, and optionally sign and send it | ||
| """ | ||
|
|
||
| from mmgen.txcreate import * | ||
| from mmgen.txsign import * | ||
|
|
||
| opts_data = { | ||
| 'desc': 'Increase the fee on a replaceable (RBF) {g.proj_name} transaction, creating a new transaction, and optionally sign and send the new transaction'.format(g=g), | ||
| 'usage': '[opts] <{g.proj_name} TX file> [seed source] ...'.format(g=g), | ||
| 'sets': ( ('yes', True, 'quiet', True), ), | ||
| 'options': """ | ||
| -h, --help Print this help message | ||
| --, --longhelp Print help message for long options (common options) | ||
| -b, --brain-params=l,p Use seed length 'l' and hash preset 'p' for | ||
| brainwallet input | ||
| -c, --comment-file= f Source the transaction's comment from file 'f' | ||
| -d, --outdir= d Specify an alternate directory 'd' for output | ||
| -e, --echo-passphrase Print passphrase to screen when typing it | ||
| -f, --tx-fee= f Transaction fee, as a decimal BTC amount or in | ||
| satoshis per byte (an integer followed by 's') | ||
| -H, --hidden-incog-input-params=f,o Read hidden incognito data from file | ||
| 'f' at offset 'o' (comma-separated) | ||
| -i, --in-fmt= f Input is from wallet format 'f' (see FMT CODES below) | ||
| -l, --seed-len= l Specify wallet seed length of 'l' bits. This option | ||
| is required only for brainwallet and incognito inputs | ||
| with non-standard (< {g.seed_len}-bit) seed lengths. | ||
| -k, --keys-from-file=f Provide additional keys for non-{pnm} addresses | ||
| -K, --key-generator= m Use method 'm' for public key generation | ||
| Options: {kgs} | ||
| (default: {kg}) | ||
| -M, --mmgen-keys-from-file=f Provide keys for {pnm} addresses in a key- | ||
| address file (output of '{pnl}-keygen'). Permits | ||
| online signing without an {pnm} seed source. The | ||
| key-address file is also used to verify {pnm}-to-BTC | ||
| mappings, so the user should record its checksum. | ||
| -o, --output-to-reduce=o Deduct the fee from output 'o' (an integer, or 'c' | ||
| for the transaction's change output, if present) | ||
| -O, --old-incog-fmt Specify old-format incognito input | ||
| -p, --hash-preset= p Use the scrypt hash parameters defined by preset 'p' | ||
| for password hashing (default: '{g.hash_preset}') | ||
| -P, --passwd-file= f Get {pnm} wallet or bitcoind passphrase from file 'f' | ||
| -q, --quiet Suppress warnings; overwrite files without prompting | ||
| -s, --send Sign and send the transaction (the default if seed | ||
| data is provided) | ||
| -v, --verbose Produce more verbose output | ||
| -y, --yes Answer 'yes' to prompts, suppress non-essential output | ||
| -z, --show-hash-presets Show information on available hash presets | ||
| """.format(g=g,pnm=pnm,pnl=pnm.lower(), | ||
| kgs=' '.join(['{}:{}'.format(n,k) for n,k in enumerate(g.key_generators,1)]), | ||
| kg=g.key_generator), | ||
| 'notes': '\n' + fee_notes + txsign_notes | ||
| } | ||
|
|
||
| cmd_args = opts.init(opts_data) | ||
|
|
||
| c = bitcoin_connection() | ||
|
|
||
| tx_file = cmd_args.pop(0) | ||
| check_infile(tx_file) | ||
|
|
||
| seed_files = get_seed_files(opt,cmd_args) if (cmd_args or opt.send) else None | ||
| kal = get_keyaddrlist(opt) | ||
| kl = get_keylist(opt) | ||
|
|
||
| tx = MMGenBumpTX(filename=tx_file,send=(seed_files or kl or kal)) | ||
|
|
||
| do_license_msg() | ||
|
|
||
| silent = opt.yes and opt.tx_fee != None and opt.output_to_reduce != None | ||
|
|
||
| if not silent: | ||
| msg(green('ORIGINAL TRANSACTION')) | ||
| msg(tx.format_view(terse=True)) | ||
|
|
||
| tx.set_min_fee() | ||
|
|
||
| if not [o.amt for o in tx.outputs if o.amt >= tx.min_fee]: | ||
| die(1,'Transaction cannot be bumped.' + | ||
| '\nAll outputs have less than the minimum fee ({} BTC)'.format(tx.min_fee)) | ||
|
|
||
| msg('Creating new transaction') | ||
|
|
||
| op_idx = tx.choose_output() | ||
|
|
||
| if not silent: | ||
| msg('Minimum fee for new transaction: {} BTC'.format(tx.min_fee)) | ||
|
|
||
| fee = tx.get_usr_fee_interactive(tx_fee=opt.tx_fee,desc='User-selected') | ||
|
|
||
| tx.update_output_amt(op_idx,tx.sum_inputs()-tx.sum_outputs(exclude=op_idx)-fee) | ||
|
|
||
| d = tx.get_fee() | ||
| assert d == fee and d <= g.max_tx_fee | ||
|
|
||
| if not opt.yes: | ||
| tx.add_comment() # edits an existing comment | ||
| tx.create_raw(c) # creates tx.hex, tx.txid | ||
| tx.add_timestamp() | ||
| tx.add_blockcount(c) | ||
|
|
||
| qmsg('Fee successfully increased') | ||
|
|
||
| if not silent: | ||
| msg(green('\nREPLACEMENT TRANSACTION:')) | ||
| msg_r(tx.format_view(terse=True)) | ||
|
|
||
| if seed_files or kl or kal: | ||
| txsign(opt,c,tx,seed_files,kl,kal) | ||
| tx.write_to_file(ask_write=False) | ||
| if tx.send(c): | ||
| tx.write_to_file(ask_write=False) | ||
| else: | ||
| tx.write_to_file(ask_write=not opt.yes,ask_write_default_yes=False,ask_overwrite=not opt.yes) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.