From 46a1140f14d5eb7ce2a568e86f3446079968ed47 Mon Sep 17 00:00:00 2001
From: alan <652732310@qq.com>
Date: Thu, 7 Nov 2024 16:16:22 +0800
Subject: [PATCH 1/3] ensure bcast.From == mgr.From()

---
 op-deployer/pkg/deployer/broadcaster/keyed.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op-deployer/pkg/deployer/broadcaster/keyed.go b/op-deployer/pkg/deployer/broadcaster/keyed.go
index f5797d9391560..1b548f20e9409 100644
--- a/op-deployer/pkg/deployer/broadcaster/keyed.go
+++ b/op-deployer/pkg/deployer/broadcaster/keyed.go
@@ -90,6 +90,9 @@ func NewKeyedBroadcaster(cfg KeyedBroadcasterOpts) (*KeyedBroadcaster, error) {
 }
 
 func (t *KeyedBroadcaster) Hook(bcast script.Broadcast) {
+	if bcast.From != t.mgr.From() {
+		panic("invalid from for broadcast")
+	}
 	t.mtx.Lock()
 	t.bcasts = append(t.bcasts, bcast)
 	t.mtx.Unlock()

From 4f6f4f26b276f047a310ee22d9ba321cf9916bdf Mon Sep 17 00:00:00 2001
From: alan <652732310@qq.com>
Date: Fri, 8 Nov 2024 23:28:31 +0800
Subject: [PATCH 2/3] address comment

---
 op-deployer/pkg/deployer/broadcaster/keyed.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-deployer/pkg/deployer/broadcaster/keyed.go b/op-deployer/pkg/deployer/broadcaster/keyed.go
index 1b548f20e9409..b819f313c890a 100644
--- a/op-deployer/pkg/deployer/broadcaster/keyed.go
+++ b/op-deployer/pkg/deployer/broadcaster/keyed.go
@@ -91,7 +91,7 @@ func NewKeyedBroadcaster(cfg KeyedBroadcasterOpts) (*KeyedBroadcaster, error) {
 
 func (t *KeyedBroadcaster) Hook(bcast script.Broadcast) {
 	if bcast.From != t.mgr.From() {
-		panic("invalid from for broadcast")
+		panic(fmt.Sprintf("invalid from for broadcast:%v, expected:%v", bcast.From, t.mgr.From()))
 	}
 	t.mtx.Lock()
 	t.bcasts = append(t.bcasts, bcast)

From 67b594d3157957ed00198558b42c9e0cf3f96bd5 Mon Sep 17 00:00:00 2001
From: alan <652732310@qq.com>
Date: Fri, 15 Nov 2024 21:49:54 +0800
Subject: [PATCH 3/3] fix for create2

---
 op-deployer/pkg/deployer/broadcaster/keyed.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-deployer/pkg/deployer/broadcaster/keyed.go b/op-deployer/pkg/deployer/broadcaster/keyed.go
index b819f313c890a..c9bb27fcf0cec 100644
--- a/op-deployer/pkg/deployer/broadcaster/keyed.go
+++ b/op-deployer/pkg/deployer/broadcaster/keyed.go
@@ -90,7 +90,7 @@ func NewKeyedBroadcaster(cfg KeyedBroadcasterOpts) (*KeyedBroadcaster, error) {
 }
 
 func (t *KeyedBroadcaster) Hook(bcast script.Broadcast) {
-	if bcast.From != t.mgr.From() {
+	if bcast.Type != script.BroadcastCreate2 && bcast.From != t.mgr.From() {
 		panic(fmt.Sprintf("invalid from for broadcast:%v, expected:%v", bcast.From, t.mgr.From()))
 	}
 	t.mtx.Lock()