Merge branch 'master' into guess

plugin/dapp/js/cmd/js.go

+// Copyright Fuzamei Corp. 2018 All Rights Reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cmd
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+
+	"github.com/33cn/chain33/rpc/jsonclient"
+	rpctypes "github.com/33cn/chain33/rpc/types"
+	"github.com/33cn/chain33/types"
+	jsty "github.com/33cn/plugin/plugin/dapp/js/types"
+	"github.com/33cn/plugin/plugin/dapp/js/types/jsproto"
+	//"github.com/gojson"
+	"github.com/spf13/cobra"
+)
+
+//JavaScriptCmd :
+func JavaScriptCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "jsvm",
+		Short: "Java Script VM contract",
+		Args:  cobra.MinimumNArgs(1),
+	}
+	cmd.AddCommand(
+		JavaScriptCreateCmd(),
+		JavaScriptCallCmd(),
+		JavaScriptQueryCmd(),
+	)
+	return cmd
+}
+
+// JavaScriptCreateCmd :
+func JavaScriptCreateCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "create",
+		Short: "create java script contract",
+		Run:   createJavaScriptContract,
+	}
+	createJavaScriptContractFlags(cmd)
+	return cmd
+}
+
+func createJavaScriptContractFlags(cmd *cobra.Command) {
+
+	cmd.Flags().StringP("code", "c", "", "path of js file,it must always be in utf-8.")
+	cmd.MarkFlagRequired("code")
+
+	cmd.Flags().StringP("name", "n", "", "contract name")
+	cmd.MarkFlagRequired("name")
+}
+
+func createJavaScriptContract(cmd *cobra.Command, args []string) {
+	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
+	patch, _ := cmd.Flags().GetString("code")
+	name, _ := cmd.Flags().GetString("name")
+
+	codestr, err := ioutil.ReadFile(patch)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		return
+	}
+	create := &jsproto.Create{
+		Code: string(codestr),
+		Name: name,
+	}
+
+	params := &rpctypes.CreateTxIn{
+		Execer:     jsty.JsX,
+		ActionName: "Create",
+		Payload:    types.MustPBToJSON(create),
+	}
+
+	var res string
+	ctx := jsonclient.NewRPCCtx(rpcLaddr, "Chain33.CreateTransaction", params, &res)
+	ctx.RunWithoutMarshal()
+}
+
+// JavaScriptCallCmd :
+func JavaScriptCallCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "call",
+		Short: "call java script contract",
+		Run:   callJavaScript,
+	}
+	callJavaScriptFlags(cmd)
+	return cmd
+}
+
+func callJavaScriptFlags(cmd *cobra.Command) {
+	cmd.Flags().StringP("name", "n", "", "java script contract name")
+	cmd.MarkFlagRequired("name")
+	cmd.Flags().StringP("funcname", "f", "", "java script contract funcname")
+	cmd.MarkFlagRequired("funcname")
+	cmd.Flags().StringP("args", "a", "", "json str of args")
+}
+
+func callJavaScript(cmd *cobra.Command, args []string) {
+	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
+	name, _ := cmd.Flags().GetString("name")
+	funcname, _ := cmd.Flags().GetString("funcname")
+	input, _ := cmd.Flags().GetString("args")
+	call := &jsproto.Call{
+		Name:     name,
+		Funcname: funcname,
+		Args:     input,
+	}
+	params := &rpctypes.CreateTxIn{
+		Execer:     "user." + jsty.JsX + "." + name,
+		ActionName: "Call",
+		Payload:    types.MustPBToJSON(call),
+	}
+
+	var res string
+	ctx := jsonclient.NewRPCCtx(rpcLaddr, "Chain33.CreateTransaction", params, &res)
+	ctx.RunWithoutMarshal()
+}
+
+//JavaScriptQueryCmd :
+func JavaScriptQueryCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "query",
+		Short: "query java script contract",
+		Run:   queryJavaScript,
+	}
+	queryJavaScriptFlags(cmd)
+	return cmd
+}
+
+func queryJavaScriptFlags(cmd *cobra.Command) {
+	cmd.Flags().StringP("name", "n", "", "java script contract name")
+	cmd.MarkFlagRequired("name")
+	cmd.Flags().StringP("funcname", "f", "", "java script contract funcname")
+	cmd.MarkFlagRequired("funcname")
+	cmd.Flags().StringP("args", "a", "", "json str of args")
+}
+
+func queryJavaScript(cmd *cobra.Command, args []string) {
+	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
+	name, _ := cmd.Flags().GetString("name")
+	funcname, _ := cmd.Flags().GetString("funcname")
+	input, _ := cmd.Flags().GetString("args")
+	var params rpctypes.Query4Jrpc
+	var rep interface{}
+	req := &jsproto.Call{
+		Name:     name,
+		Funcname: funcname,
+		Args:     input,
+	}
+
+	params.Execer = jsty.JsX
+	params.FuncName = "Query"
+	params.Payload = types.MustPBToJSON(req)
+	rep = &jsproto.QueryResult{}
+	ctx := jsonclient.NewRPCCtx(rpcLaddr, "Chain33.Query", params, rep)
+	ctx.Run()
+}

