small axios fixes

Author: Iztok

packages/fasset-bots-common/src/utils/axios-utils.ts

@@ -63,11 +63,7 @@ export function createAxiosConfig(url: string, apiKey?: string, timeoutMs?: numb
         timeout: timeoutMs ?? DEFAULT_RATE_LIMIT_OPTIONS.timeoutMs,
         headers: {
             "Content-Type": "application/json",
-        },
-        validateStatus: function (status: number) {
-            /* istanbul ignore next */
-            return (status >= 200 && status < 300) || status == 500;
-        },
+        }
     };
     if (apiKey) {
         createAxiosConfig.headers ??= {};
@@ -77,7 +73,7 @@ export function createAxiosConfig(url: string, apiKey?: string, timeoutMs?: numb
     return createAxiosConfig;
 }
 
-export function createAxiosInstance(url: string, apiKey?: string, rateLimitOptions?: RateLimitOptions): RateLimitedAxiosInstance {
+export function createRateLimitedAxiosInstance(url: string, apiKey?: string, rateLimitOptions?: RateLimitOptions): RateLimitedAxiosInstance {
     return axiosRateLimit(axios.create(createAxiosConfig(url, apiKey, rateLimitOptions?.timeoutMs)), {
         ...DEFAULT_RATE_LIMIT_OPTIONS,
         ...rateLimitOptions,

packages/fasset-bots-core/src/mock/MockIndexer.ts

@@ -1,21 +1,18 @@
-import axios, { AxiosInstance } from "axios";
+import BN from "bn.js";
 import { BlockchainIndexerHelper } from "../underlying-chain/BlockchainIndexerHelper";
+import { ChainId } from "../underlying-chain/ChainId";
 import { IBlock, IBlockId, ITransaction } from "../underlying-chain/interfaces/IBlockChain";
 import { MockChain } from "./MockChain";
-import { ChainId } from "../underlying-chain/ChainId";
-import BN from "bn.js";
 
 export class MockIndexer extends BlockchainIndexerHelper {
     static deepCopyWithObjectCreate = true;
 
-    client: AxiosInstance;
     constructor(
         public indexerWebServerUrls: string[],
         public chainId: ChainId,
         public chain: MockChain
     ) {
         super(indexerWebServerUrls, chainId, [""]);
-        this.client = axios.create({});
     }
 
     finalizationBlocks: number = this.chain.finalizationBlocks;

packages/simple-wallet/src/blockchain-apis/UTXOBlockchainAPI.ts

@@ -1,4 +1,4 @@
-import { createAxiosInstance, tryWithClients } from "@flarenetwork/fasset-bots-common";
+import { createRateLimitedAxiosInstance, tryWithClients } from "@flarenetwork/fasset-bots-common";
 import { AxiosInstance, AxiosResponse } from "axios";
 import BN from "bn.js";
 import { getConfirmedAfter, getDustAmount } from "../chain-clients/utxo/UTXOUtils";
@@ -21,7 +21,7 @@ export class UTXOBlockchainAPI implements IBlockchainAPI {
 
     constructor(createConfig: WalletServiceConfigBase, chainType: ChainType) {
         for (const [index, url] of createConfig.urls.entries()) {
-            this.clients.push(createAxiosInstance(url, createConfig.apiTokenKeys?.[index], createConfig.rateLimitOptions));
+            this.clients.push(createRateLimitedAxiosInstance(url, createConfig.apiTokenKeys?.[index], createConfig.rateLimitOptions));
         }
         this.chainType = chainType;
     }

packages/simple-wallet/src/blockchain-apis/XRPBlockchainAPI.ts

@@ -1,4 +1,4 @@
-import { createAxiosInstance, tryWithClients } from "@flarenetwork/fasset-bots-common";
+import { createRateLimitedAxiosInstance, tryWithClients } from "@flarenetwork/fasset-bots-common";
 import { AxiosInstance, AxiosResponse } from "axios";
 import type { AccountInfoRequest, AccountInfoResponse, ServerInfoResponse, SubmitResponse, TxResponse } from "xrpl";
 import { BaseWalletConfig } from "../interfaces/IWalletTransaction";
@@ -8,7 +8,7 @@ export class XRPBlockchainAPI {
 
     constructor(createConfig: BaseWalletConfig) {
         for (const [index, url] of createConfig.urls.entries()) {
-            this.clients.push(createAxiosInstance(url, createConfig.apiTokenKeys?.[index], createConfig.rateLimitOptions));
+            this.clients.push(createRateLimitedAxiosInstance(url, createConfig.apiTokenKeys?.[index], createConfig.rateLimitOptions));
         }
     }
 

packages/simple-wallet/test/OTHER/utils.test.ts

@@ -1,4 +1,4 @@
-import { createAxiosInstance, DEFAULT_RATE_LIMIT_OPTIONS } from "@flarenetwork/fasset-bots-common";
+import { createRateLimitedAxiosInstance, DEFAULT_RATE_LIMIT_OPTIONS } from "@flarenetwork/fasset-bots-common";
 import { expect } from "chai";
 import fs from "fs";
 import { FeeStatsResponse, UTXOBlockHeightResponse } from "../../src/interfaces/IBlockchainAPI";
@@ -112,7 +112,7 @@ describe("Util tests", () => {
     });
 
     it.skip("Download historic fee stats", async () => {
-        const axiosClient = createAxiosInstance("https://blockbook-bitcoin.flare.network/api/v2/", undefined, DEFAULT_RATE_LIMIT_OPTIONS);
+        const axiosClient = createRateLimitedAxiosInstance("https://blockbook-bitcoin.flare.network/api/v2/", undefined, DEFAULT_RATE_LIMIT_OPTIONS);
         const res = await axiosClient.get<UTXOBlockHeightResponse>(``);
         const blockHeight = res.data.blockbook.bestHeight;