diff --git a/package.json b/package.json index 847b9ea..537ce0b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "avalon", - "version": "1.6.1", + "version": "1.6.2", "description": "", "scripts": { "start": "node src/main.js", @@ -55,7 +55,7 @@ "title": "Avalon API Documentation", "description": "REST API documentation for Avalon blockchain", "sampleUrl": "https://api.avalonblocks.com", - "version": "1.6.1" + "version": "1.6.2" }, "devDependencies": { "apidoc": "^0.50.2", diff --git a/src/chain.js b/src/chain.js index d052299..889b7bd 100644 --- a/src/chain.js +++ b/src/chain.js @@ -821,16 +821,8 @@ let chain = { balance: 0, bw: { v: 0, t: block.timestamp }, vt: { v: 0, t: block.timestamp } - }}, () => - // disable @dtube leader - transaction.execute({ - type: 18, - data: { - pub: '' - }, - sender: 'dtube' - },block.timestamp,() => cb(null, { executed: false, distributed: 0, burned: burned })) - ) + }}, () => cb(null, { executed: false, distributed: 0, burned: burned }) + ) }) else cb(null, { executed: false, distributed: 0, burned: 0 }) diff --git a/src/p2p.js b/src/p2p.js index cf7dd19..0d0da12 100644 --- a/src/p2p.js +++ b/src/p2p.js @@ -1,4 +1,4 @@ -const version = '1.6.1' +const version = '1.6.2' const default_port = 6001 const replay_interval = 1500 const discovery_interval = 60000 diff --git a/src/transaction.js b/src/transaction.js index b5ff7a9..1503a4d 100644 --- a/src/transaction.js +++ b/src/transaction.js @@ -234,8 +234,9 @@ let transaction = { let activeProposalVotes = [] if (account.voteLock) for (let v in account.proposalVotes) - if (account.proposalVotes[v].end > ts && account.proposalVotes[v].amount - account.proposalVotes[v].bonus > newLock) { - newLock = account.proposalVotes[v].amount - account.proposalVotes[v].bonus + if (account.proposalVotes[v].end > ts) { + if (account.proposalVotes[v].amount - account.proposalVotes[v].bonus > newLock) + newLock = account.proposalVotes[v].amount - account.proposalVotes[v].bonus activeProposalVotes.push(account.proposalVotes[v]) }