From b07d69129eb6d5efeaa66a97971dd89e0a05d6c2 Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Mon, 13 Nov 2023 17:10:47 +0100 Subject: [PATCH 1/3] Drop initializing conf field that doesn't exist anymore --- cmd/datool/datool.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmd/datool/datool.go b/cmd/datool/datool.go index d20a5b52cd..d78d975fd5 100644 --- 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 { From 9ebb2764d1e3401e05bf7058d1908bcf030b40a5 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Wed, 15 Nov 2023 10:54:47 -0700 Subject: [PATCH 2/3] Add support for consensus v10.3 to Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index b05cb3d4d9..b966125b66 100644 --- 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 From 50f211da4f0ff89f011b950a1dfaadcefc75a937 Mon Sep 17 00:00:00 2001 From: ganeshvanahalli Date: Thu, 16 Nov 2023 14:26:22 -0600 Subject: [PATCH 3/3] Handle nil channel case inside router model --- broadcastclients/broadcastclients.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/broadcastclients/broadcastclients.go b/broadcastclients/broadcastclients.go index 551dcdb462..b2824221ea 100644 --- 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: