diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index f377b6bc78..774bbe3db6 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -57,7 +57,7 @@ jobs:
         run: go test --failfast -v ./... -count=1 -timeout 5m
 
       - name: Store simulation logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: ci-logs
diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml
index 7b54c25cd1..5f474f2d70 100644
--- a/.github/workflows/manual-deploy-testnet-l2.yml
+++ b/.github/workflows/manual-deploy-testnet-l2.yml
@@ -124,7 +124,7 @@ jobs:
             done
 
       - name: 'Upload L1 deployer container logs'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: deploy-l1-artifacts
           path: |
@@ -312,7 +312,7 @@ jobs:
           docker logs `docker ps -aqf "name=hh-l2-deployer"` > deploy-l2-contracts.out 2>&1
 
       - name: 'Upload L2 deployer container logs'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: deploy-l2-artifacts
           path: |
diff --git a/.github/workflows/manual-recover-network-funds.yml b/.github/workflows/manual-recover-network-funds.yml
index 4d722a12da..832dadfc59 100644
--- a/.github/workflows/manual-recover-network-funds.yml
+++ b/.github/workflows/manual-recover-network-funds.yml
@@ -65,7 +65,7 @@ jobs:
           docker logs `docker ps -aqf "name=recover-funds"` > recover-funds.out 2>&1
 
       - name: 'Upload container logs on failure'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: recover-funds
diff --git a/go/enclave/storage/enclavedb/events.go b/go/enclave/storage/enclavedb/events.go
index 8dea333f71..5936f91126 100644
--- a/go/enclave/storage/enclavedb/events.go
+++ b/go/enclave/storage/enclavedb/events.go
@@ -143,7 +143,7 @@ func FilterLogs(
 func DebugGetLogs(ctx context.Context, db *sql.DB, txHash common.TxHash) ([]*tracers.DebugLogs, error) {
 	var queryParams []any
 
-	query := "select rel_address1, rel_address2, rel_address3, rel_address4, lifecycle_event, topic0, topic1, topic2, topic3, topic4, datablob, b.hash, b.height, tx.hash, tx.idx, log_idx, c.address " +
+	query := "select eoa1.address, eoa2.address, eoa3.address, et.lifecycle_event, et.event_sig, t1.topic, t2.topic, t3.topic, datablob, b.hash, b.height, tx.hash, tx.idx, log_idx, c.address " +
 		baseEventsJoin +
 		" AND tx.hash = ? "
 
@@ -165,15 +165,14 @@ func DebugGetLogs(ctx context.Context, db *sql.DB, txHash common.TxHash) ([]*tra
 			LifecycleEvent: false,
 		}
 
-		var t0, t1, t2, t3, t4 sql.NullString
-		var relAddress1, relAddress2, relAddress3, relAddress4 []byte
+		var t0, t1, t2, t3 sql.NullString
+		var relAddress1, relAddress2, relAddress3 []byte
 		err = rows.Scan(
 			&relAddress1,
 			&relAddress2,
 			&relAddress3,
-			&relAddress4,
 			&l.LifecycleEvent,
-			&t0, &t1, &t2, &t3, &t4,
+			&t0, &t1, &t2, &t3,
 			&l.Data,
 			&l.BlockHash,
 			&l.BlockNumber,
@@ -186,7 +185,7 @@ func DebugGetLogs(ctx context.Context, db *sql.DB, txHash common.TxHash) ([]*tra
 			return nil, fmt.Errorf("could not load log entry from db: %w", err)
 		}
 
-		for _, topic := range []sql.NullString{t0, t1, t2, t3, t4} {
+		for _, topic := range []sql.NullString{t0, t1, t2, t3} {
 			if topic.Valid {
 				l.Topics = append(l.Topics, stringToHash(topic))
 			}
@@ -195,7 +194,6 @@ func DebugGetLogs(ctx context.Context, db *sql.DB, txHash common.TxHash) ([]*tra
 		l.RelAddress1 = bytesToAddress(relAddress1)
 		l.RelAddress2 = bytesToAddress(relAddress2)
 		l.RelAddress3 = bytesToAddress(relAddress3)
-		l.RelAddress4 = bytesToAddress(relAddress4)
 
 		result = append(result, &l)
 	}
@@ -247,7 +245,7 @@ func loadLogs(ctx context.Context, db *sql.DB, requestingAccount *gethcommon.Add
 
 	for rows.Next() {
 		l := types.Log{
-			Topics: make([]gethcommon.Hash, 4),
+			Topics: make([]gethcommon.Hash, 0),
 		}
 		var t0, t1, t2, t3 []byte
 		err = rows.Scan(&t0, &t1, &t2, &t3, &l.Data, &l.BlockHash, &l.BlockNumber, &l.TxHash, &l.TxIndex, &l.Index, &l.Address)
@@ -255,9 +253,11 @@ func loadLogs(ctx context.Context, db *sql.DB, requestingAccount *gethcommon.Add
 			return nil, fmt.Errorf("could not load log entry from db: %w", err)
 		}
 
-		for i, topic := range [][]byte{t0, t1, t2, t3} {
+		for _, topic := range [][]byte{t0, t1, t2, t3} {
 			if len(topic) > 0 {
-				l.Topics[i] = byteArrayToHash(topic)
+				l.Topics = append(l.Topics, byteArrayToHash(topic))
+			} else {
+				l.Topics = append(l.Topics, gethcommon.Hash{})
 			}
 		}