Merge pull request hummingbot#221 from hummingbot/staging

Sync gateway / staging to main gateway 1.21.0
OjusWiZard · Oct 30, 2023 · 3c6138f · 3c6138f
2 parents 8f4b983 + 1170c85
commit 3c6138f
Show file tree

Hide file tree

Showing 35 changed files with 488 additions and 2,666 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -21,7 +21,6 @@ module.exports = {
     'src/connectors/uniswap/uniswap.config.ts',
     'src/connectors/uniswap/uniswap.ts',
     'src/connectors/uniswap/uniswap.lp.helper.ts',
-    'src/connectors/defira/defira.ts',
     'src/connectors/openocean/openocean.ts',
     'src/connectors/pangolin/pangolin.ts',
     'src/chains/injective/injective.mappers.ts',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hummingbot-gateway",
-  "version": "1.20.0",
+  "version": "1.21.0",
   "description": "Middleware that helps Hummingbot clients access standardized DEX API endpoints on different blockchain networks",
   "main": "index.js",
   "license": "Apache-2.0",
@@ -59,7 +59,6 @@
     "@uniswap/v3-core": "^1.0.0",
     "@uniswap/v3-periphery": "^1.1.1",
     "@uniswap/v3-sdk": "^3.7.0",
-    "@zuzu-cat/defira-sdk": "^1.0.0",
     "abi-decoder": "^2.4.0",
     "ajv": "^8.6.3",
     "algosdk": "^2.2.0",

diff --git a/src/app.ts b/src/app.ts
@@ -112,7 +112,7 @@ export const startSwagger = async () => {
 
 export const startGateway = async () => {
   const port = ConfigManagerV2.getInstance().get('server.port');
-  const gateway_version="1.20.0"; // gateway version
+  const gateway_version="1.21.0"; // gateway version
   if (!ConfigManagerV2.getInstance().get('server.id')) {
     ConfigManagerV2.getInstance().set(
       'server.id',

diff --git a/src/chains/cosmos/cosmos-base.ts b/src/chains/cosmos/cosmos-base.ts
@@ -8,6 +8,7 @@ import { BigNumber } from 'ethers';
 import { AccountData, DirectSignResponse } from '@cosmjs/proto-signing';
 
 import { IndexedTx, setupIbcExtension } from '@cosmjs/stargate';
+import { logger } from '../../services/logger';
 
 //Cosmos
 const { DirectSecp256k1Wallet } = require('@cosmjs/proto-signing');
@@ -58,8 +59,7 @@ export class CosmosBase {
   private _tokenMap: Record<string, Token> = {};
 
   private _ready: boolean = false;
-  private _initializing: boolean = false;
-  private _initPromise: Promise<void> = Promise.resolve();
+  private _initialized: Promise<boolean> = Promise.resolve(false);
 
   public chainName;
   public rpcUrl;
@@ -93,17 +93,21 @@ export class CosmosBase {
   }
 
   async init(): Promise<void> {
-    if (!this.ready() && !this._initializing) {
-      this._initializing = true;
-      this._initPromise = this.loadTokens(
-        this.tokenListSource,
-        this.tokenListType
-      ).then(() => {
-        this._ready = true;
-        this._initializing = false;
-      });
+    await this._initialized; // Wait for any previous init() calls to complete
+    if (!this.ready()) {
+      // If we're not ready, this._initialized will be a Promise that resolves after init() completes
+      this._initialized = (async () => {
+        try {
+          await this.loadTokens(this.tokenListSource, this.tokenListType)
+          return true;
+        } catch (e) {
+          logger.error(`Failed to initialize ${this.chainName} chain: ${e}`);
+          return false;
+        }
+      })();
+      this._ready = await this._initialized; // Wait for the initialization to complete
     }
-    return this._initPromise;
+    return;
   }
 
   async loadTokens(

diff --git a/src/chains/ethereum/ethereum-base.ts b/src/chains/ethereum/ethereum-base.ts
@@ -39,7 +39,7 @@ export class EthereumBase {
   private _tokenMap: Record<string, TokenInfo> = {};
   // there are async values set in the constructor
   private _ready: boolean = false;
-  private _initializing: boolean = false;
+  private _initialized: Promise<boolean> = Promise.resolve(false);
   public chainName;
   public chainId;
   public rpcUrl;
@@ -121,14 +121,22 @@ export class EthereumBase {
   }
 
   async init(): Promise<void> {
-    if (!this.ready() && !this._initializing) {
-      this._initializing = true;
-      await this._nonceManager.init(
-        async (address) => await this.provider.getTransactionCount(address)
-      );
-      await this.loadTokens(this.tokenListSource, this.tokenListType);
-      this._ready = true;
-      this._initializing = false;
+    await this._initialized; // Wait for any previous init() calls to complete
+    if (!this.ready()) {
+      // If we're not ready, this._initialized will be a Promise that resolves after init() completes
+      this._initialized = (async () => {
+        try {
+          await this._nonceManager.init(
+            async (address) => await this.provider.getTransactionCount(address)
+          );
+          await this.loadTokens(this.tokenListSource, this.tokenListType);
+          return true;
+        } catch (e) {
+          logger.error(`Failed to initialize ${this.chainName} chain: ${e}`);
+          return false;
+        }
+      })();
+      this._ready = await this._initialized; // Wait for the initialization to complete
     }
     return;
   }
@@ -241,7 +249,7 @@ export class EthereumBase {
     const balance: BigNumber = await contract.balanceOf(wallet.address);
     logger.info(
       `Raw balance of ${contract.address} for ` +
-        `${wallet.address}: ${balance.toString()}`
+      `${wallet.address}: ${balance.toString()}`
     );
     return { value: balance, decimals: decimals };
   }
@@ -255,10 +263,10 @@ export class EthereumBase {
   ): Promise<TokenValue> {
     logger.info(
       'Requesting spender ' +
-        spender +
-        ' allowance for owner ' +
-        wallet.address +
-        '.'
+      spender +
+      ' allowance for owner ' +
+      wallet.address +
+      '.'
     );
     const allowance = await contract.allowance(wallet.address, spender);
     logger.info(allowance);
@@ -311,12 +319,12 @@ export class EthereumBase {
   ): Promise<Transaction> {
     logger.info(
       'Calling approve method called for spender ' +
-        spender +
-        ' requesting allowance ' +
-        amount.toString() +
-        ' from owner ' +
-        wallet.address +
-        '.'
+      spender +
+      ' requesting allowance ' +
+      amount.toString() +
+      ' from owner ' +
+      wallet.address +
+      '.'
     );
     return this.nonceManager.provideNonce(
       nonce,

diff --git a/src/chains/ethereum/ethereum.validators.ts b/src/chains/ethereum/ethereum.validators.ts
@@ -57,7 +57,6 @@ export const validateSpender: Validator = mkValidator(
       val === 'viperswap' ||
       val === 'openocean' ||
       val === 'quickswap' ||
-      val === 'defira' ||
       val === 'mad_meerkat' ||
       val === 'vvs' ||
       val === 'pancakeswap' ||

diff --git a/src/chains/harmony/harmony.ts b/src/chains/harmony/harmony.ts
@@ -146,9 +146,7 @@ export class Harmony extends EthereumBase implements Ethereumish {
 
   getSpender(reqSpender: string): string {
     let spender: string;
-    if (reqSpender === 'defira') {
-      spender = '0x3C8BF7e25EbfAaFb863256A4380A8a93490d8065';
-    } else if (reqSpender === 'openocean') {
+    if (reqSpender === 'openocean') {
       spender = OpenoceanConfig.config.routerAddress('ethereum', this._chain);
     } else if (reqSpender === 'sushiswap') {
       spender = SushiswapConfig.config.sushiswapRouterAddress(

diff --git a/src/chains/harmony/harmony.validators.ts b/src/chains/harmony/harmony.validators.ts
@@ -42,10 +42,7 @@ export const validateSpender: Validator = mkValidator(
   invalidSpenderError,
   (val) =>
     typeof val === 'string' &&
-    (val === 'sushiswap' ||
-      val === 'defira' ||
-      val === 'openocean' ||
-      isValidAddress(val))
+    (val === 'sushiswap' || val === 'openocean' || isValidAddress(val))
 );
 
 export const validateNonce: Validator = mkValidator(

diff --git a/src/chains/injective/injective.ts b/src/chains/injective/injective.ts
@@ -65,7 +65,7 @@ export interface InjectiveWallet {
 export class Injective {
   private static _instances: LRUCache<string, Injective>;
   private _ready: boolean = false;
-  private _initializing: boolean = false;
+  private _initialized: Promise<boolean> = Promise.resolve(false);
 
   private _network: Network;
   private _chainId: ChainId;
@@ -152,48 +152,56 @@ export class Injective {
   }
 
   public async init(): Promise<void> {
-    if (!this.ready() && !this._initializing) {
-      this._initializing = true;
-      // initialize nonce manager
-      await this._nonceManager.init(
-        async (address: string) => await this.getTransactionCount(address)
-      );
-      // start updating block number
-      this._blockUpdateIntervalID = setInterval(async () => {
-        await this.updateCurrentBlockNumber();
-      }, 2000) as unknown as number;
-
-      // get tokens
-      const rawMarkets = await this._spotApi.fetchMarkets();
-      for (const market of rawMarkets) {
-        if (market.baseToken) {
-          const token = {
-            address: '',
-            chainId: chainIdToInt(this._chainId),
-            name: market.baseToken.name,
-            decimals: market.baseToken.decimals,
-            symbol: market.baseToken.symbol,
-            denom: market.baseDenom,
-          };
-          this._symbolToToken[market.baseToken.symbol] = token;
-          this._denomToToken[market.baseDenom] = token;
-        }
+    await this._initialized; // Wait for any previous init() calls to complete
+    if (!this.ready()) {
+      // If we're not ready, this._initialized will be a Promise that resolves after init() completes
+      this._initialized = (async () => {
+        try {
+          // initialize nonce manager
+          await this._nonceManager.init(
+            async (address: string) => await this.getTransactionCount(address)
+          );
+          // start updating block number
+          this._blockUpdateIntervalID = setInterval(async () => {
+            await this.updateCurrentBlockNumber();
+          }, 2000) as unknown as number;
+
+          // get tokens
+          const rawMarkets = await this._spotApi.fetchMarkets();
+          for (const market of rawMarkets) {
+            if (market.baseToken) {
+              const token = {
+                address: '',
+                chainId: chainIdToInt(this._chainId),
+                name: market.baseToken.name,
+                decimals: market.baseToken.decimals,
+                symbol: market.baseToken.symbol,
+                denom: market.baseDenom,
+              };
+              this._symbolToToken[market.baseToken.symbol] = token;
+              this._denomToToken[market.baseDenom] = token;
+            }
 
-        if (market.quoteToken) {
-          const token = {
-            address: '',
-            chainId: chainIdToInt(this._chainId),
-            name: market.quoteToken.name,
-            decimals: market.quoteToken.decimals,
-            symbol: market.quoteToken.symbol,
-            denom: market.quoteDenom,
-          };
-          this._symbolToToken[market.quoteToken.symbol] = token;
-          this._denomToToken[market.quoteDenom] = token;
+            if (market.quoteToken) {
+              const token = {
+                address: '',
+                chainId: chainIdToInt(this._chainId),
+                name: market.quoteToken.name,
+                decimals: market.quoteToken.decimals,
+                symbol: market.quoteToken.symbol,
+                denom: market.quoteDenom,
+              };
+              this._symbolToToken[market.quoteToken.symbol] = token;
+              this._denomToToken[market.quoteDenom] = token;
+            }
+          }
+          return true;
+        } catch (e) {
+          logger.error(`Failed to initialize ${this.chainName} chain: ${e}`);
+          return false;
         }
-        this._ready = true;
-        this._initializing = false;
-      }
+      })();
+      this._ready = await this._initialized; // Wait for the initialization to complete
     }
     return;
   }

diff --git a/src/chains/near/near.base.ts b/src/chains/near/near.base.ts
@@ -42,8 +42,7 @@ export class NearBase {
   private _tokenMap: Record<string, TokenInfo> = {};
   // there are async values set in the constructor
   private _ready: boolean = false;
-  private _initializing: boolean = false;
-  private _initPromise: Promise<void> = Promise.resolve();
+  private _initialized: Promise<boolean> = Promise.resolve(false);
   private _keyStore: keyStores.InMemoryKeyStore;
   private _connection: Near | undefined;
 
@@ -107,18 +106,25 @@ export class NearBase {
   }
 
   async init(): Promise<void> {
-    if (!this.ready() && !this._initializing) {
-      this._initializing = true;
-      this._connection = await this.connectProvider();
-      this._initPromise = this.loadTokens(
-        this.tokenListSource,
-        this.tokenListType
-      ).then(() => {
-        this._ready = true;
-        this._initializing = false;
-      });
+    await this._initialized; // Wait for any previous init() calls to complete
+    if (!this.ready()) {
+      // If we're not ready, this._initialized will be a Promise that resolves after init() completes
+      this._initialized = (async () => {
+        try {
+          this._connection = await this.connectProvider();
+          await this.loadTokens(
+            this.tokenListSource,
+            this.tokenListType
+          )
+          return true;
+        } catch (e) {
+          logger.error(`Failed to initialize ${this.chainName} chain: ${e}`);
+          return false;
+        }
+      })();
+      this._ready = await this._initialized; // Wait for the initialization to complete
     }
-    return this._initPromise;
+    return;
   }
 
   async connectProvider(): Promise<Near> {
@@ -260,7 +266,7 @@ export class NearBase {
     }
     logger.info(
       `Raw balance of ${contract.contractId} for ` +
-        `${contract.account.accountId}: ${balance}`
+      `${contract.account.accountId}: ${balance}`
     );
     return balance;
   }