Merge branch 'develop' into merge/auto/master-to-develop

CHANGELOG.md

@@ -12,6 +12,10 @@
 
 - fix: Change address for WBTC test token to contract with 8 decimals (was 18)
 
+# 2.1.4-0
+
+- Add Orbit Address
+
 # 2.1.3
 
 - Consolidated CHANGELOG

src/assets/strats/v2.1.0-1/OrbitLogic.json

@@ -0,0 +1,113 @@
+{
+  "$schema": "../../../../contract.schema.json",
+  "released": false,
+  "contractName": "OrbitLogic",
+  "deploymentName": "OrbitLogic",
+  "version": "2.1.0-1",
+  "networkAddresses": {
+    "168587773": {
+      "primaryAddress": "0x9F7265122F280C7a15b433177096c9371BA0d583",
+      "allAddresses": [
+        {
+          "address": "0x9F7265122F280C7a15b433177096c9371BA0d583"
+        }
+      ]
+    }
+  },
+  "abi": [
+    {
+      "type": "constructor",
+      "inputs": [
+        {
+          "name": "_spaceStation",
+          "type": "address",
+          "internalType": "contract OrbitSpaceStation"
+        }
+      ],
+      "stateMutability": "nonpayable"
+    },
+    {
+      "type": "function",
+      "name": "balanceLogic",
+      "inputs": [
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "contract IERC20"
+        },
+        { "name": "fundOwner", "type": "address", "internalType": "address" }
+      ],
+      "outputs": [
+        { "name": "balance", "type": "uint256", "internalType": "uint256" }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "orbitStorage",
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "",
+          "type": "address",
+          "internalType": "contract OrbitLogicStorage"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "overlying",
+      "inputs": [
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "contract IERC20"
+        }
+      ],
+      "outputs": [
+        {
+          "name": "_overlying",
+          "type": "address",
+          "internalType": "contract OErc20"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "pullLogic",
+      "inputs": [
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "contract IERC20"
+        },
+        { "name": "fundOwner", "type": "address", "internalType": "address" },
+        { "name": "amount", "type": "uint256", "internalType": "uint256" },
+        { "name": "", "type": "bool", "internalType": "bool" }
+      ],
+      "outputs": [
+        { "name": "pulled", "type": "uint256", "internalType": "uint256" }
+      ],
+      "stateMutability": "nonpayable"
+    },
+    {
+      "type": "function",
+      "name": "pushLogic",
+      "inputs": [
+        {
+          "name": "token",
+          "type": "address",
+          "internalType": "contract IERC20"
+        },
+        { "name": "fundOwner", "type": "address", "internalType": "address" },
+        { "name": "amount", "type": "uint256", "internalType": "uint256" }
+      ],
+      "outputs": [
+        { "name": "pushed", "type": "uint256", "internalType": "uint256" }
+      ],
+      "stateMutability": "nonpayable"
+    }
+  ]
+}

src/strats.ts

@@ -30,6 +30,8 @@ import BlastMangroveAmplifier_v2_1_0_0 from "./assets/strats/v2.1.0-0/BlastMangr
 import BlastMangroveOrderRouter_v2_1_0_0 from "./assets/strats/v2.1.0-0/BlastMangroveOrder-Router.json";
 import BlastMangroveOrder_v2_1_0_0 from "./assets/strats/v2.1.0-0/BlastMangroveOrder.json";
 import BlastRouterProxyFactory_v2_1_0_0 from "./assets/strats/v2.1.0-0/BlastRouterProxyFactory.json";
+// v2.1.0-1
+import OrbitLogic_v2_1_0_1 from "./assets/strats/v2.1.0-1/OrbitLogic.json";
 
 import { getLatestMangrovePerNetwork } from "./core";
 
@@ -289,6 +291,18 @@ export const getLatestSimpleAaveLogicPerNetwork = (
   return findLatestDeploymentPerNetwork(filter, _simpleAaveLogicDeployments);
 };
 
+//////////////////////////
+// OrbitLogic
+export const _orbitLogicDeployments: VersionDeployments[] = [
+  OrbitLogic_v2_1_0_1,
+];
+
+export const getOrbitLogicVersionDeployments = (
+  filter?: DeploymentFilter,
+): VersionDeployments | undefined => {
+  return findDeployment(filter, _orbitLogicDeployments);
+};
+
 //////////////////////////
 // MangroveAmplifier