Merge branch 'rss3-dev' into rss3-main

Author: Albert

op-batcher/batcher/driver.go

@@ -51,7 +51,7 @@ type DriverSetup struct {
 	EndpointProvider dial.L2EndpointProvider
 	ChannelConfig    ChannelConfig
 	PlasmaDA         *plasma.DAClient
-	NearDA           *opnear.DAClient
+	NearDA           opnear.CLIConfig
 }
 
 // BatchSubmitter encapsulates a service responsible for submitting L2 tx
@@ -439,10 +439,24 @@ func (l *BatchSubmitter) blobTxCandidate(data txData) (*txmgr.TxCandidate, error
 	}, nil
 }
 
-func (l *BatchSubmitter) submitBlobToNearDA(data []byte) ([]byte, error) {
+func (l *BatchSubmitter) submitBlobToNearDA(data []byte) (frameRef []byte, err error) {
+	defer func() {
+		if rErr := recover(); rErr != nil {
+			err = fmt.Errorf("critical error from submitBlobToNearDA: %v", rErr)
+		}
+	}()
+
+	// create a Near DA Client before submitting blob
+	daClient, err := opnear.NewDAClient(l.NearDA.DaAccount, l.NearDA.DaContract, l.NearDA.DaKey, l.NearDA.DaNetwork, l.NearDA.DaNamespaceId)
+	if err != nil {
+		l.Log.Error("new near da client", "err", err)
+		return nil, err
+	}
+	defer daClient.FreeDAClient()
+
 	l.Log.Debug("submitBlobToNearDA", "data", hex.EncodeToString(data), "size", len(data))
 	// frameRef is the blob commitment, which is provided as [transaction_id ++ commitment]
-	frameRef, err := l.NearDA.Submit(data)
+	frameRef, err = daClient.Submit(data)
 	if err != nil {
 		l.Log.Warn("failed to submit blob to near da", "err", err)
 		return nil, err
@@ -451,7 +465,7 @@ func (l *BatchSubmitter) submitBlobToNearDA(data []byte) ([]byte, error) {
 	// finality is achieved which is 3 blocks (around 2-3 seconds) its not possible for a reorg to happen
 	// check the submitted blob after finality
 	time.Sleep(10 * time.Second)
-	blobData, err := l.NearDA.Get(frameRef, 0)
+	blobData, err := daClient.Get(frameRef, 0)
 	if err != nil {
 		log.Error("failed to get blob from near da, maybe chain reorg", "id", hex.EncodeToString(data), "err", err)
 		return nil, err

op-batcher/batcher/service.go

@@ -55,7 +55,7 @@ type BatcherService struct {
 	EndpointProvider dial.L2EndpointProvider
 	TxManager        txmgr.TxManager
 	PlasmaDA         *plasma.DAClient
-	NearDA           *opnear.DAClient
+	NearDA           opnear.CLIConfig
 
 	BatcherConfig
 
@@ -332,13 +332,7 @@ func (bs *BatcherService) initPlasmaDA(cfg *CLIConfig) error {
 }
 
 func (bs *BatcherService) initNearDA(cfg *CLIConfig) error {
-	bs.Log.Info("initNearDA", "DaAccount", cfg.NearDA.DaAccount, "DaContract", cfg.NearDA.DaContract, "NamespaceId", cfg.NearDA.DaNamespaceId, "Network", cfg.NearDA.DaNetwork)
-	client, err := opnear.NewDAClient(cfg.NearDA.DaAccount, cfg.NearDA.DaContract, cfg.NearDA.DaKey, cfg.NearDA.DaNetwork, cfg.NearDA.DaNamespaceId)
-	if err != nil {
-		bs.Log.Error("Failed to create near da client", "err", err)
-		return err
-	}
-	bs.NearDA = client
+	bs.NearDA = cfg.NearDA
 	return nil
 }
 
@@ -422,11 +416,6 @@ func (bs *BatcherService) Stop(ctx context.Context) error {
 		bs.Log.Info("Batch Submitter stopped")
 	}
 
-	// free near da client
-	if bs.NearDA != nil {
-		bs.driver.Log.Info("Free Near DA Client")
-		bs.NearDA.FreeDAClient()
-	}
 	return result
 }
 

op-near/da_client.go

@@ -35,6 +35,7 @@ func NewDAClient(accountN, contractN, keyN, networkN string, nameSpace uint32) (
 }
 
 func (c *DAClient) FreeDAClient() {
+	log.Info("free NEAR client")
 	c.Client.FreeClient()
 }