chore(chart): update cm values; fix updater ctx cancellation issue

Galxe · Jan 6, 2025 · 4eea903 · 4eea903
1 parent f8e5697
commit 4eea903
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/charts/updater/templates/configmap.yaml b/charts/updater/templates/configmap.yaml
@@ -11,3 +11,7 @@ data:
   CHAIN_ID: "{{ .Values.config.chainId }}"
   SET_RANDOMNESS_GAS_LIMIT: "{{ .Values.config.setRandomnessGasLimit }}"
   GENESIS_ROUND: "{{ .Values.config.genesisRound }}"
+  MAX_RETRIES: "{{ .Values.config.maxRetries }}"
+  {{- with .Values.extraConfig }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
diff --git a/charts/updater/values.yaml b/charts/updater/values.yaml
@@ -21,6 +21,9 @@ config:
   chainId: "31337"
   genesisRound: "4496672"
   setRandomnessGasLimit: "500000"
+  maxRetries: "5"
+
+extraConfig: {}
 
 useExistingSecrets: false
 existingSecretName: ""

diff --git a/updater/Makefile b/updater/Makefile
@@ -1,7 +1,7 @@
 ANVIL_RPC="http://localhost:8545"
 ANVIL_DRAND_ORACLE_ADDRESS="0xa6F9208a7F9d8CFBDe24417CfAE3092AF31029d0"
 ANVIL_SIGNER_PRIVATE_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
-ANVIL_SENDER_PRIVATE_KEY="0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
+ANVIL_SENDER_PRIVATE_KEY="0x2bfdc1fb0bea671f30f341f27ba8c3c39e1c329448383d1f5871ed7508c7af87"
 ANVIL_CHAIN_ID=31337
 ANVIL_GENESIS_ROUND=4496672
 

diff --git a/updater/internal/service/updater.go b/updater/internal/service/updater.go
@@ -236,10 +236,14 @@ func (u *Updater) watchNewRounds(ctx context.Context) error {
 		u.latestDrandRound = result.Round()
 		u.metrics.SetDrandRound(float64(result.Round()))
 		u.latestDrandRoundMutex.Unlock()
-		u.roundChan <- &roundData{
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		case u.roundChan <- &roundData{
 			round:      result.Round(),
 			randomness: result.Randomness(),
 			signature:  result.Signature(),
+		}:
 		}
 	}
 	return nil