Merge branch 'master' into sys_tests_wait_for_consensus

OffchainLabs · Nov 20, 2023 · d33bbf9 · d33bbf9
2 parents 6b42be9 + 3f78331
commit d33bbf9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -163,6 +163,7 @@ COPY ./scripts/download-machine.sh .
 RUN ./download-machine.sh consensus-v10 0x6b94a7fc388fd8ef3def759297828dc311761e88d8179c7ee8d3887dc554f3c3
 RUN ./download-machine.sh consensus-v10.1 0xda4e3ad5e7feacb817c21c8d0220da7650fe9051ece68a3f0b1c5d38bbb27b21
 RUN ./download-machine.sh consensus-v10.2 0x0754e09320c381566cc0449904c377a52bd34a6b9404432e80afd573b67f7b17
+RUN ./download-machine.sh consensus-v10.3 0xf559b6d4fa869472dabce70fe1c15221bdda837533dfd891916836975b434dec
 
 FROM golang:1.20-bullseye as node-builder
 WORKDIR /workspace

diff --git a/broadcastclients/broadcastclients.go b/broadcastclients/broadcastclients.go
@@ -166,7 +166,9 @@ func (bcs *BroadcastClients) Start(ctx context.Context) {
 					continue
 				}
 				lastConfirmed = cs
-				bcs.primaryRouter.forwardConfirmationChan <- cs
+				if bcs.primaryRouter.forwardConfirmationChan != nil {
+					bcs.primaryRouter.forwardConfirmationChan <- cs
+				}
 
 			// Secondary Feeds
 			case msg := <-bcs.secondaryRouter.messageChan:
@@ -187,7 +189,9 @@ func (bcs *BroadcastClients) Start(ctx context.Context) {
 					continue
 				}
 				lastConfirmed = cs
-				bcs.secondaryRouter.forwardConfirmationChan <- cs
+				if bcs.secondaryRouter.forwardConfirmationChan != nil {
+					bcs.secondaryRouter.forwardConfirmationChan <- cs
+				}
 
 			// Cycle buckets to get rid of old entries
 			case <-recentFeedItemsCleanup.C:

diff --git a/cmd/datool/datool.go b/cmd/datool/datool.go
@@ -102,7 +102,6 @@ func parseClientStoreConfig(args []string) (*ClientStoreConfig, error) {
 	f.String("signing-wallet", "", "wallet containing ecdsa key to sign the message with")
 	f.String("signing-wallet-password", genericconf.PASSWORD_NOT_SET, "password to unlock the wallet, if not specified the user is prompted for the password")
 	f.Duration("das-retention-period", 24*time.Hour, "The period which DASes are requested to retain the stored batches.")
-	genericconf.ConfConfigAddOptions("conf", f)
 
 	k, err := confighelpers.BeginCommonParse(f, args)
 	if err != nil {
@@ -204,8 +203,6 @@ func parseRESTClientGetByHashConfig(args []string) (*RESTClientGetByHashConfig,
 	f.String("url", "http://localhost:9877", "URL of DAS server to connect to.")
 	f.String("data-hash", "", "hash of the message to retrieve, if starts with '0x' it's treated as hex encoded, otherwise base64 encoded")
 
-	genericconf.ConfConfigAddOptions("conf", f)
-
 	k, err := confighelpers.BeginCommonParse(f, args)
 	if err != nil {
 		return nil, err
@@ -267,7 +264,6 @@ func parseKeyGenConfig(args []string) (*KeyGenConfig, error) {
 	f.String("dir", "", "the directory to generate the keys in")
 	f.Bool("ecdsa", false, "generate an ECDSA keypair instead of BLS")
 	f.Bool("wallet", false, "generate the ECDSA keypair in a wallet file")
-	genericconf.ConfConfigAddOptions("conf", f)
 
 	k, err := confighelpers.BeginCommonParse(f, args)
 	if err != nil {