Merge branch 'andrius/relay-upgrade-2026-02' into 'main'

chore: Relay contract upgrade for all networks

See merge request flarenetwork/ftso/ftso-scaling!170

Author: adg-flare

libs/contracts/src/constants.ts

@@ -5,7 +5,7 @@ export const COSTON_CONTRACTS: NetworkContractAddresses = {
   FtsoRewardOffersManager: { name: "FtsoRewardOffersManager", address: "0xC9534cB913150aD3e98D792857689B55e2404212" },
   RewardManager: { name: "RewardManager", address: "0x2ade9972E7f27200872D378acF7a1BaD8D696FC5" },
   Submission: { name: "Submission", address: "0x2cA6571Daa15ce734Bbd0Bf27D5C9D16787fc33f" },
-  Relay: { name: "Relay", address: "0x92a6E1127262106611e1e129BB64B6D8654273F7" },
+  Relay: { name: "Relay", address: "0x051f214D346Cfd97B107BECb87E2B35D1b4287E9" },
   FlareSystemsCalculator: { name: "FlareSystemsCalculator", address: "0x3787dcbd770202f856ed9204c19d6f9022ff3bf2" },
   VoterRegistry: { name: "VoterRegistry", address: "0xb4b93a3a3ada93a574e6efeb5f295bf882934cb6" },
   FtsoMerkleStructs: { name: "FtsoMerkleStructs", address: "" },
@@ -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: "0x97702e350CaEda540935d92aAf213307e9069784" },
+  Relay: { name: "Relay", address: "0xa10B672D1c62e5457b17af63d4302add6A99d7dE" },
   FlareSystemsCalculator: { name: "FlareSystemsCalculator", address: "0x9aF60c16192330EC98d04Ec9675d22dBb9892951" },
   VoterRegistry: { name: "VoterRegistry", address: "0xc6E40401395DCc648bC4bBb38fE4552423cD9BAC" },
   FtsoMerkleStructs: { name: "FtsoMerkleStructs", address: "" },
