From 6a3429a81df7b5031debbbdeb26a2e843ae22a65 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Mon, 28 Jul 2014 02:29:18 +0200 Subject: [PATCH] Protocol version bump. --- libethcore/CommonEth.cpp | 2 +- stdserv.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libethcore/CommonEth.cpp b/libethcore/CommonEth.cpp index e88de28e1..3c1a336eb 100644 --- a/libethcore/CommonEth.cpp +++ b/libethcore/CommonEth.cpp @@ -29,7 +29,7 @@ using namespace eth; //#define ETH_ADDRESS_DEBUG 1 -const unsigned eth::c_protocolVersion = 23; +const unsigned eth::c_protocolVersion = 24; const unsigned eth::c_databaseVersion = 1; static const vector> g_units = diff --git a/stdserv.js b/stdserv.js index 6d94c397b..4d95f8a82 100644 --- a/stdserv.js +++ b/stdserv.js @@ -152,8 +152,8 @@ var exchangeCode = eth.lll(" (def 'rateof (_item) @@ (+ _item 1)) (def 'idof (_item) @@ (+ _item 2)) (def 'wantof (_item) @@ (+ _item 3)) -(def 'newitem (rate who want) { - (set 'pos (sha3pair rate who)) +(def 'newitem (rate who want list) { + (set 'pos (sha3trip rate who list)) [[ (+ @pos 1) ]] rate [[ (+ @pos 2) ]] who [[ (+ @pos 3) ]] want @@ -225,7 +225,7 @@ var exchangeCode = eth.lll(" (set 'last @list) (set 'item @@ @last) - (set 'newpos (newitem @rate (caller) @xwant)) + (set 'newpos (newitem @rate (caller) @xwant @list)) (for {} (&& @item (!= @item @newpos) (>= (rateof @item) @rate)) { (set 'last @item) (inc item) } {}) (if (= @item @newpos)