From 7babff0dddbde89b68fb0105ee664f252daf0fce Mon Sep 17 00:00:00 2001
From: Trevor Porter <tkporter4@gmail.com>
Date: Fri, 24 Jan 2025 13:21:39 +0000
Subject: [PATCH] feat: add rivalz to the solanamainnet IGP (#5282)

### Description

- Rivalz deployed their own warp route and needs this to test
- The optimism & trumpchain change was already applied, but I think was
lost somewhere in the branch juggle. As the warp route has been updated
in the registry, we no longer need the explicit handling

### Drive-by changes

<!--
Are there any minor or drive-by changes also included?
-->

### Related issues

<!--
- Fixes #[issue number here]
-->

### Backward compatibility

<!--
Are these changes backward compatible? Are there any infrastructure
implications, e.g. changes that would prohibit deploying older commits
using this infra tooling?

Yes/No
-->

### Testing

<!--
What kind of testing have these changes undergone?

None/Manual/Unit Tests
-->
---
 .../mainnet3/gas-oracle-configs.json          | 28 ++++++++++++-------
 .../sealevel-helpers/print-gas-oracles.ts     |  8 ++----
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/rust/sealevel/environments/mainnet3/gas-oracle-configs.json b/rust/sealevel/environments/mainnet3/gas-oracle-configs.json
index 26f2b592ef..544b37f17a 100644
--- a/rust/sealevel/environments/mainnet3/gas-oracle-configs.json
+++ b/rust/sealevel/environments/mainnet3/gas-oracle-configs.json
@@ -1,17 +1,9 @@
 {
   "solanamainnet": {
-    "trumpchain": {
-      "oracleConfig": {
-        "tokenExchangeRate": "4545000000000000000",
-        "gasPrice": "11271716004",
-        "tokenDecimals": 18
-      },
-      "overhead": 166887
-    },
-    "optimism": {
+    "rivalz": {
       "oracleConfig": {
         "tokenExchangeRate": "263105000000000000000",
-        "gasPrice": "486782274",
+        "gasPrice": "194712945",
         "tokenDecimals": 18
       },
       "overhead": 166887
@@ -72,6 +64,22 @@
       },
       "overhead": 166887
     },
+    "optimism": {
+      "oracleConfig": {
+        "tokenExchangeRate": "263105000000000000000",
+        "gasPrice": "486782274",
+        "tokenDecimals": 18
+      },
+      "overhead": 166887
+    },
+    "trumpchain": {
+      "oracleConfig": {
+        "tokenExchangeRate": "4545000000000000000",
+        "gasPrice": "11271716004",
+        "tokenDecimals": 18
+      },
+      "overhead": 166887
+    },
     "ethereum": {
       "oracleConfig": {
         "tokenExchangeRate": "263105000000000000000",
diff --git a/typescript/infra/scripts/sealevel-helpers/print-gas-oracles.ts b/typescript/infra/scripts/sealevel-helpers/print-gas-oracles.ts
index 8e61cd2ce6..aedc026fb0 100644
--- a/typescript/infra/scripts/sealevel-helpers/print-gas-oracles.ts
+++ b/typescript/infra/scripts/sealevel-helpers/print-gas-oracles.ts
@@ -98,12 +98,8 @@ function getChainConnections(
   if (environment === 'mainnet3') {
     // All the mainnet3 warp route chains
     connectedChains = [
-      // Some branch juggling for the new TRUMP route temporarily
-      // requires these chains to be hardcoded:
-      // TRUMP/solanamainnet-trumpchain
-      ['solanamainnet', 'trumpchain'],
-      // For the massive TRUMP warp route, which is undergoing an extension atm
-      ['solanamainnet', 'optimism'],
+      // For the Rivalz team building out their own warp route
+      ['solanamainnet', 'rivalz'],
       // All warp routes
       ...Object.values(WarpRouteIds).map(getWarpChains),
     ];