@across-protocol/sdk 4.4.0-alpha.8 → 4.4.0

package/dist/esm/src/arch/tvm/SpokeUtils.js

@@ -29,10 +29,10 @@ const FALLBACK_FILL_DEADLINE_BUFFER = 21600; // 6 hours in seconds
  * the value may have changed at the upgrade boundary. In that case, return
  * the greater of the current value and a conservative 6-hour fallback.
  */
-export async function getMaxFillDeadlineInRange(spokePool, startBlock, endBlock) {
+export async function getMaxFillDeadlineInRange(spokePool, startBlock, endBlock, eventSearchConfig) {
     const [fillDeadlineBuffer, upgrades] = await Promise.all([
         spokePool.fillDeadlineBuffer(),
-        get1967Upgrades(spokePool, startBlock, endBlock),
+        get1967Upgrades(spokePool, startBlock, endBlock, eventSearchConfig?.maxLookBack),
     ]);
     const currentBuffer = Number(fillDeadlineBuffer);
     if (upgrades.length > 0) {
@@ -51,13 +51,13 @@ export function getDepositIdAtBlock(_contract, _blockTag) {
  * TRON does not support historical eth_call, so event queries replace the
  * EVM binary-search over numberOfDeposits().
  */
-export async function findDepositBlock(spokePool, depositId, lowBlock, highBlock) {
+export async function findDepositBlock(spokePool, depositId, lowBlock, highBlock, eventSearchConfig) {
     if (isUnsafeDepositId(depositId)) {
         throw new Error(`Cannot search for depositId ${depositId}`);
     }
     highBlock ??= await spokePool.provider.getBlockNumber();
     assert(highBlock > lowBlock, `Block numbers out of range (${lowBlock} >= ${highBlock})`);
-    const events = await paginatedEventQuery(spokePool, spokePool.filters.FundsDeposited(null, null, null, null, null, depositId), { from: lowBlock, to: highBlock });
+    const events = await paginatedEventQuery(spokePool, spokePool.filters.FundsDeposited(null, null, null, null, null, depositId), { from: lowBlock, to: highBlock, maxLookBack: eventSearchConfig?.maxLookBack });
     if (events.length === 0) {
         return undefined;
     }
@@ -70,7 +70,7 @@ export async function findDepositBlock(spokePool, depositId, lowBlock, highBlock
  * status is reconstructed from on-chain events because TRON does not
  * support eth_call with historical blockTags.
  */
-export async function relayFillStatus(spokePool, relayData, blockTag = "latest", destinationChainId) {
+export async function relayFillStatus(spokePool, relayData, blockTag = "latest", destinationChainId, eventSearchConfig) {
     if (blockTag === "latest") {
         return evmRelayFillStatus(spokePool, relayData, blockTag, destinationChainId);
     }
@@ -84,16 +84,16 @@ export async function relayFillStatus(spokePool, relayData, blockTag = "latest",
     if (latestStatus === FillStatus.Unfilled) {
         return FillStatus.Unfilled;
     }
-    // Reconstruct from events up to the requested block.
-    const fromBlock = 0;
+    const fromBlock = eventSearchConfig?.from ?? 0;
     const toBlock = Number(blockTag);
-    const fillEvents = await paginatedEventQuery(spokePool, spokePool.filters.FilledRelay(null, null, null, null, null, relayData.originChainId, relayData.depositId), { from: fromBlock, to: toBlock });
+    const { maxLookBack } = eventSearchConfig ?? {};
+    const fillEvents = await paginatedEventQuery(spokePool, spokePool.filters.FilledRelay(null, null, null, null, null, relayData.originChainId, relayData.depositId), { from: fromBlock, to: toBlock, maxLookBack });
     if (fillEvents.length > 0) {
         return FillStatus.Filled;
     }
     // No fill before blockTag — check for slow fill requests.
     if (latestStatus >= FillStatus.RequestedSlowFill) {
-        const slowFillEvents = await paginatedEventQuery(spokePool, spokePool.filters.RequestedSlowFill(null, null, null, null, relayData.originChainId, relayData.depositId), { from: fromBlock, to: toBlock });
+        const slowFillEvents = await paginatedEventQuery(spokePool, spokePool.filters.RequestedSlowFill(null, null, null, null, relayData.originChainId, relayData.depositId), { from: fromBlock, to: toBlock, maxLookBack });
         if (slowFillEvents.length > 0) {
             return FillStatus.RequestedSlowFill;
         }
@@ -105,11 +105,11 @@ export async function relayFillStatus(spokePool, relayData, blockTag = "latest",
  * TRON does not support historical eth_call, so event queries replace the
  * EVM binary-search over fillStatuses().
  */
-export async function findFillBlock(spokePool, relayData, lowBlockNumber, highBlockNumber) {
+export async function findFillBlock(spokePool, relayData, lowBlockNumber, highBlockNumber, eventSearchConfig) {
     const { provider } = spokePool;
     highBlockNumber ??= await provider.getBlockNumber();
     assert(highBlockNumber > lowBlockNumber, `Block numbers out of range (${lowBlockNumber} >= ${highBlockNumber})`);
-    const events = await paginatedEventQuery(spokePool, spokePool.filters.FilledRelay(null, null, null, null, null, relayData.originChainId, relayData.depositId), { from: lowBlockNumber, to: highBlockNumber });
+    const events = await paginatedEventQuery(spokePool, spokePool.filters.FilledRelay(null, null, null, null, null, relayData.originChainId, relayData.depositId), { from: lowBlockNumber, to: highBlockNumber, maxLookBack: eventSearchConfig?.maxLookBack });
     if (events.length === 0) {
         return undefined;
     }
@@ -119,10 +119,10 @@ export async function findFillBlock(spokePool, relayData, lowBlockNumber, highBl
  * @notice Find the fill event for a deposit.
  * Queries fill events directly rather than binary-searching then re-querying.
  */
-export async function findFillEvent(spokePool, relayData, lowBlockNumber, highBlockNumber) {
+export async function findFillEvent(spokePool, relayData, lowBlockNumber, highBlockNumber, eventSearchConfig) {
     const { provider } = spokePool;
     highBlockNumber ??= await provider.getBlockNumber();
-    const events = await paginatedEventQuery(spokePool, spokePool.filters.FilledRelay(null, null, null, null, null, relayData.originChainId, relayData.depositId), { from: lowBlockNumber, to: highBlockNumber });
+    const events = await paginatedEventQuery(spokePool, spokePool.filters.FilledRelay(null, null, null, null, null, relayData.originChainId, relayData.depositId), { from: lowBlockNumber, to: highBlockNumber, maxLookBack: eventSearchConfig?.maxLookBack });
     if (events.length === 0) {
         return undefined;
     }

package/dist/esm/src/arch/tvm/SpokeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../../../src/arch/tvm/SpokeUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../../../src/arch/tvm/SpokeUtils.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/arch/tvm/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./SpokeUtils";
 export * from "./TransactionUtils";
+export * from "./MessageUtils";

package/dist/esm/src/arch/tvm/index.js

@@ -1,3 +1,4 @@
 export * from "./SpokeUtils";
 export * from "./TransactionUtils";
+export * from "./MessageUtils";
 //# sourceMappingURL=index.js.map

package/dist/esm/src/arch/tvm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/arch/tvm/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/arch/tvm/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC"}

package/dist/esm/src/caching/Arweave/ArweaveClient.d.ts

@@ -1,17 +1,33 @@
 import { JWKInterface } from "arweave/node/lib/wallet";
 import { Struct } from "superstruct";
 import winston from "winston";
-import { BigNumber } from "../../utils";
+import { BigNumber } from "../../utils/BigNumberUtils";
+export interface ArweaveGatewayConfig {
+    host: string;
+    protocol?: string;
+    port?: number;
+}
+export declare const DEFAULT_ARWEAVE_GATEWAYS: ArweaveGatewayConfig[];
 export declare class ArweaveClient {
     private arweaveJWT;
     private logger;
-    gatewayURL: string;
-    protocol: string;
     private readonly retries;
     private readonly retryDelaySeconds;
-    private client;
-    private gatewayUrl;
-    constructor(arweaveJWT: JWKInterface, logger: winston.Logger, gatewayURL?: string, protocol?: string, port?: number, retries?: number, retryDelaySeconds?: number);
+    private gateways;
+    constructor(arweaveJWT: JWKInterface, logger: winston.Logger, gateways?: ArweaveGatewayConfig[], retries?: number, retryDelaySeconds?: number);
+    /**
+     * Races a request across all gateways, returning the first successful response.
+     * If all gateways fail, throws an error with details from each gateway.
+     */
+    private _raceGateways;
+    /**
+     * Tries gateways sequentially, returning the first successful response.
+     * Used for write operations where we want exactly one successful submission.
+     */
+    private _failoverGateways;
+    private _retryRequest;
+    private _isNotFoundError;
+    private _wrapWriteError;
     /**
      * Stores an arbitrary record in the Arweave network. The record is stored as a JSON string and uses
      * JSON.stringify to convert the record to a string. The record has all of its big numbers converted
@@ -19,7 +35,6 @@ export declare class ArweaveClient {
      * @param value The value to store
      * @param topicTag An optional topic tag to add to the transaction
      * @returns The transaction ID of the stored value
-     * @
      */
     set(value: Record<string, unknown>, topicTag?: string | undefined): Promise<string | undefined>;
     /**
@@ -53,11 +68,11 @@ export declare class ArweaveClient {
      */
     getMetadata(transactionID: string): Promise<Record<string, string> | null>;
     /**
-     * Returns the address of the signer of the JWT
+     * Returns the address of the signer of the JWT. This is a local crypto
+     * operation and does not require a network call.
      * @returns The address of the signer in this client
      */
     getAddress(): Promise<string>;
-    private _retryRequest;
     /**
      * The balance of the signer
      * @returns The balance of the signer in winston units

package/dist/esm/src/caching/Arweave/ArweaveClient.js

@@ -1,42 +1,147 @@
 import Arweave from "arweave";
 import { create } from "superstruct";
 import { ARWEAVE_TAG_APP_NAME, ARWEAVE_TAG_APP_VERSION, DEFAULT_ARWEAVE_STORAGE_ADDRESS } from "../../constants";
-import { BigNumber, delay, fetchWithTimeout, isDefined, jsonReplacerWithBigNumbers, toBN } from "../../utils";
+import { BigNumber, toBN } from "../../utils/BigNumberUtils";
+import { delay } from "../../utils/common";
+import { fetchWithTimeout, isHttpError, postWithTimeout } from "../../utils/FetchUtils";
+import { jsonReplacerWithBigNumbers } from "../../utils/JSONUtils";
+import { isDefined } from "../../utils/TypeGuards";
+export const DEFAULT_ARWEAVE_GATEWAYS = [{ host: "arweave.net" }, { host: "ar-io.net" }];
+function decodeBase64UrlUtf8(value) {
+    // `/tx/{id}` returns tag names and values in RFC 4648 base64url form.
+    // Node's built-in `base64url` decoder handles the URL-safe alphabet and
+    // omitted padding for us, so this matches the SDK's
+    // `tag.get(..., { decode: true, string: true })` behavior without a custom transform.
+    return Buffer.from(value, "base64url").toString("utf-8");
+}
+class ArweaveWriteError extends Error {
+    phase;
+    gateway;
+    status;
+    constructor(message, phase, gateway, status) {
+        super(message);
+        this.phase = phase;
+        this.gateway = gateway;
+        this.status = status;
+        this.name = "ArweaveWriteError";
+    }
+}
 export class ArweaveClient {
     arweaveJWT;
     logger;
-    gatewayURL;
-    protocol;
     retries;
     retryDelaySeconds;
-    client;
-    gatewayUrl;
-    constructor(arweaveJWT, logger, gatewayURL = "arweave.net", protocol = "https", port = 443, retries = 2, retryDelaySeconds = 1) {
+    gateways;
+    constructor(arweaveJWT, logger, gateways = DEFAULT_ARWEAVE_GATEWAYS, retries = 2, retryDelaySeconds = 1) {
         this.arweaveJWT = arweaveJWT;
         this.logger = logger;
-        this.gatewayURL = gatewayURL;
-        this.protocol = protocol;
         this.retries = retries;
         this.retryDelaySeconds = retryDelaySeconds;
-        this.gatewayUrl = `${protocol}://${gatewayURL}:${port}`;
-        this.client = new Arweave({
-            host: gatewayURL,
-            port,
-            protocol,
-            timeout: 20000,
-            logging: false,
-        });
-        this.logger.debug({
-            at: "ArweaveClient:constructor",
-            message: "Arweave client initialized",
-            gateway: this.gatewayUrl,
-        });
+        if (gateways.length === 0) {
+            throw new Error("At least one gateway must be provided");
+        }
         if (this.retries < 0) {
             throw new Error(`retries cannot be < 0 and must be an integer. Currently set to ${this.retries}`);
         }
         if (this.retryDelaySeconds < 0) {
             throw new Error(`delay cannot be < 0. Currently set to ${this.retryDelaySeconds}`);
         }
+        this.gateways = gateways.map(({ host, protocol = "https", port = 443 }) => ({
+            client: new Arweave({ host, port, protocol, timeout: 20000, logging: false }),
+            url: `${protocol}://${host}:${port}`,
+        }));
+        this.logger.debug({
+            at: "ArweaveClient:constructor",
+            message: "Arweave client initialized",
+            gateways: this.gateways.map((g) => g.url),
+        });
+    }
+    /**
+     * Races a request across all gateways, returning the first successful response.
+     * If all gateways fail, throws an error with details from each gateway.
+     */
+    async _raceGateways(label, fn, topicTag) {
+        try {
+            return await Promise.any(this.gateways.map((gw) => this._retryRequest(() => fn(gw), 0, label, gw.url, topicTag)));
+        }
+        catch (e) {
+            if (e instanceof AggregateError) {
+                const details = this.gateways.map((gw, i) => `${gw.url}: ${e.errors[i]}`).join("; ");
+                throw new Error(`All Arweave gateways failed for ${label}: ${details}`);
+            }
+            throw e;
+        }
+    }
+    /**
+     * Tries gateways sequentially, returning the first successful response.
+     * Used for write operations where we want exactly one successful submission.
+     */
+    async _failoverGateways(label, fn, topicTag) {
+        const errors = [];
+        for (const [index, gw] of this.gateways.entries()) {
+            try {
+                return await this._retryRequest(() => fn(gw, index + 1), 0, label, gw.url, topicTag);
+            }
+            catch (e) {
+                const error = e instanceof Error ? e : new Error(String(e));
+                errors.push(error);
+                this.logger.debug({
+                    at: "ArweaveClient:failoverGateways",
+                    message: `Gateway ${gw.url} failed for ${label}, trying next gateway`,
+                    gateway: gw.url,
+                    attempt: index + 1,
+                    error: String(error),
+                });
+            }
+        }
+        const details = this.gateways.map((gw, i) => `${gw.url}: ${errors[i]}`).join("; ");
+        throw new Error(`All Arweave gateways failed for ${label}: ${details}`);
+    }
+    async _retryRequest(request, retryCount, label, gateway, topicTag) {
+        try {
+            return await request();
+        }
+        catch (e) {
+            if (retryCount < this.retries) {
+                // Implement a slightly aggressive exponential backoff to account for fierce parallelism.
+                const baseDelay = this.retryDelaySeconds * Math.pow(2, retryCount);
+                const delayS = baseDelay + baseDelay * Math.random();
+                this.logger.debug({
+                    at: "ArweaveClient:retryRequest",
+                    message: `Arweave request failed, retrying after waiting ${delayS} seconds`,
+                    label,
+                    gateway,
+                    topicTag,
+                    retryCount,
+                    retryAttempt: retryCount + 1,
+                    maxRetries: this.retries,
+                    nextRetryDelaySeconds: delayS,
+                    error: String(e),
+                });
+                await delay(delayS);
+                return this._retryRequest(request, retryCount + 1, label, gateway, topicTag);
+            }
+            else {
+                throw e;
+            }
+        }
+    }
+    _isNotFoundError(error) {
+        if (isHttpError(error)) {
+            return error.status === 404;
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        return /404/i.test(message);
+    }
+    _wrapWriteError(error, phase, gateway) {
+        if (error instanceof ArweaveWriteError) {
+            return error;
+        }
+        if (isHttpError(error)) {
+            return new ArweaveWriteError(error.message, phase, gateway, error.status);
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        return new ArweaveWriteError(message, phase, gateway);
     }
     /**
      * Stores an arbitrary record in the Arweave network. The record is stored as a JSON string and uses
@@ -45,41 +150,65 @@ export class ArweaveClient {
      * @param value The value to store
      * @param topicTag An optional topic tag to add to the transaction
      * @returns The transaction ID of the stored value
-     * @
      */
     async set(value, topicTag) {
-        const transaction = await this.client.createTransaction({ data: JSON.stringify(value, jsonReplacerWithBigNumbers) }, this.arweaveJWT);
-        // Add tags to the transaction
-        transaction.addTag("Content-Type", "application/json");
-        transaction.addTag("App-Name", ARWEAVE_TAG_APP_NAME);
-        transaction.addTag("App-Version", ARWEAVE_TAG_APP_VERSION.toString());
-        if (isDefined(topicTag)) {
-            transaction.addTag("Topic", topicTag);
-        }
-        // Sign the transaction
-        await this.client.transactions.sign(transaction, this.arweaveJWT);
-        // Send the transaction
-        const result = await this.client.transactions.post(transaction);
-        // Ensure that the result is successful
-        if (result.status !== 200) {
-            const message = result?.data?.error?.msg ?? "Unknown error";
-            this.logger.error({
-                at: "ArweaveClient:set",
-                message,
-                result,
-                txn: transaction.id,
-                address: await this.getAddress(),
-                balance: (await this.getBalance()).toString(),
-            });
-            throw new Error(message);
+        const payload = JSON.stringify(value, jsonReplacerWithBigNumbers);
+        let signedTransaction;
+        try {
+            return await this._failoverGateways("set", async ({ client, url }, attempt) => {
+                if (!signedTransaction) {
+                    let createdTransaction;
+                    try {
+                        createdTransaction = await client.createTransaction({ data: payload }, this.arweaveJWT);
+                    }
+                    catch (error) {
+                        throw this._wrapWriteError(error, "createTransaction", url);
+                    }
+                    createdTransaction.addTag("Content-Type", "application/json");
+                    createdTransaction.addTag("App-Name", ARWEAVE_TAG_APP_NAME);
+                    createdTransaction.addTag("App-Version", ARWEAVE_TAG_APP_VERSION.toString());
+                    if (isDefined(topicTag)) {
+                        createdTransaction.addTag("Topic", topicTag);
+                    }
+                    try {
+                        await client.transactions.sign(createdTransaction, this.arweaveJWT);
+                    }
+                    catch (error) {
+                        throw this._wrapWriteError(error, "sign", url);
+                    }
+                    signedTransaction = createdTransaction;
+                }
+                let result;
+                try {
+                    result = await client.transactions.post(signedTransaction);
+                }
+                catch (error) {
+                    throw this._wrapWriteError(error, "post", url);
+                }
+                if (result.status !== 200) {
+                    const message = result?.data?.error?.msg ?? result.statusText ?? `HTTP ${result.status}`;
+                    throw new ArweaveWriteError(message, "post", url, result.status);
+                }
+                this.logger.debug({
+                    at: "ArweaveClient:set",
+                    message: `Arweave transaction posted with ${signedTransaction.id}`,
+                    gateway: url,
+                    attempt,
+                    phase: "post",
+                    txn: signedTransaction.id,
+                });
+                return signedTransaction.id;
+            }, topicTag);
         }
-        else {
-            this.logger.debug({
+        catch (error) {
+            this.logger.warn({
                 at: "ArweaveClient:set",
-                message: `Arweave transaction posted with ${transaction.id}`,
+                message: "Failed to persist data to Arweave after exhausting all gateways",
+                topicTag,
+                error: String(error),
             });
+            throw error;
         }
-        return transaction.id;
     }
     /**
      * Retrieves a record from the Arweave network. The record is expected to be a JSON string and is
@@ -89,15 +218,12 @@ export class ArweaveClient {
      * @returns The record if it exists, otherwise null
      */
     async get(transactionID, validator) {
-        // Resolve the URL of the transaction
-        const transactionUrl = `${this.gatewayUrl}/${transactionID}`;
-        // We should query in via Axios directly to the gateway URL. The reasoning behind this is
+        // We query via fetchWithTimeout directly to the gateway URL. The reasoning behind this is
         // that the Arweave SDK's `getData` method is too slow and does not provide a way to set a timeout.
         // Therefore, something that could take milliseconds to complete could take tens of minutes.
-        const request = async () => {
-            return await fetchWithTimeout(transactionUrl, {}, {}, 20_000);
-        };
-        const data = await this._retryRequest(request, 0);
+        const data = await this._raceGateways("get", async ({ url }) => {
+            return await fetchWithTimeout(`${url}/${transactionID}`, {}, {}, 20_000);
+        });
         try {
             // We should validate the data and perform any logical coercion here.
             return create(data, validator);
@@ -136,14 +262,10 @@ export class ArweaveClient {
         ]
       ) { edges { node { id } } }
     }`;
-        const response = await this._retryRequest(async () => {
-            const response = await this.client.api.post("/graphql", { query });
-            if (!response.ok) {
-                throw new Error(`Arweave GraphQL request failed with status ${response.status}`);
-            }
-            return response;
-        }, 0);
-        const entries = response?.data?.data?.transactions?.edges ?? [];
+        const response = await this._raceGateways("getByTopic", async ({ url }) => {
+            return await postWithTimeout(`${url}/graphql`, { query }, {}, {}, 20_000);
+        }, tag);
+        const entries = response?.data?.transactions?.edges ?? [];
         this.logger.debug({
             at: "ArweaveClient:getByTopic",
             message: `Retrieved ${entries.length} matching transactions from Arweave`,
@@ -154,6 +276,7 @@ export class ArweaveClient {
                 appVersion: ARWEAVE_TAG_APP_VERSION,
             },
         });
+        const failures = [];
         const results = await Promise.all(entries.map(async (edge) => {
             try {
                 const data = await this.get(edge.node.id, validator);
@@ -165,13 +288,31 @@ export class ArweaveClient {
                     : null;
             }
             catch (e) {
-                this.logger.warn({
-                    at: "ArweaveClient:getByTopic",
-                    message: `Bad request for Arweave topic ${edge.node.id}: ${e}`,
-                });
+                failures.push({ hash: edge.node.id, error: e });
                 return null;
             }
         }));
+        const notFoundFailures = failures.filter(({ error }) => this._isNotFoundError(error));
+        const unexpectedFailures = failures.filter(({ error }) => !this._isNotFoundError(error));
+        if (notFoundFailures.length > 0) {
+            this.logger.debug({
+                at: "ArweaveClient:getByTopic",
+                message: `Skipped ${notFoundFailures.length} Arweave topic entries that were not yet available`,
+                tag,
+                transactions: notFoundFailures.map(({ hash }) => hash),
+            });
+        }
+        if (unexpectedFailures.length > 0) {
+            this.logger.warn({
+                at: "ArweaveClient:getByTopic",
+                message: `Failed to fetch ${unexpectedFailures.length} Arweave topic entries`,
+                tag,
+                failures: unexpectedFailures.map(({ hash, error }) => ({
+                    hash,
+                    error: String(error),
+                })),
+            });
+        }
         return results.filter(isDefined);
     }
     /**
@@ -180,14 +321,13 @@ export class ArweaveClient {
      * @returns The metadata of the transaction if it exists, otherwise null
      */
     async getMetadata(transactionID) {
-        const transaction = await this.client.transactions.get(transactionID);
+        const transaction = await this._raceGateways("getMetadata", async ({ url }) => {
+            return await fetchWithTimeout(`${url}/tx/${transactionID}`, {}, {}, 20_000);
+        });
         if (!isDefined(transaction)) {
             return null;
         }
-        const tags = Object.fromEntries(transaction.tags.map((tag) => [
-            tag.get("name", { decode: true, string: true }),
-            tag.get("value", { decode: true, string: true }),
-        ]));
+        const tags = Object.fromEntries((transaction.tags ?? []).map((tag) => [decodeBase64UrlUtf8(tag.name), decodeBase64UrlUtf8(tag.value)]));
         return {
             contentType: tags["Content-Type"],
             appName: tags["App-Name"],
@@ -195,33 +335,12 @@ export class ArweaveClient {
         };
     }
     /**
-     * Returns the address of the signer of the JWT
+     * Returns the address of the signer of the JWT. This is a local crypto
+     * operation and does not require a network call.
      * @returns The address of the signer in this client
      */
     getAddress() {
-        return this.client.wallets.jwkToAddress(this.arweaveJWT);
-    }
-    async _retryRequest(request, retryCount) {
-        try {
-            return await request();
-        }
-        catch (e) {
-            if (retryCount < this.retries) {
-                // Implement a slightly aggressive exponential backoff to account for fierce parallelism.
-                const baseDelay = this.retryDelaySeconds * Math.pow(2, retryCount); // ms; attempt = [0, 1, 2, ...]
-                const delayS = baseDelay + baseDelay * Math.random();
-                this.logger.debug({
-                    at: "ArweaveClient:retryRequest",
-                    message: `Arweave request failed, retrying after waiting ${delayS} seconds: ${e}`,
-                    retryCount,
-                });
-                await delay(delayS);
-                return this._retryRequest(request, retryCount + 1);
-            }
-            else {
-                throw e;
-            }
-        }
+        return this.gateways[0].client.wallets.jwkToAddress(this.arweaveJWT);
     }
     /**
      * The balance of the signer
@@ -229,9 +348,9 @@ export class ArweaveClient {
      */
     async getBalance() {
         const address = await this.getAddress();
-        const request = async () => {
-            const balanceInFloat = await this.client.wallets.getBalance(address);
-            // @dev The reason we add in the BN.from into this retry loop is because the client.getBalance call
+        return this._raceGateways("getBalance", async ({ client }) => {
+            const balanceInFloat = await client.wallets.getBalance(address);
+            // @dev The reason we add in the BN.from here is because the client.getBalance call
             // does not correctly throw an error if the request fails, instead it will return the error string as the
             // balanceInFloat.
             // Sometimes the balance is returned in scientific notation, so we need to
@@ -244,8 +363,7 @@ export class ArweaveClient {
             else {
                 return BigNumber.from(balanceInFloat);
             }
-        };
-        return await this._retryRequest(request, 0);
+        });
     }
 }
 //# sourceMappingURL=ArweaveClient.js.map