🐛 Fixed get IBTP function

hub/client/mock_client/mock_client.go

@@ -9,10 +9,10 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
-	rpcx "gitlab.33.cn/link33/sidecar/hub/client"
-	pb "gitlab.33.cn/link33/sidecar/model/pb"
 	crypto "github.com/meshplus/bitxhub-kit/crypto"
 	types "github.com/meshplus/bitxhub-kit/types"
+	rpcx "gitlab.33.cn/link33/sidecar/hub/client"
+	pb "gitlab.33.cn/link33/sidecar/model/pb"
 )
 
 // MockClient is a mock of Client interface.

internal/appchain/appchain.go

@@ -97,7 +97,7 @@ func (a *appChain) ExecuteIBTP(ibtp *pb.IBTP) (*pb.IBTP, error) {
 	}).Info("Apply tx")
 
 	switch ibtp.Type {
-	case pb.IBTP_INTERCHAIN:
+	case pb.IBTP_INTERCHAIN, pb.IBTP_ROLLBACK:
 		return a.applyInterchainIBTP(ibtp)
 	case pb.IBTP_RECEIPT_SUCCESS, pb.IBTP_RECEIPT_FAILURE:
 		err := a.applyReceiptIBTP(ibtp)

internal/syncer/mock_syncer/mock_syncer.go

@@ -8,9 +8,9 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
+	appchain_mgr "github.com/meshplus/bitxhub-core/appchain-mgr"
 	syncer "gitlab.33.cn/link33/sidecar/internal/syncer"
 	pb "gitlab.33.cn/link33/sidecar/model/pb"
-	appchain_mgr "github.com/meshplus/bitxhub-core/appchain-mgr"
 )
 
 // MockSyncer is a mock of Syncer interface.

model/pb/ibtp.go

