Commit 17ec8479 authored by vipwzw's avatar vipwzw Committed by 33cn

fix all test

parent e23d2a79
<script src="runtime.js"></script> <script src="runtime.js"></script>
<script src="test.js"></script> <script src="game.js"></script>
<script> <script>
//demo database function //demo database function
var statedb = {} var statedb = {}
...@@ -34,11 +34,15 @@ function getstatedb(key) { ...@@ -34,11 +34,15 @@ function getstatedb(key) {
return statedb[key] return statedb[key]
} }
function execname() {
return "user.jsvm.test"
}
function setstatedb(kvs) { function setstatedb(kvs) {
for (var i = 0; i < kvs.length; i++) { for (var i = 0; i < kvs.length; i++) {
statedb[kvs[i].key] = kvs[i].value statedb[kvs[i].key] = kvs[i].value
} }
} }
var ret = callcode("{}", "execlocal_hello", "{}", []) var ret = callcode("{}", "exec_NewGame", "{}", [])
console.log(ret) console.log(ret)
</script> </script>
\ No newline at end of file
...@@ -282,7 +282,7 @@ func (u *js) execFrozenFunc(vm *otto.Otto) { ...@@ -282,7 +282,7 @@ func (u *js) execFrozenFunc(vm *otto.Otto) {
if err != nil { if err != nil {
return errReturn(vm, err) 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 { if err != nil {
return errReturn(vm, err) return errReturn(vm, err)
} }
...@@ -311,7 +311,7 @@ func (u *js) execActiveFunc(vm *otto.Otto) { ...@@ -311,7 +311,7 @@ func (u *js) execActiveFunc(vm *otto.Otto) {
if err != nil { if err != nil {
return errReturn(vm, err) 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 { if err != nil {
return errReturn(vm, err) return errReturn(vm, err)
} }
...@@ -340,7 +340,7 @@ func (u *js) execDepositFunc(vm *otto.Otto) { ...@@ -340,7 +340,7 @@ func (u *js) execDepositFunc(vm *otto.Otto) {
if err != nil { if err != nil {
return errReturn(vm, err) 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 { if err != nil {
return errReturn(vm, err) return errReturn(vm, err)
} }
......
This diff is collapsed.
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
package executor package executor
import ( import (
"fmt"
"github.com/33cn/chain33/system/dapp" "github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
ptypes "github.com/33cn/plugin/plugin/dapp/js/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 ...@@ -28,5 +30,8 @@ func (c *js) ExecLocal_Call(payload *jsproto.Call, tx *types.Transaction, receip
kvc.AddRollbackKV() kvc.AddRollbackKV()
r := &types.LocalDBSet{} r := &types.LocalDBSet{}
r.KV = kvc.KVList() r.KV = kvc.KVList()
for i := 0; i < len(r.KV); i++ {
fmt.Println(string(r.KV[i].Key))
}
return r, nil return r, nil
} }
...@@ -11,17 +11,17 @@ function Init(context) { ...@@ -11,17 +11,17 @@ function Init(context) {
var MIN_WAIT_BLOCK = 2 var MIN_WAIT_BLOCK = 2
var RAND_MAX = 10 var RAND_MAX = 10
function ExecInit(execthis) { function ExecInit() {
execthis.acc = new account(this.kvc, "coins", "bty") this.acc = new account(this.kvc, "coins", "bty")
} }
Exec.prototype.NewGame = function(args) { Exec.prototype.NewGame = function(args) {
var game = {__type__ : "game"} var game = {__type__ : "game"}
game.id = this.context.txhash game.gameid = this.txID()
game.index = this.txID()
game.height = this.context.height game.height = this.context.height
game.randhash = args.hash game.randhash = args.randhash
game.bet = args.bet game.bet = args.bet
game.hash = this.context.txhash
game.obet = game.bet game.obet = game.bet
game.addr = this.context.from game.addr = this.context.from
game.status = 1 //open game.status = 1 //open
...@@ -29,9 +29,13 @@ Exec.prototype.NewGame = function(args) { ...@@ -29,9 +29,13 @@ Exec.prototype.NewGame = function(args) {
if (game.bet < 10 * COINS || game.bet > 10000000 * COINS) { if (game.bet < 10 * COINS || game.bet > 10000000 * COINS) {
throwerr("bet low than 10 or hight than 10000000") 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) var err = this.acc.execFrozen(this.name, this.context.from, game.bet)
throwerr(err) throwerr(err)
this.kvc.add(game.id, game) this.kvc.add(game.gameid, game)
this.kvc.add(game.randhash, "ok")
this.kvc.addlog(game) this.kvc.addlog(game)
return this.kvc.receipt() return this.kvc.receipt()
} }
...@@ -42,6 +46,7 @@ Exec.prototype.Guess = function(args) { ...@@ -42,6 +46,7 @@ Exec.prototype.Guess = function(args) {
match.bet = args.bet match.bet = args.bet
match.id = this.txID() match.id = this.txID()
match.addr = this.context.from match.addr = this.context.from
match.hash = this.context.txhash
var game = this.kvc.get(match.gameid) var game = this.kvc.get(match.gameid)
if (!game) { if (!game) {
throwerr("game id not found") throwerr("game id not found")
...@@ -97,29 +102,29 @@ Exec.prototype.CloseGame = function(args) { ...@@ -97,29 +102,29 @@ Exec.prototype.CloseGame = function(args) {
game.bet = 0 game.bet = 0
} }
game.status = 2 game.status = 2
this.kvc.add(game.id, game) this.kvc.add(game.gameid, game)
this.kvc.addlog(game) this.kvc.addlog(game)
return this.kvc.receipt() return this.kvc.receipt()
} }
function win(this, game, match) { function win(othis, game, match) {
var amount = (RAND_MAX - 1) * match.bet var amount = (RAND_MAX - 1) * match.bet
if (game.bet - amount < 0) { if (game.bet - amount < 0) {
amount = game.bet amount = game.bet
} }
var err var err
if (amount > 0) { 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) throwerr(err)
game.bet -= amount game.bet -= amount
} }
err = this.acc.execActive(match.addr, match.bet) err = othis.acc.execActive(match.addr, match.bet)
throwerr(err) throwerr(err)
} }
function fail(this, game, match) { function fail(othis, game, match) {
var amount = match.bet 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) throwerr(err)
game.bet += amount game.bet += amount
} }
...@@ -147,47 +152,47 @@ Exec.prototype.ForceCloseGame = function(args) { ...@@ -147,47 +152,47 @@ Exec.prototype.ForceCloseGame = function(args) {
game.bet = 0 game.bet = 0
} }
game.status = 2 game.status = 2
this.kvc.add(game.id, game) this.kvc.add(game.gameid, game)
this.kvc.addlog(game) this.kvc.addlog(game)
return this.kvc.receipt() return this.kvc.receipt()
} }
ExecLocal.prototype.NewGame = function(args) { ExecLocal.prototype.NewGame = function(args) {
var local = new MatchGameTable(this.kvc) var local = MatchGameTable(this.kvc)
local.add(this.logs) local.addlogs(this.logs)
local.table.save() local.save()
return this.kvc.receipt() return this.kvc.receipt()
} }
ExecLocal.prototype.Guess = function(args) { ExecLocal.prototype.Guess = function(args) {
var local = new MatchGameTable(this.kvc) var local = MatchGameTable(this.kvc)
local.add(this.logs) local.addlogs(this.logs)
local.table.save() local.save()
return this.kvc.receipt() return this.kvc.receipt()
} }
ExecLocal.prototype.CloseGame = function(args) { ExecLocal.prototype.CloseGame = function(args) {
var local = new MatchGameTable(this.kvc) var local = MatchGameTable(this.kvc)
local.add(this.logs) local.addlogs(this.logs)
local.table.save() local.save()
return this.kvc.receipt() return this.kvc.receipt()
} }
ExecLocal.prototype.ForceCloseGame = function(args) { ExecLocal.prototype.ForceCloseGame = function(args) {
var local = new GameLocalTable(this.kvc) var local = MatchGameTable(this.kvc)
local.add(this.logs) local.addlogs(this.logs)
local.table.save() local.save()
return this.kvc.receipt() return this.kvc.receipt()
} }
Query.prototype.ListGameByAddr = function(args) { Query.prototype.ListGameByAddr = function(args) {
var local = new GameLocalTable(this.kvc) var local = GameLocalTable(this.kvc)
return local.query(args) return local.query("addr", args.addr, args.primaryKey, args.count, args.direction)
} }
/* /*
game ->(1 : n) match game ->(1 : n) match
game.id -> primary game.gameid -> primary
match.gameid -> fk match.gameid -> fk
match.id -> primary match.id -> primary
...@@ -195,19 +200,20 @@ match.id -> primary ...@@ -195,19 +200,20 @@ match.id -> primary
function GameLocalTable(kvc) { function GameLocalTable(kvc) {
this.config = { this.config = {
"#tablename" : "game", "#tablename" : "game",
"#primary" : "id", "#primary" : "gameid",
"#db" : "localdb", "#db" : "localdb",
"id" : "%018d", "gameid" : "%018d",
"status" : "%d", "status" : "%d",
"hash" : "%s",
"addr" : "%s", "addr" : "%s",
} }
this.defaultvalue = { this.defaultvalue = {
"id" : "0", "gameid" : 0,
"status" : 0, "status" : 0,
"hash" : "",
"addr" : "", "addr" : "",
} }
this.kvc = kvc return new Table(kvc, this.config, this.defaultvalue)
this.table = new Table(this.kvc, this.config, this.defaultvalue)
} }
function MatchLocalTable(kvc) { function MatchLocalTable(kvc) {
...@@ -216,29 +222,19 @@ function MatchLocalTable(kvc) { ...@@ -216,29 +222,19 @@ function MatchLocalTable(kvc) {
"#primary" : "id", "#primary" : "id",
"#db" : "localdb", "#db" : "localdb",
"id" : "%018d", "id" : "%018d",
"gameid" : "%s", "gameid" : "%018d",
"hash" : "%s",
"addr" : "%s", "addr" : "%s",
} }
this.defaultvalue = { this.defaultvalue = {
"id" : 0, "id" : 0,
"gameid" : 0, "gameid" : 0,
"hash" : "",
"addr" : "", "addr" : "",
} }
this.kvc = kvc return new Table(kvc, this.config, this.defaultvalue)
this.table = new Table(this.kvc, this.config, this.defaultvalue)
} }
function MatchGameTable(kvc) { function MatchGameTable(kvc) {
this.left = MatchLocalTable(kvc) return new JoinTable(MatchLocalTable(kvc), GameLocalTable(kvc), "addr#status")
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)
}
} }
\ No newline at end of file
...@@ -8,4 +8,19 @@ ...@@ -8,4 +8,19 @@
cat "test.js" cat "test.js"
printf '`\n' printf '`\n'
printf 'var _ = jscode\n' printf 'var _ = jscode\n'
printf 'var gamecode = `\n'
cat "game.js"
printf '`\n'
printf 'var _ = gamecode\n'
} >const.go } >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
...@@ -3,7 +3,7 @@ package executor ...@@ -3,7 +3,7 @@ package executor
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt" "sync"
"sync/atomic" "sync/atomic"
"github.com/33cn/chain33/common" "github.com/33cn/chain33/common"
...@@ -28,7 +28,6 @@ func init() { ...@@ -28,7 +28,6 @@ func init() {
panic(err) panic(err)
} }
execaddressFunc(basevm) execaddressFunc(basevm)
registerTableFunc(basevm)
sha256Func(basevm) sha256Func(basevm)
} }
...@@ -49,7 +48,9 @@ func Init(name string, sub []byte) { ...@@ -49,7 +48,9 @@ func Init(name string, sub []byte) {
type js struct { type js struct {
drivers.DriverBase drivers.DriverBase
prefix []byte prefix []byte
globalTableHandle sync.Map
globalHanldeID int64
} }
func newjs() drivers.Driver { func newjs() drivers.Driver {
...@@ -224,7 +225,7 @@ func (u *js) localdbFunc(vm *otto.Otto, name string) { ...@@ -224,7 +225,7 @@ func (u *js) localdbFunc(vm *otto.Otto, name string) {
func (u *js) execnameFunc(vm *otto.Otto, name string) { func (u *js) execnameFunc(vm *otto.Otto, name string) {
vm.Set("execname", func(call otto.FunctionCall) otto.Value { 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 ...@@ -281,7 +282,7 @@ func (u *js) createVM(name string, tx *types.Transaction, index int) (*otto.Otto
u.listdbFunc(vm, name) u.listdbFunc(vm, name)
u.execnameFunc(vm, name) u.execnameFunc(vm, name)
u.registerAccountFunc(vm) u.registerAccountFunc(vm)
u.newTableFunc(vm, name) u.registerTableFunc(vm, name)
return vm, nil return vm, nil
} }
...@@ -360,26 +361,28 @@ func (u *js) Allow(tx *types.Transaction, index int) error { ...@@ -360,26 +361,28 @@ func (u *js) Allow(tx *types.Transaction, index int) error {
return types.ErrNotAllow return types.ErrNotAllow
} }
func createKVObject(vm *otto.Otto, kvs []*types.KeyValue) otto.Value { func createKVObject(vm *otto.Otto, kvs []*types.KeyValue) []interface{} {
obj := newObjectString(vm, "([])") data := make([]interface{}, len(kvs))
for i := 0; i < len(kvs); i++ { for i := 0; i < len(kvs); i++ {
item := newObject(vm).setValue("key", string(kvs[i].Key)) item := make(map[string]interface{})
item.setValue("value", string(kvs[i].Value)) item["key"] = string(kvs[i].Key)
item.setValue("prefix", true) item["value"] = string(kvs[i].Value)
obj.setValue(fmt.Sprint(i), item) item["prefix"] = true
data[i] = item
} }
return obj.value() return data
} }
func createLogsObject(vm *otto.Otto, logs []*types.ReceiptLog) otto.Value { func createLogsObject(vm *otto.Otto, logs []*types.ReceiptLog) []interface{} {
obj := newObjectString(vm, "([])") data := make([]interface{}, len(logs))
for i := 0; i < len(logs); i++ { for i := 0; i < len(logs); i++ {
item := newObject(vm).setValue("ty", logs[i].Ty) item := make(map[string]interface{})
item.setValue("log", string(logs[i].Log)) item["ty"] = logs[i].Ty
item.setValue("format", "proto") item["log"] = string(logs[i].Log)
obj.setValue(fmt.Sprint(i), item) item["format"] = "proto"
data[i] = item
} }
return obj.value() return data
} }
func accountReturn(vm *otto.Otto, acc *types.Account) otto.Value { func accountReturn(vm *otto.Otto, acc *types.Account) otto.Value {
......
...@@ -22,12 +22,12 @@ func init() { ...@@ -22,12 +22,12 @@ func init() {
Init(ptypes.JsX, nil) 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 := newjs().(*js)
e.SetEnv(1, time.Now().Unix(), 1) e.SetEnv(1, time.Now().Unix(), 1)
e.SetLocalDB(kvdb) e.SetLocalDB(kvdb)
e.SetStateDB(kvdb) e.SetStateDB(kvdb)
c, tx := createCodeTx("test", jscode) c, tx := createCodeTx("test", code)
receipt, err := e.Exec_Create(c, tx, 0) receipt, err := e.Exec_Create(c, tx, 0)
assert.Nil(t, err) assert.Nil(t, err)
util.SaveKVList(ldb, receipt.KV) util.SaveKVList(ldb, receipt.KV)
...@@ -54,7 +54,7 @@ func callCodeTx(name, f, args string) (*jsproto.Call, *types.Transaction) { ...@@ -54,7 +54,7 @@ func callCodeTx(name, f, args string) (*jsproto.Call, *types.Transaction) {
func TestCallcode(t *testing.T) { func TestCallcode(t *testing.T) {
dir, ldb, kvdb := util.CreateTestDB() dir, ldb, kvdb := util.CreateTestDB()
defer util.CloseTestDB(dir, ldb) defer util.CloseTestDB(dir, ldb)
e := initExec(ldb, kvdb, t) e := initExec(ldb, kvdb, jscode, t)
call, tx := callCodeTx("test", "hello", `{"hello":"world"}`) call, tx := callCodeTx("test", "hello", `{"hello":"world"}`)
receipt, err := e.Exec_Call(call, tx, 0) receipt, err := e.Exec_Call(call, tx, 0)
...@@ -107,7 +107,7 @@ func TestCallcode(t *testing.T) { ...@@ -107,7 +107,7 @@ func TestCallcode(t *testing.T) {
func TestCallError(t *testing.T) { func TestCallError(t *testing.T) {
dir, ldb, kvdb := util.CreateTestDB() dir, ldb, kvdb := util.CreateTestDB()
defer util.CloseTestDB(dir, ldb) defer util.CloseTestDB(dir, ldb)
e := initExec(ldb, kvdb, t) e := initExec(ldb, kvdb, jscode, t)
//test call error(invalid json input) //test call error(invalid json input)
call, tx := callCodeTx("test", "hello", `{hello":"world"}`) call, tx := callCodeTx("test", "hello", `{hello":"world"}`)
_, err := e.callVM("exec", call, tx, 0, nil) _, err := e.callVM("exec", call, tx, 0, nil)
...@@ -132,7 +132,7 @@ func TestCallError(t *testing.T) { ...@@ -132,7 +132,7 @@ func TestCallError(t *testing.T) {
func TestBigInt(t *testing.T) { func TestBigInt(t *testing.T) {
dir, ldb, kvdb := util.CreateTestDB() dir, ldb, kvdb := util.CreateTestDB()
defer util.CloseTestDB(dir, ldb) defer util.CloseTestDB(dir, ldb)
e := initExec(ldb, kvdb, t) e := initExec(ldb, kvdb, jscode, t)
//test call error(invalid json input) //test call error(invalid json input)
s := fmt.Sprintf(`{"balance":%d,"balance1":%d,"balance2":%d,"balance3":%d}`, math.MaxInt64, math.MinInt64, 9007199254740990, -9007199254740990) s := fmt.Sprintf(`{"balance":%d,"balance1":%d,"balance2":%d,"balance3":%d}`, math.MaxInt64, math.MinInt64, 9007199254740990, -9007199254740990)
call, tx := callCodeTx("test", "hello", s) call, tx := callCodeTx("test", "hello", s)
...@@ -146,7 +146,7 @@ func TestBigInt(t *testing.T) { ...@@ -146,7 +146,7 @@ func TestBigInt(t *testing.T) {
func BenchmarkBigInt(b *testing.B) { func BenchmarkBigInt(b *testing.B) {
dir, ldb, kvdb := util.CreateTestDB() dir, ldb, kvdb := util.CreateTestDB()
defer util.CloseTestDB(dir, ldb) defer util.CloseTestDB(dir, ldb)
e := initExec(ldb, kvdb, b) e := initExec(ldb, kvdb, jscode, b)
//test call error(invalid json input) //test call error(invalid json input)
s := fmt.Sprintf(`{"balance":%d,"balance1":%d,"balance2":%d,"balance3":%d}`, math.MaxInt64, math.MinInt64, 9007199254740990, -9007199254740990) s := fmt.Sprintf(`{"balance":%d,"balance1":%d,"balance2":%d,"balance3":%d}`, math.MaxInt64, math.MinInt64, 9007199254740990, -9007199254740990)
call, tx := callCodeTx("test", "hello", s) call, tx := callCodeTx("test", "hello", s)
...@@ -184,7 +184,7 @@ func TestCalcLocalPrefix(t *testing.T) { ...@@ -184,7 +184,7 @@ func TestCalcLocalPrefix(t *testing.T) {
func TestCacheMemUsage(t *testing.T) { func TestCacheMemUsage(t *testing.T) {
dir, ldb, kvdb := util.CreateTestDB() dir, ldb, kvdb := util.CreateTestDB()
defer util.CloseTestDB(dir, ldb) defer util.CloseTestDB(dir, ldb)
e := initExec(ldb, kvdb, t) e := initExec(ldb, kvdb, jscode, t)
vm, err := e.createVM("test", nil, 0) vm, err := e.createVM("test", nil, 0)
assert.Nil(t, err) assert.Nil(t, err)
vms := make([]*otto.Otto, 1024) vms := make([]*otto.Otto, 1024)
......
...@@ -4,10 +4,13 @@ import ( ...@@ -4,10 +4,13 @@ import (
"fmt" "fmt"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
ptypes "github.com/33cn/plugin/plugin/dapp/js/types"
"github.com/33cn/plugin/plugin/dapp/js/types/jsproto" "github.com/33cn/plugin/plugin/dapp/js/types/jsproto"
) )
func (c *js) Query_Query(payload *jsproto.Call) (types.Message, error) { 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) jsvalue, err := c.callVM("query", payload, nil, 0, nil)
if err != nil { if err != nil {
fmt.Println("query", err) fmt.Println("query", err)
......
package executor_test package executor_test
import ( import (
"fmt"
"math/rand"
"testing" "testing"
"time"
"github.com/33cn/chain33/common"
"github.com/33cn/chain33/common/address"
rpctypes "github.com/33cn/chain33/rpc/types" rpctypes "github.com/33cn/chain33/rpc/types"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
"github.com/33cn/chain33/util/testnode" "github.com/33cn/chain33/util/testnode"
...@@ -14,6 +19,10 @@ import ( ...@@ -14,6 +19,10 @@ import (
_ "github.com/33cn/plugin/plugin" _ "github.com/33cn/plugin/plugin"
) )
func init() {
rand.Seed(time.Now().UnixNano())
}
func TestJsVM(t *testing.T) { func TestJsVM(t *testing.T) {
mocker := testnode.New("--free--", nil) mocker := testnode.New("--free--", nil)
defer mocker.Close() defer mocker.Close()
...@@ -75,53 +84,95 @@ func TestJsVM(t *testing.T) { ...@@ -75,53 +84,95 @@ func TestJsVM(t *testing.T) {
t.Log(queryresult.Data) t.Log(queryresult.Data)
} }
var jscode = ` func TestJsGame(t *testing.T) {
//数据结构设计 contractName := "test1"
//kvlist [{key:"key1", value:"value1"},{key:"key2", value:"value2"}] mocker := testnode.New("--free--", nil)
//log 设计 {json data} defer mocker.Close()
function Init(context) { mocker.Listen()
this.kvc = new kvcreator("init") err := mocker.SendHot()
this.context = context assert.Nil(t, err)
this.kvc.add("action", "init") //开始部署合约, 测试阶段任何人都可以部署合约
this.kvc.add("context", this.context) //后期需要加上权限控制
return this.kvc.receipt() //1. 部署合约
} create := &jsproto.Create{
Code: gamecode,
function Exec(context) { Name: contractName,
this.kvc = new kvcreator("exec") }
this.context = context req := &rpctypes.CreateTxIn{
} Execer: ptypes.JsX,
ActionName: "Create",
function ExecLocal(context, logs) { Payload: types.MustPBToJSON(create),
this.kvc = new kvcreator("local") }
this.context = context var txhex string
this.logs = logs err = mocker.GetJSONC().Call("Chain33.CreateTransaction", req, &txhex)
} assert.Nil(t, err)
hash, err := mocker.SendAndSign(mocker.GetHotKey(), txhex)
function Query(context) { assert.Nil(t, err)
this.kvc = new kvcreator("query") txinfo, err := mocker.WaitTx(hash)
this.context = context assert.Nil(t, err)
} assert.Equal(t, txinfo.Receipt.Ty, int32(2))
block := mocker.GetLastBlock()
Exec.prototype.hello = function(args) { balance := mocker.GetAccount(block.StateHash, mocker.GetHotAddress()).Balance
this.kvc.add("args", args) assert.Equal(t, balance, 10000*types.Coin)
this.kvc.add("action", "exec") //2.1 充值到合约
this.kvc.add("context", this.context) reqtx := &rpctypes.CreateTx{
this.kvc.addlog({"key1": "value1"}) To: address.ExecAddress("user.jsvm." + contractName),
this.kvc.addlog({"key2": "value2"}) Amount: 100 * types.Coin,
return this.kvc.receipt() 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) { call := &jsproto.Call{
this.kvc.add("args", args) Funcname: "NewGame",
this.kvc.add("action", "execlocal") Name: contractName,
this.kvc.add("log", this.logs) Args: fmt.Sprintf(`{"bet": %d, "randhash" : "%s"}`, 100*types.Coin, myhash),
this.kvc.add("context", this.context) }
return this.kvc.receipt() 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 //3. query 函数查询
Query.prototype.hello = function(args) { call = &jsproto.Call{
return tojson({hello:"wzw"}) 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)
} }
`
This diff is collapsed.
This diff is collapsed.
...@@ -205,6 +205,27 @@ func (mock *Chain33Mock) SendAndSign(priv crypto.PrivKey, hextx string) ([]byte, ...@@ -205,6 +205,27 @@ func (mock *Chain33Mock) SendAndSign(priv crypto.PrivKey, hextx string) ([]byte,
return reply.GetMsg(), nil 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) { func newWalletRealize(qAPI client.QueueProtocolAPI) {
seed := &types.SaveSeedByPw{ seed := &types.SaveSeedByPw{
Seed: "subject hamster apple parent vital can adult chapter fork business humor pen tiger void elephant", Seed: "subject hamster apple parent vital can adult chapter fork business humor pen tiger void elephant",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment