fix all test

plugin/dapp/js/executor/1.html

 <script src="runtime.js"></script>
-<script src="test.js"></script>
+<script src="game.js"></script>
 <script>
 //demo database function
 var statedb = {}
@@ -34,11 +34,15 @@ function getstatedb(key) {
     return statedb[key]
 }
 
+function execname() {
+    return "user.jsvm.test"
+}
+
 function setstatedb(kvs) {
     for (var i = 0; i < kvs.length; i++) {
         statedb[kvs[i].key] = kvs[i].value
     }
 }
-var ret = callcode("{}", "execlocal_hello", "{}", [])
+var ret = callcode("{}", "exec_NewGame", "{}", [])
 console.log(ret)
 </script>
\ No newline at end of file

plugin/dapp/js/executor/account.go

@@ -282,7 +282,7 @@ func (u *js) execFrozenFunc(vm *otto.Otto) {
 		if err != nil {
 			return errReturn(vm, err)
 		}
-		receipt, err := acc.ExecFrozen(address.ExecAddress(execer), addr, amount)
+		receipt, err := acc.ExecFrozen(addr, address.ExecAddress(execer), amount)
 		if err != nil {
 			return errReturn(vm, err)
 		}
@@ -311,7 +311,7 @@ func (u *js) execActiveFunc(vm *otto.Otto) {
 		if err != nil {
 			return errReturn(vm, err)
 		}
-		receipt, err := acc.ExecActive(address.ExecAddress(execer), addr, amount)
+		receipt, err := acc.ExecActive(addr, address.ExecAddress(execer), amount)
 		if err != nil {
 			return errReturn(vm, err)
 		}
@@ -340,7 +340,7 @@ func (u *js) execDepositFunc(vm *otto.Otto) {
 		if err != nil {
 			return errReturn(vm, err)
 		}
-		receipt, err := acc.ExecDeposit(address.ExecAddress(execer), addr, amount)
+		receipt, err := acc.ExecDeposit(addr, address.ExecAddress(execer), amount)
 		if err != nil {
 			return errReturn(vm, err)
 		}

plugin/dapp/js/executor/const_test.go

+package executor_test
+
+var jscode = `
+//数据结构设计
+function Init(context) {
+    this.kvc = new kvcreator("init")
+    this.context = context
+    this.kvc.add("action", "init")
+    this.kvc.add("context", this.context)
+    return this.kvc.receipt()
+}
+
+Exec.prototype.hello = function(args) {
+    this.kvc.add("args", args)
+    this.kvc.add("action", "exec")
+    this.kvc.add("context", this.context)
+    this.kvc.addlog({"key1": "value1"})
+    this.kvc.addlog({"key2": "value2"})
+	return this.kvc.receipt()
+}
+
+ExecLocal.prototype.hello = function(args) {
+    this.kvc.add("args", args)
+    this.kvc.add("action", "execlocal")
+    this.kvc.add("log", this.logs)
+    this.kvc.add("context", this.context)
+	return this.kvc.receipt()
+}
+
+//return a json string
+Query.prototype.hello = function(args) {
+	var obj = getlocaldb("context")
+	return tojson(obj)
+}
+`
+var _ = jscode
+var gamecode = `
+//简单的猜数字游戏
+//游戏规则: 庄家出一个 0 - 10 的数字 hash(随机数 + 9) (一共的赔偿金额) NewGame()
+//用户可以猜这个数字，多个用户都可以猜测。 Guess()
+//开奖 CloseGame()
+function Init(context) {
+    this.kvc = new kvcreator("init")
+    this.context = context
+    return this.kvc.receipt()
+}
+
+var MIN_WAIT_BLOCK = 2
+var RAND_MAX = 10
+
+function ExecInit() {
+    this.acc = new account(this.kvc, "coins", "bty")
+}
+
+Exec.prototype.NewGame = function(args) {
+    var game = {__type__ : "game"}
+    game.gameid = this.txID()
+    game.height = this.context.height
+    game.randhash = args.randhash
+    game.bet = args.bet
+    game.hash = this.context.txhash
+    game.obet = game.bet
+    game.addr = this.context.from
+    game.status = 1 //open
+    //最大值是 9000万,否则js到 int 会溢出
+    if (game.bet < 10 * COINS || game.bet > 10000000 * COINS) {
+        throwerr("bet low than 10 or hight than 10000000")
+    }
+    if (this.kvc.get(game.randhash)) { //如果randhash 已经被使用了
+        throwerr("dup rand hash")
+    }
+    var err = this.acc.execFrozen(this.name, this.context.from, game.bet)
+    throwerr(err)
+    this.kvc.add(game.gameid, game)
+    this.kvc.add(game.randhash, "ok")
+    this.kvc.addlog(game)
+    return this.kvc.receipt()
+}
+
+Exec.prototype.Guess = function(args) {
+    var match = {__type__ : "match"}
+    match.gameid = args.gameid
+    match.bet = args.bet
+    match.id = this.txID()
+    match.addr = this.context.from
+    match.hash = this.context.txhash
+    var game = this.kvc.get(match.gameid)
+    if (!game) {
+        throwerr("game id not found")
+    }
+    if (game.status != 1) {
+        throwerr("game status not open")
+    }
+    if (match.bet < 1 * COINS || match.bet > game.bet / RAND_MAX) {
+        throwerr("match bet litte than 1 or big than game.bet/10")
+    }
+    var err = this.acc.execFrozen(this.name, this.context.from, game.bet)
+    throwerr(err)
+    this.kvc.add(match.id, match)
+    this.kvc.addlog(match)
+    return this.kvc.receipt()
+}
+
+Exec.prototype.CloseGame = function(args) {
+    var local = new MatchLocalTable(this.kvc)
+    var game = this.kvc.get(args.id)
+    if (!game) {
+        throwerr("game id not found")
+    }
+    var matches = local.getmath(args.id)
+    if (!matches) {
+        matches = []
+    }
+    var n = -1
+    for (var i = 0; i < RAND_MAX; i ++) {
+        if (sha256(args.randstr + i) == game.randhash) {
+            n = i
+        }
+    }
+    if (n == -1) {
+        throwerr("err rand str")
+    }
+    //必须可以让用户可以有一个区块的竞猜时间
+    if (this.context.height - game.height < MIN_WAIT_BLOCK) {
+        throwerr("close game must wait 2 block")
+    }
+    for (var i = 0; i < matches.length; i++) {
+        var match = matches[i]
+        if (match.num == n) {
+            //不能随便添加辅助函数，因为可以被外界调用到，所以辅助函数都是传递 this
+            win(this, game, match)
+        } else {
+            fail(this, game, match)
+        }
+    }
+    if (game.bet > 0) {
+        var err = this.acc.execActive(this.name, game.addr, game.bet)
+        throwerr(err)
+        game.bet = 0
+    }
+    game.status = 2
+    this.kvc.add(game.gameid, game)
+    this.kvc.addlog(game)
+    return this.kvc.receipt()
+}
+
+function win(othis, game, match) {
+    var amount = (RAND_MAX - 1) * match.bet
+    if (game.bet - amount < 0) {
+        amount = game.bet
+    }
+    var err 
+    if (amount > 0) {
+        err = this.acc.execTransFrozenToActive(othis.name, game.addr, match.addr, amount)
+        throwerr(err)
+        game.bet -= amount
+    }
+    err = othis.acc.execActive(match.addr, match.bet)
+    throwerr(err)
+}
+
+function fail(othis, game, match) {
+    var amount = match.bet
+    err = othis.acc.execTransFrozenToFrozen(othis.name, match.addr, game.addr, amount)
+    throwerr(err)
+    game.bet += amount
+}
+
+Exec.prototype.ForceCloseGame = function(args) {
+    var local = new MatchLocalTable(this.kvc)
+    var game = this.kvc.get(args.id)
+    if (!game) {
+        throwerr("game id not found")
+    }
+    var matches = local.getmath(args.id)
+    if (!matches) {
+        matches = []
+    }
+    if (this.context.height - game.height < 100) {
+        throwerr("force close game must wait 100 block")
+    }
+    for (var i = 0; i < matches.length; i++) {
+        var match = matches[i]
+        win(this.kvc, game, match)
+    }
+    if (game.bet > 0) {
+        var err = this.acc.execActive(this.name, game.addr, game.bet)
+        throwerr(err)
+        game.bet = 0
+    }
+    game.status = 2
+    this.kvc.add(game.gameid, game)
+    this.kvc.addlog(game)
+    return this.kvc.receipt()
+}
+
+ExecLocal.prototype.NewGame = function(args) {
+    var local = MatchGameTable(this.kvc)
+    local.addlogs(this.logs)
+    local.save()
+    return this.kvc.receipt()
+}
+
+ExecLocal.prototype.Guess = function(args) {
+    var local = MatchGameTable(this.kvc)
+    local.addlogs(this.logs)
+    local.save()
+    return this.kvc.receipt()
+}
+
+ExecLocal.prototype.CloseGame = function(args) {
+    var local = MatchGameTable(this.kvc)
+    local.addlogs(this.logs)
+    local.save()
+    return this.kvc.receipt()
+}
+
+ExecLocal.prototype.ForceCloseGame = function(args) {
+    var local = MatchGameTable(this.kvc)
+    local.addlogs(this.logs)
+    local.save()
+    return this.kvc.receipt()
+}
+
+Query.prototype.ListGameByAddr = function(args) {
+    var local = GameLocalTable(this.kvc)
+    return local.query("addr", args.addr, args.primaryKey, args.count, args.direction)
+}
+
+/*
+game ->(1 : n) match
+game.gameid -> primary
+
+match.gameid -> fk
+match.id -> primary
+*/
+function GameLocalTable(kvc) {
+    this.config = {
+        "#tablename" : "game",
+        "#primary" : "gameid",
+        "#db" : "localdb",
+        "gameid"    : "%018d",
+        "status" : "%d",
+        "hash" : "%s",
+        "addr" : "%s",
+    }
+    this.defaultvalue = {
+        "gameid" : 0,
+        "status" : 0,
+        "hash" : "",
+        "addr" : "",
+    }
+    return new Table(kvc, this.config, this.defaultvalue) 
+}
+
+function MatchLocalTable(kvc) {
+    this.config = {
+        "#tablename" : "match",
+        "#primary" : "id",
+        "#db" : "localdb",
+        "id"    : "%018d",
+        "gameid" : "%018d",
+        "hash" : "%s",
+        "addr" : "%s",
+    }
+    this.defaultvalue = {
+        "id" : 0,
+        "gameid" : 0,
+        "hash" : "",
+        "addr" : "",
+    }
+    return new Table(kvc, this.config, this.defaultvalue)  
+}
+
+function MatchGameTable(kvc) {
+    return new JoinTable(MatchLocalTable(kvc), GameLocalTable(kvc), "addr#status")
+}`
+var _ = gamecode

plugin/dapp/js/executor/exec_local.go

 package executor
 
 import (
+	"fmt"
+
 	"github.com/33cn/chain33/system/dapp"
 	"github.com/33cn/chain33/types"
 	ptypes "github.com/33cn/plugin/plugin/dapp/js/types"
@@ -28,5 +30,8 @@ func (c *js) ExecLocal_Call(payload *jsproto.Call, tx *types.Transaction, receip
 	kvc.AddRollbackKV()
 	r := &types.LocalDBSet{}
 	r.KV = kvc.KVList()
+	for i := 0; i < len(r.KV); i++ {
+		fmt.Println(string(r.KV[i].Key))
+	}
 	return r, nil
 }

plugin/dapp/js/executor/game.js

@@ -11,17 +11,17 @@ function Init(context) {
 var MIN_WAIT_BLOCK = 2
 var RAND_MAX = 10
 
-function ExecInit(execthis) {
-    execthis.acc = new account(this.kvc, "coins", "bty")
+function ExecInit() {
+    this.acc = new account(this.kvc, "coins", "bty")
 }
 
 Exec.prototype.NewGame = function(args) {
     var game = {__type__ : "game"}
-    game.id = this.context.txhash
-    game.index = this.txID()
+    game.gameid = this.txID()
     game.height = this.context.height
-    game.randhash = args.hash
+    game.randhash = args.randhash
     game.bet = args.bet
+    game.hash = this.context.txhash
     game.obet = game.bet
     game.addr = this.context.from
     game.status = 1 //open
@@ -29,9 +29,13 @@ Exec.prototype.NewGame = function(args) {
     if (game.bet < 10 * COINS || game.bet > 10000000 * COINS) {
         throwerr("bet low than 10 or hight than 10000000")
     }
+    if (this.kvc.get(game.randhash)) { //如果randhash 已经被使用了
+        throwerr("dup rand hash")
+    }
     var err = this.acc.execFrozen(this.name, this.context.from, game.bet)
     throwerr(err)
-    this.kvc.add(game.id, game)
+    this.kvc.add(game.gameid, game)
+    this.kvc.add(game.randhash, "ok")
     this.kvc.addlog(game)
     return this.kvc.receipt()
 }
@@ -42,6 +46,7 @@ Exec.prototype.Guess = function(args) {
     match.bet = args.bet
     match.id = this.txID()
     match.addr = this.context.from
+    match.hash = this.context.txhash
     var game = this.kvc.get(match.gameid)
     if (!game) {
         throwerr("game id not found")
@@ -97,29 +102,29 @@ Exec.prototype.CloseGame = function(args) {
         game.bet = 0
     }
     game.status = 2
-    this.kvc.add(game.id, game)
+    this.kvc.add(game.gameid, game)
     this.kvc.addlog(game)
     return this.kvc.receipt()
 }
 
-function win(this, game, match) {
+function win(othis, game, match) {
     var amount = (RAND_MAX - 1) * match.bet
     if (game.bet - amount < 0) {
         amount = game.bet
     }
     var err 
     if (amount > 0) {
-        err = this.acc.execTransFrozenToActive(this.name, game.addr, match.addr, amount)
+        err = this.acc.execTransFrozenToActive(othis.name, game.addr, match.addr, amount)
         throwerr(err)
         game.bet -= amount
     }
-    err = this.acc.execActive(match.addr, match.bet)
+    err = othis.acc.execActive(match.addr, match.bet)
     throwerr(err)
 }
 
-function fail(this, game, match) {
+function fail(othis, game, match) {
     var amount = match.bet
-    err = this.acc.execTransFrozenToFrozen(this.name, match.addr, game.addr, amount)
+    err = othis.acc.execTransFrozenToFrozen(othis.name, match.addr, game.addr, amount)
     throwerr(err)
     game.bet += amount
 }
@@ -147,47 +152,47 @@ Exec.prototype.ForceCloseGame = function(args) {
         game.bet = 0
     }
     game.status = 2
-    this.kvc.add(game.id, game)
+    this.kvc.add(game.gameid, game)
     this.kvc.addlog(game)
     return this.kvc.receipt()
 }
 
 ExecLocal.prototype.NewGame = function(args) {
-    var local = new MatchGameTable(this.kvc)
-    local.add(this.logs)
-    local.table.save()
+    var local = MatchGameTable(this.kvc)
+    local.addlogs(this.logs)
+    local.save()
     return this.kvc.receipt()
 }
 
 ExecLocal.prototype.Guess = function(args) {
-    var local = new MatchGameTable(this.kvc)
-    local.add(this.logs)
-    local.table.save()
+    var local = MatchGameTable(this.kvc)
+    local.addlogs(this.logs)
+    local.save()
     return this.kvc.receipt()
 }
 
 ExecLocal.prototype.CloseGame = function(args) {
-    var local = new MatchGameTable(this.kvc)
-    local.add(this.logs)
-    local.table.save()
+    var local = MatchGameTable(this.kvc)
+    local.addlogs(this.logs)
+    local.save()
     return this.kvc.receipt()
 }
 
 ExecLocal.prototype.ForceCloseGame = function(args) {
-    var local = new GameLocalTable(this.kvc)
-    local.add(this.logs)
-    local.table.save()
+    var local = MatchGameTable(this.kvc)
+    local.addlogs(this.logs)
+    local.save()
     return this.kvc.receipt()
 }
 
 Query.prototype.ListGameByAddr = function(args) {
-    var local = new GameLocalTable(this.kvc)
-    return local.query(args)
+    var local = GameLocalTable(this.kvc)
+    return local.query("addr", args.addr, args.primaryKey, args.count, args.direction)
 }
 
 /*
 game ->(1 : n) match
-game.id -> primary
+game.gameid -> primary
 
 match.gameid -> fk
 match.id -> primary
@@ -195,19 +200,20 @@ match.id -> primary
 function GameLocalTable(kvc) {
     this.config = {
         "#tablename" : "game",
-        "#primary" : "id",
+        "#primary" : "gameid",
         "#db" : "localdb",
-        "id"    : "%018d",
+        "gameid"    : "%018d",
         "status" : "%d",
+        "hash" : "%s",
         "addr" : "%s",
     }
     this.defaultvalue = {
-        "id" : "0",
+        "gameid" : 0,
         "status" : 0,
+        "hash" : "",
         "addr" : "",
     }
-    this.kvc = kvc
-    this.table = new Table(this.kvc, this.config, this.defaultvalue) 
+    return new Table(kvc, this.config, this.defaultvalue) 
 }
 
 function MatchLocalTable(kvc) {
@@ -216,29 +222,19 @@ function MatchLocalTable(kvc) {
         "#primary" : "id",
         "#db" : "localdb",
         "id"    : "%018d",
-        "gameid" : "%s",
+        "gameid" : "%018d",
+        "hash" : "%s",
         "addr" : "%s",
     }
     this.defaultvalue = {
         "id" : 0,
         "gameid" : 0,
+        "hash" : "",
         "addr" : "",
     }
-    this.kvc = kvc
-    this.table = new Table(this.kvc, this.config, this.defaultvalue)  
+    return new Table(kvc, this.config, this.defaultvalue)  
 }
 
 function MatchGameTable(kvc) {
-    this.left = MatchLocalTable(kvc)
-    this.right = GameLocalTable(kvc)
-    this.table = new JoinTable(left, right, "addr#status")
-}
-
-MatchGameTable.prototype.add = function(data) {
-    if (data.__type__ == "match") {
-        this.left.table.replace(data)
-    }
-    if (data.__type__ == "game") {
-        this.right.table.replace(data)
-    }
+    return new JoinTable(MatchLocalTable(kvc), GameLocalTable(kvc), "addr#status")
 }
\ No newline at end of file

plugin/dapp/js/executor/gen.sh

@@ -8,4 +8,19 @@
     cat "test.js"
     printf '`\n'
     printf 'var _ = jscode\n'
+    printf 'var gamecode = `\n'
+    cat "game.js"
+    printf '`\n'
+    printf 'var _ = gamecode\n'
 } >const.go
+
+{
+    printf 'package executor_test\n\nvar jscode = `\n'
+    cat "test.js"
+    printf '`\n'
+    printf 'var _ = jscode\n'
+    printf 'var gamecode = `\n'
+    cat "game.js"
+    printf '`\n'
+    printf 'var _ = gamecode\n'
+} >const_test.go
\ No newline at end of file

plugin/dapp/js/executor/js.go

@@ -3,7 +3,7 @@ package executor
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
+	"sync"
 	"sync/atomic"
 
 	"github.com/33cn/chain33/common"
@@ -28,7 +28,6 @@ func init() {
 		panic(err)
 	}
 	execaddressFunc(basevm)
-	registerTableFunc(basevm)
 	sha256Func(basevm)
 }
 
@@ -49,7 +48,9 @@ func Init(name string, sub []byte) {
 
 type js struct {
 	drivers.DriverBase
-	prefix []byte
+	prefix            []byte
+	globalTableHandle sync.Map
+	globalHanldeID    int64
 }
 
 func newjs() drivers.Driver {
@@ -224,7 +225,7 @@ func (u *js) localdbFunc(vm *otto.Otto, name string) {
 
 func (u *js) execnameFunc(vm *otto.Otto, name string) {
 	vm.Set("execname", func(call otto.FunctionCall) otto.Value {
-		return okReturn(vm, types.ExecName("user.js."+name))
+		return okReturn(vm, types.ExecName("user."+ptypes.JsX+"."+name))
 	})
 }
 
@@ -281,7 +282,7 @@ func (u *js) createVM(name string, tx *types.Transaction, index int) (*otto.Otto
 	u.listdbFunc(vm, name)
 	u.execnameFunc(vm, name)
 	u.registerAccountFunc(vm)
-	u.newTableFunc(vm, name)
+	u.registerTableFunc(vm, name)
 	return vm, nil
 }
 
@@ -360,26 +361,28 @@ func (u *js) Allow(tx *types.Transaction, index int) error {
 	return types.ErrNotAllow
 }
 
-func createKVObject(vm *otto.Otto, kvs []*types.KeyValue) otto.Value {
-	obj := newObjectString(vm, "([])")
+func createKVObject(vm *otto.Otto, kvs []*types.KeyValue) []interface{} {
+	data := make([]interface{}, len(kvs))
 	for i := 0; i < len(kvs); i++ {
-		item := newObject(vm).setValue("key", string(kvs[i].Key))
-		item.setValue("value", string(kvs[i].Value))
-		item.setValue("prefix", true)
-		obj.setValue(fmt.Sprint(i), item)
+		item := make(map[string]interface{})
+		item["key"] = string(kvs[i].Key)
+		item["value"] = string(kvs[i].Value)
+		item["prefix"] = true
+		data[i] = item
 	}
-	return obj.value()
+	return data
 }
 
-func createLogsObject(vm *otto.Otto, logs []*types.ReceiptLog) otto.Value {
-	obj := newObjectString(vm, "([])")
+func createLogsObject(vm *otto.Otto, logs []*types.ReceiptLog) []interface{} {
+	data := make([]interface{}, len(logs))
 	for i := 0; i < len(logs); i++ {
-		item := newObject(vm).setValue("ty", logs[i].Ty)
-		item.setValue("log", string(logs[i].Log))
-		item.setValue("format", "proto")
-		obj.setValue(fmt.Sprint(i), item)
+		item := make(map[string]interface{})
+		item["ty"] = logs[i].Ty
+		item["log"] = string(logs[i].Log)
+		item["format"] = "proto"
+		data[i] = item
 	}
-	return obj.value()
+	return data
 }
 
 func accountReturn(vm *otto.Otto, acc *types.Account) otto.Value {

plugin/dapp/js/executor/jsvm_test.go

@@ -22,12 +22,12 @@ func init() {
 	Init(ptypes.JsX, nil)
 }
 
-func initExec(ldb db.DB, kvdb db.KVDB, t assert.TestingT) *js {
+func initExec(ldb db.DB, kvdb db.KVDB, code string, t assert.TestingT) *js {
 	e := newjs().(*js)
 	e.SetEnv(1, time.Now().Unix(), 1)
 	e.SetLocalDB(kvdb)
 	e.SetStateDB(kvdb)
-	c, tx := createCodeTx("test", jscode)
+	c, tx := createCodeTx("test", code)
 	receipt, err := e.Exec_Create(c, tx, 0)
 	assert.Nil(t, err)
 	util.SaveKVList(ldb, receipt.KV)
@@ -54,7 +54,7 @@ func callCodeTx(name, f, args string) (*jsproto.Call, *types.Transaction) {
 func TestCallcode(t *testing.T) {
 	dir, ldb, kvdb := util.CreateTestDB()
 	defer util.CloseTestDB(dir, ldb)
-	e := initExec(ldb, kvdb, t)
+	e := initExec(ldb, kvdb, jscode, t)
 
 	call, tx := callCodeTx("test", "hello", `{"hello":"world"}`)
 	receipt, err := e.Exec_Call(call, tx, 0)
@@ -107,7 +107,7 @@ func TestCallcode(t *testing.T) {
 func TestCallError(t *testing.T) {
 	dir, ldb, kvdb := util.CreateTestDB()
 	defer util.CloseTestDB(dir, ldb)
-	e := initExec(ldb, kvdb, t)
+	e := initExec(ldb, kvdb, jscode, t)
 	//test call error(invalid json input)
 	call, tx := callCodeTx("test", "hello", `{hello":"world"}`)
 	_, err := e.callVM("exec", call, tx, 0, nil)
@@ -132,7 +132,7 @@ func TestCallError(t *testing.T) {
 func TestBigInt(t *testing.T) {
 	dir, ldb, kvdb := util.CreateTestDB()
 	defer util.CloseTestDB(dir, ldb)
-	e := initExec(ldb, kvdb, t)
+	e := initExec(ldb, kvdb, jscode, t)
 	//test call error(invalid json input)
 	s := fmt.Sprintf(`{"balance":%d,"balance1":%d,"balance2":%d,"balance3":%d}`, math.MaxInt64, math.MinInt64, 9007199254740990, -9007199254740990)
 	call, tx := callCodeTx("test", "hello", s)
@@ -146,7 +146,7 @@ func TestBigInt(t *testing.T) {
 func BenchmarkBigInt(b *testing.B) {
 	dir, ldb, kvdb := util.CreateTestDB()
 	defer util.CloseTestDB(dir, ldb)
-	e := initExec(ldb, kvdb, b)
+	e := initExec(ldb, kvdb, jscode, b)
 	//test call error(invalid json input)
 	s := fmt.Sprintf(`{"balance":%d,"balance1":%d,"balance2":%d,"balance3":%d}`, math.MaxInt64, math.MinInt64, 9007199254740990, -9007199254740990)
 	call, tx := callCodeTx("test", "hello", s)
@@ -184,7 +184,7 @@ func TestCalcLocalPrefix(t *testing.T) {
 func TestCacheMemUsage(t *testing.T) {
 	dir, ldb, kvdb := util.CreateTestDB()
 	defer util.CloseTestDB(dir, ldb)
-	e := initExec(ldb, kvdb, t)
+	e := initExec(ldb, kvdb, jscode, t)
 	vm, err := e.createVM("test", nil, 0)
 	assert.Nil(t, err)
 	vms := make([]*otto.Otto, 1024)

plugin/dapp/js/executor/query.go

@@ -4,10 +4,13 @@ import (
 	"fmt"
 
 	"github.com/33cn/chain33/types"
+	ptypes "github.com/33cn/plugin/plugin/dapp/js/types"
 	"github.com/33cn/plugin/plugin/dapp/js/types/jsproto"
 )
 
 func (c *js) Query_Query(payload *jsproto.Call) (types.Message, error) {
+	execer := types.ExecName("user." + ptypes.JsX + "." + payload.Name)
+	c.prefix = calcLocalPrefix([]byte(execer))
 	jsvalue, err := c.callVM("query", payload, nil, 0, nil)
 	if err != nil {
 		fmt.Println("query", err)

plugin/dapp/js/executor/rpc_test.go

 package executor_test
 
 import (
+	"fmt"
+	"math/rand"
 	"testing"
+	"time"
 
+	"github.com/33cn/chain33/common"
+	"github.com/33cn/chain33/common/address"
 	rpctypes "github.com/33cn/chain33/rpc/types"
 	"github.com/33cn/chain33/types"
 	"github.com/33cn/chain33/util/testnode"
@@ -14,6 +19,10 @@ import (
 	_ "github.com/33cn/plugin/plugin"
 )
 
+func init() {
+	rand.Seed(time.Now().UnixNano())
+}
+
 func TestJsVM(t *testing.T) {
 	mocker := testnode.New("--free--", nil)
 	defer mocker.Close()
@@ -75,53 +84,95 @@ func TestJsVM(t *testing.T) {
 	t.Log(queryresult.Data)
 }
 
-var jscode = `
-//数据结构设计
-//kvlist [{key:"key1", value:"value1"},{key:"key2", value:"value2"}]
-//log 设计 {json data}
-function Init(context) {
-    this.kvc = new kvcreator("init")
-    this.context = context
-    this.kvc.add("action", "init")
-    this.kvc.add("context", this.context)
-    return this.kvc.receipt()
-}
-
-function Exec(context) {
-    this.kvc = new kvcreator("exec")
-	this.context = context
-}
-
-function ExecLocal(context, logs) {
-    this.kvc = new kvcreator("local")
-	this.context = context
-    this.logs = logs
-}
-
-function Query(context) {
-	this.kvc = new kvcreator("query")
-	this.context = context
-}
-
-Exec.prototype.hello = function(args) {
-    this.kvc.add("args", args)
-    this.kvc.add("action", "exec")
-    this.kvc.add("context", this.context)
-    this.kvc.addlog({"key1": "value1"})
-    this.kvc.addlog({"key2": "value2"})
-	return this.kvc.receipt()
-}
+func TestJsGame(t *testing.T) {
+	contractName := "test1"
+	mocker := testnode.New("--free--", nil)
+	defer mocker.Close()
+	mocker.Listen()
+	err := mocker.SendHot()
+	assert.Nil(t, err)
+	//开始部署合约, 测试阶段任何人都可以部署合约
+	//后期需要加上权限控制
+	//1. 部署合约
+	create := &jsproto.Create{
+		Code: gamecode,
+		Name: contractName,
+	}
+	req := &rpctypes.CreateTxIn{
+		Execer:     ptypes.JsX,
+		ActionName: "Create",
+		Payload:    types.MustPBToJSON(create),
+	}
+	var txhex string
+	err = mocker.GetJSONC().Call("Chain33.CreateTransaction", req, &txhex)
+	assert.Nil(t, err)
+	hash, err := mocker.SendAndSign(mocker.GetHotKey(), txhex)
+	assert.Nil(t, err)
+	txinfo, err := mocker.WaitTx(hash)
+	assert.Nil(t, err)
+	assert.Equal(t, txinfo.Receipt.Ty, int32(2))
+	block := mocker.GetLastBlock()
+	balance := mocker.GetAccount(block.StateHash, mocker.GetHotAddress()).Balance
+	assert.Equal(t, balance, 10000*types.Coin)
+	//2.1 充值到合约
+	reqtx := &rpctypes.CreateTx{
+		To:          address.ExecAddress("user.jsvm." + contractName),
+		Amount:      100 * types.Coin,
+		Note:        "12312",
+		IsWithdraw:  false,
+		IsToken:     false,
+		TokenSymbol: "",
+		ExecName:    "user.jsvm." + contractName,
+	}
+	err = mocker.GetJSONC().Call("Chain33.CreateRawTransaction", reqtx, &txhex)
+	assert.Nil(t, err)
+	hash, err = mocker.SendAndSign(mocker.GetHotKey(), txhex)
+	assert.Nil(t, err)
+	txinfo, err = mocker.WaitTx(hash)
+	assert.Nil(t, err)
+	assert.Equal(t, txinfo.Receipt.Ty, int32(2))
+	block = mocker.GetLastBlock()
+	balance = mocker.GetExecAccount(block.StateHash, "user.jsvm."+contractName, mocker.GetHotAddress()).Balance
+	assert.Equal(t, 100*types.Coin, balance)
+	//2.2 调用 hello 函数(随机数，用nonce)
+	privhash := common.Sha256(mocker.GetHotKey().Bytes())
+	nonce := rand.Int63()
+	num := rand.Int63() % 10
+	realhash := common.Sha256([]byte(string(privhash) + ":" + fmt.Sprint(nonce)))
+	myhash := common.ToHex(common.Sha256([]byte(string(realhash) + fmt.Sprint(num))))
 
-ExecLocal.prototype.hello = function(args) {
-    this.kvc.add("args", args)
-    this.kvc.add("action", "execlocal")
-    this.kvc.add("log", this.logs)
-    this.kvc.add("context", this.context)
-	return this.kvc.receipt()
-}
+	call := &jsproto.Call{
+		Funcname: "NewGame",
+		Name:     contractName,
+		Args:     fmt.Sprintf(`{"bet": %d, "randhash" : "%s"}`, 100*types.Coin, myhash),
+	}
+	req = &rpctypes.CreateTxIn{
+		Execer:     "user." + ptypes.JsX + "." + contractName,
+		ActionName: "Call",
+		Payload:    types.MustPBToJSON(call),
+	}
+	err = mocker.GetJSONC().Call("Chain33.CreateTransaction", req, &txhex)
+	assert.Nil(t, err)
+	t.Log(mocker.GetHotAddress())
+	hash, err = mocker.SendAndSignNonce(mocker.GetHotKey(), txhex, nonce)
+	assert.Nil(t, err)
+	txinfo, err = mocker.WaitTx(hash)
+	assert.Nil(t, err)
+	assert.Equal(t, txinfo.Receipt.Ty, int32(2))
 
-//return a json string
-Query.prototype.hello = function(args) {
-	return tojson({hello:"wzw"})
+	//3. query 函数查询
+	call = &jsproto.Call{
+		Funcname: "ListGameByAddr",
+		Name:     contractName,
+		Args:     fmt.Sprintf(`{"addr":"%s", "count" : 20}`, txinfo.Tx.From),
+	}
+	query := &rpctypes.Query4Jrpc{
+		Execer:   "user." + ptypes.JsX + "." + contractName,
+		FuncName: "Query",
+		Payload:  types.MustPBToJSON(call),
+	}
+	var queryresult jsproto.QueryResult
+	err = mocker.GetJSONC().Call("Chain33.Query", query, &queryresult)
+	assert.Nil(t, err)
+	t.Log(queryresult.Data)
 }
-`

vendor/github.com/33cn/chain33/util/testnode/testnode.go

@@ -205,6 +205,27 @@ func (mock *Chain33Mock) SendAndSign(priv crypto.PrivKey, hextx string) ([]byte,
 	return reply.GetMsg(), nil
 }
 
+//SendAndSignNonce 用外部传入的nonce 重写nonce
+func (mock *Chain33Mock) SendAndSignNonce(priv crypto.PrivKey, hextx string, nonce int64) ([]byte, error) {
+	txbytes, err := hex.DecodeString(hextx)
+	if err != nil {
+		return nil, err
+	}
+	tx := &types.Transaction{}
+	err = types.Decode(txbytes, tx)
+	if err != nil {
+		return nil, err
+	}
+	tx.Nonce = nonce
+	tx.Fee = 1e6
+	tx.Sign(types.SECP256K1, priv)
+	reply, err := mock.api.SendTx(tx)
+	if err != nil {
+		return nil, err
+	}
+	return reply.GetMsg(), nil
+}
+
 func newWalletRealize(qAPI client.QueueProtocolAPI) {
 	seed := &types.SaveSeedByPw{
 		Seed:   "subject hamster apple parent vital can adult chapter fork business humor pen tiger void elephant",