@@ -33,9 +33,9 @@ func (m *IBTP) Hash() *types.Hash {
 
 func (m *IBTP) Category() IBTP_Category {
 	switch m.Type {
-	case IBTP_INTERCHAIN, IBTP_ASSET_EXCHANGE_INIT, IBTP_ASSET_EXCHANGE_REDEEM, IBTP_ASSET_EXCHANGE_REFUND:
+	case IBTP_INTERCHAIN, IBTP_ROLLBACK:
 		return IBTP_REQUEST
-	case IBTP_RECEIPT_SUCCESS, IBTP_RECEIPT_FAILURE, IBTP_ASSET_EXCHANGE_RECEIPT:
+	case IBTP_RECEIPT_SUCCESS, IBTP_RECEIPT_FAILURE, IBTP_RECEIPT_ROLLBACK:
 		return IBTP_RESPONSE
 	}
 	return IBTP_UNKNOWN

model/pb/ibtp.pb.go

@@ -28,33 +28,27 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 type IBTP_Type int32
 
 const (
-	IBTP_INTERCHAIN             IBTP_Type = 0
-	IBTP_RECEIPT_SUCCESS        IBTP_Type = 1
-	IBTP_RECEIPT_FAILURE        IBTP_Type = 2
-	IBTP_ASSET_EXCHANGE_INIT    IBTP_Type = 3
-	IBTP_ASSET_EXCHANGE_REDEEM  IBTP_Type = 4
-	IBTP_ASSET_EXCHANGE_REFUND  IBTP_Type = 5
-	IBTP_ASSET_EXCHANGE_RECEIPT IBTP_Type = 6
+	IBTP_INTERCHAIN       IBTP_Type = 0
+	IBTP_RECEIPT_SUCCESS  IBTP_Type = 1
+	IBTP_RECEIPT_FAILURE  IBTP_Type = 2
+	IBTP_ROLLBACK         IBTP_Type = 3
+	IBTP_RECEIPT_ROLLBACK IBTP_Type = 4
 )
 
 var IBTP_Type_name = map[int32]string{
 	0: "INTERCHAIN",
 	1: "RECEIPT_SUCCESS",
 	2: "RECEIPT_FAILURE",
-	3: "ASSET_EXCHANGE_INIT",
-	4: "ASSET_EXCHANGE_REDEEM",
-	5: "ASSET_EXCHANGE_REFUND",
-	6: "ASSET_EXCHANGE_RECEIPT",
+	3: "ROLLBACK",
+	4: "RECEIPT_ROLLBACK",
 }
 
 var IBTP_Type_value = map[string]int32{
-	"INTERCHAIN":             0,
-	"RECEIPT_SUCCESS":        1,
-	"RECEIPT_FAILURE":        2,
-	"ASSET_EXCHANGE_INIT":    3,
-	"ASSET_EXCHANGE_REDEEM":  4,
-	"ASSET_EXCHANGE_REFUND":  5,
-	"ASSET_EXCHANGE_RECEIPT": 6,
+	"INTERCHAIN":       0,
+	"RECEIPT_SUCCESS":  1,
+	"RECEIPT_FAILURE":  2,
+	"ROLLBACK":         3,
+	"RECEIPT_ROLLBACK": 4,
 }
 
 func (x IBTP_Type) String() string {
@@ -460,44 +454,42 @@ func init() {
 func init() { proto.RegisterFile("ibtp.proto", fileDescriptor_7576a0a5bf0190a3) }
 
 var fileDescriptor_7576a0a5bf0190a3 = []byte{
-	// 587 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xcf, 0x6e, 0xd3, 0x3e,
-	0x1c, 0xaf, 0xdb, 0xb4, 0x4d, 0xbf, 0xed, 0xb6, 0xc8, 0xfb, 0xfd, 0x86, 0x99, 0x50, 0x14, 0x7a,
-	0x80, 0x70, 0xe9, 0xa1, 0x20, 0xee, 0x5d, 0xe6, 0xb1, 0x08, 0x96, 0x0d, 0x27, 0x15, 0xdc, 0xaa,
-	0x24, 0xcd, 0xaa, 0x88, 0x2d, 0x8e, 0x1c, 0x0f, 0xd1, 0xb7, 0xe0, 0x3d, 0x78, 0x11, 0x8e, 0x3b,
-	0x72, 0x44, 0xdb, 0x89, 0x0b, 0xcf, 0x80, 0xec, 0xb4, 0xeb, 0xf8, 0x73, 0xf3, 0xe7, 0x9f, 0xbf,
-	0x89, 0xfd, 0x31, 0x40, 0x9e, 0xc8, 0x72, 0x54, 0x0a, 0x2e, 0x39, 0x6e, 0x96, 0xc9, 0x7e, 0x3f,
-	0x89, 0xab, 0x3c, 0xad, 0x89, 0xe1, 0xcf, 0x16, 0x18, 0xfe, 0x41, 0x74, 0x86, 0x31, 0x18, 0xe7,
-	0x82, 0x5f, 0x12, 0xe4, 0x20, 0xb7, 0xc7, 0xf4, 0x1a, 0x6f, 0x43, 0x53, 0x72, 0xd2, 0xd4, 0x4c,
-	0x53, 0x72, 0xfc, 0x1f, 0xb4, 0x0b, 0x5e, 0xa4, 0x19, 0x69, 0x39, 0xc8, 0x35, 0x58, 0x0d, 0xf0,
-	0x63, 0x30, 0xe4, 0xb2, 0xcc, 0x88, 0xe1, 0x20, 0x77, 0x7b, 0xbc, 0x35, 0x2a, 0x93, 0x91, 0xda,
-	0x71, 0x14, 0x2d, 0xcb, 0x8c, 0x69, 0x09, 0x3f, 0x82, 0x9e, 0xcc, 0x2f, 0xb3, 0x4a, 0xc6, 0x97,
-	0x25, 0x69, 0x3b, 0xc8, 0x6d, 0xb1, 0x0d, 0xa1, 0xb6, 0x2d, 0x05, 0xe7, 0xe7, 0xa4, 0xe3, 0x20,
-	0x77, 0xc0, 0x6a, 0x80, 0x09, 0x74, 0xcb, 0x78, 0x79, 0xc1, 0xe3, 0x39, 0xe9, 0x6a, 0x7e, 0x0d,
-	0xf1, 0x33, 0x68, 0x2f, 0x04, 0xbf, 0x2a, 0x89, 0xe9, 0x20, 0xb7, 0x3f, 0xde, 0x55, 0x13, 0x43,
-	0x29, 0xf2, 0x62, 0x31, 0xcd, 0x0b, 0xf9, 0xf2, 0xc5, 0x49, 0x5c, 0xb2, 0xda, 0xa1, 0x36, 0xf9,
-	0x98, 0x89, 0x2a, 0xe7, 0x05, 0xe9, 0xe9, 0xdf, 0x58, 0x43, 0x35, 0x34, 0xfb, 0x24, 0x45, 0x4c,
-	0xa0, 0x1e, 0xaa, 0xc1, 0xf0, 0x0b, 0x02, 0x43, 0x7d, 0x37, 0xde, 0x06, 0xf0, 0x83, 0x88, 0x32,
-	0xef, 0x78, 0xe2, 0x07, 0x56, 0x03, 0xef, 0xc2, 0x0e, 0xa3, 0x1e, 0xf5, 0xcf, 0xa2, 0x59, 0x38,
-	0xf5, 0x3c, 0x1a, 0x86, 0x16, 0xba, 0x4f, 0x1e, 0x4d, 0xfc, 0x37, 0x53, 0x46, 0xad, 0x26, 0x7e,
-	0x00, 0xbb, 0x93, 0x30, 0xa4, 0xd1, 0x8c, 0xbe, 0xf7, 0x8e, 0x27, 0xc1, 0x2b, 0x3a, 0xf3, 0x03,
-	0x3f, 0xb2, 0x5a, 0xf8, 0x21, 0xfc, 0xff, 0x87, 0xc0, 0xe8, 0x21, 0xa5, 0x27, 0x96, 0xf1, 0x4f,
-	0xe9, 0x68, 0x1a, 0x1c, 0x5a, 0x6d, 0xbc, 0x0f, 0x7b, 0x7f, 0x49, 0x7a, 0xa4, 0xd5, 0x19, 0x8e,
-	0xc1, 0xf4, 0x62, 0x99, 0x2d, 0xb8, 0x58, 0xe2, 0x3e, 0x74, 0x19, 0x7d, 0x3b, 0xa5, 0x61, 0x64,
-	0x35, 0xf0, 0x00, 0x4c, 0x46, 0xc3, 0xb3, 0xd3, 0x20, 0xa4, 0x16, 0x52, 0xd2, 0x34, 0x78, 0x1d,
-	0x9c, 0xbe, 0x0b, 0xac, 0xe6, 0x70, 0x72, 0x77, 0xac, 0xea, 0x56, 0xb2, 0x22, 0x15, 0xcb, 0x52,
-	0x66, 0x73, 0x7d, 0xef, 0x26, 0xdb, 0x10, 0xea, 0xe8, 0x52, 0x5e, 0xc8, 0xac, 0x90, 0xba, 0x01,
-	0x03, 0xb6, 0x86, 0xc3, 0x1f, 0xe8, 0x4e, 0xc2, 0x4f, 0x60, 0xa7, 0x12, 0xe9, 0x4c, 0x41, 0x11,
-	0xa7, 0x72, 0x96, 0xcf, 0x57, 0x0d, 0xda, 0xaa, 0x44, 0xea, 0xad, 0x58, 0x7f, 0xae, 0x7c, 0xf3,
-	0x4a, 0xfe, 0xe6, 0xab, 0x7b, 0xb5, 0x35, 0xaf, 0xe4, 0x3d, 0x9f, 0xaa, 0xe1, 0x55, 0x91, 0xea,
-	0x86, 0xa9, 0x1a, 0x5e, 0x15, 0xa9, 0xe2, 0x62, 0xb1, 0xa8, 0x88, 0xe1, 0xb4, 0xdc, 0x01, 0xd3,
-	0x6b, 0xbc, 0x0f, 0x66, 0x1a, 0x5f, 0x5c, 0x24, 0x71, 0xfa, 0x41, 0x17, 0xaa, 0xc7, 0xee, 0x30,
-	0xde, 0x83, 0x8e, 0xf2, 0x78, 0x09, 0xe9, 0xe8, 0xc4, 0x0a, 0xa9, 0x8c, 0xe0, 0xab, 0x4c, 0xb7,
-	0xce, 0xac, 0xf1, 0x3a, 0xc3, 0x12, 0x62, 0x6e, 0x32, 0x2c, 0x19, 0x3e, 0x85, 0xb6, 0x2a, 0x73,
-	0x85, 0x6d, 0x68, 0xab, 0x77, 0x54, 0x11, 0xe4, 0xb4, 0xdc, 0xfe, 0xd8, 0x5c, 0xd7, 0x9c, 0xd5,
-	0xf4, 0x01, 0xf9, 0x7a, 0x63, 0xa3, 0xeb, 0x1b, 0x1b, 0x7d, 0xbf, 0xb1, 0xd1, 0xe7, 0x5b, 0xbb,
-	0x71, 0x7d, 0x6b, 0x37, 0xbe, 0xdd, 0xda, 0x8d, 0xa4, 0xa3, 0x5f, 0xda, 0xf3, 0x5f, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0x98, 0x2d, 0x3a, 0x6f, 0x88, 0x03, 0x00, 0x00,
+	// 551 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x53, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0xcd, 0xc4, 0x4e, 0xe2, 0xdc, 0xa4, 0xad, 0x35, 0xad, 0x3e, 0x8d, 0xaa, 0x4f, 0x96, 0xf1,
+	0x02, 0xcc, 0x26, 0x8b, 0x80, 0xd8, 0xa7, 0x96, 0x11, 0x56, 0x8b, 0x5b, 0xc6, 0x89, 0x58, 0x56,
+	0xfe, 0x6b, 0x64, 0xd1, 0x7a, 0x46, 0xe3, 0x29, 0x22, 0x6f, 0xc1, 0x53, 0xf0, 0x2c, 0x2c, 0xbb,
+	0x64, 0x89, 0xda, 0x15, 0x6f, 0x81, 0x66, 0x1c, 0x27, 0x65, 0x37, 0xe7, 0xdc, 0x73, 0xee, 0xf5,
+	0xcc, 0x3d, 0x06, 0xa8, 0x32, 0xc9, 0x67, 0x5c, 0x30, 0xc9, 0x70, 0x9f, 0x67, 0xa7, 0x93, 0x2c,
+	0x6d, 0xaa, 0xbc, 0x25, 0xbc, 0x1f, 0x06, 0x98, 0xd1, 0xd9, 0xf2, 0x0a, 0x63, 0x30, 0x6f, 0x04,
+	0xbb, 0x23, 0xc8, 0x45, 0xfe, 0x98, 0xea, 0x33, 0x3e, 0x84, 0xbe, 0x64, 0xa4, 0xaf, 0x99, 0xbe,
+	0x64, 0xf8, 0x04, 0x06, 0x35, 0xab, 0xf3, 0x92, 0x18, 0x2e, 0xf2, 0x4d, 0xda, 0x02, 0xfc, 0x02,
+	0x4c, 0xb9, 0xe1, 0x25, 0x31, 0x5d, 0xe4, 0x1f, 0xce, 0x0f, 0x66, 0x3c, 0x9b, 0xa9, 0x8e, 0xb3,
+	0xe5, 0x86, 0x97, 0x54, 0x97, 0xf0, 0xff, 0x30, 0x96, 0xd5, 0x5d, 0xd9, 0xc8, 0xf4, 0x8e, 0x93,
+	0x81, 0x8b, 0x7c, 0x83, 0xee, 0x09, 0xd5, 0x96, 0x0b, 0xc6, 0x6e, 0xc8, 0xd0, 0x45, 0xfe, 0x94,
+	0xb6, 0x00, 0x13, 0x18, 0xf1, 0x74, 0x73, 0xcb, 0xd2, 0x82, 0x8c, 0x34, 0xdf, 0x41, 0xfc, 0x1a,
+	0x06, 0x6b, 0xc1, 0xee, 0x39, 0xb1, 0x5c, 0xe4, 0x4f, 0xe6, 0xc7, 0x6a, 0x62, 0x22, 0x45, 0x55,
+	0xaf, 0x57, 0x55, 0x2d, 0xdf, 0xbd, 0xfd, 0x98, 0x72, 0xda, 0x2a, 0x54, 0x93, 0xaf, 0xa5, 0x68,
+	0x2a, 0x56, 0x93, 0xb1, 0xbe, 0x46, 0x07, 0xd5, 0xd0, 0xf2, 0x9b, 0x14, 0x29, 0x81, 0x76, 0xa8,
+	0x06, 0x5e, 0x01, 0xa6, 0xfa, 0x6c, 0x7c, 0x08, 0x10, 0xc5, 0xcb, 0x90, 0x06, 0x1f, 0x16, 0x51,
+	0x6c, 0xf7, 0xf0, 0x31, 0x1c, 0xd1, 0x30, 0x08, 0xa3, 0xab, 0xe5, 0x75, 0xb2, 0x0a, 0x82, 0x30,
+	0x49, 0x6c, 0xf4, 0x9c, 0x7c, 0xbf, 0x88, 0x2e, 0x56, 0x34, 0xb4, 0xfb, 0x78, 0x0a, 0x16, 0xbd,
+	0xbc, 0xb8, 0x38, 0x5b, 0x04, 0xe7, 0xb6, 0x81, 0x4f, 0xc0, 0xee, 0x24, 0x3b, 0xd6, 0xf4, 0xe6,
+	0x60, 0x05, 0xa9, 0x2c, 0xd7, 0x4c, 0x6c, 0xf0, 0x04, 0x46, 0x34, 0xfc, 0xb4, 0x0a, 0x93, 0xa5,
+	0xdd, 0xd3, 0xe6, 0x30, 0xb9, 0xba, 0x8c, 0x93, 0xd0, 0x46, 0xaa, 0xb4, 0x8a, 0xcf, 0xe3, 0xcb,
+	0xcf, 0xb1, 0xdd, 0xf7, 0x16, 0xbb, 0xe7, 0x50, 0xaf, 0x59, 0xd6, 0xb9, 0xd8, 0x70, 0x59, 0x16,
+	0x7a, 0x5f, 0x16, 0xdd, 0x13, 0xea, 0xca, 0x39, 0xab, 0x65, 0x59, 0x4b, 0xbd, 0xb9, 0x29, 0xed,
+	0xa0, 0xf7, 0x07, 0xed, 0x4a, 0xf8, 0x25, 0x1c, 0x35, 0x22, 0xbf, 0x56, 0x50, 0xa4, 0xb9, 0xbc,
+	0xae, 0x8a, 0xed, 0xe6, 0x0f, 0x1a, 0x91, 0x07, 0x5b, 0x36, 0x2a, 0x94, 0xae, 0x68, 0xe4, 0x3f,
+	0xba, 0x36, 0x0f, 0x07, 0x45, 0x23, 0x9f, 0xe9, 0x54, 0x7c, 0xee, 0xeb, 0x5c, 0x27, 0x43, 0xc5,
+	0xe7, 0xbe, 0xce, 0x15, 0x97, 0x8a, 0x75, 0x43, 0x4c, 0xd7, 0xf0, 0xa7, 0x54, 0x9f, 0xf1, 0x29,
+	0x58, 0x79, 0x7a, 0x7b, 0x9b, 0xa5, 0xf9, 0x17, 0x1d, 0x84, 0x31, 0xdd, 0x61, 0xfc, 0x1f, 0x0c,
+	0x95, 0x26, 0xc8, 0xc8, 0x50, 0x3b, 0xb6, 0x48, 0x79, 0x04, 0xdb, 0x7a, 0x46, 0xad, 0xa7, 0xc3,
+	0x9d, 0x87, 0x66, 0xc4, 0xda, 0x7b, 0x68, 0xe6, 0xbd, 0x82, 0x81, 0x0a, 0x61, 0x83, 0x1d, 0x18,
+	0xa8, 0xfc, 0x37, 0x04, 0xb9, 0x86, 0x3f, 0x99, 0x5b, 0x5d, 0x3c, 0x69, 0x4b, 0x9f, 0x91, 0x9f,
+	0x8f, 0x0e, 0x7a, 0x78, 0x74, 0xd0, 0xef, 0x47, 0x07, 0x7d, 0x7f, 0x72, 0x7a, 0x0f, 0x4f, 0x4e,
+	0xef, 0xd7, 0x93, 0xd3, 0xcb, 0x86, 0xfa, 0x0f, 0x79, 0xf3, 0x37, 0x00, 0x00, 0xff, 0xff, 0xf4,
+	0x8e, 0xc3, 0xc2, 0x40, 0x03, 0x00, 0x00,
 }
 
 func (m *IBTP) Marshal() (dAtA []byte, err error) {

model/pb/ibtp.proto

@@ -7,13 +7,11 @@ import "basic.proto";
 // Inter-blockchain Transfer Protocol
 message IBTP {
     enum Type {
-        INTERCHAIN             = 0;
-        RECEIPT_SUCCESS        = 1;
-        RECEIPT_FAILURE        = 2;
-        ASSET_EXCHANGE_INIT    = 3;
-        ASSET_EXCHANGE_REDEEM  = 4;
-        ASSET_EXCHANGE_REFUND  = 5;
-        ASSET_EXCHANGE_RECEIPT = 6;
+        INTERCHAIN       = 0;
+        RECEIPT_SUCCESS  = 1;
+        RECEIPT_FAILURE  = 2;
+        ROLLBACK         = 3;
+        RECEIPT_ROLLBACK = 4;
     }
 
     enum Category {
@@ -62,4 +60,4 @@ message content {
 
 message IBTPs {
     repeated IBTP ibtps = 1;
-}
\ No newline at end of file
+}

pkg/plugins/grpc.go

@@ -152,18 +152,12 @@ func (g *GRPCClient) Initialize(configPath string, ID string, extra []byte) erro
 		ConfigPath: configPath,
 		Extra:      extra,
 	})
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func (g *GRPCClient) Start() error {
 	_, err := g.client.Start(g.doneContext, &pb.Empty{})
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func (g *GRPCClient) Stop() error {