feat: add deposit and delete operation to GVG in signer and fix a few…

… issue (#1258) * feat: monitor GVG add deposit and delete operation * chore: add log * fix: sort imports * fix: fix log
bnb-chain · Dec 5, 2023 · 4142018 · 4142018
1 parent c917422
commit 4142018
Show file tree

Hide file tree

Showing 18 changed files with 705 additions and 112 deletions.
diff --git a/base/gfspapp/app_options.go b/base/gfspapp/app_options.go
@@ -154,6 +154,12 @@ const (
 	SignerSuccessRejectMigrateBucket        = "signer_reject_migrate_bucket_success"
 	SignerFailureRejectMigrateBucket        = "signer_reject_migrate_bucket_failure"
 
+	SignerSuccessDeposit = "signer_deposit_success"
+	SignerFailureDeposit = "signer_deposit_failure"
+
+	SignerSuccessDeleteGlobalVirtualGroup = "signer_delete_global_virtual_group_success"
+	SignerFailureDeleteGlobalVirtualGroup = "signer_delete_global_virtual_group_failure"
+
 	UploaderSuccessPutObject = "uploader_put_object_success"
 	UploaderFailurePutObject = "uploader_put_object_failure"
 )

diff --git a/base/gfspapp/sign_server.go b/base/gfspapp/sign_server.go
@@ -291,6 +291,26 @@ func (g *GfSpBaseApp) GfSpSign(ctx context.Context, req *gfspserver.GfSpSignRequ
 			metrics.ReqCounter.WithLabelValues(SignerSuccessRejectMigrateBucket).Inc()
 			metrics.ReqTime.WithLabelValues(SignerSuccessRejectMigrateBucket).Observe(time.Since(startTime).Seconds())
 		}
+	case *gfspserver.GfSpSignRequest_Deposit:
+		txHash, err = g.signer.Deposit(ctx, t.Deposit)
+		if err != nil {
+			log.CtxErrorw(ctx, "failed to deposit", "error", err)
+			metrics.ReqCounter.WithLabelValues(SignerFailureDeposit).Inc()
+			metrics.ReqTime.WithLabelValues(SignerFailureDeposit).Observe(time.Since(startTime).Seconds())
+		} else {
+			metrics.ReqCounter.WithLabelValues(SignerSuccessDeposit).Inc()
+			metrics.ReqTime.WithLabelValues(SignerSuccessDeposit).Observe(time.Since(startTime).Seconds())
+		}
+	case *gfspserver.GfSpSignRequest_DeleteGlobalVirtualGroup:
+		txHash, err = g.signer.DeleteGlobalVirtualGroup(ctx, t.DeleteGlobalVirtualGroup)
+		if err != nil {
+			log.CtxErrorw(ctx, "failed to delete global virtual group", "error", err)
+			metrics.ReqCounter.WithLabelValues(SignerFailureDeleteGlobalVirtualGroup).Inc()
+			metrics.ReqTime.WithLabelValues(SignerFailureDeleteGlobalVirtualGroup).Observe(time.Since(startTime).Seconds())
+		} else {
+			metrics.ReqCounter.WithLabelValues(SignerSuccessDeleteGlobalVirtualGroup).Inc()
+			metrics.ReqTime.WithLabelValues(SignerSuccessDeleteGlobalVirtualGroup).Observe(time.Since(startTime).Seconds())
+		}
 	default:
 		log.CtxError(ctx, "unknown gfsp sign request type")
 		return &gfspserver.GfSpSignResponse{

diff --git a/base/gfspclient/interface.go b/base/gfspclient/interface.go
@@ -192,6 +192,8 @@ type SignerAPI interface {
 	SignMigrateGVG(ctx context.Context, task *gfsptask.GfSpMigrateGVGTask) ([]byte, error)
 	SignBucketMigrationInfo(ctx context.Context, task *gfsptask.GfSpBucketMigrationInfo) ([]byte, error)
 	RejectMigrateBucket(ctx context.Context, rejectMigrateBucket *storagetypes.MsgRejectMigrateBucket) (string, error)
+	Deposit(ctx context.Context, deposit *virtualgrouptypes.MsgDeposit) (string, error)
+	DeleteGlobalVirtualGroup(ctx context.Context, deleteGVG *virtualgrouptypes.MsgDeleteGlobalVirtualGroup) (string, error)
 }
 
 // UploaderAPI for mock use

diff --git a/base/gfspclient/interface_mock.go b/base/gfspclient/interface_mock.go
diff --git a/base/gfspclient/signer.go b/base/gfspclient/signer.go
@@ -544,3 +544,47 @@ func (s *GfSpClient) RejectMigrateBucket(ctx context.Context, rejectMigrateBucke
 	}
 	return resp.GetTxHash(), nil
 }
+
+func (s *GfSpClient) Deposit(ctx context.Context, deposit *virtualgrouptypes.MsgDeposit) (string, error) {
+	conn, err := s.SignerConn(ctx)
+	if err != nil {
+		log.Errorw("failed to connect to signer", "error", err)
+		return "", ErrRPCUnknownWithDetail("client failed to connect to signer, error: ", err)
+	}
+	req := &gfspserver.GfSpSignRequest{
+		Request: &gfspserver.GfSpSignRequest_Deposit{
+			Deposit: deposit,
+		},
+	}
+	resp, err := gfspserver.NewGfSpSignServiceClient(conn).GfSpSign(ctx, req)
+	if err != nil {
+		log.CtxErrorw(ctx, "client failed to sign deposit", "msg", deposit, "error", err)
+		return "", ErrRPCUnknownWithDetail("client failed to sign deposit, error: ", err)
+	}
+	if resp.GetErr() != nil {
+		return "", resp.GetErr()
+	}
+	return resp.GetTxHash(), nil
+}
+
+func (s *GfSpClient) DeleteGlobalVirtualGroup(ctx context.Context, deleteGVG *virtualgrouptypes.MsgDeleteGlobalVirtualGroup) (string, error) {
+	conn, err := s.SignerConn(ctx)
+	if err != nil {
+		log.Errorw("failed to connect to signer", "error", err)
+		return "", ErrRPCUnknownWithDetail("client failed to connect to signer, error: ", err)
+	}
+	req := &gfspserver.GfSpSignRequest{
+		Request: &gfspserver.GfSpSignRequest_DeleteGlobalVirtualGroup{
+			DeleteGlobalVirtualGroup: deleteGVG,
+		},
+	}
+	resp, err := gfspserver.NewGfSpSignServiceClient(conn).GfSpSign(ctx, req)
+	if err != nil {
+		log.CtxErrorw(ctx, "client failed to sign delete GVG", "msg", deleteGVG, "error", err)
+		return "", ErrRPCUnknownWithDetail("client failed to sign delete GVG, error: ", err)
+	}
+	if resp.GetErr() != nil {
+		return "", resp.GetErr()
+	}
+	return resp.GetTxHash(), nil
+}