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

Jump to bottom

joinmarket: 0.8.3 -> 0.9.1 #380

Merged
merged 9 commits into from
Aug 30, 2021
Merged

joinmarket: 0.8.3 -> 0.9.1 #380

merged 9 commits into from
Aug 30, 2021

Conversation

nixbitcoin
Copy link
Member

No description provided.

@erikarvstedt
Copy link
Collaborator

Fixups and extra commits.

Commit joinmarket: document optional fidelity bond wallet for makers is superseded by joinmarket: allow recreating wallet from seed and can be deleted.

Commit joinmarket: allow recreating wallet from seed

Unfortunately, joinmarket can't be properly tested in unsynced mainnet or regtest.
Use the following to manually test this commit:

tr -d "\n" < /secrets/jm-wallet-password | jm-wallet-tool --wallet-password-stdin wallet.jmdat showseed
rm /var/lib/joinmarket/wallets/wallet.jmdat
# This recreates the wallet from the seed
systemctl restart joinmarket
# Check that the same seed and password is used
tr -d "\n" < /secrets/jm-wallet-password | jm-wallet-tool --wallet-password-stdin wallet.jmdat showseed

nixbitcoin
nixbitcoin commented Aug 30, 2021
View reviewed changes
modules/joinmarket.nix Outdated Show resolved Hide resolved
@nixbitcoin
Copy link
Member Author

Merged fixups and extra commit, see comments for issues.

Maybe we should also note that recreating from seed is the default behavior when a seed is present but no wallet file. Or is the edge case just to esoteric to be applicable to any real person?

erikarvstedt and others added 7 commits August 30, 2021 13:37
@erikarvstedt
joinmarket-ob-watcher: move resource files to extra dir
d7f9e33 
Don't clutter joinmarket/bin with ob-watcher resource files.
@nixbitcoin @erikarvstedt
joinmarket-ob-watcher: extra permissions & functionality for fidelity…
00a0759 
… bonds
@nixbitcoin @erikarvstedt
joinmarket-ob-watcher: don't assert running, assert rpc failure
5c14453 
joinmarket-ob-watcher now makes extensive use of bitcoind because of
JoinMarket's new fidelity bond functionality. Therefore it fails on
non-synced nodes, as those in the test suite. We now test that the
service fails with the correct error, rather than asserting that it is
running.
@erikarvstedt
joinmarket: fix leaking passwords
b15d716 
Previously, `bitcoin-rpcpassword-privileged` and `jm-wallet-password` were
passed as world readable arguments to sed and jm-genwallet subprocesses.
@erikarvstedt
versioning: move list of changes to the top
7c5ef32 
Improves readability.
@erikarvstedt
joinmarket: allow recreating wallet from seed
179b86d 
This allows users to easily upgrade their wallets to use Fidelity Bonds.
@erikarvstedt
joinmarket-yieldgenerator: simplify start script
9730be9
@erikarvstedt
Copy link
Collaborator

Fixed branch.

  • Fix pipe error
  • Document that wallets are restored from seed
  • Remove obsolete commit joinmarket: document optional fidelity bond wallet for makers.

@nixbitcoin
Copy link
Member Author

Reset to your HEAD.

Remove obsolete commit joinmarket: document optional fidelity bond wallet for makers.

Oh yeah, I had removed that commit on a previous merge but then forgot when I had to redo some of the squashing. Good catch!

erikarvstedt
erikarvstedt approved these changes Aug 30, 2021
View reviewed changes
Copy link
Collaborator

@erikarvstedt erikarvstedt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 9730be9

@jonasnick jonasnick merged commit 1c5154c into fort-nix:master Aug 30, 2021
@nixbitcoin nixbitcoin deleted the joinmarket-0.9.1 branch December 30, 2021 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erikarvstedt erikarvstedt erikarvstedt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nixbitcoin @erikarvstedt @jonasnick