update broker

plugin/dapp/broker/executor/exec.go

@@ -10,9 +10,9 @@ import (
  * 关键数据上链（statedb）并生成交易回执（log）
  */
 
-func (b *broker) Exec_Init()(*types.Receipt, error){
-	return nil,nil
-
+func (b *broker) Exec_Init(payload *brokertypes.Init,tx *types.Transaction, index int)(*types.Receipt, error){
+	db := newBrokerDB(b,tx,index)
+	return db.initBroker(payload)
 }
 
 func (b *broker) Exec_Register(payload *brokertypes.Register, tx *types.Transaction, index int) (*types.Receipt, error) {

plugin/dapp/broker/executor/kv.go

@@ -19,14 +19,18 @@ const (
 	callbackMeta        = "callback-meta"
 	dstRollbackMeta     = "dst-rollback-meta"
 	whiteList           = "white-list"
-	adminList           = "admin-list"
+	//adminList           = "admin-list"
 	passed              = "1"
 	rejected            = "2"
 	delimiter           = "&"
 	bxhID               = "bxh-id"
-	appchainID          = "appchain-id"
+	//appchainID          = "appchain-id"
+	brokerAdmin          = "broker-admin"
 )
-
+//跨链协议版本信息
+func BxhIDKey()[]byte{
+	return []byte(KeyPrefixStateDB + bxhID)
+}
 //状态数据库中存储innermeta信息
 func calInnerMetaKey() []byte {
 	key := fmt.Sprintf("%s"+":%s", KeyPrefixStateDB, innerMeta)

plugin/dapp/broker/executor/query.go

@@ -3,24 +3,33 @@ package executor
 import (
 	brokertypes "github.com/33cn/plugin/plugin/dapp/broker/types"
 )
+
 //获取innterMeta
-func(b *broker) Query_QueryInnerMeta(query *brokertypes.QueryInnerMeta)(*brokertypes.Meta,error){
+func (b *broker) Query_QueryInnerMeta(query *brokertypes.QueryInnerMeta) (*brokertypes.Meta, error) {
 	return getInnerMeta(b.GetStateDB())
 }
+
 //获取outterMeta
-func(b *broker) Query_QueryOutterMeta(query *brokertypes.QueryOutterMeta)(*brokertypes.Meta,error){
+func (b *broker) Query_QueryOutterMeta(query *brokertypes.QueryOutterMeta) (*brokertypes.Meta, error) {
 	return getOutterMeta(b.GetStateDB())
 }
 
 //获取inMessage
-func(b *broker) Query_QueryInMessage(query *brokertypes.QueryInMessage)(*brokertypes.Response,error){
-	return getInMessage(b.GetStateDB(),query)
+func (b *broker) Query_QueryInMessage(query *brokertypes.QueryInMessage) (*brokertypes.Response, error) {
+	return getInMessage(b.GetStateDB(), query)
 }
+
 //获取outMessage
-func(b *broker) Query_QueryOutMessage(query *brokertypes.QueryOutMessage)(*brokertypes.Response,error){
-	return getOutMessage(b.GetStateDB(),query)
+func (b *broker) Query_QueryOutMessage(query *brokertypes.QueryOutMessage) (*brokertypes.Response, error) {
+	return getOutMessage(b.GetStateDB(), query)
 }
+
 //获取监听列表
-func(b *broker) Query_PollingEvent(query *brokertypes.PollingEvent)(*brokertypes.InterChainEventList,error){
-	return pollInterEvent(b.GetStateDB(),query.Meta)
-}
\ No newline at end of file
+func (b *broker) Query_PollingEvent(query *brokertypes.PollingEvent) (*brokertypes.InterChainEventList, error) {
+	return pollInterEvent(b.GetStateDB(), query.Meta)
+}
+
+//get bitxhub  and chainID
+func (b *broker) Query_GetBrokerInfo(query *brokertypes.QueryNilParam) (*brokertypes.BrokerInfo, error) {
+	return getBrokerInfo(b.GetStateDB())
+}

plugin/dapp/broker/proto/broker.proto

@@ -3,13 +3,23 @@ package types;
 option go_package = "../types";
 message BrokerAction {
     oneof value {
-        Register  register      = 1;
-        Audit     audit         = 2;
-        InterchainEvent emitInterchainEvent = 3;
-        UpdateIndex  updateIndex =4;
+        Init      init   =1;
+        Register  register      = 2;
+        Audit     audit         = 3;
+        InterchainEvent emitInterchainEvent = 4;
+        UpdateIndex  updateIndex =5;
     }
-    int32 ty = 5;
+    int32 ty = 6;
+}
+//broker初始化信息
+message Init {
+
+    string bxhId = 1;
+
+    string appChainId = 2;
 }
+
+
 // 业务合约注册模型: 0表示正在审核，1表示审核通过，2表示审核失败
 message Register {
     //业务合约名称
@@ -101,6 +111,10 @@ message InterChainEventList{
 //    repeated InterchainEvent  list  = 1;
 //    string         primaryKey = 2;
 //}
+
+message QueryNilParam{
+
+}
 message QueryOutterMeta{
 
 }
@@ -119,6 +133,14 @@ message QueryOutMessage{
     uint64 sequenceNum = 2;
 }
 
+message BrokerInfo {
+    //跨链协议版本ID
+    string bxhId =1;
+    //应用链ID
+    string appChainId = 2;
+}
+
+
 message Meta {
     map<string,uint64> meta = 1;
 }

plugin/dapp/broker/types/broker.go

@@ -14,11 +14,13 @@ import (
 // action类型id和name，这些常量可以自定义修改
 const (
 	TyUnknowAction = iota + 100
+	TyInitAction
 	TyRegisterAction
 	TyAuditAction
 	TyUpdateIndexAction
 	TyEmitInterchainEventAction
 
+	NameInitAction                = "Init"
 	NameRegisterAction            = "Register"
 	NameAuditAction               = "Audit"
 	NameUpdateIndexAction         = "UpdateIndex"
@@ -69,6 +71,7 @@ const (
 // log类型id值
 const (
 	TyUnknownLog = iota + 100
+	TyInitLog
 	TyRegisterLog
 	TyAuditLog
 	TyUpdateIndexLog
@@ -80,6 +83,7 @@ var (
 	BrokerX = "broker"
 	//定义actionMap
 	actionMap = map[string]int32{
+		NameInitAction:                TyInitAction,
 		NameRegisterAction:            TyRegisterAction,
 		NameAuditAction:               TyAuditAction,
 		NameUpdateIndexAction:         TyUpdateIndexAction,