Merge branch 'develop' into aj/error-msg

op-e2e/actions/l2_engine.go

@@ -178,9 +178,8 @@ func (e *L2Engine) ActL2IncludeTx(from common.Address) Action {
 
 		i := e.engineApi.PendingIndices(from)
 		txs, q := e.eth.TxPool().ContentFrom(from)
-		if uint64(len(txs)) <= i {
-			t.Fatalf("no pending txs from %s, and have %d unprocessable queued txs from this account", from, len(q))
-		}
+		require.Greaterf(t, uint64(len(txs)), i,
+			"no pending txs from %s, and have %d unprocessable queued txs from this account", from, len(q))
 		tx := txs[i]
 		err := e.engineApi.IncludeTx(tx, from)
 		if errors.Is(err, engineapi.ErrNotBuildingBlock) {
@@ -188,7 +187,7 @@ func (e *L2Engine) ActL2IncludeTx(from common.Address) Action {
 		} else if errors.Is(err, engineapi.ErrUsesTooMuchGas) {
 			t.InvalidAction("included tx uses too much gas: %v", err)
 		} else if err != nil {
-			t.Fatalf("include tx: %v", err)
+			require.NoError(t, err, "include tx")
 		}
 	}
 }

packages/common-ts/package.json

@@ -57,7 +57,7 @@
     "@types/express": "^4.17.17",
     "@types/morgan": "^1.9.4",
     "@types/pino": "^7.0.5",
-    "@types/pino-multi-stream": "^5.1.3",
+    "@types/pino-multi-stream": "^5.1.4",
     "chai": "^4.3.9",
     "supertest": "^6.3.3"
   }

pnpm-lock.yaml

@@ -256,8 +256,8 @@ importers:
         specifier: ^7.0.5
         version: 7.0.5
       '@types/pino-multi-stream':
-        specifier: ^5.1.3
-        version: 5.1.3
+        specifier: ^5.1.4
+        version: 5.1.4
       chai:
         specifier: ^4.3.9
         version: 4.3.9
@@ -4043,8 +4043,8 @@ packages:
       '@types/node': 20.7.0
     dev: true
 
-  /@types/pino-multi-stream@5.1.3:
-    resolution: {integrity: sha512-OxIkhBpfXw1q1BkOIkTSrq0YAkOmlSBaZbM5EXjgjTvgNLZLBwC7/+HGVWw7wW5/ofRyNPDg8Ykd/cx4bq69PQ==}
+  /@types/pino-multi-stream@5.1.4:
+    resolution: {integrity: sha512-+UrFCcIx4cUo473GwCt5/v8m0r+W08iuaphu8L5bx76zcShvQRWPtKkRxImUCLXW9bHpPFHAJZKANMP/vAbycA==}
     dependencies:
       '@types/pino': 6.3.11
     dev: true