From 977fc916a70c00b914e233b25c62bde5045e00f7 Mon Sep 17 00:00:00 2001
From: Przemek Rzad <przemek@parity.io>
Date: Mon, 25 Mar 2024 11:06:48 +0100
Subject: [PATCH] Add a nonce collision workaround for bridge relayer reward
 claiming job (#336)

---
 charts/bridges-common-relay/Chart.yaml            | 2 +-
 charts/bridges-common-relay/README.md             | 2 +-
 charts/bridges-common-relay/templates/cronjob.yml | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/charts/bridges-common-relay/Chart.yaml b/charts/bridges-common-relay/Chart.yaml
index 502ffaee..65014ee7 100644
--- a/charts/bridges-common-relay/Chart.yaml
+++ b/charts/bridges-common-relay/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bridges-common-relay
 description: A Helm chart for bridges-common-relay
 type: application
-version: 1.1.0
+version: 1.1.1
 maintainers:
   - name: Parity
     url: https://github.com/paritytech/helm-charts
diff --git a/charts/bridges-common-relay/README.md b/charts/bridges-common-relay/README.md
index 79d44216..a3441b74 100644
--- a/charts/bridges-common-relay/README.md
+++ b/charts/bridges-common-relay/README.md
@@ -18,7 +18,7 @@ This is intended behaviour. Make sure to run `git add -A` once again to stage ch
 
 # Parity Bridges Common helm chart
 
-![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 This helm chart installs [Parity Bridges Common](https://github.com/paritytech/parity-bridges-common) relayer.
 
diff --git a/charts/bridges-common-relay/templates/cronjob.yml b/charts/bridges-common-relay/templates/cronjob.yml
index 305b207d..1176f043 100644
--- a/charts/bridges-common-relay/templates/cronjob.yml
+++ b/charts/bridges-common-relay/templates/cronjob.yml
@@ -71,6 +71,9 @@ spec:
                   fi
                   echo "{{ $val.name }} on {{ $reward_owner }} has a reward of ${reward}."
 
+                  # Avoid nonce collision with "ThisChain".
+                  {{ if eq $reward_owner "BridgedChain" }}sleep 10{{ end }}
+
                   polkadot-js-api --ws "$RPC_URL" \
                       --seed "$(cat /secrets/{{ $val.seed_phrase_secret_name }})" \
                     tx.bridgeRelayers.claimRewards "$rewards_account_params"