Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 20:48:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

receiveAt with new key

Browse source
This commit is contained in:
howard-stearns 2018-02-23 17:05:46 -08:00
parent 8f44a52140
commit 726c1ed816
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/commerce/wallet/Wallet.qml
View file

@ -792,7 +792,6 @@ Rectangle {
function walletResetSetup() { function walletResetSetup() {
root.activeView = "walletSetup"; root.activeView = "walletSetup";
Commerce.resetLocalWalletOnly();
var timestamp = new Date(); var timestamp = new Date();
walletSetup.startingTimestamp = timestamp; walletSetup.startingTimestamp = timestamp;
walletSetup.setupAttemptID = generateUUID(); walletSetup.setupAttemptID = generateUUID();

2
interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
View file

@ -205,7 +205,7 @@ Item {
"This step cannot be undone."; "This step cannot be undone.";
lightboxPopup.button1color = hifi.buttons.red; lightboxPopup.button1color = hifi.buttons.red;
lightboxPopup.button1text = "YES, CREATE NEW WALLET"; lightboxPopup.button1text = "YES, CREATE NEW WALLET";
lightboxPopup.button1method = "proceed(true);root.visible = false;"; lightboxPopup.button1method = "root.visible = false;proceed(true);";
lightboxPopup.button2text = "CANCEL"; lightboxPopup.button2text = "CANCEL";
lightboxPopup.button2method = "root.visible = false;" lightboxPopup.button2method = "root.visible = false;"
lightboxPopup.buttonLayout = "topbottom"; lightboxPopup.buttonLayout = "topbottom";

3
interface/src/commerce/Wallet.cpp
View file

@ -541,7 +541,6 @@ bool Wallet::generateKeyPair() {
// TODO: redo this soon -- need error checking and so on // TODO: redo this soon -- need error checking and so on
writeSecurityImage(_securityImage, keyFilePath()); writeSecurityImage(_securityImage, keyFilePath());
QString oldKey = _publicKeys.count() == 0 ? "" : _publicKeys.last();
QString key = keyPair.first->toBase64(); QString key = keyPair.first->toBase64();
_publicKeys.push_back(key); _publicKeys.push_back(key);
qCDebug(commerce) << "public key:" << key; qCDebug(commerce) << "public key:" << key;
@ -551,7 +550,7 @@ bool Wallet::generateKeyPair() {
// 2. It is maximally private, and we can step back from that later if desired. // 2. It is maximally private, and we can step back from that later if desired.
// 3. It maximally exercises all the machinery, so we are most likely to surface issues now. // 3. It maximally exercises all the machinery, so we are most likely to surface issues now.
auto ledger = DependencyManager::get<Ledger>(); auto ledger = DependencyManager::get<Ledger>();
return ledger->receiveAt(key, oldKey); return ledger->receiveAt(key, "");
} }
QStringList Wallet::listPublicKeys() { QStringList Wallet::listPublicKeys() {