adjust tx expiration

Author: qianbin

src/renderer/components/TxActivityItem.vue

@@ -83,7 +83,7 @@ const timeAgo = TimeAgo()
 export default class TxActivityItem extends Vue {
     @Prop(Object) item !: entities.Activity<'tx'>
 
-    resendCount = 0
+    resendTime: { [id: string]: number } = {}
 
     get txObject() { return Transaction.decode(Buffer.from(this.item.data.raw.slice(2), 'hex')) }
     get comment() { return this.item.data.comment || describeClauses(this.item.data.message) }
@@ -110,7 +110,6 @@ export default class TxActivityItem extends Vue {
     }
 
     get status() {
-        this.resendCount
         this.$store.state.syncStatus // pulse
         const headTs = this.$store.state.chainHead.timestamp as number
         if (this.item.data.receipt) {
@@ -127,7 +126,8 @@ export default class TxActivityItem extends Vue {
             return 'error'
         }
 
-        if (qStatus === 'sent' && headTs > this.item.data.timestamp + 10 * 60) {
+        const sendTime = this.resendTime[this.item.data.id] || this.item.data.timestamp
+        if (qStatus === 'sent' && headTs > sendTime + 10 * 6) {
             return 'timeout'
         }
 
@@ -169,7 +169,7 @@ export default class TxActivityItem extends Vue {
 
     resend() {
         CLIENT.txer.send(this.item.data.id, this.item.data.raw)
-        this.resendCount++
+        this.$set(this.resendTime, this.item.data.id, Date.now() / 1000)
     }
 
     reveal() {

src/renderer/tx-tracker.ts

@@ -7,7 +7,7 @@ async function handleTx(txRow: entities.Activity<'tx'>, dispose: () => void) {
                 try {
                     const receipt = await connex.thor.transaction(txRow.data.id).getReceipt()
                     const confirmed = receipt ? head.number - receipt.meta.blockNumber >= 12 : false
-                    const expired = !receipt && (head.timestamp - txRow.data.timestamp > 3600 * 2)
+                    const expired = !receipt && (head.timestamp - txRow.data.timestamp > 18 * 10 + 10)
                     await BDB.activities
                         .where({ id: txRow.id! })
                         .modify(row => {

src/renderer/tx-utils.ts

@@ -79,7 +79,7 @@ export function buildTx(
     const tx = new Transaction({
         chainTag: Number.parseInt(genesis.id.slice(genesis.id.length - 2), 16),
         blockRef: bestId.slice(0, 18),
-        expiration: 720,
+        expiration: 18, // about 3 mins
         clauses,
         gasPriceCoef,
         gas,