Skip to content

Commit af2ee44

Browse files
committed
cleanup memory db fix siafund display bug
1 parent 70d71ab commit af2ee44

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

src/store/db.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ export async function saveWallet(wallet, password) {
4444

4545
let confirmedSiafundBalance = new BigNumber(wallet.confirmed_siafund_balance),
4646
confirmedSiacoinBalance = new BigNumber(wallet.confirmed_siacoin_balance),
47-
unconfirmedSiafundDelta = new BigNumber(wallet.unconfirmed_siacoin_delta),
48-
unconfirmedSiacoinDelta = new BigNumber(wallet.unconfirmed_siafund_delta),
47+
unconfirmedSiacoinDelta = new BigNumber(wallet.unconfirmed_siacoin_delta),
48+
unconfirmedSiafundDelta = new BigNumber(wallet.unconfirmed_siafund_delta),
4949
siafundClaim = new BigNumber(wallet.siafund_claim);
5050

5151
if (siafundClaim.isNaN() || !siafundClaim.isFinite())
@@ -72,8 +72,8 @@ export async function saveWallet(wallet, password) {
7272
seed: encrypt(wallet.seed, key.hash),
7373
confirmed_siafund_balance: confirmedSiafundBalance.toString(10),
7474
confirmed_siacoin_balance: confirmedSiacoinBalance.toString(10),
75-
unconfirmed_siacoin_delta: unconfirmedSiafundDelta.toString(10),
76-
unconfirmed_siafund_delta: unconfirmedSiacoinDelta.toString(10),
75+
unconfirmed_siacoin_delta: unconfirmedSiacoinDelta.toString(10),
76+
unconfirmed_siafund_delta: unconfirmedSiafundDelta.toString(10),
7777
siafund_claim: siafundClaim.toString(10)
7878
});
7979

src/store/db/memory.js

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,14 @@ export default class MemoryStore {
4747
}
4848

4949
async getAddresses(walletID, addresses) {
50+
if (!Array.isArray(addresses))
51+
addresses = [addresses];
52+
5053
return Object.keys(this._addresses).reduce((v, a) => {
5154
const r = this._addresses[a];
5255

53-
if (r.wallet_id === walletID && addresses.indexOf(a))
54-
v.push(a);
56+
if (r.wallet_id === walletID && addresses.indexOf(a) !== -1)
57+
v.push(r);
5558

5659
return v;
5760
}, []);
@@ -60,11 +63,19 @@ export default class MemoryStore {
6063
async getWalletChangeAddress(walletID) {
6164
const addresses = await this.getWalletAddresses(walletID);
6265

63-
addresses.sort((a, b) => a.index > b.index ? -1 : a.index < b.index ? 1 : 0);
66+
addresses.sort((a, b) => a.index > b.index ? 1 : a.index < b.index ? -1 : 0);
6467

6568
return addresses[0];
6669
}
6770

71+
async getFirstWalletAddresses(walletID) {
72+
const addresses = await this.getWalletAddresses(walletID);
73+
74+
addresses.sort((a, b) => a.index > b.index ? 1 : a.index < b.index ? -1 : 0);
75+
76+
return addresses.slice(0, 100);
77+
}
78+
6879
async getLastWalletAddresses(walletID, limit, offset) {
6980
const addresses = await this.getWalletAddresses(walletID);
7081

src/store/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ const store = new Vuex.Store({
132132
if (state.wallets.length === 0)
133133
state.setup = false; // redo onboarding
134134
},
135-
setExchangeRate(state, { siacoin, siafund }) {
135+
setExchangeRate(state, { siacoin, siafund = {} }) {
136136
state.exchangeRateSC = siacoin;
137137
state.exchangeRateSF = siafund;
138138
},
@@ -302,8 +302,6 @@ async function updateMetadata() {
302302
const [usd, eur, jpy, cny, btc, eth] = await Promise.all([
303303
getExchangeRate('usd'),
304304
getExchangeRate('eur'),
305-
getExchangeRate('cad'),
306-
getExchangeRate('gbp'),
307305
getExchangeRate('jpy'),
308306
getExchangeRate('cny'),
309307
getExchangeRate('btc'),

0 commit comments

Comments
 (0)