diff --git a/eth/tracers/firehose.go b/eth/tracers/firehose.go
index 4d2cbefbe2..094fbe0ef4 100644
--- a/eth/tracers/firehose.go
+++ b/eth/tracers/firehose.go
@@ -2107,6 +2107,7 @@ func newSetCodeAuthorizationsFromChain(authorizations []types.SetCodeAuthorizati
 	for i, authorization := range authorizations {
 		pbAuthorization := &pbeth.SetCodeAuthorization{
 			ChainId: authorization.ChainID.Bytes(),
+			Address: authorization.Address.Bytes(),
 			Nonce:   authorization.Nonce,
 			V:       uint32(authorization.V),
 			R:       normalizeSignaturePoint(authorization.R.Bytes()),
diff --git a/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh2.3/block.1.golden.json b/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh2.3/block.1.golden.json
index 99802d4832..2cbddaedc7 100644
--- a/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh2.3/block.1.golden.json
+++ b/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh2.3/block.1.golden.json
@@ -260,6 +260,7 @@
       "s": "N9pmx9wBwi0vXsT283fImtj6D4zPzYK3ZFXwBhYmbBA=",
       "setCodeAuthorizations": [
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAqqo=",
           "authority": "cVYrcZmYc9tbKG35V68ZnslGF/c=",
           "chainId": "AQ==",
           "nonce": "1",
@@ -268,23 +269,27 @@
           "v": 1
         },
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAzMw=",
           "authority": "cDxLK9cMFp9XFxAcruVDKZ/JRsc=",
           "r": "2uP1vwtGC/qSZin0z+PZ2kBZ/xY3445BRUpUUwr4UOc=",
           "s": "HhA+a0fj/u82ZZyD9gMoHso5vGditId+wkZrJcpo4UM="
         },
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAzMw=",
           "discarded": true,
           "r": "2uP1vwtGC/qSZin0z+PZ2kBZ/xY3445BRUpUUwr4UOc=",
           "s": "HhA+a0fj/u82ZZyD9gMoHso5vGditId+wkZrJcpo4UM=",
           "v": 4
         },
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAu7s=",
           "authority": "cDxLK9cMFp9XFxAcruVDKZ/JRsc=",
           "nonce": "1",
           "r": "aZRYP4l48gpWJSypjCxSptjK/kDFXmphIXOrnH6LlKs=",
           "s": "HLb0WRaaPuzez2ZbtK39Ch9vZGXNjm5AYg2i8X5MMwg="
         },
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAu7s=",
           "authority": "cDxLK9cMFp9XFxAcruVDKZ/JRsc=",
           "discarded": true,
           "nonce": "1",
diff --git a/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh2.3/block.3.golden.json b/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh2.3/block.3.golden.json
index 57e67b4969..f3f84a0d7d 100644
--- a/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh2.3/block.3.golden.json
+++ b/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh2.3/block.3.golden.json
@@ -170,6 +170,7 @@
       "s": "UGXb+KJ8dparEBn0Wb2lX5fh1gB2+AiHfowzzmJWOkE=",
       "setCodeAuthorizations": [
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAAAA=",
           "authority": "cVYrcZmYc9tbKG35V68ZnslGF/c=",
           "chainId": "AQ==",
           "nonce": "4",
diff --git a/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh3.0/block.1.golden.json b/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh3.0/block.1.golden.json
index a1105d231c..537367b809 100644
--- a/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh3.0/block.1.golden.json
+++ b/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh3.0/block.1.golden.json
@@ -349,6 +349,7 @@
       "s": "N9pmx9wBwi0vXsT283fImtj6D4zPzYK3ZFXwBhYmbBA=",
       "setCodeAuthorizations": [
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAqqo=",
           "authority": "cVYrcZmYc9tbKG35V68ZnslGF/c=",
           "chainId": "AQ==",
           "nonce": "1",
@@ -357,23 +358,27 @@
           "v": 1
         },
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAzMw=",
           "authority": "cDxLK9cMFp9XFxAcruVDKZ/JRsc=",
           "r": "2uP1vwtGC/qSZin0z+PZ2kBZ/xY3445BRUpUUwr4UOc=",
           "s": "HhA+a0fj/u82ZZyD9gMoHso5vGditId+wkZrJcpo4UM="
         },
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAzMw=",
           "discarded": true,
           "r": "2uP1vwtGC/qSZin0z+PZ2kBZ/xY3445BRUpUUwr4UOc=",
           "s": "HhA+a0fj/u82ZZyD9gMoHso5vGditId+wkZrJcpo4UM=",
           "v": 4
         },
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAu7s=",
           "authority": "cDxLK9cMFp9XFxAcruVDKZ/JRsc=",
           "nonce": "1",
           "r": "aZRYP4l48gpWJSypjCxSptjK/kDFXmphIXOrnH6LlKs=",
           "s": "HLb0WRaaPuzez2ZbtK39Ch9vZGXNjm5AYg2i8X5MMwg="
         },
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAu7s=",
           "authority": "cDxLK9cMFp9XFxAcruVDKZ/JRsc=",
           "discarded": true,
           "nonce": "1",
diff --git a/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh3.0/block.3.golden.json b/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh3.0/block.3.golden.json
index 58744dcbc2..d1b4159a16 100644
--- a/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh3.0/block.3.golden.json
+++ b/eth/tracers/internal/tracetest/firehose/testdata/TestEIP7702/fh3.0/block.3.golden.json
@@ -245,6 +245,7 @@
       "s": "UGXb+KJ8dparEBn0Wb2lX5fh1gB2+AiHfowzzmJWOkE=",
       "setCodeAuthorizations": [
         {
+          "address": "AAAAAAAAAAAAAAAAAAAAAAAAAAA=",
           "authority": "cVYrcZmYc9tbKG35V68ZnslGF/c=",
           "chainId": "AQ==",
           "nonce": "4",
diff --git a/go.mod b/go.mod
index a8241a5ad3..36ba3e7677 100644
--- a/go.mod
+++ b/go.mod
@@ -58,7 +58,7 @@ require (
 	github.com/rs/cors v1.7.0
 	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible
 	github.com/status-im/keycard-go v0.2.0
-	github.com/streamingfast/firehose-ethereum/types v0.0.0-20250219193809-31f4c76a8a5d
+	github.com/streamingfast/firehose-ethereum/types v0.0.0-20250507011922-e3d3efeda61d
 	github.com/stretchr/testify v1.10.0
 	github.com/supranational/blst v0.3.14
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
diff --git a/go.sum b/go.sum
index be376dddd7..d4c0c6ac5f 100644
--- a/go.sum
+++ b/go.sum
@@ -486,8 +486,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
 github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg=
-github.com/streamingfast/firehose-ethereum/types v0.0.0-20250219193809-31f4c76a8a5d h1:8Ki6y+B7HB3Wo8DBUqoIpNxT6mGZ/5joPHRZSvLIFdE=
-github.com/streamingfast/firehose-ethereum/types v0.0.0-20250219193809-31f4c76a8a5d/go.mod h1:CG22ObinxSbKIP19bAj0uro0a290kzZTiBbjL8VR0SE=
+github.com/streamingfast/firehose-ethereum/types v0.0.0-20250507011922-e3d3efeda61d h1:UOY/wuuvgunXAeF2mxZFrZXW9djOs02t6Fpw+ABwwBY=
+github.com/streamingfast/firehose-ethereum/types v0.0.0-20250507011922-e3d3efeda61d/go.mod h1:CG22ObinxSbKIP19bAj0uro0a290kzZTiBbjL8VR0SE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=