fix batcher commitment encoding and invalid comm logging

latticexyz · Mar 12, 2024 · 767af5a · 767af5a
1 parent 644ddea
commit 767af5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
@@ -393,13 +393,14 @@ func (l *BatchSubmitter) sendTransaction(ctx context.Context, txdata txData, que
 		data := txdata.CallData()
 		// if plasma DA is enabled we post the txdata to the DA Provider and replace it with the commitment.
 		if l.Config.UsePlasma {
-			data, err = l.PlasmaDA.SetInput(ctx, data)
+			comm, err := l.PlasmaDA.SetInput(ctx, data)
 			if err != nil {
 				l.Log.Error("Failed to post input to Plasma DA", "error", err)
 				// requeue frame if we fail to post to the DA Provider so it can be retried
 				l.recordFailedTx(txdata, err)
 				return nil
 			}
+			data = comm.Encode()
 		}
 		candidate = l.calldataTxCandidate(data)
 	}

diff --git a/op-node/rollup/derive/plasma_data_source.go b/op-node/rollup/derive/plasma_data_source.go
@@ -52,7 +52,7 @@ func (s *PlasmaDataSource) Next(ctx context.Context) (eth.Data, error) {
 		// validate batcher inbox data is a commitment.
 		comm, err := plasma.DecodeKeccak256(data)
 		if err != nil {
-			s.log.Warn("invalid commitment", "data", fmt.Sprintf("%x", data), "err", err)
+			s.log.Warn("invalid commitment", "commitment", data, "err", err)
 			return s.Next(ctx)
 		}
 		s.comm = comm