Merge branch 'andrius/coston2-relay-upgrade' into 'main'

Support Coston2 Relay upgrade See merge request flarenetwork/ftso/ftso-scaling!149
flare-foundation · Jan 7, 2025 · be440b5 · be440b5
2 parents da3b236 + 7775e46
commit be440b5
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/libs/contracts/src/constants.ts b/libs/contracts/src/constants.ts
@@ -23,7 +23,7 @@ export const COSTON2_CONTRACTS: NetworkContractAddresses = {
     FtsoRewardOffersManager: {name: "FtsoRewardOffersManager", address: "0x1b7ffab226b66b5eCBdC79a42287BC09C05bCb33"},
     RewardManager: {name: "RewardManager", address: "0xB4f43E342c5c77e6fe060c0481Fe313Ff2503454"},
     Submission: {name: "Submission", address: "0x2cA6571Daa15ce734Bbd0Bf27D5C9D16787fc33f"},
-    Relay: {name: "Relay", address: "0x4087D4B5E009Af9FF41db910205439F82C3dc63c"},
+    Relay: {name: "Relay", address: "0x97702e350CaEda540935d92aAf213307e9069784"},
     FlareSystemsCalculator: {name: "FlareSystemsCalculator", address: "0x9aF60c16192330EC98d04Ec9675d22dBb9892951"},
     VoterRegistry: {name: "VoterRegistry", address: "0xc6E40401395DCc648bC4bBb38fE4552423cD9BAC"},
     FtsoMerkleStructs: {name: "FtsoMerkleStructs", address: ""},

diff --git a/libs/fsp-rewards/src/IndexerClientForRewarding.ts b/libs/fsp-rewards/src/IndexerClientForRewarding.ts
@@ -70,6 +70,13 @@ export class IndexerClientForRewarding extends IndexerClient {
       };
     }
 
+    const oldCoston2RelayAddress = "0x4087D4B5E009Af9FF41db910205439F82C3dc63c";
+    if (network === "coston2" && CONTRACTS.Relay.address != oldCoston2RelayAddress) {
+      oldRelay = {
+        ...CONTRACTS.Relay,
+        address: oldCoston2RelayAddress,
+      };
+    }
 
     const oldSongbirdRelayAddress = "0xbA35e39D01A3f5710d1e43FC61dbb738B68641c4";
     if (network === "songbird" && CONTRACTS.Relay.address != oldSongbirdRelayAddress) {
@@ -87,6 +94,14 @@ export class IndexerClientForRewarding extends IndexerClient {
       };
     }
 
+    const oldFlareRelayAddress = "0xea077600E3065F4FAd7161a6D0977741f2618eec";
+    if (network === "flare" && CONTRACTS.Relay.address != oldFlareRelayAddress) {
+      oldRelay = {
+        ...CONTRACTS.Relay,
+        address: oldFlareRelayAddress,
+      };
+    }
+
     if (oldRelay !== undefined) {
       oldTransactionsResults = await this.queryTransactions(
         oldRelay,

diff --git a/libs/ftso-core/src/IndexerClient.ts b/libs/ftso-core/src/IndexerClient.ts
@@ -430,6 +430,24 @@ export class IndexerClient {
       );
     }
 
+    // TEMP CHANGE for upgrading Relay contract on Coston2, can be removed in February 2025
+    const oldCoston2Relay = "0x4087D4B5E009Af9FF41db910205439F82C3dc63c";
+    if (network == "coston2" && CONTRACTS.Relay.address != oldCoston2Relay) {
+      this.logger.log(`Querying old Relay address for Coston2: ${oldCoston2Relay}`);
+      result.push(
+        ...(await this.queryEvents({ ...CONTRACTS.Relay, address: oldCoston2Relay }, eventName, fromStartTime))
+      );
+    }
+
+    // TEMP CHANGE for upgrading Relay contract on Flare, can be removed in March 2025
+    const oldFlareRelay = "0xea077600E3065F4FAd7161a6D0977741f2618eec";
+    if (network == "flare" && CONTRACTS.Relay.address != oldFlareRelay) {
+      this.logger.log(`Querying old Relay address for Flare: ${oldFlareRelay}`);
+      result.push(
+        ...(await this.queryEvents({ ...CONTRACTS.Relay, address: oldFlareRelay }, eventName, fromStartTime))
+      );
+    }
+
     // END TEMP CHANGE
 
     result.push(...(await this.queryEvents(CONTRACTS.Relay, eventName, fromStartTime)));