Merge pull request #261 from hummingbot/development

fix/ add XRPL testnet fix to staging
hummingbot · Dec 26, 2023 · f771fb7 · f771fb7
2 parents 66bf142 + 7efa672
commit f771fb7
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 12 deletions.
diff --git a/src/chains/xrpl/xrpl.controllers.ts b/src/chains/xrpl/xrpl.controllers.ts
@@ -85,6 +85,7 @@ export class XRPLController {
     validateXRPLPollRequest(req);
 
     const initTime = Date.now();
+    await xrplish.ensureConnection();
     const currentLedgerIndex = await xrplish.getCurrentLedgerIndex();
     const txData = await xrplish.getTransaction(req.txHash);
     const txStatus = await xrplish.getTransactionStatusCode(txData);

diff --git a/src/chains/xrpl/xrpl.ts b/src/chains/xrpl/xrpl.ts
@@ -424,13 +424,17 @@ export class XRPL implements XRPLish {
 
   async getReserveInfo() {
     await this.ensureConnection();
-    const reserveInfoResp = await this._client.request({
-      command: 'server_info',
-    });
-    this._reserveBaseXrp =
-      reserveInfoResp.result.info.validated_ledger?.reserve_base_xrp ?? 0;
-    this._reserveIncrementXrp =
-      reserveInfoResp.result.info.validated_ledger?.reserve_inc_xrp ?? 0;
+    try {
+      const reserveInfoResp = await this._client.request({
+        command: 'server_info',
+      });
+      this._reserveBaseXrp =
+        reserveInfoResp.result.info.validated_ledger?.reserve_base_xrp ?? 0;
+      this._reserveIncrementXrp =
+        reserveInfoResp.result.info.validated_ledger?.reserve_inc_xrp ?? 0;
+    } catch (error) {
+      throw new Error("Can't get reserve info: " + String(error));
+    }
   }
 
   public get chain(): string {

diff --git a/src/templates/lists/xrpl_markets_testnet.json b/src/templates/lists/xrpl_markets_testnet.json
@@ -3,31 +3,39 @@
     "id": 1,
     "marketId": "SOLO-XRP",
     "baseIssuer": "rHZwvHEs56GCmHupwjA4RY7oPA3EoAJWuN",
+    "baseCode": "534F4C4F00000000000000000000000000000000",
     "quoteIssuer": "",
+    "quoteCode": "XRP",
     "baseTokenID": 3,
     "quoteTokenID": 0
   },
   {
     "id": 2,
     "marketId": "SOLO-USD",
     "baseIssuer": "rHZwvHEs56GCmHupwjA4RY7oPA3EoAJWuN",
+    "baseCode": "534F4C4F00000000000000000000000000000000",
     "quoteIssuer": "rh8LssQyeBdEXk7Zv86HxHrx8k2R2DBUrx",
+    "quoteCode": "USD",
     "baseTokenID": 3,
     "quoteTokenID": 2
   },
   {
     "id": 3,
     "marketId": "USD-XRP",
     "baseIssuer": "rh8LssQyeBdEXk7Zv86HxHrx8k2R2DBUrx",
+    "baseCode": "USD",
     "quoteIssuer": "",
+    "quoteCode": "XRP",
     "baseTokenID": 2,
     "quoteTokenID": 0
   },
   {
     "id": 4,
     "marketId": "USD-VND",
     "baseIssuer": "rh8LssQyeBdEXk7Zv86HxHrx8k2R2DBUrx",
+    "baseCode": "USD",
     "quoteIssuer": "rh8LssQyeBdEXk7Zv86HxHrx8k2R2DBUrx",
+    "quoteCode": "VND",
     "baseTokenID": 2,
     "quoteTokenID": 1
   }

diff --git a/src/templates/lists/xrpl_tokens_testnet.json b/src/templates/lists/xrpl_tokens_testnet.json
@@ -25,7 +25,7 @@
   },
   {
     "id": 3,
-    "code": "SOLO",
+    "code": "534F4C4F00000000000000000000000000000000",
     "issuer": "rHZwvHEs56GCmHupwjA4RY7oPA3EoAJWuN",
     "title": "Sologenic",
     "trustlines": 999,

diff --git a/src/templates/xrpl.yml b/src/templates/xrpl.yml
@@ -21,8 +21,8 @@ networks:
     marketListSource: "/home/gateway/conf/lists/xrpl_markets_devnet.json"
     nativeCurrencySymbol: "XRP"
 network: "xrpl"
-requestTimeout: 2000
-connectionTimeout: 2000
+requestTimeout: 5000
+connectionTimeout: 5000
 feeCushion: 1.2
 maxFeeXRP: "2"
 orderDbPath: "db/xrpl.level"

diff --git a/test/chains/xrpl/xrpl.routes.test.ts → test-bronze/chains/xrpl/xrpl.routes.test.ts b/test/chains/xrpl/xrpl.routes.test.ts → test-bronze/chains/xrpl/xrpl.routes.test.ts
diff --git a/test/chains/xrpl/xrpl.validator.test.ts → ...bronze/chains/xrpl/xrpl.validator.test.ts b/test/chains/xrpl/xrpl.validator.test.ts → ...bronze/chains/xrpl/xrpl.validator.test.ts
diff --git a/test/connectors/xrpl/xrpl.e2e.test.ts → test-bronze/connectors/xrpl/xrpl.e2e.test.ts b/test/connectors/xrpl/xrpl.e2e.test.ts → test-bronze/connectors/xrpl/xrpl.e2e.test.ts
@@ -4,7 +4,7 @@ import { Wallet } from 'xrpl';
 import { XRPL } from '../../../src/chains/xrpl/xrpl';
 import { XRPLCLOB } from '../../../src/connectors/xrpl/xrpl';
 import { getsSequenceNumberFromTxn } from '../../../src/connectors/xrpl/xrpl.utils';
-import { patch, unpatch } from '../../services/patch';
+import { patch, unpatch } from '../../../test/services/patch';
 import { Order } from '../../../src/connectors/xrpl/xrpl.types';
 
 let xrpl: XRPL;

diff --git a/test/connectors/xrpl/xrpl.routes.test.ts → ...ronze/connectors/xrpl/xrpl.routes.test.ts b/test/connectors/xrpl/xrpl.routes.test.ts → ...ronze/connectors/xrpl/xrpl.routes.test.ts
@@ -4,7 +4,7 @@ import { XRPL } from '../../../src/chains/xrpl/xrpl';
 import { XRPLCLOB } from '../../../src/connectors/xrpl/xrpl';
 import {} from '../../../src/chains/xrpl/xrpl.order-tracker';
 import { Order } from '../../../src/connectors/xrpl/xrpl.types';
-import { patch, unpatch } from '../../services/patch';
+import { patch, unpatch } from '../../../test/services/patch';
 
 let xrpl: XRPL;
 let xrplCLOB: XRPLCLOB;
@@ -293,6 +293,7 @@ beforeAll(async () => {
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 beforeEach(() => {
   patchConnect();
+  patchGetReserveInfo();
   patchFee();
   patchOrderTracking();
   patchCurrentBlockNumber();
@@ -403,6 +404,12 @@ const patchGasPrices = () => {
   });
 };
 
+const patchGetReserveInfo = () => {
+  patch(xrpl, 'getReserveInfo', async () => {
+    return Promise.resolve();
+  });
+};
+
 describe('GET /clob/markets', () => {
   it('should return 200 with proper request', async () => {
     patchMarkets();