@@ -41,7 +41,7 @@ export const SONGBIRD_CONTRACTS: NetworkContractAddresses = {
   FtsoRewardOffersManager: { name: "FtsoRewardOffersManager", address: "0x5aB9cB258a342001C4663D9526A1c54cCcF8C545" },
   RewardManager: { name: "RewardManager", address: "0xE26AD68b17224951b5740F33926Cc438764eB9a7" },
   Submission: { name: "Submission", address: "0x2cA6571Daa15ce734Bbd0Bf27D5C9D16787fc33f" },
-  Relay: { name: "Relay", address: "0x67a916E175a2aF01369294739AA60dDdE1Fad189" },
+  Relay: { name: "Relay", address: "0xCB86E8Be709001e01897Bf59847406853da8f14b" },
   FlareSystemsCalculator: { name: "FlareSystemsCalculator", address: "0x126FAeEc75601dA3354c0b5Cc0b60C85fCbC3A5e" },
   VoterRegistry: { name: "VoterRegistry", address: "0x31B9EC65C731c7D973a33Ef3FC83B653f540dC8D" },
   FtsoMerkleStructs: { name: "FtsoMerkleStructs", address: "" },
@@ -59,7 +59,7 @@ export const FLARE_CONTRACTS: NetworkContractAddresses = {
   FtsoRewardOffersManager: { name: "FtsoRewardOffersManager", address: "0x244EA7f173895968128D5847Df2C75B1460ac685" },
   RewardManager: { name: "RewardManager", address: "0xC8f55c5aA2C752eE285Bd872855C749f4ee6239B" },
   Submission: { name: "Submission", address: "0x2cA6571Daa15ce734Bbd0Bf27D5C9D16787fc33f" },
-  Relay: { name: "Relay", address: "0x57a4c3676d08Aa5d15410b5A6A80fBcEF72f3F45" },
+  Relay: { name: "Relay", address: "0xCcF30790A93F15e24EB909548a2C58a9b0a7FBd4" },
   FlareSystemsCalculator: { name: "FlareSystemsCalculator", address: "0x67c4B11c710D35a279A41cff5eb089Fe72748CF8" },
   VoterRegistry: { name: "VoterRegistry", address: "0x2580101692366e2f331e891180d9ffdF861Fce83" },
   FtsoMerkleStructs: { name: "FtsoMerkleStructs", address: "" },

libs/ftso-core/src/IndexerClient.ts

@@ -391,53 +391,32 @@ export class IndexerClient {
 
     const result: TLPEvents[] = [];
 
-    // TEMP CHANGE for upgrading Relay contract, can be removed in December 2024
+    // TEMP CHANGE for upgrading Relay contract, can be removed in March 2026
     const network = process.env.NETWORK as networks;
 
-    const oldSongbirdRelay = "0xbA35e39D01A3f5710d1e43FC61dbb738B68641c4";
-    if (network === "songbird" && CONTRACTS.Relay.address !== oldSongbirdRelay) {
+    if (network === "songbird") {
+      const oldSongbirdRelay = "0x67a916E175a2aF01369294739AA60dDdE1Fad189";
       this.logger.log(`Querying old Relay address for Songbird: ${oldSongbirdRelay}`);
       result.push(
         ...(await this.queryEvents({ ...CONTRACTS.Relay, address: oldSongbirdRelay }, eventName, fromStartTime))
       );
     }
-
-    const secondOldSongbirdRelay = "0x0D462d2Fec11554D64F52D7c5A5C269d748037aD";
-    if (network === "songbird" && CONTRACTS.Relay.address !== secondOldSongbirdRelay) {
-      this.logger.log(`Querying second old Relay address for Songbird: ${secondOldSongbirdRelay}`);
-      result.push(
-        ...(await this.queryEvents({ ...CONTRACTS.Relay, address: secondOldSongbirdRelay }, eventName, fromStartTime))
-      );
-    }
-
-    const oldCostonRelay = "0x32D46A1260BB2D8C9d5Ab1C9bBd7FF7D7CfaabCC";
-    if (network === "coston" && CONTRACTS.Relay.address !== oldCostonRelay) {
+    if (network === "coston") {
+      const oldCostonRelay = "0x92a6E1127262106611e1e129BB64B6D8654273F7";
       this.logger.log(`Querying old Relay address for Coston: ${oldCostonRelay}`);
       result.push(
         ...(await this.queryEvents({ ...CONTRACTS.Relay, address: oldCostonRelay }, eventName, fromStartTime))
       );
     }
-
-    const secondOldCostonRelay = "0xA300E71257547e645CD7241987D3B75f2012E0E3";
-    if (network === "coston" && CONTRACTS.Relay.address !== secondOldCostonRelay) {
-      this.logger.log(`Querying second old Relay address for Coston: ${secondOldCostonRelay}`);
-      result.push(
-        ...(await this.queryEvents({ ...CONTRACTS.Relay, address: secondOldCostonRelay }, eventName, fromStartTime))
-      );
-    }
-
-    // TEMP CHANGE for upgrading Relay contract on Coston2, can be removed in February 2025
-    const oldCoston2Relay = "0x4087D4B5E009Af9FF41db910205439F82C3dc63c";
-    if (network === "coston2" && CONTRACTS.Relay.address !== oldCoston2Relay) {
+    if (network === "coston2") {
+      const oldCoston2Relay = "0x97702e350CaEda540935d92aAf213307e9069784";
       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) {
+    if (network === "flare") {
+      const oldFlareRelay = "0x57a4c3676d08Aa5d15410b5A6A80fBcEF72f3F45";
       this.logger.log(`Querying old Relay address for Flare: ${oldFlareRelay}`);
       result.push(
         ...(await this.queryEvents({ ...CONTRACTS.Relay, address: oldFlareRelay }, eventName, fromStartTime))