diff --git a/src/pages/history/tx-history-bitcoin.vue b/src/pages/history/tx-history-bitcoin.vue
index 5c868ce..2815617 100644
--- a/src/pages/history/tx-history-bitcoin.vue
+++ b/src/pages/history/tx-history-bitcoin.vue
@@ -72,9 +72,16 @@
this.$wallet.getTransactions(this.$store.state.account.address, option)
.then(data => {
this.total = data.wallet.n_tx;
+ let lastBlockHeight = data.info.latest_block.height;
data.txs.forEach(item => {
+ item.confirmations = 0;
+ if (item.block_height) {
+ item.confirmations = lastBlockHeight - item.block_height + 1;
+ }
let history = this.toHistory(item);
- this.normalHistory.push(history);
+ if (history) {
+ this.normalHistory.push(history);
+ }
});
this.nextLoading = false;
}).catch(err => {
@@ -96,26 +103,92 @@
};
return option;
},
- toHistory (data) {
+ updateConfirmations () {
+ let confirmations = 6;
+ this.clearTimers();
+ this.tempHistory.forEach(item => {
+ let timer = setInterval(async () => {
+ const trxConfirmations = await this.$wallet.getConfirmations(item);
+ console.log('trxConfirmations:', trxConfirmations);
+ if (trxConfirmations === -1) {
+ this.$collecitons.tempHistory.removeHistory({txHash: item.txHash});
+ this.getRemoteHistory();
+ }
+ if (trxConfirmations > confirmations) {
+ this.$collecitons.tempHistory.removeHistory({txHash: item.txHash});
+ clearInterval(timer);
+ this.$store.dispatch('setBalances', this.$store.state.account.address);
+ this.getRemoteHistory();
+ } else {
+ this.$collecitons.tempHistory.updateHistory(item.txHash, history => {
+ history.confirmations = trxConfirmations;
+ });
+ item.confirmations = trxConfirmations;
+ }
+ }, 20 * 1000);
+ this.timers.push(timer);
+ });
+ },
+ checkTempHistory (data) {
+ let storeTempHistory = this.$collecitons.tempHistory.findHistory(this.$store.state.account.type, this.$store.state.account.address, this.asset.code, this.asset.issuer, data.hash);
+ if (storeTempHistory && storeTempHistory.length > 0) {
+ this.$collecitons.tempHistory.updateHistory(data.hash, history => {
+ history.confirmations = data.confirmations;
+ });
+ this.tempHistory = this.$collecitons.tempHistory.findHistory(this.$store.state.account.type, this.$store.state.account.address, this.asset.code, this.asset.issuer);
+ this.updateConfirmations();
+ return true;
+ }
+
let fee = '0';
if (data.fee) {
fee = this.$wallet.transfToBtc(data.fee);
}
- let history = {
- address: this.$store.state.account.address,
- acctType: this.$store.state.account.type,
- assetCode: this.asset.code,
- txHash: data.hash,
- amount: Math.abs(this.$wallet.transfToBtc(data.result)),
- blockNumber: data.block_height,
- to: data.out[0].addr,
- from: data.inputs[0].prev_out.addr,
- txTime: moment.unix(data.time).format('YYYYMMDD HH:mm:ss'),
- fee: fee,
- txType: data.out[0].addr.toLowerCase() === this.$store.state.account.address.toLowerCase() ? '1' : '0',
- data: data
- };
- return history;
+ if (data.confirmations <= 6) {
+ let tempHistory = {
+ address: this.$store.state.account.address,
+ acctType: this.$store.state.account.type,
+ assetCode: this.asset.code,
+ txHash: data.hash,
+ amount: Math.abs(this.$wallet.transfToBtc(data.result)),
+ blockNumber: data.block_height,
+ to: data.out[0].addr,
+ from: data.inputs[0].prev_out.addr,
+ txTime: moment.unix(data.time).format('YYYYMMDD HH:mm:ss'),
+ fee: fee,
+ txType: data.out[0].addr.toLowerCase() === this.$store.state.account.address.toLowerCase() ? '1' : '0',
+ data: data,
+ confirmations: data.confirmations
+ };
+ this.$collecitons.tempHistory.insertHistory(tempHistory);
+ this.tempHistory.push(tempHistory);
+ this.updateConfirmations();
+ return true;
+ }
+ return false;
+ },
+ toHistory (data) {
+ if (!this.checkTempHistory(data)) {
+ let fee = '0';
+ if (data.fee) {
+ fee = this.$wallet.transfToBtc(data.fee);
+ }
+ let history = {
+ address: this.$store.state.account.address,
+ acctType: this.$store.state.account.type,
+ assetCode: this.asset.code,
+ txHash: data.hash,
+ amount: Math.abs(this.$wallet.transfToBtc(data.result)),
+ blockNumber: data.block_height,
+ to: data.out[0].addr,
+ from: data.inputs[0].prev_out.addr,
+ txTime: moment.unix(data.time).format('YYYYMMDD HH:mm:ss'),
+ fee: fee,
+ txType: data.out[0].addr.toLowerCase() === this.$store.state.account.address.toLowerCase() ? '1' : '0',
+ data: data
+ };
+ return history;
+ }
}
}
};
diff --git a/src/pages/wallet/account-type-select-pop.vue b/src/pages/wallet/account-type-select-pop.vue
index c1fd2cf..de05103 100644
--- a/src/pages/wallet/account-type-select-pop.vue
+++ b/src/pages/wallet/account-type-select-pop.vue
@@ -35,6 +35,7 @@
diff --git a/src/pages/wallet/check-memorizing-words-pop.vue b/src/pages/wallet/check-memorizing-words-pop.vue
index 57c343a..bc458f3 100644
--- a/src/pages/wallet/check-memorizing-words-pop.vue
+++ b/src/pages/wallet/check-memorizing-words-pop.vue
@@ -56,19 +56,22 @@
export default {
mixins: [createWallet],
components: {ContentBlock, topBlock, buttonBottom},
+ props: {
+ // 两个值，一个是创建(create)，一个是备份(backups)
+ backupsSource: String
+ },
data () {
return {
showVpop: false,
selectMemorizingWords: [],
memorizingWords: [],
password: '',
- backFlag: '2',
source: '',
accountTypes: []
};
},
methods: {
- show (form, canBack = true, source, accountTypes) {
+ show (form, source, accountTypes) {
this.password = form.password;
this.memorizingWords = [];
this.selectMemorizingWords = [];
@@ -77,12 +80,6 @@
this.memorizingWords.push({name: item, index});
});
this.shuffle(this.memorizingWords);
- window.canBack = canBack;
- if (canBack) {
- this.backFlag = '2';
- } else {
- this.backFlag = '1';
- }
this.source = source;
this.accountTypes = accountTypes;
this.showVpop = true;
@@ -93,6 +90,9 @@
createWalletAcct (mnemonicCodes) {
// 创建账户
this.createWalletAcctByMnemonicCode(this.accountTypes, mnemonicCodes, this.password, this.source, true);
+ // 创建隐藏账户
+ this.filterAndCreateNotSelectAccountType(this.accountTypes, mnemonicCodes, this.password, this.source, true, 'D');
+
let firstAcct = this.getFirstAcct();
if (firstAcct) {
this.$store.dispatch('setAccount', firstAcct);
@@ -108,7 +108,7 @@
if (this.selectMemorizingWords && this.selectMemorizingWords.length > 0 && hdWallet.validateMnemonic(mnemonicCodes, this.getMemorizingCodeLanguage(mnemonicCodes))) {
/* 备份成功之后把手机设备返回按钮启动 */
window.canBack = true;
- if (this.backFlag == '2') {
+ if (this.backupsSource === 'backups') {
// 保存数据库操作
const toast = this.$toast.loading({
duration: 0,
diff --git a/src/pages/wallet/import-type-select-pop.vue b/src/pages/wallet/import-type-select-pop.vue
index e76ef7d..01c718a 100644
--- a/src/pages/wallet/import-type-select-pop.vue
+++ b/src/pages/wallet/import-type-select-pop.vue
@@ -34,7 +34,7 @@
-
+