Merge pull request #55 from meshplus/fix/fix-invoke-interchain

Fix/fix invoke interchain

Author: jzhe886

a_main-packr.go

@@ -21,6 +21,7 @@ type Fabric struct {
 	CCID          string `toml:"ccid" json:"ccid"`
 	ChannelId     string `mapstructure:"channel_id" toml:"channel_id" json:"channel_id"`
 	Org           string `toml:"org" json:"org"`
+	ServerPort    string `toml:"server_port" json:"server_port"`
 	TimeoutHeight int64  `mapstructure:"timeout_height" json:"timeout_height"`
 }
 
@@ -35,7 +36,7 @@ func DefaultConfig() *Config {
 		Fabric: Fabric{
 			Name:          "fabric",
 			Username:      "Admin",
-			CCID:          "Broker-001",
+			CCID:          "broker",
 			ChannelId:     "mychannel",
 			Org:           "org2",
 			TimeoutHeight: 30,

client.go

@@ -1,21 +1,21 @@
 package main
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/cloudflare/cfssl/log"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/meshplus/bitxhub-model/pb"
 )
 
 type Event struct {
-	Index     uint64 `json:"index"`
-	DstFullID string `json:"dst_full_id"`
-	SrcFullID string `json:"src_full_id"`
-	Func      string `json:"func"`
-	Args      string `json:"args"`
-	Argscb    string `json:"argscb"`
-	Argsrb    string `json:"argsrb"`
+	Index     uint64   `json:"index"`
+	DstFullID string   `json:"dst_full_id"`
+	SrcFullID string   `json:"src_full_id"`
+	Encrypt   bool     `json:"encrypt"`
+	CallFunc  CallFunc `json:"call_func"`
+	CallBack  CallFunc `json:"callback"`
+	RollBack  CallFunc `json:"rollback"`
 }
 
 func (ev *Event) Convert2IBTP(timeoutHeight int64, ibtpType pb.IBTP_Type) *pb.IBTP {
@@ -44,25 +44,26 @@ func handleArgs(args string) [][]byte {
 }
 
 func (ev *Event) encryptPayload() ([]byte, error) {
-	funcSplit := strings.Split(ev.Func, ",")
-	if len(funcSplit) != 3 {
-		return nil, fmt.Errorf("ibtp func not is (func, callback,rollback)")
-	}
 	content := &pb.Content{
-		Func:     funcSplit[0],
-		Args:     handleArgs(ev.Args),
-		Callback: funcSplit[1],
-		ArgsCb:   handleArgs(ev.Argscb),
-		Rollback: funcSplit[2],
-		ArgsRb:   handleArgs(ev.Argsrb),
+		Func: ev.CallFunc.Func,
+		Args: ev.CallFunc.Args,
 	}
 	data, err := content.Marshal()
 	if err != nil {
 		return nil, err
 	}
 
+	var packed []byte
+	packed = append(packed, []byte(ev.CallFunc.Func)...)
+	for _, arg := range ev.CallFunc.Args {
+		packed = append(packed, arg...)
+	}
+	hash := crypto.Keccak256(packed)
+
 	ibtppd := &pb.Payload{
-		Content: data,
+		Encrypted: ev.Encrypt,
+		Content:   data,
+		Hash:      hash,
 	}
 	return ibtppd.Marshal()
 }