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.

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

GUI cold signing #1541

Merged
merged 3 commits into from Jan 13, 2017
Merged

GUI cold signing #1541

merged 3 commits into from Jan 13, 2017

Conversation

Jaqueeee
Copy link
Contributor

@Jaqueeee Jaqueeee commented Jan 8, 2017

@fluffypony
Copy link
Contributor

Please rebase

@Jaqueeee
Copy link
Contributor Author

Jaqueeee commented Jan 9, 2017

Don't merge this yet. have some conflicts to resolve.

@Jaqueeee
Copy link
Contributor Author

Jaqueeee commented Jan 9, 2017

Rebased.

moneromooo-monero
moneromooo-monero reviewed Jan 9, 2017
View reviewed changes
Copy link
Collaborator

@moneromooo-monero moneromooo-monero left a comment

Choose a reason for hiding this comment

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

ok, quick glance only

src/wallet/api/unsigned_transaction.cpp
@@ -0,0 +1,284 @@
// Copyright (c) 2014-2016, The Monero Project
Copy link
Collaborator

Choose a reason for hiding this comment

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

I guess it's 2017 now ^_^

Jaqueeee
Jaqueeee commented Jan 10, 2017
View reviewed changes
src/wallet/api/pending_transaction.cpp
if (!filename.empty()) {
boost::system::error_code ignore;
bool tx_file_exists = boost::filesystem::exists(filename, ignore);
if(tx_file_exists && !overwrite){
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added optional overwrite here after moo's review.

Jaqueeee
Jaqueeee commented Jan 10, 2017
View reviewed changes
Copy link
Contributor Author

@Jaqueeee Jaqueeee left a comment

Choose a reason for hiding this comment

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

Rebased + small updates

@Jaqueeee Jaqueeee mentioned this pull request Jan 12, 2017
Merged
fluffypony
fluffypony approved these changes Jan 13, 2017
View reviewed changes
Copy link
Contributor

@fluffypony fluffypony left a comment

Choose a reason for hiding this comment

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

Reviewed

@fluffypony fluffypony merged commit 0d3918e into monero-project:master Jan 13, 2017
fluffypony added a commit that referenced this pull request Jan 13, 2017
@fluffypony
Merge pull request #1541
faa33fc 
0d3918e Wallet api: Update trustedDaemon when daemon is changed (Jaquee)
dbb838f GUI cold signing (Jaquee)
afb85a0 Wallet API: functions for supporting/creating view only wallets (Jaquee)
@stoffu stoffu mentioned this pull request Jan 17, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@moneromooo-monero moneromooo-monero moneromooo-monero left review comments

@fluffypony fluffypony fluffypony 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.

TrustedDaemon() doesn't update when changing daemon address
3 participants
@Jaqueeee @fluffypony @moneromooo-monero