(wip) skeleton running

hummingbot · Aug 21, 2024 · a862249 · a862249
1 parent 10db292
commit a862249
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 29 deletions.
diff --git a/src/connectors/connectors.routes.ts b/src/connectors/connectors.routes.ts
@@ -24,6 +24,7 @@ import { KujiraConfig } from './kujira/kujira.config';
 import { OsmosisConfig } from '../chains/osmosis/osmosis.config';
 import { CarbonConfig } from './carbon/carbon.config';
 import { BalancerConfig } from './balancer/balancer.config';
+import { OrcaConfig } from './orca/orca.config';
 
 export namespace ConnectorsRoutes {
   export const router = Router();
@@ -183,6 +184,12 @@ export namespace ConnectorsRoutes {
             chain_type: BalancerConfig.config.chainType,
             available_networks: BalancerConfig.config.availableNetworks,
           },
+          {
+            name: 'orca',
+            trading_type: OrcaConfig.config.tradingTypes('LP'),
+            chain_type: OrcaConfig.config.chainType,
+            available_networks: OrcaConfig.config.availableNetworks,
+          },
         ],
       });
     })

diff --git a/src/connectors/orca/orca.lp.ts b/src/connectors/orca/orca.lp.ts
@@ -16,7 +16,7 @@ export class Orca implements OrcaLPish {
   // private tokenList: TokenInfo[] = [];
 
   private constructor(chain: string, network: string) {
-    this._whirlpoolsConfig = OrcaConfig.config.whirlpoolsConfig(network);
+    this._whirlpoolsConfig = OrcaConfig.config.routerAddress(network);
     if (chain === 'solana') {
       this.chain = Solana.getInstance(network);
     } else {

diff --git a/src/services/connection-manager.ts b/src/services/connection-manager.ts
@@ -30,6 +30,7 @@ import {
   UniswapLPish,
   Xdcish,
   Tezosish,
+  OrcaLPish,
 } from './common-interfaces';
 import { Traderjoe } from '../connectors/traderjoe/traderjoe';
 import { Sushiswap } from '../connectors/sushiswap/sushiswap';
@@ -48,6 +49,7 @@ import { PancakeswapLP } from '../connectors/pancakeswap/pancakeswap.lp';
 import { XRPLCLOB } from '../connectors/xrpl/xrpl';
 import { Carbonamm } from '../connectors/carbon/carbonAMM';
 import { Balancer } from '../connectors/balancer/balancer';
+import { Orca } from '../connectors/orca/orca.lp';
 
 export type ChainUnion =
   | Algorand
@@ -170,6 +172,7 @@ export type ConnectorUnion =
   | XRPLCLOB
   | Curve
   | KujiraCLOB
+  | OrcaLPish
 
 export type Connector<T> = T extends Uniswapish
   ? Uniswapish
@@ -189,7 +192,9 @@ export type Connector<T> = T extends Uniswapish
                 ? XRPLCLOB
                 : T extends KujiraCLOB
                   ? KujiraCLOB
-                    : never;
+                    : T extends OrcaLPish
+                    ? OrcaLPish
+                      : never;
 
 export async function getConnector<T>(
   chain: string,
@@ -243,6 +248,8 @@ export async function getConnector<T>(
     connectorInstance = Tinyman.getInstance(network);
   } else if (connector === 'plenty') {
     connectorInstance = Plenty.getInstance(network);
+  } else if (connector === 'orca') {
+    connectorInstance = Orca.getInstance(chain, network);
   } else {
     throw new Error('unsupported chain or connector');
   }

diff --git a/src/services/schema/orca-schema.json b/src/services/schema/orca-schema.json
@@ -1,24 +1,23 @@
 {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "type": "object",
-    "properties": {
-      "allowedSlippage": { "type": "string" },
-      "contractAddresses": {
-        "type": "object",
-        "patternProperties": {
-          "^\\w+$": {
-            "type": "object",
-            "properties": {
-              "whirlpoolsConfig": { "type": "string" }
-            },
-            "required": ["whirlpoolsConfig"],
-            "additionalProperties": false
-          }
-        },
-        "additionalProperties": false
-      }
-    },
-    "additionalProperties": false,
-    "required": ["allowedSlippage", "contractAddresses"]
-  }
-
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "allowedSlippage": { "type": "string" },
+    "contractAddresses": {
+      "type": "object",
+      "patternProperties": {
+        "^\\w+$": {
+          "type": "object",
+          "properties": {
+            "routerAddress": { "type": "string" }
+          },
+          "required": ["routerAddress"],
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    }
+  },
+  "additionalProperties": false,
+  "required": ["allowedSlippage", "contractAddresses"]
+}
diff --git a/src/templates/orca.yml b/src/templates/orca.yml
@@ -3,7 +3,7 @@
 allowedSlippage: '1/100'  
 
 contractAddresses:
-  mainnet-beta:
-      whirlpoolsConfig: '0xE54Ca86531e17Ef3616d22Ca28b0D458b6C89106'
+  mainnet:
+      routerAddress: '0xE54Ca86531e17Ef3616d22Ca28b0D458b6C89106'
   devnet:
-      whirlpoolsConfig: '0xE54Ca86531e17Ef3616d22Ca28b0D458b6C89106'
+      routerAddress: '0xE54Ca86531e17Ef3616d22Ca28b0D458b6C89106'
diff --git a/src/templates/root.yml b/src/templates/root.yml
@@ -139,6 +139,11 @@ configurations:
   $namespace solana:
     configurationPath: solana.yml
     schemaPath: solana-schema.json
+
   $namespace telos:
     configurationPath: telos.yml
     schemaPath: ethereum-schema.json
+
+  $namespace orca:
+    configurationPath: orca.yml
+    schemaPath: orca-schema.json
diff --git a/src/templates/solana.yml b/src/templates/solana.yml
@@ -1,5 +1,5 @@
 networks:
-  mainnet-beta:
+  mainnet:
     nodeURL: https://api.mainnet-beta.solana.com
     tokenListType: 'FILE'
     tokenListSource: '/home/gateway/conf/lists/solflare-tokenlist.json'