OSDN Git Service

add the confirmation params.
authorZhiting Lin <zlin035@uottawa.ca>
Thu, 21 Feb 2019 01:51:07 +0000 (09:51 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Thu, 21 Feb 2019 01:51:07 +0000 (09:51 +0800)
src/dapp.js
src/models/transaction.js
src/views/advancedTransfer.vue

index e14eb62..3557abe 100644 (file)
@@ -88,13 +88,14 @@ export default class Bytomdapp {
     })
   }
 
-  advancedTransfer(account, input, output, gas, args) {
+  advancedTransfer(account, input, output, gas, args, confirmations) {
     return _send(MsgTypes.ADVTRANSFER, {
       account,
       input,
       output,
       gas,
-      args
+      args,
+      confirmations
     })
   }
 
index a60b513..6f23d5c 100644 (file)
@@ -41,10 +41,10 @@ transaction.build = function(guid, to, asset, amount, fee) {
   return retPromise;
 };
 
-transaction.buildTransaction = function(guid, inputs, outputs, gas) {
+transaction.buildTransaction = function(guid, inputs, outputs, gas, confirmations) {
   let retPromise = new Promise((resolve, reject) => {
     bytom.transaction
-      .buildTransaction(guid, inputs, outputs, gas)
+      .buildTransaction(guid, inputs, outputs, gas, confirmations)
       .then(res => {
         resolve(res);
       })
index 53904ce..36f1ea8 100644 (file)
@@ -138,7 +138,7 @@ export default {
             });
             const inout = JSON.parse(this.$route.query.object)
 
-            transaction.buildTransaction(this.account.guid,  inout.input, inout.output, inout.gas).then(ret => {
+            transaction.buildTransaction(this.account.guid,  inout.input, inout.output, inout.gas, inout.confirmations).then(ret => {
                 return transaction.convertArgument(inout.args)
                     .then((arrayData) =>{
                         return transaction.advancedTransfer(this.account.guid, ret.result.data, passwd, arrayData)
@@ -148,7 +148,7 @@ export default {
                                 this.$dialog.show({
                                     body: this.$t("transfer.success")
                                 });
-                                this.$router.push('/');
+                              window.close();
                             })
                             .catch(error => {
                                  throw error