plugin/dapp/js/doc.go

+// Copyright Fuzamei Corp. 2018 All Rights Reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package js
+
+/*
+Java Script VM contract
+
+cli 命令行
+Available Commands:
+  call        call java script contract
+  create      create java script contract
+  query       query java script contract
+
+cli jsvm create
+Flags:
+  -c, --code string   path of js file,it must always be in utf-8.
+  -h, --help          help for create
+  -n, --name string   contract name
+
+cli jsvm call
+Flags:
+  -a, --args string       json str of args
+  -f, --funcname string   java script contract funcname
+  -h, --help              help for call
+  -n, --name string       java script contract name
+
+cli jsvm query
+Flags:
+  -a, --args string       json str of args
+  -f, --funcname string   java script contract funcname
+  -h, --help              help for query
+  -n, --name string       java script contract name
+
+测试步骤：
+第一步：创建钱包
+cli seed save -p heyubin -s "voice leisure mechanic tape cluster grunt receive joke nurse between monkey lunch save useful cruise"
+
+cli wallet unlock -p heyubin
+
+cli account import_key  -l miner -k CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944
+
+第二步：创建名为test的js合约，合约代码使用test.js代码文件（必须是utf-8格式）
+cli send jsvm create -c "../plugin/dapp/js/executor/test.js"  -n test -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt
+
+第三步：调用test合约的hello函数
+cli send jsvm  call -a "{\"hello\": \"world\"}" -f hello -n test -k 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt
+
+第四步：query test合约hello函数
+cli jsvm  query -a "{\"hello\": \"world\"}" -f hello -n 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
+    match.num = args.num
+    var game = this.kvc.get(match.gameid)
+    if (!game) {
+        throwerr("guess: game id not found")
+    }
+    if (game.status != 1) {
+        throwerr("guess: game status not open")
+    }
+    if (this.context.from == game.addr) {
+        throwerr("guess: game addr and match addr is same")
+    }
+    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, match.bet)
+    console.log(this.name, this.context.from, err)
+    throwerr(err)
+    this.kvc.add(match.id, match)
+    this.kvc.addlog(match)
+    return this.kvc.receipt()
+}
+
+Exec.prototype.CloseGame = function(args) {
+    var local = MatchLocalTable(this.kvc)
+    var game = this.kvc.get(args.gameid)
+    if (!game) {
+        throwerr("game id not found")
+    }
+    var querykey = local.get("gameid", args)
+    var matches = local.query("gameid", querykey, "", 0, 1)
+    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 "+MIN_WAIT_BLOCK+" block")
+    }
+    for (var i = 0; i < matches.length; i++) {
+        var match = matches[i].left
+        if (match.num == n) {
+            //不能随便添加辅助函数，因为可以被外界调用到，所以辅助函数都是传递 this
+            win.call(this, game, match)
+        } else {
+            fail.call(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(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)
+        throwerr(err, "execTransFrozenToActive")
+        game.bet -= amount
+    }
+    err = this.acc.execActive(this.name, match.addr, match.bet)
+    throwerr(err, "execActive")
+}
+
+function fail(game, match) {
+    var amount = match.bet
+    err = this.acc.execTransFrozenToFrozen(this.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.call(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) {
+    return localprocess.call(this, args)
+}
+
+ExecLocal.prototype.Guess = function(args) {
+    return localprocess.call(this, args)
+}
+
+ExecLocal.prototype.CloseGame = function(args) {
+    return localprocess.call(this, args)
+}
+
+ExecLocal.prototype.ForceCloseGame = function(args) {
+    return localprocess.call(this, args)
+}
+
+function localprocess(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)
+    var q = local.query("addr", args.addr, args.primaryKey, args.count, args.direction)
+    return querytojson(q)
+}
+
+Query.prototype.ListMatchByAddr = function(args) {
+    var local = MatchGameTable(this.kvc)
+    var q= local.query("addr#status", args["addr#status"], args.primaryKey, args.count, args.direction)
+    return querytojson(q)
+}
+
+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/game.js

+//简单的猜数字游戏
+//游戏规则: 庄家出一个 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
+    match.num = args.num
+    var game = this.kvc.get(match.gameid)
+    if (!game) {
+        throwerr("guess: game id not found")
+    }
+    if (game.status != 1) {
+        throwerr("guess: game status not open")
+    }
+    if (this.context.from == game.addr) {
+        throwerr("guess: game addr and match addr is same")
+    }
+    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, match.bet)
+    console.log(this.name, this.context.from, err)
+    throwerr(err)
+    this.kvc.add(match.id, match)
+    this.kvc.addlog(match)
+    return this.kvc.receipt()
+}
+
+Exec.prototype.CloseGame = function(args) {
+    var local = MatchLocalTable(this.kvc)
+    var game = this.kvc.get(args.gameid)
+    if (!game) {
+        throwerr("game id not found")
+    }
+    var querykey = local.get("gameid", args)
+    var matches = local.query("gameid", querykey, "", 0, 1)
+    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 "+MIN_WAIT_BLOCK+" block")
+    }
+    for (var i = 0; i < matches.length; i++) {
+        var match = matches[i].left
+        if (match.num == n) {
+            //不能随便添加辅助函数，因为可以被外界调用到，所以辅助函数都是传递 this
+            win.call(this, game, match)
+        } else {
+            fail.call(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(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)
+        throwerr(err, "execTransFrozenToActive")
+        game.bet -= amount
+    }
+    err = this.acc.execActive(this.name, match.addr, match.bet)
+    throwerr(err, "execActive")
+}
+
+function fail(game, match) {
+    var amount = match.bet
+    err = this.acc.execTransFrozenToFrozen(this.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.call(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) {
+    return localprocess.call(this, args)
+}
+
+ExecLocal.prototype.Guess = function(args) {
+    return localprocess.call(this, args)
+}
+
+ExecLocal.prototype.CloseGame = function(args) {
+    return localprocess.call(this, args)
+}
+
+ExecLocal.prototype.ForceCloseGame = function(args) {
+    return localprocess.call(this, args)
+}
+
+function localprocess(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)
+    var q = local.query("addr", args.addr, args.primaryKey, args.count, args.direction)
+    return querytojson(q)
+}
+
+Query.prototype.ListMatchByAddr = function(args) {
+    var local = MatchGameTable(this.kvc)
+    var q= local.query("addr#status", args["addr#status"], args.primaryKey, args.count, args.direction)
+    return querytojson(q)
+}
+
+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")
+}
\ 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

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,7 @@ func init() {
 		panic(err)
 	}
 	execaddressFunc(basevm)
-	registerTableFunc(basevm)
+	sha256Func(basevm)
 }
 
 var isinit int64
@@ -49,6 +49,8 @@ func Init(name string, sub []byte) {
 type js struct {
 	drivers.DriverBase
 	prefix            []byte
+	globalTableHandle sync.Map
+	globalHanldeID    int64
 }
 
 func newjs() drivers.Driver {
@@ -173,6 +175,7 @@ func (u *js) getContext(tx *types.Transaction, index int64) *blockContext {
 		Difficulty: u.GetDifficulty(),
 		TxHash:     common.ToHex(hash[:]),
 		Index:      index,
+		From:       tx.From(),
 	}
 }
 
@@ -222,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))
 	})
 }
 
@@ -279,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
 }
 
@@ -358,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.go

@@ -22,6 +22,7 @@ type blockContext struct {
 	Difficulty uint64 `json:"difficulty"`
 	TxHash     string `json:"txhash"`
 	Index      int64  `json:"index"`
+	From       string `json:"from"`
 }
 
 func parseJsReturn(prefix []byte, jsvalue *otto.Object) (kvlist []*types.KeyValue, logs []*types.ReceiptLog, err error) {

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 (
+	"encoding/json"
+	"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 +20,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 +85,204 @@ 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
-}
+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)
 
-function ExecLocal(context, logs) {
-    this.kvc = new kvcreator("local")
-	this.context = context
-    this.logs = logs
-}
+	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.GetGenesisKey(), 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.GetGenesisAddress()).Balance
+	assert.Equal(t, 100*types.Coin, balance)
+	t.Log(mocker.GetGenesisAddress())
+	//2.2 调用 hello 函数(随机数，用nonce)
+	privhash := common.Sha256(mocker.GetHotKey().Bytes())
+	nonce := rand.Int63()
+	num := rand.Int63() % 10
+	realhash := common.ToHex(common.Sha256([]byte(string(privhash) + ":" + fmt.Sprint(nonce))))
+	myhash := common.ToHex(common.Sha256([]byte(realhash + fmt.Sprint(num))))
 
-function Query(context) {
-	this.kvc = new kvcreator("query")
-	this.context = context
-}
+	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)
+	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))
+	gameid := txinfo.Height*100000 + txinfo.Index
+	//2.3 guess a number (win)
+	call = &jsproto.Call{
+		Funcname: "Guess",
+		Name:     contractName,
+		Args:     fmt.Sprintf(`{"bet": %d, "gameid" : "%d", "num" : %d}`, 1*types.Coin, gameid, num),
+	}
+	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)
+	hash, err = mocker.SendAndSignNonce(mocker.GetGenesisKey(), txhex, nonce)
+	assert.Nil(t, err)
+	txinfo, err = mocker.WaitTx(hash)
+	assert.Nil(t, err)
+	assert.Equal(t, txinfo.Receipt.Ty, int32(2))
 
-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()
-}
+	//2.4 guess a num (failed)
+	call = &jsproto.Call{
+		Funcname: "Guess",
+		Name:     contractName,
+		Args:     fmt.Sprintf(`{"bet": %d, "gameid" : "%d", "num" : %d}`, 1*types.Coin, gameid, num+1),
+	}
+	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.GetGenesisKey(), txhex, nonce)
+	assert.Nil(t, err)
+	txinfo, err = mocker.WaitTx(hash)
+	assert.Nil(t, err)
+	assert.Equal(t, txinfo.Receipt.Ty, int32(2))
 
-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()
-}
+	//2.5 close the game
+	call = &jsproto.Call{
+		Funcname: "CloseGame",
+		Name:     contractName,
+		Args:     fmt.Sprintf(`{"gameid":%d, "randstr":"%s"}`, gameid, realhash),
+	}
+	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))
+	//3.1 query game 函数查询
+	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)
 
-//return a json string
-Query.prototype.hello = function(args) {
-	return tojson({hello:"wzw"})
+	//3.2 query match -> status 函数
+	call = &jsproto.Call{
+		Funcname: "JoinKey",
+		Name:     contractName,
+		Args:     fmt.Sprintf(`{"left":"%s", "right" : "%s"}`, mocker.GetGenesisAddress(), "2"),
+	}
+	query = &rpctypes.Query4Jrpc{
+		Execer:   "user." + ptypes.JsX + "." + contractName,
+		FuncName: "Query",
+		Payload:  types.MustPBToJSON(call),
+	}
+	err = mocker.GetJSONC().Call("Chain33.Query", query, &queryresult)
+	assert.Nil(t, err)
+	joinkey := queryresult.Data
+	reqjson := make(map[string]interface{})
+	reqjson["addr#status"] = joinkey
+	reqdata, _ := json.Marshal(reqjson)
+	call = &jsproto.Call{
+		Funcname: "ListMatchByAddr",
+		Name:     contractName,
+		Args:     string(reqdata),
+	}
+	query = &rpctypes.Query4Jrpc{
+		Execer:   "user." + ptypes.JsX + "." + contractName,
+		FuncName: "Query",
+		Payload:  types.MustPBToJSON(call),
+	}
+	err = mocker.GetJSONC().Call("Chain33.Query", query, &queryresult)
+	assert.Nil(t, err)
+	t.Log(queryresult.Data)
 }
-`

plugin/dapp/js/executor/runtime.go

 package executor
 
 import (
+	"github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/common/address"
 	"github.com/robertkrimen/otto"
 )
@@ -17,6 +18,17 @@ func execaddressFunc(vm *otto.Otto) {
 	})
 }
 
+func sha256Func(vm *otto.Otto) {
+	vm.Set("sha256", func(call otto.FunctionCall) otto.Value {
+		key, err := call.Argument(0).ToString()
+		if err != nil {
+			return errReturn(vm, err)
+		}
+		var hash = common.Sha256([]byte(key))
+		return okReturn(vm, common.ToHex(hash))
+	})
+}
+
 /*
 //获取系统随机数的接口
 //randnum

plugin/dapp/js/executor/test.js

 //数据结构设计
-//kvlist [{key:"key1", value:"value1"},{key:"key2", value:"value2"}]
-//log 设计 {json data}
 function Init(context) {
     this.kvc = new kvcreator("init")
     this.context = context
@@ -9,22 +7,6 @@ function Init(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")

plugin/dapp/js/plugin.go

-package unfreeze
+package js
 
 import (
 	"github.com/33cn/chain33/pluginmgr"
+	"github.com/33cn/plugin/plugin/dapp/js/cmd"
 	"github.com/33cn/plugin/plugin/dapp/js/executor"
 	ptypes "github.com/33cn/plugin/plugin/dapp/js/types"
 )
@@ -11,7 +12,7 @@ func init() {
 		Name:     ptypes.JsX,
 		ExecName: executor.GetName(),
 		Exec:     executor.Init,
-		Cmd:      nil,
+		Cmd:      cmd.JavaScriptCmd,
 		RPC:      nil,
 	})
 }

vendor/github.com/33cn/chain33/build/while.sh

@@ -2,4 +2,6 @@
 
 while :; do
     ./chain33-cli net time
+    #nc -vz localhost 8805
+    sleep 1
 done

vendor/github.com/33cn/chain33/cmd/chain33/chain33.test.toml

@@ -190,3 +190,8 @@ superManager=[
     "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",
     "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
 ]
+
+[health]
+listenAddr="localhost:8805"
+checkInterval=1
+unSyncMaxTimes=2
\ No newline at end of file

vendor/github.com/33cn/chain33/common/db/table/table.go

@@ -312,6 +312,16 @@ func (table *Table) getPrimaryFromData(data types.Message) (primaryKey []byte, e
 	return
 }
 
+//ListIndex  list table index
+func (table *Table) ListIndex(indexName string, prefix []byte, primaryKey []byte, count, direction int32) (rows []*Row, err error) {
+	kvdb, ok := table.kvdb.(db.KVDB)
+	if !ok {
+		return nil, errors.New("list only support KVDB interface")
+	}
+	query := &Query{table: table, kvdb: kvdb}
+	return query.ListIndex(indexName, prefix, primaryKey, count, direction)
+}
+
 //Replace 如果有重复的，那么替换
 func (table *Table) Replace(data types.Message) error {
 	if err := table.checkIndex(data); err != nil {
@@ -602,8 +612,15 @@ func (table *Table) getModify(row, oldrow *Row, index string) ([]byte, []byte, b
 	return indexkey, oldkey, true, nil
 }
 
-//GetQuery 获取查询结构
+//GetQuery 获取查询结构(允许传入 kvdb 为nil)
 func (table *Table) GetQuery(kvdb db.KVDB) *Query {
+	if kvdb == nil {
+		var ok bool
+		kvdb, ok = table.kvdb.(db.KVDB)
+		if !ok {
+			return nil
+		}
+	}
 	return &Query{table: table, kvdb: kvdb}
 }
 
@@ -611,6 +628,11 @@ func (table *Table) getMeta() RowMeta {
 	return table.meta
 }
 
+//GetMeta 获取meta
+func (table *Table) GetMeta() RowMeta {
+	return table.getMeta()
+}
+
 func (table *Table) getOpt() *Option {
 	return table.opt
 }

vendor/github.com/33cn/chain33/system/store/base.go

@@ -90,6 +90,7 @@ func (store *BaseStore) Wait() {}
 func (store *BaseStore) processMessage(msg queue.Message) {
 	client := store.qclient
 	if msg.Ty == types.EventStoreSet {
+		go func() {
 			datas := msg.GetData().(*types.StoreSetWithSync)
 			hash, err := store.child.Set(datas.Storeset, datas.Sync)
 			if err != nil {
@@ -97,20 +98,28 @@ func (store *BaseStore) processMessage(msg queue.Message) {
 				return
 			}
 			msg.Reply(client.NewMessage("", types.EventStoreSetReply, &types.ReplyHash{Hash: hash}))
+		}()
 	} else if msg.Ty == types.EventStoreGet {
+		go func() {
 			datas := msg.GetData().(*types.StoreGet)
 			values := store.child.Get(datas)
 			msg.Reply(client.NewMessage("", types.EventStoreGetReply, &types.StoreReplyValue{Values: values}))
+		}()
 	} else if msg.Ty == types.EventStoreMemSet { //只是在内存中set 一下，并不改变状态
+		go func() {
 			datas := msg.GetData().(*types.StoreSetWithSync)
 			hash, err := store.child.MemSet(datas.Storeset, datas.Sync)
+			println("EventStoreMemSet", string(hash))
 			if err != nil {
 				msg.Reply(client.NewMessage("", types.EventStoreSetReply, err))
 				return
 			}
 			msg.Reply(client.NewMessage("", types.EventStoreSetReply, &types.ReplyHash{Hash: hash}))
+		}()
 	} else if msg.Ty == types.EventStoreCommit { //把内存中set 的交易 commit
+		go func() {
 			req := msg.GetData().(*types.ReqHash)
+			println("EventStoreCommit", string(req.Hash))
 			hash, err := store.child.Commit(req)
 			if hash == nil {
 				msg.Reply(client.NewMessage("", types.EventStoreCommit, types.ErrHashNotFound))
@@ -120,7 +129,9 @@ func (store *BaseStore) processMessage(msg queue.Message) {
 			} else {
 				msg.Reply(client.NewMessage("", types.EventStoreCommit, &types.ReplyHash{Hash: hash}))
 			}
+		}()
 	} else if msg.Ty == types.EventStoreRollback {
+		go func() {
 			req := msg.GetData().(*types.ReqHash)
 			hash, err := store.child.Rollback(req)
 			if err != nil {
@@ -128,13 +139,17 @@ func (store *BaseStore) processMessage(msg queue.Message) {
 			} else {
 				msg.Reply(client.NewMessage("", types.EventStoreRollback, &types.ReplyHash{Hash: hash}))
 			}
+		}()
 	} else if msg.Ty == types.EventStoreGetTotalCoins {
+		go func() {
 			req := msg.GetData().(*types.IterateRangeByStateHash)
 			resp := &types.ReplyGetTotalCoins{}
 			resp.Count = req.Count
 			store.child.IterateRangeByStateHash(req.StateHash, req.Start, req.End, true, resp.IterateRangeByStateHash)
 			msg.Reply(client.NewMessage("", types.EventGetTotalCoinsReply, resp))
+		}()
 	} else if msg.Ty == types.EventStoreDel {
+		go func() {
 			req := msg.GetData().(*types.StoreDel)
 			hash, err := store.child.Del(req)
 			if err != nil {
@@ -142,12 +157,15 @@ func (store *BaseStore) processMessage(msg queue.Message) {
 			} else {
 				msg.Reply(client.NewMessage("", types.EventStoreDel, &types.ReplyHash{Hash: hash}))
 			}
+		}()
 	} else if msg.Ty == types.EventStoreList {
+		go func() {
 			req := msg.GetData().(*types.StoreList)
 			query := NewStoreListQuery(store.child, req)
 			msg.Reply(client.NewMessage("", types.EventStoreListReply, query.Run()))
+		}()
 	} else {
-		store.child.ProcEvent(msg)
+		go store.child.ProcEvent(msg)
 	}
 }
 

vendor/github.com/33cn/chain33/system/store/mavl/db/tree.go

@@ -47,7 +47,6 @@ func EnableMVCC(enable bool) {
 type Tree struct {
 	root        *Node
 	ndb         *nodeDB
-	//batch *nodeBatch
 	blockHeight int64
 }
 
@@ -135,7 +134,9 @@ func (t *Tree) Save() []byte {
 	if t.ndb != nil {
 		saveNodeNo := t.root.save(t)
 		treelog.Debug("Tree.Save", "saveNodeNo", saveNodeNo, "tree height", t.blockHeight)
+		beg := types.Now()
 		err := t.ndb.Commit()
+		treelog.Info("tree.commit", "cost", types.Since(beg))
 		if err != nil {
 			return nil
 		}
@@ -268,10 +269,6 @@ type nodeDB struct {
 	orphans map[string]struct{}
 }
 
-type nodeBatch struct {
-	batch dbm.Batch
-}
-
 func newNodeDB(db dbm.DB, sync bool) *nodeDB {
 	ndb := &nodeDB{
 		cache:   db.GetCache(),
@@ -312,11 +309,6 @@ func (ndb *nodeDB) GetNode(t *Tree, hash []byte) (*Node, error) {
 	return node, nil
 }
 
-// GetBatch get db batch handle
-func (ndb *nodeDB) GetBatch(sync bool) *nodeBatch {
-	return &nodeBatch{ndb.db.NewBatch(sync)}
-}
-
 // 获取叶子节点的所有父节点
 func getHashNode(node *Node) (hashs [][]byte) {
 	for {

vendor/github.com/33cn/chain33/system/store/mavl/mavl.go

@@ -6,6 +6,8 @@
 package mavl
 
 import (
+	"sync"
+
 	"github.com/33cn/chain33/common"
 	clog "github.com/33cn/chain33/common/log"
 	log "github.com/33cn/chain33/common/log/log15"
@@ -13,7 +15,6 @@ import (
 	drivers "github.com/33cn/chain33/system/store"
 	mavl "github.com/33cn/chain33/system/store/mavl/db"
 	"github.com/33cn/chain33/types"
-	lru "github.com/hashicorp/golang-lru"
 )
 
 var mlog = log.New("module", "mavl")
@@ -31,8 +32,7 @@ func DisableLog() {
 // Store mavl store struct
 type Store struct {
 	*drivers.BaseStore
-	trees            map[string]*mavl.Tree
-	cache            *lru.Cache
+	trees            *sync.Map
 	enableMavlPrefix bool
 	enableMVCC       bool
 	enableMavlPrune  bool
@@ -57,10 +57,7 @@ func New(cfg *types.Store, sub []byte) queue.Module {
 	if sub != nil {
 		types.MustDecode(sub, &subcfg)
 	}
-	mavls := &Store{bs, make(map[string]*mavl.Tree), nil, subcfg.EnableMavlPrefix, subcfg.EnableMVCC, subcfg.EnableMavlPrune, subcfg.PruneHeight}
-	mavls.cache, _ = lru.New(10)
-	//使能前缀mavl以及MVCC
-
+	mavls := &Store{bs, &sync.Map{}, subcfg.EnableMavlPrefix, subcfg.EnableMVCC, subcfg.EnableMavlPrune, subcfg.PruneHeight}
 	mavls.enableMavlPrefix = subcfg.EnableMavlPrefix
 	mavls.enableMVCC = subcfg.EnableMVCC
 	mavls.enableMavlPrune = subcfg.EnableMavlPrune
@@ -91,18 +88,13 @@ func (mavls *Store) Get(datas *types.StoreGet) [][]byte {
 	var err error
 	values := make([][]byte, len(datas.Keys))
 	search := string(datas.StateHash)
-	if data, ok := mavls.cache.Get(search); ok {
+	if data, ok := mavls.trees.Load(search); ok {
 		tree = data.(*mavl.Tree)
-	} else if data, ok := mavls.trees[search]; ok {
-		tree = data
 	} else {
 		tree = mavl.NewTree(mavls.GetDB(), true)
 		//get接口也应该传入高度
 		//tree.SetBlockHeight(datas.Height)
 		err = tree.Load(datas.StateHash)
-		if err == nil {
-			mavls.cache.Add(search, tree)
-		}
 		mlog.Debug("store mavl get tree", "err", err, "StateHash", common.ToHex(datas.StateHash))
 	}
 	if err == nil {
@@ -118,9 +110,13 @@ func (mavls *Store) Get(datas *types.StoreGet) [][]byte {
 
 // MemSet set keys values to memcory mavl, return root hash and error
 func (mavls *Store) MemSet(datas *types.StoreSet, sync bool) ([]byte, error) {
+	beg := types.Now()
+	defer func() {
+		mlog.Info("MemSet", "cost", types.Since(beg))
+	}()
 	if len(datas.KV) == 0 {
 		mlog.Info("store mavl memset,use preStateHash as stateHash for kvset is null")
-		mavls.trees[string(datas.StateHash)] = nil
+		mavls.trees.Store(string(datas.StateHash), nil)
 		return datas.StateHash, nil
 	}
 	tree := mavl.NewTree(mavls.GetDB(), sync)
@@ -133,44 +129,47 @@ func (mavls *Store) MemSet(datas *types.StoreSet, sync bool) ([]byte, error) {
 		tree.Set(datas.KV[i].Key, datas.KV[i].Value)
 	}
 	hash := tree.Hash()
-	mavls.trees[string(hash)] = tree
-	if len(mavls.trees) > 1000 {
-		mlog.Error("too many trees in cache")
-	}
+	mavls.trees.Store(string(hash), tree)
 	return hash, nil
 }
 
 // Commit convert memcory mavl to storage db
 func (mavls *Store) Commit(req *types.ReqHash) ([]byte, error) {
-	tree, ok := mavls.trees[string(req.Hash)]
+	beg := types.Now()
+	defer func() {
+		mlog.Info("Commit", "cost", types.Since(beg))
+	}()
+	tree, ok := mavls.trees.Load(string(req.Hash))
 	if !ok {
 		mlog.Error("store mavl commit", "err", types.ErrHashNotFound)
 		return nil, types.ErrHashNotFound
 	}
-
 	if tree == nil {
 		mlog.Info("store mavl commit,do nothing for kvset is null")
-		delete(mavls.trees, string(req.Hash))
+		mavls.trees.Delete(string(req.Hash))
 		return req.Hash, nil
 	}
-
-	hash := tree.Save()
+	hash := tree.(*mavl.Tree).Save()
 	if hash == nil {
 		mlog.Error("store mavl commit", "err", types.ErrHashNotFound)
 		return nil, types.ErrDataBaseDamage
 	}
-	delete(mavls.trees, string(req.Hash))
+	mavls.trees.Delete(string(req.Hash))
 	return req.Hash, nil
 }
 
 // Rollback 回退将缓存的mavl树删除掉
 func (mavls *Store) Rollback(req *types.ReqHash) ([]byte, error) {
-	_, ok := mavls.trees[string(req.Hash)]
+	beg := types.Now()
+	defer func() {
+		mlog.Info("Rollback", "cost", types.Since(beg))
+	}()
+	_, ok := mavls.trees.Load(string(req.Hash))
 	if !ok {
 		mlog.Error("store mavl rollback", "err", types.ErrHashNotFound)
 		return nil, types.ErrHashNotFound
 	}
-	delete(mavls.trees, string(req.Hash))
+	mavls.trees.Delete(string(req.Hash))
 	return req.Hash, nil
 }
 

vendor/github.com/33cn/chain33/types/cfg.go

@@ -21,6 +21,7 @@ type Config struct {
 	FixTime    bool         `protobuf:"varint,13,opt,name=fixTime" json:"fixTime,omitempty"`
 	Pprof      *Pprof       `protobuf:"bytes,14,opt,name=pprof" json:"pprof,omitempty"`
 	Fork       *ForkList    `protobuf:"bytes,15,opt,name=fork" json:"fork,omitempty"`
+	Health     *HealthCheck `protobuf:"bytes,16,opt,name=health" json:"health,omitempty"`
 }
 
 // ForkList fork列表配置
@@ -165,3 +166,10 @@ type Exec struct {
 type Pprof struct {
 	ListenAddr string `protobuf:"bytes,1,opt,name=listenAddr" json:"listenAddr,omitempty"`
 }
+
+// HealthCheck 配置
+type HealthCheck struct {
+	ListenAddr     string `protobuf:"bytes,1,opt,name=listenAddr" json:"listenAddr,omitempty"`
+	CheckInterval  uint32 `protobuf:"varint,2,opt,name=checkInterval" json:"checkInterval,omitempty"`
+	UnSyncMaxTimes uint32 `protobuf:"varint,3,opt,name=unSyncMaxTimes" json:"unSyncMaxTimes,omitempty"`
+}

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

@@ -171,6 +171,9 @@ func RunChain33(name string) {
 	log.Info("loading wallet module")
 	walletm := wallet.New(cfg.Wallet, sub.Wallet)
 	walletm.SetQueueClient(q.Client())
+
+	health := util.NewHealthCheckServer(q.Client())
+	health.Start(cfg.Health)
 	defer func() {
 		//close all module,clean some resource
 		log.Info("begin close blockchain module")
@@ -189,6 +192,8 @@ func RunChain33(name string) {
 		rpcapi.Close()
 		log.Info("begin close wallet module")
 		walletm.Close()
+		log.Info("begin close health module")
+		health.Close()
 		log.Info("begin close queue module")
 		q.Close()
 

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

+// Copyright Fuzamei Corp. 2018 All Rights Reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package util
+
+import (
+	"net"
+	"time"
+
+	"sync"
+
+	"github.com/33cn/chain33/client"
+	log "github.com/33cn/chain33/common/log/log15"
+	"github.com/33cn/chain33/queue"
+	"github.com/33cn/chain33/types"
+)
+
+var (
+	listenAddr            = "localhost:8805"
+	unSyncMaxTimes uint32 = 6 //max 6 times
+	checkInterval  uint32 = 5 // 5s
+)
+
+// HealthCheckServer  a node's health check server
+type HealthCheckServer struct {
+	api  client.QueueProtocolAPI
+	l    net.Listener
+	quit chan struct{}
+	wg   sync.WaitGroup
+}
+
+// Close NewHealthCheckServer close
+func (s *HealthCheckServer) Close() {
+	close(s.quit)
+	s.wg.Wait()
+	log.Info("healthCheck quit")
+}
+
+// NewHealthCheckServer new json rpcserver object
+func NewHealthCheckServer(c queue.Client) *HealthCheckServer {
+	h := &HealthCheckServer{}
+	h.api, _ = client.New(c, nil)
+	h.quit = make(chan struct{})
+	return h
+}
+
+// Start HealthCheckServer start
+func (s *HealthCheckServer) Start(cfg *types.HealthCheck) {
+	if cfg != nil {
+		if cfg.ListenAddr != "" {
+			listenAddr = cfg.ListenAddr
+		}
+		if cfg.CheckInterval != 0 {
+			checkInterval = cfg.CheckInterval
+		}
+		if cfg.UnSyncMaxTimes != 0 {
+			unSyncMaxTimes = cfg.UnSyncMaxTimes
+		}
+	}
+	log.Info("healthCheck start ", "addr", listenAddr, "inter", checkInterval, "times", unSyncMaxTimes)
+	s.wg.Add(1)
+	go s.healthCheck()
+
+}
+
+func (s *HealthCheckServer) listen(on bool) error {
+	if on {
+		listener, err := net.Listen("tcp", listenAddr)
+		if err != nil {
+			return err
+		}
+		s.l = listener
+		log.Info("healthCheck listen open")
+		return nil
+	}
+
+	if s.l != nil {
+		err := s.l.Close()
+		if err != nil {
+			return err
+		}
+		log.Info("healthCheck listen close")
+		s.l = nil
+	}
+
+	return nil
+}
+
+func (s *HealthCheckServer) getHealth(sync bool) (bool, error) {
+	reply, err := s.api.IsSync()
+	if err != nil {
+		return false, err
+	}
+
+	peerList, err := s.api.PeerInfo()
+	if err != nil {
+		return false, err
+	}
+
+	log.Info("healthCheck tick", "peers", len(peerList.Peers), "isSync", reply.IsOk, "sync", sync)
+
+	return len(peerList.Peers) > 1 && reply.IsOk, nil
+}
+
+func (s *HealthCheckServer) healthCheck() {
+	ticker := time.NewTicker(time.Second * time.Duration(checkInterval))
+	defer ticker.Stop()
+	defer s.wg.Done()
+
+	var sync bool
+	var unSyncTimes uint32
+
+	for {
+		select {
+		case <-s.quit:
+			if s.l != nil {
+				s.l.Close()
+			}
+			if s.api != nil {
+				s.api.Close()
+			}
+			return
+		case <-ticker.C:
+			health, err := s.getHealth(sync)
+			if err != nil {
+				continue
+			}
+			//sync
+			if health {
+				if !sync {
+					err = s.listen(true)
+					if err != nil {
+						log.Error("healthCheck ", "listen open err", err.Error())
+						continue
+					}
+					sync = true
+				}
+				unSyncTimes = 0
+
+			} else {
+				if sync {
+					if unSyncTimes >= unSyncMaxTimes {
+						err = s.listen(false)
+						if err != nil {
+							log.Error("healthCheck ", "listen close err", err.Error())
+							continue
+						}
+						sync = false
+					}
+					unSyncTimes++
+				}
+			}
+		}
+	}
+}

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

+// Copyright Fuzamei Corp. 2018 All Rights Reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package util
+
+import (
+	"testing"
+
+	"time"
+
+	"github.com/33cn/chain33/client/mocks"
+	"github.com/33cn/chain33/queue"
+	"github.com/33cn/chain33/types"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestStart(t *testing.T) {
+	q := queue.New("channel")
+	health := NewHealthCheckServer(q.Client())
+
+	api := new(mocks.QueueProtocolAPI)
+	reply := &types.Reply{IsOk: true}
+	api.On("IsSync").Return(reply, nil)
+	peer1 := &types.Peer{Addr: "addr1"}
+	peer2 := &types.Peer{Addr: "addr2"}
+	peers := &types.PeerList{Peers: []*types.Peer{peer1, peer2}}
+	api.On("PeerInfo").Return(peers, nil)
+	api.On("Close").Return()
+	health.api = api
+
+	cfg, _ := types.InitCfg("../cmd/chain33/chain33.test.toml")
+	health.Start(cfg.Health)
+	time.Sleep(time.Second * 3)
+	health.Close()
+	time.Sleep(time.Second * 1)
+}
+
+func TestGetHealth(t *testing.T) {
+	api := new(mocks.QueueProtocolAPI)
+	reply := &types.Reply{IsOk: true}
+	api.On("IsSync").Return(reply, nil).Once()
+	peer2 := &types.Peer{Addr: "addr2"}
+	peerlist := &types.PeerList{Peers: []*types.Peer{peer2}}
+	api.On("PeerInfo").Return(peerlist, nil).Once()
+
+	q := queue.New("channel")
+	health := NewHealthCheckServer(q.Client())
+	health.api = api
+	ret, err := health.getHealth(true)
+	assert.Nil(t, err)
+	assert.Equal(t, false, ret)
+
+}

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",