From dbf519434d48c6a6833255fd7fb803df2b7ff119 Mon Sep 17 00:00:00 2001
From: rbajollari <rbajollari@gmail.com>
Date: Mon, 13 May 2024 17:09:52 -0600
Subject: [PATCH 1/2] feat: Integrate AxelarExpressExecutable

---
 contracts/Ojo.sol | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contracts/Ojo.sol b/contracts/Ojo.sol
index 97c1f23..fe4c147 100644
--- a/contracts/Ojo.sol
+++ b/contracts/Ojo.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import "@axelar-network/axelar-gmp-sdk-solidity/contracts/executable/AxelarExecutable.sol";
+import "@axelar-network/axelar-gmp-sdk-solidity/contracts/express/AxelarExpressExecutable.sol";
 import "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGateway.sol";
 import "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGasService.sol";
 import "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IERC20.sol";
@@ -9,7 +9,7 @@ import "@axelar-network/axelar-gmp-sdk-solidity/contracts/upgradable/Upgradable.
 import "./IOjo.sol";
 import "./OjoTypes.sol";
 
-contract Ojo is IOjo, AxelarExecutable, Upgradable {
+contract Ojo is IOjo, AxelarExpressExecutable, Upgradable {
     IAxelarGasService public immutable gasReceiver;
 
     string public ojoChain;
@@ -24,7 +24,7 @@ contract Ojo is IOjo, AxelarExecutable, Upgradable {
 
     error AlreadyInitialized();
 
-    constructor(address gateway_, address gasReceiver_) AxelarExecutable(gateway_) {
+    constructor(address gateway_, address gasReceiver_) AxelarExpressExecutable(gateway_) {
         gasReceiver = IAxelarGasService(gasReceiver_);
     }
 

From 8213005cc8754c78cc342bbc88363a3910c140b8 Mon Sep 17 00:00:00 2001
From: rbajollari <rbajollari@gmail.com>
Date: Tue, 14 May 2024 06:28:01 -0600
Subject: [PATCH 2/2] deploy update

---
 scripts/deployOjo.ts |  4 ++--
 testnet_chains.json  | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/scripts/deployOjo.ts b/scripts/deployOjo.ts
index 8072fff..27af4c6 100644
--- a/scripts/deployOjo.ts
+++ b/scripts/deployOjo.ts
@@ -19,9 +19,9 @@ async function main() {
       throw new Error('Invalid private key. Make sure the PRIVATE_KEY environment variable is set.');
   }
 
-  const mainnet = Boolean(process.env.MAINNET)
+  const mainnet = process.env.MAINNET as string
   let evmChains = testnet_chains.map((chain) => ({ ...chain }));
-  if (mainnet === true) {
+  if (mainnet === "TRUE") {
       evmChains = mainnet_chains.map((chain) => ({ ...chain }));
   }
 
diff --git a/testnet_chains.json b/testnet_chains.json
index 4796e55..8e3df94 100644
--- a/testnet_chains.json
+++ b/testnet_chains.json
@@ -76,6 +76,13 @@
         "rpc": "https://optimism-goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
         "tokenSymbol": "ETH"
     },
+    {
+        "name": "Optimism Sepolia",
+        "chainId": 11155420,
+        "gateway": "0xe432150cce91c13a887f7D836923d5597adD8E31",
+        "rpc": "https://sepolia.optimism.io",
+        "tokenSymbol": "ETH"
+    },
     {
         "name": "Base Goerli",
         "chainId": 84531,
@@ -83,6 +90,13 @@
         "rpc": "https://goerli.base.org",
         "tokenSymbol": "ETH"
     },
+    {
+        "name": "Base Sepolia",
+        "chainId": 84532,
+        "gateway": "0xe432150cce91c13a887f7D836923d5597adD8E31",
+        "rpc": "https://base-sepolia-rpc.publicnode.com",
+        "tokenSymbol": "ETH"
+    },
     {
         "name": "Mantle",
         "chainId": 5001,