update plugin

.gitignore

+consensus/raft/tools/scripts/grpc33.log
+consensus/raft/tools/scripts/logs/
+*.orig
+store/kvmvcc/1.png
+store/kvmvcc/cpu.pprof
+store/kvmvcc/kvmvcc.test
+store/mpt/1.png
+store/mpt/cpu.pprof
+store/mpt/mpt.test
+

README.md

-chain33 plugin system
\ No newline at end of file

consensus/init/init.go

-package plugin
+package init
 
 import (
 	_ "gitlab.33.cn/chain33/chain33/plugin/consensus/para"

consensus/pbft/D:/goprogram/src/gitlab.33.cn/chain33/chain33/logs/pbft.log

-t=2018-09-05T17:07:56+0800 lvl=info msg="init::LoadBlockStoreHeight::database may be crash" module=blockchain err=ErrHeightNotExist
-t=2018-09-05T17:07:56+0800 lvl=info msg="load block height error, may be init database" module=blockchain height=-1
-t=2018-09-05T17:07:56+0800 lvl=info msg=InitIndexAndBestView module=blockchain cost=485.295µs
-t=2018-09-05T17:07:56+0800 lvl=info msg=GetDbVersion module=blockchain submodule=store err=ErrNotFoundInDb
-t=2018-09-05T17:07:56+0800 lvl=info msg=SetDbVersion module=blockchain submodule=store blcokchain db version=1
-t=2018-09-05T17:07:56+0800 lvl=info msg="mempool piple line start" module=mempool
-t=2018-09-05T17:07:56+0800 lvl=info msg="pollLastHeader quit" module=mempool
-t=2018-09-05T17:08:29+0800 lvl=info msg="init::LoadBlockStoreHeight::database may be crash" module=blockchain err=ErrHeightNotExist
-t=2018-09-05T17:08:29+0800 lvl=info msg="load block height error, may be init database" module=blockchain height=-1
-t=2018-09-05T17:08:29+0800 lvl=info msg=InitIndexAndBestView module=blockchain cost=1.503171ms
-t=2018-09-05T17:08:29+0800 lvl=info msg=GetDbVersion module=blockchain submodule=store blockchain db version=1
-t=2018-09-05T17:08:29+0800 lvl=info msg="mempool piple line start" module=mempool
-t=2018-09-05T17:08:29+0800 lvl=info msg="pollLastHeader quit" module=mempool
-t=2018-09-05T17:08:29+0800 lvl=info msg="Enter store mavl" module=store
-t=2018-09-05T17:08:29+0800 lvl=info msg="start to creat pbft node" module=Pbft
-t=2018-09-05T17:08:29+0800 lvl=info msg="Enter consensus pbft"
-t=2018-09-05T17:08:29+0800 lvl=info msg="Enter SetQueue method of pbft consensus" module=Pbft
-t=2018-09-05T17:08:29+0800 lvl=info msg="Enter SetQueueClient method of consensus"
-t=2018-09-05T17:08:29+0800 lvl=info msg=ExecBlock module=util height=0 ntx=1 writebatchsync=false cost=411.009µs
-t=2018-09-05T17:08:29+0800 lvl=info msg=EventAddBlockDetail module=blockchain height=0 hash=935cb32d5a24e56967c7a0a9bf357e447fcaa082d703159ccb3a04bf9ae8ec32
-t=2018-09-05T17:08:29+0800 lvl=info msg=p2p module=p2p Version=118
-t=2018-09-05T17:08:29+0800 lvl=info msg=p2p module=p2p InnerBounds=500
-t=2018-09-05T17:08:29+0800 lvl=info msg=p2p module=p2p setqueuecliet=ok
-t=2018-09-05T17:08:29+0800 lvl=info msg=DetectNodeAddr module=p2p addr:=192.168.0.141
-t=2018-09-05T17:08:29+0800 lvl=info msg=detectNodeAddr module=p2p LocalAddr=192.168.0.141
-t=2018-09-05T17:08:29+0800 lvl=info msg=ShowTaskCapcity module=p2p Capcity=1000
-t=2018-09-05T17:08:29+0800 lvl=eror msg=GetFeeAmount module=wallet submodule=store Get from db error=ErrNotFoundInDb
-t=2018-09-05T17:08:29+0800 lvl=eror msg=getVersion module=wallet.privacy db.Get error=ErrNotFoundInDb
-t=2018-09-05T17:08:29+0800 lvl=eror msg="GetAccountByPrefix addr not exist" wallet=store
-t=2018-09-05T17:08:29+0800 lvl=info msg=GetWalletAccounts module=wallet GetAccountByPrefix:err=ErrAccountNotExist
-t=2018-09-05T17:08:29+0800 lvl=eror msg=rescanAllTxToUpdateUTXOs module=wallet.privacy walletOperate.GetWalletAccounts error=ErrAccountNotExist
-t=2018-09-05T17:08:29+0800 lvl=eror msg=GetAutoMinerFlag module=wallet.ticket Get error=ErrNotFoundInDb
-t=2018-09-05T17:08:29+0800 lvl=info msg="Begin auto mining" module=wallet.ticket

consensus/pbft/datadir/addrbook/addrbook.db/CURRENT

-MANIFEST-000000

consensus/pbft/datadir/addrbook/addrbook.db/LOG

-=============== Sep 5, 2018 (CST) ===============
-17:08:29.922706 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
-17:08:29.923258 db@open opening
-17:08:29.923864 version@stat F·[] S·0B[] Sc·[]
-17:08:29.924069 db@janitor F·2 G·0
-17:08:29.924089 db@open done T·818.266µs

consensus/pbft/datadir/blockchain.db/CURRENT

-MANIFEST-000004

consensus/pbft/datadir/blockchain.db/LOG

-=============== Sep 5, 2018 (CST) ===============
-17:07:56.823741 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
-17:07:56.824523 db@open opening
-17:07:56.825400 version@stat F·[] S·0B[] Sc·[]
-17:07:56.825624 db@janitor F·2 G·0
-17:07:56.825646 db@open done T·1.107044ms
-=============== Sep 5, 2018 (CST) ===============
-17:08:29.905714 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
-17:08:29.906016 version@stat F·[] S·0B[] Sc·[]
-17:08:29.906037 db@open opening
-17:08:29.906108 journal@recovery F·1
-17:08:29.907790 journal@recovery recovering @1
-17:08:29.908286 memdb@flush created L0@2 N·1 S·194B "Blo..Key,v1":"Blo..Key,v1"
-17:08:29.908970 version@stat F·[1] S·194B[194B] Sc·[0.25]
-17:08:29.909559 db@janitor F·3 G·0
-17:08:29.909588 db@open done T·3.53978ms

consensus/pbft/datadir/mavltree/store.db/CURRENT

-MANIFEST-000000

consensus/pbft/datadir/mavltree/store.db/LOG

-=============== Sep 5, 2018 (CST) ===============
-17:08:29.914061 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
-17:08:29.914622 db@open opening
-17:08:29.915266 version@stat F·[] S·0B[] Sc·[]
-17:08:29.915477 db@janitor F·2 G·0
-17:08:29.915495 db@open done T·860.67µs

consensus/pbft/datadir/wallet/wallet.db/CURRENT

-MANIFEST-000000

consensus/pbft/datadir/wallet/wallet.db/LOG

-=============== Sep 5, 2018 (CST) ===============
-17:08:29.948081 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
-17:08:29.948567 db@open opening
-17:08:29.949041 version@stat F·[] S·0B[] Sc·[]
-17:08:29.949212 db@janitor F·2 G·0
-17:08:29.949228 db@open done T·651.21µs

dapp/lottery/executor/lotterydb.go

@@ -598,7 +598,7 @@ func (action *Action) checkDraw(lott *LotteryDB) (*types.Receipt, *pty.LotteryUp
 			fund, fundType := checkFundAmount(luckynum, rec.Number, rec.Way)
 			if fund != 0 {
 				newUpdateRec := &pty.LotteryUpdateRec{rec.Index, fundType}
-				if update, ok := updateInfo.BuyInfo[action.fromaddr]; ok {
+				if update, ok := updateInfo.BuyInfo[addr]; ok {
 					update.Records = append(update.Records, newUpdateRec)
 				} else {
 					initrecord := &pty.LotteryUpdateRecs{}

dapp/paracross/executor/paracross_test.go

@@ -21,6 +21,7 @@ import (
 	"gitlab.33.cn/chain33/chain33/common/address"
 	"gitlab.33.cn/chain33/chain33/common/log"
 	pt "gitlab.33.cn/chain33/chain33/plugin/dapp/paracross/types"
+	mty "gitlab.33.cn/chain33/chain33/system/dapp/manage/types"
 )
 
 // 构造一个4个节点的平行链数据， 进行测试
@@ -67,7 +68,7 @@ func makeNodeInfo(key, addr string, cnt int) *types.ConfigItem {
 	var item types.ConfigItem
 	item.Key = key
 	item.Addr = addr
-	item.Ty = types.ConfigItemArrayConfig
+	item.Ty = mty.ConfigItemArrayConfig
 	emptyValue := &types.ArrayConfig{make([]string, 0)}
 	arr := types.ConfigItem_Arr{emptyValue}
 	item.Value = &arr

dapp/privacy/wallet/privacy.go

@@ -24,7 +24,7 @@ import (
 func (policy *privacyPolicy) rescanAllTxAddToUpdateUTXOs() {
 	accounts, err := policy.getWalletOperate().GetWalletAccounts()
 	if err != nil {
-		bizlog.Error("rescanAllTxToUpdateUTXOs", "walletOperate.GetWalletAccounts error", err)
+		bizlog.Debug("rescanAllTxToUpdateUTXOs", "walletOperate.GetWalletAccounts error", err)
 		return
 	}
 	bizlog.Debug("rescanAllTxToUpdateUTXOs begin!")

dapp/privacy/wallet/privacystore.go

@@ -32,7 +32,7 @@ func (store *privacyStore) getVersion() int64 {
 	var version int64
 	data, err := store.Get(calcPrivacyDBVersion())
 	if err != nil || data == nil {
-		bizlog.Error("getVersion", "db.Get error", err)
+		bizlog.Debug("getVersion", "db.Get error", err)
 		return 0
 	}
 	err = json.Unmarshal(data, &version)

dapp/ticket/wallet/ticketstore.go

@@ -37,7 +37,7 @@ func (store *ticketStore) GetAutoMinerFlag() int32 {
 	flag := int32(0)
 	value, err := store.Get(CalcWalletAutoMiner())
 	if err != nil {
-		bizlog.Error("GetAutoMinerFlag", "Get error", err)
+		bizlog.Debug("GetAutoMinerFlag", "Get error", err)
 		return flag
 	}
 	if value != nil && string(value) == "1" {

dapp/token/types/const.go

@@ -37,3 +37,9 @@ const (
 	TyLogTokenGenesisTransfer = 321
 	TyLogTokenGenesisDeposit  = 322
 )
+
+const (
+	TokenNameLenLimit   = 128
+	TokenSymbolLenLimit = 16
+	TokenIntroLenLimit  = 1024
+)

dapp/trade/executor/exec_del_local.go

@@ -34,7 +34,7 @@ func (t *trade) localDelLog(tx *types.Transaction, receipt *types.ReceiptData, i
 
 	for i := 0; i < len(receipt.Logs); i++ {
 		item := receipt.Logs[i]
-		if item.Ty == types.TyLogTradeSellLimit || item.Ty == types.TyLogTradeSellRevoke {
+		if item.Ty == pty.TyLogTradeSellLimit || item.Ty == pty.TyLogTradeSellRevoke {
 			var receipt pty.ReceiptTradeSellLimit
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
@@ -42,7 +42,7 @@ func (t *trade) localDelLog(tx *types.Transaction, receipt *types.ReceiptData, i
 			}
 			kv := t.deleteSell([]byte(receipt.Base.SellID), item.Ty)
 			set.KV = append(set.KV, kv...)
-		} else if item.Ty == types.TyLogTradeBuyMarket {
+		} else if item.Ty == pty.TyLogTradeBuyMarket {
 			var receipt pty.ReceiptTradeBuyMarket
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
@@ -50,7 +50,7 @@ func (t *trade) localDelLog(tx *types.Transaction, receipt *types.ReceiptData, i
 			}
 			kv := t.deleteBuy(receipt.Base)
 			set.KV = append(set.KV, kv...)
-		} else if item.Ty == types.TyLogTradeBuyRevoke || item.Ty == types.TyLogTradeBuyLimit {
+		} else if item.Ty == pty.TyLogTradeBuyRevoke || item.Ty == pty.TyLogTradeBuyLimit {
 			var receipt pty.ReceiptTradeBuyLimit
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
@@ -58,7 +58,7 @@ func (t *trade) localDelLog(tx *types.Transaction, receipt *types.ReceiptData, i
 			}
 			kv := t.deleteBuyLimit([]byte(receipt.Base.BuyID), item.Ty)
 			set.KV = append(set.KV, kv...)
-		} else if item.Ty == types.TyLogTradeSellMarket {
+		} else if item.Ty == pty.TyLogTradeSellMarket {
 			var receipt pty.ReceiptSellMarket
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {

dapp/trade/executor/exec_local.go

@@ -34,7 +34,7 @@ func (t *trade) localAddLog(tx *types.Transaction, receipt *types.ReceiptData, i
 
 	for i := 0; i < len(receipt.Logs); i++ {
 		item := receipt.Logs[i]
-		if item.Ty == types.TyLogTradeSellLimit || item.Ty == types.TyLogTradeSellRevoke {
+		if item.Ty == pty.TyLogTradeSellLimit || item.Ty == pty.TyLogTradeSellRevoke {
 			var receipt pty.ReceiptTradeSellLimit
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
@@ -42,7 +42,7 @@ func (t *trade) localAddLog(tx *types.Transaction, receipt *types.ReceiptData, i
 			}
 			kv := t.saveSell([]byte(receipt.Base.SellID), item.Ty)
 			set.KV = append(set.KV, kv...)
-		} else if item.Ty == types.TyLogTradeBuyMarket {
+		} else if item.Ty == pty.TyLogTradeBuyMarket {
 			var receipt pty.ReceiptTradeBuyMarket
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
@@ -50,7 +50,7 @@ func (t *trade) localAddLog(tx *types.Transaction, receipt *types.ReceiptData, i
 			}
 			kv := t.saveBuy(receipt.Base)
 			set.KV = append(set.KV, kv...)
-		} else if item.Ty == types.TyLogTradeBuyRevoke || item.Ty == types.TyLogTradeBuyLimit {
+		} else if item.Ty == pty.TyLogTradeBuyRevoke || item.Ty == pty.TyLogTradeBuyLimit {
 			var receipt pty.ReceiptTradeBuyLimit
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {
@@ -59,7 +59,7 @@ func (t *trade) localAddLog(tx *types.Transaction, receipt *types.ReceiptData, i
 
 			kv := t.saveBuyLimit([]byte(receipt.Base.BuyID), item.Ty)
 			set.KV = append(set.KV, kv...)
-		} else if item.Ty == types.TyLogTradeSellMarket {
+		} else if item.Ty == pty.TyLogTradeSellMarket {
 			var receipt pty.ReceiptSellMarket
 			err := types.Decode(item.Log, &receipt)
 			if err != nil {

dapp/trade/executor/query.go

@@ -302,7 +302,7 @@ func txResult2sellOrderReply(txResult *types.TxResult) *pty.ReplySellOrder {
 	logs := txResult.Receiptdate.Logs
 	tradelog.Debug("txResult2sellOrderReply", "show logs", logs)
 	for _, log := range logs {
-		if log.Ty == types.TyLogTradeSellMarket {
+		if log.Ty == pty.TyLogTradeSellMarket {
 			var receipt pty.ReceiptSellMarket
 			err := types.Decode(log.Log, &receipt)
 			if err != nil {
@@ -369,7 +369,7 @@ func txResult2buyOrderReply(txResult *types.TxResult) *pty.ReplyBuyOrder {
 	logs := txResult.Receiptdate.Logs
 	tradelog.Debug("txResult2sellOrderReply", "show logs", logs)
 	for _, log := range logs {
-		if log.Ty == types.TyLogTradeBuyMarket {
+		if log.Ty == pty.TyLogTradeBuyMarket {
 			var receipt pty.ReceiptTradeBuyMarket
 			err := types.Decode(log.Log, &receipt)
 			if err != nil {
@@ -525,7 +525,7 @@ func txResult2OrderReply(txResult *types.TxResult) *pty.ReplyTradeOrder {
 	logs := txResult.Receiptdate.Logs
 	tradelog.Debug("txResult2sellOrderReply", "show logs", logs)
 	for _, log := range logs {
-		if log.Ty == types.TyLogTradeBuyMarket {
+		if log.Ty == pty.TyLogTradeBuyMarket {
 			var receipt pty.ReceiptTradeBuyMarket
 			err := types.Decode(log.Log, &receipt)
 			if err != nil {
@@ -534,7 +534,7 @@ func txResult2OrderReply(txResult *types.TxResult) *pty.ReplyTradeOrder {
 			}
 			tradelog.Debug("txResult2sellOrderReply", "show logs 1 ", receipt)
 			return buyBase2Order(receipt.Base, common.ToHex(txResult.GetTx().Hash()), txResult.Blocktime)
-		} else if log.Ty == types.TyLogTradeBuyRevoke {
+		} else if log.Ty == pty.TyLogTradeBuyRevoke {
 			var receipt pty.ReceiptTradeBuyRevoke
 			err := types.Decode(log.Log, &receipt)
 			if err != nil {
@@ -543,7 +543,7 @@ func txResult2OrderReply(txResult *types.TxResult) *pty.ReplyTradeOrder {
 			}
 			tradelog.Debug("txResult2sellOrderReply", "show logs 1 ", receipt)
 			return buyBase2Order(receipt.Base, common.ToHex(txResult.GetTx().Hash()), txResult.Blocktime)
-		} else if log.Ty == types.TyLogTradeSellRevoke {
+		} else if log.Ty == pty.TyLogTradeSellRevoke {
 			var receipt pty.ReceiptTradeSellRevoke
 			err := types.Decode(log.Log, &receipt)
 			if err != nil {
@@ -552,7 +552,7 @@ func txResult2OrderReply(txResult *types.TxResult) *pty.ReplyTradeOrder {
 			}
 			tradelog.Debug("txResult2sellOrderReply", "show revoke 1 ", receipt)
 			return sellBase2Order(receipt.Base, common.ToHex(txResult.GetTx().Hash()), txResult.Blocktime)
-		} else if log.Ty == types.TyLogTradeSellMarket {
+		} else if log.Ty == pty.TyLogTradeSellMarket {
 			var receipt pty.ReceiptSellMarket
 			err := types.Decode(log.Log, &receipt)
 			if err != nil {
@@ -570,7 +570,7 @@ func limitOrderTxResult2Order(txResult *types.TxResult) *pty.ReplyTradeOrder {
 	logs := txResult.Receiptdate.Logs
 	tradelog.Debug("txResult2sellOrderReply", "show logs", logs)
 	for _, log := range logs {
-		if log.Ty == types.TyLogTradeSellLimit {
+		if log.Ty == pty.TyLogTradeSellLimit {
 			var receipt pty.ReceiptTradeSellLimit
 			err := types.Decode(log.Log, &receipt)
 			if err != nil {
@@ -579,7 +579,7 @@ func limitOrderTxResult2Order(txResult *types.TxResult) *pty.ReplyTradeOrder {
 			}
 			tradelog.Debug("txResult2sellOrderReply", "show logs 1 ", receipt)
 			return sellBase2Order(receipt.Base, common.ToHex(txResult.GetTx().Hash()), txResult.Blocktime)
-		} else if log.Ty == types.TyLogTradeBuyLimit {
+		} else if log.Ty == pty.TyLogTradeBuyLimit {
 			var receipt pty.ReceiptTradeBuyLimit
 			err := types.Decode(log.Log, &receipt)
 			if err != nil {

dapp/trade/executor/tradedb.go

@@ -17,7 +17,7 @@ type sellDB struct {
 
 func newSellDB(sellOrder pty.SellOrder) (selldb *sellDB) {
 	selldb = &sellDB{sellOrder}
-	if types.InvalidStartTime != selldb.Starttime {
+	if pty.InvalidStartTime != selldb.Starttime {
 		selldb.Status = pty.TradeOrderStatusNotStart
 	}
 	return
@@ -53,11 +53,11 @@ func (selldb *sellDB) getSellLogs(tradeType int32, txhash string) *types.Receipt
 		selldb.Height,
 		selldb.AssetExec,
 	}
-	if types.TyLogTradeSellLimit == tradeType {
+	if pty.TyLogTradeSellLimit == tradeType {
 		receiptTrade := &pty.ReceiptTradeSellLimit{base}
 		log.Log = types.Encode(receiptTrade)
 
-	} else if types.TyLogTradeSellRevoke == tradeType {
+	} else if pty.TyLogTradeSellRevoke == tradeType {
 		receiptTrade := &pty.ReceiptTradeSellRevoke{base}
 		log.Log = types.Encode(receiptTrade)
 	}
@@ -67,7 +67,7 @@ func (selldb *sellDB) getSellLogs(tradeType int32, txhash string) *types.Receipt
 
 func (selldb *sellDB) getBuyLogs(buyerAddr string, boardlotcnt int64, txhash string) *types.ReceiptLog {
 	log := &types.ReceiptLog{}
-	log.Ty = types.TyLogTradeBuyMarket
+	log.Ty = pty.TyLogTradeBuyMarket
 	base := &pty.ReceiptBuyBase{
 		selldb.TokenSymbol,
 		buyerAddr,
@@ -174,11 +174,11 @@ func (buydb *buyDB) getBuyLogs(tradeType int32, txhash string) *types.ReceiptLog
 		buydb.Height,
 		buydb.AssetExec,
 	}
-	if types.TyLogTradeBuyLimit == tradeType {
+	if pty.TyLogTradeBuyLimit == tradeType {
 		receiptTrade := &pty.ReceiptTradeBuyLimit{base}
 		log.Log = types.Encode(receiptTrade)
 
-	} else if types.TyLogTradeBuyRevoke == tradeType {
+	} else if pty.TyLogTradeBuyRevoke == tradeType {
 		receiptTrade := &pty.ReceiptTradeBuyRevoke{base}
 		log.Log = types.Encode(receiptTrade)
 	}
@@ -203,7 +203,7 @@ func getBuyOrderFromID(buyID []byte, db dbm.KV) (*pty.BuyLimitOrder, error) {
 
 func (buydb *buyDB) getSellLogs(sellerAddr string, sellID string, boardlotCnt int64, txhash string) *types.ReceiptLog {
 	log := &types.ReceiptLog{}
-	log.Ty = types.TyLogTradeSellMarket
+	log.Ty = pty.TyLogTradeSellMarket
 	base := &pty.ReceiptSellBase{
 		buydb.TokenSymbol,
 		sellerAddr,
@@ -287,7 +287,7 @@ func (action *tradeAction) tradeSell(sell *pty.TradeForSell) (*types.Receipt, er
 	tokendb := newSellDB(sellOrder)
 	sellOrderKV := tokendb.save(action.db)
 	logs = append(logs, receipt.Logs...)
-	logs = append(logs, tokendb.getSellLogs(types.TyLogTradeSellLimit, action.txhash))
+	logs = append(logs, tokendb.getSellLogs(pty.TyLogTradeSellLimit, action.txhash))
 	kv = append(kv, receipt.KV...)
 	kv = append(kv, sellOrderKV...)
 
@@ -357,7 +357,7 @@ func (action *tradeAction) tradeBuy(buyOrder *pty.TradeForBuy) (*types.Receipt,
 
 	logs = append(logs, receiptFromAcc.Logs...)
 	logs = append(logs, receiptFromExecAcc.Logs...)
-	logs = append(logs, sellTokendb.getSellLogs(types.TyLogTradeSellLimit, action.txhash))
+	logs = append(logs, sellTokendb.getSellLogs(pty.TyLogTradeSellLimit, action.txhash))
 	logs = append(logs, sellTokendb.getBuyLogs(action.fromaddr, buyOrder.BoardlotCnt, action.txhash))
 	kv = append(kv, receiptFromAcc.KV...)
 	kv = append(kv, receiptFromExecAcc.KV...)
@@ -402,7 +402,7 @@ func (action *tradeAction) tradeRevokeSell(revoke *pty.TradeForRevokeSell) (*typ
 	sellOrderKV := tokendb.save(action.db)
 
 	logs = append(logs, receiptFromExecAcc.Logs...)
-	logs = append(logs, tokendb.getSellLogs(types.TyLogTradeSellRevoke, action.txhash))
+	logs = append(logs, tokendb.getSellLogs(pty.TyLogTradeSellRevoke, action.txhash))
 	kv = append(kv, receiptFromExecAcc.KV...)
 	kv = append(kv, sellOrderKV...)
 	return &types.Receipt{types.ExecOk, kv, logs}, nil
@@ -444,7 +444,7 @@ func (action *tradeAction) tradeBuyLimit(buy *pty.TradeForBuyLimit) (*types.Rece
 	tokendb := newBuyDB(buyOrder)
 	buyOrderKV := tokendb.save(action.db)
 	logs = append(logs, receipt.Logs...)
-	logs = append(logs, tokendb.getBuyLogs(types.TyLogTradeBuyLimit, action.txhash))
+	logs = append(logs, tokendb.getBuyLogs(pty.TyLogTradeBuyLimit, action.txhash))
 	kv = append(kv, receipt.KV...)
 	kv = append(kv, buyOrderKV...)
 
@@ -514,7 +514,7 @@ func (action *tradeAction) tradeSellMarket(sellOrder *pty.TradeForSellMarket) (*
 
 	logs = append(logs, receiptFromAcc.Logs...)
 	logs = append(logs, receiptFromExecAcc.Logs...)
-	logs = append(logs, buyTokendb.getBuyLogs(types.TyLogTradeBuyLimit, action.txhash))
+	logs = append(logs, buyTokendb.getBuyLogs(pty.TyLogTradeBuyLimit, action.txhash))
 	logs = append(logs, buyTokendb.getSellLogs(action.fromaddr, action.txhash, sellOrder.BoardlotCnt, action.txhash))
 	kv = append(kv, receiptFromAcc.KV...)
 	kv = append(kv, receiptFromExecAcc.KV...)
@@ -555,7 +555,7 @@ func (action *tradeAction) tradeRevokeBuyLimit(revoke *pty.TradeForRevokeBuy) (*
 	sellOrderKV := tokendb.save(action.db)
 
 	logs = append(logs, receiptFromExecAcc.Logs...)
-	logs = append(logs, tokendb.getBuyLogs(types.TyLogTradeBuyRevoke, action.txhash))
+	logs = append(logs, tokendb.getBuyLogs(pty.TyLogTradeBuyRevoke, action.txhash))
 	kv = append(kv, receiptFromExecAcc.KV...)
 	kv = append(kv, sellOrderKV...)
 	return &types.Receipt{types.ExecOk, kv, logs}, nil

dapp/trade/rpc/jrpc_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"gitlab.33.cn/chain33/chain33/client/mocks"
-	ptypes "gitlab.33.cn/chain33/chain33/plugin/dapp/trade/types"
+	pty "gitlab.33.cn/chain33/chain33/plugin/dapp/trade/types"
 	rpctypes "gitlab.33.cn/chain33/chain33/rpc/types"
 )
 
@@ -30,7 +30,7 @@ func TestChain33_CreateRawTradeSellTx(t *testing.T) {
 	assert.NotNil(t, err)
 	assert.Nil(t, testResult)
 
-	token := &ptypes.TradeSellTx{
+	token := &pty.TradeSellTx{
 		TokenSymbol:       "CNY",
 		AmountPerBoardlot: 10,
 		MinBoardlot:       1,
@@ -51,7 +51,7 @@ func TestChain33_CreateRawTradeBuyTx(t *testing.T) {
 	assert.NotNil(t, err)
 	assert.Nil(t, testResult)
 
-	token := &ptypes.TradeBuyTx{
+	token := &pty.TradeBuyTx{
 		SellID:      "sadfghjkhgfdsa",
 		BoardlotCnt: 100,
 		Fee:         1,
@@ -69,7 +69,7 @@ func TestChain33_CreateRawTradeRevokeTx(t *testing.T) {
 	assert.NotNil(t, err)
 	assert.Nil(t, testResult)
 
-	token := &ptypes.TradeRevokeTx{
+	token := &pty.TradeRevokeTx{
 		SellID: "sadfghjkhgfdsa",
 		Fee:    1,
 	}
@@ -87,7 +87,7 @@ func TestChain33_CreateRawTradeBuyLimitTx(t *testing.T) {
 	assert.NotNil(t, err)
 	assert.Nil(t, testResult)
 
-	token := &ptypes.TradeBuyLimitTx{
+	token := &pty.TradeBuyLimitTx{
 		TokenSymbol:       "CNY",
 		AmountPerBoardlot: 10,
 		MinBoardlot:       1,
@@ -109,7 +109,7 @@ func TestChain33_CreateRawTradeSellMarketTx(t *testing.T) {
 	assert.NotNil(t, err)
 	assert.Nil(t, testResult)
 
-	token := &ptypes.TradeSellMarketTx{
+	token := &pty.TradeSellMarketTx{
 		BuyID:       "12asdfa",
 		BoardlotCnt: 100,
 		Fee:         1,
@@ -128,7 +128,7 @@ func TestChain33_CreateRawTradeRevokeBuyTx(t *testing.T) {
 	assert.NotNil(t, err)
 	assert.Nil(t, testResult)
 
-	token := &ptypes.TradeRevokeBuyTx{
+	token := &pty.TradeRevokeBuyTx{
 		BuyID: "12asdfa",
 		Fee:   1,
 	}
@@ -139,11 +139,11 @@ func TestChain33_CreateRawTradeRevokeBuyTx(t *testing.T) {
 }
 
 func TestDecodeLogTradeSellLimit(t *testing.T) {
-	var logTmp = &ptypes.ReceiptTradeSellLimit{}
+	var logTmp = &pty.ReceiptTradeSellLimit{}
 	dec := types.Encode(logTmp)
 	strdec := hex.EncodeToString(dec)
 	rlog := &rpctypes.ReceiptLog{
-		Ty:  types.TyLogTradeSellLimit,
+		Ty:  pty.TyLogTradeSellLimit,
 		Log: "0x" + strdec,
 	}
 
@@ -161,11 +161,11 @@ func TestDecodeLogTradeSellLimit(t *testing.T) {
 }
 
 func TestDecodeLogTradeSellRevoke(t *testing.T) {
-	var logTmp = &ptypes.ReceiptTradeBuyMarket{}
+	var logTmp = &pty.ReceiptTradeBuyMarket{}
 	dec := types.Encode(logTmp)
 	strdec := hex.EncodeToString(dec)
 	rlog := &rpctypes.ReceiptLog{
-		Ty:  types.TyLogTradeSellRevoke,
+		Ty:  pty.TyLogTradeSellRevoke,
 		Log: "0x" + strdec,
 	}
 
@@ -183,11 +183,11 @@ func TestDecodeLogTradeSellRevoke(t *testing.T) {
 }
 
 func TestDecodeLogTradeBuyLimit(t *testing.T) {
-	var logTmp = &ptypes.ReceiptTradeBuyLimit{}
+	var logTmp = &pty.ReceiptTradeBuyLimit{}
 	dec := types.Encode(logTmp)
 	strdec := hex.EncodeToString(dec)
 	rlog := &rpctypes.ReceiptLog{
-		Ty:  types.TyLogTradeBuyLimit,
+		Ty:  pty.TyLogTradeBuyLimit,
 		Log: "0x" + strdec,
 	}
 
@@ -205,11 +205,11 @@ func TestDecodeLogTradeBuyLimit(t *testing.T) {
 }
 
 func TestDecodeLogTradeSellMarket(t *testing.T) {
-	var logTmp = &ptypes.ReceiptSellMarket{}
+	var logTmp = &pty.ReceiptSellMarket{}
 	dec := types.Encode(logTmp)
 	strdec := hex.EncodeToString(dec)
 	rlog := &rpctypes.ReceiptLog{
-		Ty:  types.TyLogTradeSellMarket,
+		Ty:  pty.TyLogTradeSellMarket,
 		Log: "0x" + strdec,
 	}
 
@@ -227,11 +227,11 @@ func TestDecodeLogTradeSellMarket(t *testing.T) {
 }
 
 func TestDecodeLogTradeBuyRevoke(t *testing.T) {
-	var logTmp = &ptypes.ReceiptTradeBuyRevoke{}
+	var logTmp = &pty.ReceiptTradeBuyRevoke{}
 	dec := types.Encode(logTmp)
 	strdec := hex.EncodeToString(dec)
 	rlog := &rpctypes.ReceiptLog{
-		Ty:  types.TyLogTradeBuyRevoke,
+		Ty:  pty.TyLogTradeBuyRevoke,
 		Log: "0x" + strdec,
 	}
 
@@ -249,11 +249,11 @@ func TestDecodeLogTradeBuyRevoke(t *testing.T) {
 }
 
 func TestDecodeLogTradeBuyMarket(t *testing.T) {
-	var logTmp = &ptypes.ReceiptTradeBuyMarket{}
+	var logTmp = &pty.ReceiptTradeBuyMarket{}
 	dec := types.Encode(logTmp)
 	strdec := hex.EncodeToString(dec)
 	rlog := &rpctypes.ReceiptLog{
-		Ty:  types.TyLogTradeBuyMarket,
+		Ty:  pty.TyLogTradeBuyMarket,
 		Log: "0x" + strdec,
 	}
 
@@ -275,10 +275,10 @@ func TestChain33_GetLastMemPoolOk(t *testing.T) {
 	testChain33 := newTestChain33(api)
 
 	var txlist types.ReplyTxList
-	var action ptypes.Trade
+	var action pty.Trade
 	act := types.Encode(&action)
 	var tx = &types.Transaction{
-		Execer:  []byte(types.ExecName(ptypes.TradeX)),
+		Execer:  []byte(types.ExecName(pty.TradeX)),
 		Payload: act,
 		To:      "to",
 	}

dapp/trade/types/const.go

@@ -10,6 +10,17 @@ const (
 	TradeRevokeBuy
 )
 
+// log
+const (
+	TyLogTradeSellLimit  = 310
+	TyLogTradeBuyMarket  = 311
+	TyLogTradeSellRevoke = 312
+
+	TyLogTradeSellMarket = 330
+	TyLogTradeBuyLimit   = 331
+	TyLogTradeBuyRevoke  = 332
+)
+
 // 0->not start, 1->on sale, 2->sold out, 3->revoke, 4->expired
 const (
 	TradeOrderStatusNotStart = iota
@@ -55,3 +66,7 @@ var MapBuyOrderStatusStr2Int = map[string]int32{
 	"boughtout":  TradeOrderStatusBoughtOut,
 	"buyrevoked": TradeOrderStatusBuyRevoked,
 }
+
+const (
+	InvalidStartTime = 0
+)

dapp/trade/types/trade.go

@@ -22,12 +22,12 @@ var (
 	}
 
 	logInfo = map[int64]*types.LogInfo{
-		types.TyLogTradeSellLimit:  {reflect.TypeOf(ReceiptTradeSellLimit{}), "LogTradeSell"},
-		types.TyLogTradeBuyMarket:  {reflect.TypeOf(ReceiptTradeBuyMarket{}), "LogTradeBuyMarket"},
-		types.TyLogTradeSellRevoke: {reflect.TypeOf(ReceiptTradeSellRevoke{}), "LogTradeSellRevoke"},
-		types.TyLogTradeSellMarket: {reflect.TypeOf(ReceiptSellMarket{}), "LogTradeSellMarket"},
-		types.TyLogTradeBuyLimit:   {reflect.TypeOf(ReceiptTradeBuyLimit{}), "LogTradeBuyLimit"},
-		types.TyLogTradeBuyRevoke:  {reflect.TypeOf(ReceiptTradeBuyRevoke{}), "LogTradeBuyRevoke"},
+		TyLogTradeSellLimit:  {reflect.TypeOf(ReceiptTradeSellLimit{}), "LogTradeSell"},
+		TyLogTradeBuyMarket:  {reflect.TypeOf(ReceiptTradeBuyMarket{}), "LogTradeBuyMarket"},
+		TyLogTradeSellRevoke: {reflect.TypeOf(ReceiptTradeSellRevoke{}), "LogTradeSellRevoke"},
+		TyLogTradeSellMarket: {reflect.TypeOf(ReceiptSellMarket{}), "LogTradeSellMarket"},
+		TyLogTradeBuyLimit:   {reflect.TypeOf(ReceiptTradeBuyLimit{}), "LogTradeBuyLimit"},
+		TyLogTradeBuyRevoke:  {reflect.TypeOf(ReceiptTradeBuyRevoke{}), "LogTradeBuyRevoke"},
 	}
 )
 

store/init/init.go

-package plugin
+package init
 
 import (
 	_ "gitlab.33.cn/chain33/chain33/plugin/store/kvdb"