@across-protocol/sdk 4.3.111-alpha.0 → 4.3.111-alpha.1

package/dist/cjs/providers/solana/cachedRpcFactory.js

@@ -1,136 +1,94 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CachedSolanaRpcFactory = void 0;
-var tslib_1 = require("tslib");
-var rpc_transformers_1 = require("@solana/rpc-transformers");
-var superstruct_1 = require("superstruct");
-var baseRpcFactories_1 = require("./baseRpcFactories");
-var utils_1 = require("../utils");
-var utils_2 = require("../../utils");
-var retryRpcFactory_1 = require("./retryRpcFactory");
-var CachedSolanaRpcFactory = (function (_super) {
-    tslib_1.__extends(CachedSolanaRpcFactory, _super);
-    function CachedSolanaRpcFactory(providerCacheNamespace, redisClient) {
-        var retryConstructorParams = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            retryConstructorParams[_i - 2] = arguments[_i];
-        }
-        var _this = this;
-        var superParams = retryConstructorParams.slice(-2);
-        _this = _super.apply(this, superParams) || this;
-        _this.redisClient = redisClient;
-        var retryRpcFactory = new (retryRpcFactory_1.RetrySolanaRpcFactory.bind.apply(retryRpcFactory_1.RetrySolanaRpcFactory, tslib_1.__spreadArray([void 0], retryConstructorParams, false)))();
-        _this.retryTransport = retryRpcFactory.createTransport();
-        _this.retryRpcClient = retryRpcFactory.createRpcClient();
-        var cachePrefix = "".concat(providerCacheNamespace, ",").concat(new URL(_this.clusterUrl).hostname, ",").concat(_this.chainId);
-        _this.getTransactionCachePrefix = "".concat(cachePrefix, ":getTransaction,");
-        return _this;
+const rpc_transformers_1 = require("@solana/rpc-transformers");
+const superstruct_1 = require("superstruct");
+const baseRpcFactories_1 = require("./baseRpcFactories");
+const utils_1 = require("../utils");
+const utils_2 = require("../../utils");
+const retryRpcFactory_1 = require("./retryRpcFactory");
+class CachedSolanaRpcFactory extends baseRpcFactories_1.SolanaClusterRpcFactory {
+    redisClient;
+    getTransactionCachePrefix;
+    retryTransport;
+    retryRpcClient;
+    constructor(providerCacheNamespace, redisClient, ...retryConstructorParams) {
+        const superParams = retryConstructorParams.slice(-2);
+        super(...superParams);
+        this.redisClient = redisClient;
+        const retryRpcFactory = new retryRpcFactory_1.RetrySolanaRpcFactory(...retryConstructorParams);
+        this.retryTransport = retryRpcFactory.createTransport();
+        this.retryRpcClient = retryRpcFactory.createRpcClient();
+        const cachePrefix = `${providerCacheNamespace},${new URL(this.clusterUrl).hostname},${this.chainId}`;
+        this.getTransactionCachePrefix = `${cachePrefix}:getTransaction,`;
     }
-    CachedSolanaRpcFactory.prototype.createTransport = function () {
-        var _this = this;
-        return function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
+    createTransport() {
+        return async (...args) => {
+            const { method, params } = args[0].payload;
+            const cacheType = this.redisClient ? this.cacheType(method) : utils_1.CacheType.NONE;
+            if (cacheType === utils_1.CacheType.NONE) {
+                return this.retryTransport(...args);
+            }
+            const redisKey = this.buildRedisKey(method, params);
+            const redisResult = await this.redisClient?.get(redisKey);
+            if (redisResult) {
+                return JSON.parse(redisResult, utils_2.jsonReviverWithBigInts);
             }
-            return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var _a, method, params, cacheType, redisKey, redisResult;
-                var _b;
-                return tslib_1.__generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0:
-                            _a = args[0].payload, method = _a.method, params = _a.params;
-                            cacheType = this.redisClient ? this.cacheType(method) : utils_1.CacheType.NONE;
-                            if (cacheType === utils_1.CacheType.NONE) {
-                                return [2, this.retryTransport.apply(this, args)];
-                            }
-                            redisKey = this.buildRedisKey(method, params);
-                            return [4, ((_b = this.redisClient) === null || _b === void 0 ? void 0 : _b.get(redisKey))];
-                        case 1:
-                            redisResult = _c.sent();
-                            if (redisResult) {
-                                return [2, JSON.parse(redisResult, utils_2.jsonReviverWithBigInts)];
-                            }
-                            return [2, this.requestAndCacheFinalized.apply(this, args)];
-                    }
-                });
-            });
+            return this.requestAndCacheFinalized(...args);
         };
-    };
-    CachedSolanaRpcFactory.prototype.requestAndCacheFinalized = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
+    }
+    async requestAndCacheFinalized(...args) {
+        const { method, params } = args[0].payload;
+        if (method !== "getTransaction")
+            return this.retryTransport(...args);
+        if (!this.isGetTransactionParams(params))
+            return this.retryTransport(...args);
+        try {
+            const getSignatureStatusesResponse = await this.retryRpcClient
+                .getSignatureStatuses([params[0]], {
+                searchTransactionHistory: true,
+            })
+                .send();
+            if (getSignatureStatusesResponse.value[0]?.confirmationStatus !== "finalized") {
+                return this.retryTransport(...args);
+            }
+        }
+        catch (error) {
+            return this.retryTransport(...args);
+        }
+        const getTransactionResponse = await this.retryTransport(...args);
+        try {
+            (0, rpc_transformers_1.getThrowSolanaErrorResponseTransformer)()(getTransactionResponse, { methodName: method, params });
         }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, method, params, getSignatureStatusesResponse, error_1, getTransactionResponse, redisKey;
-            var _b, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        _a = args[0].payload, method = _a.method, params = _a.params;
-                        if (method !== "getTransaction")
-                            return [2, this.retryTransport.apply(this, args)];
-                        if (!this.isGetTransactionParams(params))
-                            return [2, this.retryTransport.apply(this, args)];
-                        _d.label = 1;
-                    case 1:
-                        _d.trys.push([1, 3, , 4]);
-                        return [4, this.retryRpcClient
-                                .getSignatureStatuses([params[0]], {
-                                searchTransactionHistory: true,
-                            })
-                                .send()];
-                    case 2:
-                        getSignatureStatusesResponse = _d.sent();
-                        if (((_b = getSignatureStatusesResponse.value[0]) === null || _b === void 0 ? void 0 : _b.confirmationStatus) !== "finalized") {
-                            return [2, this.retryTransport.apply(this, args)];
-                        }
-                        return [3, 4];
-                    case 3:
-                        error_1 = _d.sent();
-                        return [2, this.retryTransport.apply(this, args)];
-                    case 4: return [4, this.retryTransport.apply(this, args)];
-                    case 5:
-                        getTransactionResponse = _d.sent();
-                        try {
-                            (0, rpc_transformers_1.getThrowSolanaErrorResponseTransformer)()(getTransactionResponse, { methodName: method, params: params });
-                        }
-                        catch (_e) {
-                            return [2, getTransactionResponse];
-                        }
-                        redisKey = this.buildRedisKey(method, params);
-                        return [4, ((_c = this.redisClient) === null || _c === void 0 ? void 0 : _c.set(redisKey, JSON.stringify(getTransactionResponse, utils_2.jsonReplacerWithBigInts), Number.POSITIVE_INFINITY))];
-                    case 6:
-                        _d.sent();
-                        return [2, getTransactionResponse];
-                }
-            });
-        });
-    };
-    CachedSolanaRpcFactory.prototype.buildRedisKey = function (method, params) {
+        catch {
+            return getTransactionResponse;
+        }
+        const redisKey = this.buildRedisKey(method, params);
+        await this.redisClient?.set(redisKey, JSON.stringify(getTransactionResponse, utils_2.jsonReplacerWithBigInts), Number.POSITIVE_INFINITY);
+        return getTransactionResponse;
+    }
+    buildRedisKey(method, params) {
         switch (method) {
             case "getTransaction":
                 return this.getTransactionCachePrefix + JSON.stringify(params, utils_2.jsonReplacerWithBigInts);
             default:
-                throw new Error("CachedSolanaRpcFactory::buildRedisKey: invalid JSON-RPC method ".concat(method));
+                throw new Error(`CachedSolanaRpcFactory::buildRedisKey: invalid JSON-RPC method ${method}`);
         }
-    };
-    CachedSolanaRpcFactory.prototype.cacheType = function (method) {
+    }
+    cacheType(method) {
         if (method === "getTransaction") {
             return utils_1.CacheType.NO_TTL;
         }
         else {
             return utils_1.CacheType.NONE;
         }
-    };
-    CachedSolanaRpcFactory.prototype.isGetTransactionParams = function (params) {
+    }
+    isGetTransactionParams(params) {
         return (0, superstruct_1.is)(params, (0, superstruct_1.tuple)([
             (0, superstruct_1.string)(),
             (0, superstruct_1.optional)((0, superstruct_1.object)()),
         ]));
-    };
-    return CachedSolanaRpcFactory;
-}(baseRpcFactories_1.SolanaClusterRpcFactory));
+    }
+}
 exports.CachedSolanaRpcFactory = CachedSolanaRpcFactory;
 //# sourceMappingURL=cachedRpcFactory.js.map

package/dist/cjs/providers/solana/cachedRpcFactory.js.map

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

package/dist/cjs/providers/solana/defaultRpcFactory.js

@@ -1,22 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaDefaultRpcFactory = void 0;
-var tslib_1 = require("tslib");
-var kit_1 = require("@solana/kit");
-var baseRpcFactories_1 = require("./baseRpcFactories");
-var SolanaDefaultRpcFactory = (function (_super) {
-    tslib_1.__extends(SolanaDefaultRpcFactory, _super);
-    function SolanaDefaultRpcFactory() {
-        var clusterConstructorParams = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            clusterConstructorParams[_i] = arguments[_i];
-        }
-        return _super.apply(this, clusterConstructorParams) || this;
+const kit_1 = require("@solana/kit");
+const baseRpcFactories_1 = require("./baseRpcFactories");
+class SolanaDefaultRpcFactory extends baseRpcFactories_1.SolanaClusterRpcFactory {
+    constructor(...clusterConstructorParams) {
+        super(...clusterConstructorParams);
     }
-    SolanaDefaultRpcFactory.prototype.createTransport = function () {
+    createTransport() {
         return (0, kit_1.createDefaultRpcTransport)({ url: this.clusterUrl });
-    };
-    return SolanaDefaultRpcFactory;
-}(baseRpcFactories_1.SolanaClusterRpcFactory));
+    }
+}
 exports.SolanaDefaultRpcFactory = SolanaDefaultRpcFactory;
 //# sourceMappingURL=defaultRpcFactory.js.map

package/dist/cjs/providers/solana/defaultRpcFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultRpcFactory.js","sourceRoot":"","sources":["../../../../src/providers/solana/defaultRpcFactory.ts"],"names":[],"mappings":";;;;AAAA,mCAAsE;AACtE,uDAA6D;AAG7D;IAA6C,mDAAuB;IAClE;QAAY,kCAAkF;aAAlF,UAAkF,EAAlF,qBAAkF,EAAlF,IAAkF;YAAlF,6CAAkF;;QAC5F,OAAA,MAAK,aAAI,wBAAwB,UAAE;IACrC,CAAC;IAEM,iDAAe,GAAtB;QACE,OAAO,IAAA,+BAAyB,EAAC,EAAE,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAC7D,CAAC;IACH,8BAAC;AAAD,CAAC,AARD,CAA6C,0CAAuB,GAQnE;AARY,0DAAuB"}
+{"version":3,"file":"defaultRpcFactory.js","sourceRoot":"","sources":["../../../../src/providers/solana/defaultRpcFactory.ts"],"names":[],"mappings":";;;AAAA,qCAAsE;AACtE,yDAA6D;AAG7D,MAAa,uBAAwB,SAAQ,0CAAuB;IAClE,YAAY,GAAG,wBAA+E;QAC5F,KAAK,CAAC,GAAG,wBAAwB,CAAC,CAAC;IACrC,CAAC;IAEM,eAAe;QACpB,OAAO,IAAA,+BAAyB,EAAC,EAAE,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAC7D,CAAC;CACF;AARD,0DAQC"}

package/dist/cjs/providers/solana/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./baseRpcFactories"), exports);
 tslib_1.__exportStar(require("./cachedRpcFactory"), exports);
 tslib_1.__exportStar(require("./defaultRpcFactory"), exports);

package/dist/cjs/providers/solana/quorumFallbackRpcFactory.js

@@ -1,212 +1,156 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuorumFallbackSolanaRpcFactory = void 0;
-var tslib_1 = require("tslib");
-var TypeGuards_1 = require("../../utils/TypeGuards");
-var utils_1 = require("../utils");
-var cachedRpcFactory_1 = require("./cachedRpcFactory");
-var baseRpcFactories_1 = require("./baseRpcFactories");
-var utils_2 = require("./utils");
-var QuorumFallbackSolanaRpcFactory = (function (_super) {
-    tslib_1.__extends(QuorumFallbackSolanaRpcFactory, _super);
-    function QuorumFallbackSolanaRpcFactory(factoryConstructorParams, nodeQuorumThreshold, logger) {
-        var _this = _super.call(this) || this;
-        _this.nodeQuorumThreshold = nodeQuorumThreshold;
-        _this.logger = logger;
-        _this.rpcFactories = [];
-        factoryConstructorParams.forEach(function (params) {
-            var rpcFactory = new (cachedRpcFactory_1.CachedSolanaRpcFactory.bind.apply(cachedRpcFactory_1.CachedSolanaRpcFactory, tslib_1.__spreadArray([void 0], params, false)))();
-            _this.rpcFactories.push({
+const TypeGuards_1 = require("../../utils/TypeGuards");
+const utils_1 = require("../utils");
+const cachedRpcFactory_1 = require("./cachedRpcFactory");
+const baseRpcFactories_1 = require("./baseRpcFactories");
+const utils_2 = require("./utils");
+class QuorumFallbackSolanaRpcFactory extends baseRpcFactories_1.SolanaBaseRpcFactory {
+    nodeQuorumThreshold;
+    logger;
+    rpcFactories = [];
+    constructor(factoryConstructorParams, nodeQuorumThreshold, logger) {
+        super();
+        this.nodeQuorumThreshold = nodeQuorumThreshold;
+        this.logger = logger;
+        factoryConstructorParams.forEach((params) => {
+            const rpcFactory = new cachedRpcFactory_1.CachedSolanaRpcFactory(...params);
+            this.rpcFactories.push({
                 transport: rpcFactory.createTransport(),
                 rpcClient: rpcFactory.createRpcClient(),
-                rpcFactory: rpcFactory,
+                rpcFactory,
             });
         });
-        if (_this.nodeQuorumThreshold < 1 || !Number.isInteger(_this.nodeQuorumThreshold)) {
-            throw new Error("nodeQuorum,Threshold cannot be < 1 and must be an integer. Currently set to ".concat(_this.nodeQuorumThreshold));
+        if (this.nodeQuorumThreshold < 1 || !Number.isInteger(this.nodeQuorumThreshold)) {
+            throw new Error(`nodeQuorum,Threshold cannot be < 1 and must be an integer. Currently set to ${this.nodeQuorumThreshold}`);
         }
-        return _this;
     }
-    QuorumFallbackSolanaRpcFactory.prototype.createTransport = function () {
-        var _this = this;
-        return function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
+    createTransport() {
+        return async (...args) => {
+            const { method, params } = args[0].payload;
+            const quorumThreshold = this._getQuorum(method, params ?? []);
+            const requiredFactories = this.rpcFactories.slice(0, quorumThreshold);
+            const fallbackFactories = [...this.rpcFactories.slice(quorumThreshold)];
+            const errors = [];
+            const tryWithFallback = (factory, ...args) => {
+                return factory
+                    .transport(...args)
+                    .then((result) => [factory.rpcFactory, result])
+                    .catch((error) => {
+                    errors.push([factory.rpcFactory, error?.stack || error?.toString()]);
+                    if (fallbackFactories.length === 0) {
+                        throw error;
+                    }
+                    if (quorumThreshold === 1 && (0, utils_2.shouldFailImmediate)(method, error)) {
+                        throw new Error(`RPC provider reverted for method ${method}`);
+                    }
+                    const currentFactory = factory.rpcFactory.clusterUrl;
+                    const nextFactory = fallbackFactories.shift();
+                    this.logger.debug({
+                        at: "FallbackSolanaRpcFactory#createTransport::tryWithFallback",
+                        message: `[${method}] ${currentFactory} failed, falling back to ${nextFactory.rpcFactory.clusterUrl}, new fallback providers length: ${fallbackFactories.length}`,
+                        method,
+                        jsonError: error,
+                    });
+                    return tryWithFallback(nextFactory, ...args);
+                });
+            };
+            const results = await Promise.allSettled(requiredFactories.map((factory) => {
+                return tryWithFallback(factory, ...args);
+            }));
+            const getErrorStrings = () => {
+                return errors.map(([factory, errorText]) => `Provider ${factory.clusterUrl} failed to call ${method} with error ${errorText}`);
+            };
+            if (!results.every(TypeGuards_1.isPromiseFulfilled)) {
+                const errorTexts = getErrorStrings();
+                const successfulProviderUrls = results.filter(TypeGuards_1.isPromiseFulfilled).map((result) => result.value[0].clusterUrl);
+                throw (0, utils_1.createSendErrorWithMessage)(`Not enough providers succeeded on ${method} call. Errors:\n${errorTexts.join("\n")}\n` +
+                    `Successful Providers:\n${successfulProviderUrls.join("\n")}`, results.find(TypeGuards_1.isPromiseRejected)?.reason);
             }
-            return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var _a, method, params, quorumThreshold, requiredFactories, fallbackFactories, errors, tryWithFallback, results, getErrorStrings, errorTexts, successfulProviderUrls_1, values, getHighestCountResult, logQuorumMismatchOrFailureDetails, throwQuorumError, mostFrequentResult, fallbackResults, fallbackValues, _b, quorumResult, count, mismatchedProviders, successfulProviderUrls;
-                var _this = this;
-                var _c;
-                return tslib_1.__generator(this, function (_d) {
-                    switch (_d.label) {
-                        case 0:
-                            _a = args[0].payload, method = _a.method, params = _a.params;
-                            quorumThreshold = this._getQuorum(method, params !== null && params !== void 0 ? params : []);
-                            requiredFactories = this.rpcFactories.slice(0, quorumThreshold);
-                            fallbackFactories = tslib_1.__spreadArray([], this.rpcFactories.slice(quorumThreshold), true);
-                            errors = [];
-                            tryWithFallback = function (factory) {
-                                var args = [];
-                                for (var _i = 1; _i < arguments.length; _i++) {
-                                    args[_i - 1] = arguments[_i];
-                                }
-                                return factory
-                                    .transport.apply(factory, args).then(function (result) { return [factory.rpcFactory, result]; })
-                                    .catch(function (error) {
-                                    errors.push([factory.rpcFactory, (error === null || error === void 0 ? void 0 : error.stack) || (error === null || error === void 0 ? void 0 : error.toString())]);
-                                    if (fallbackFactories.length === 0) {
-                                        throw error;
-                                    }
-                                    if (quorumThreshold === 1 && (0, utils_2.shouldFailImmediate)(method, error)) {
-                                        throw new Error("RPC provider reverted for method ".concat(method));
-                                    }
-                                    var currentFactory = factory.rpcFactory.clusterUrl;
-                                    var nextFactory = fallbackFactories.shift();
-                                    _this.logger.debug({
-                                        at: "FallbackSolanaRpcFactory#createTransport::tryWithFallback",
-                                        message: "[".concat(method, "] ").concat(currentFactory, " failed, falling back to ").concat(nextFactory.rpcFactory.clusterUrl, ", new fallback providers length: ").concat(fallbackFactories.length),
-                                        method: method,
-                                        jsonError: error,
-                                    });
-                                    return tryWithFallback.apply(void 0, tslib_1.__spreadArray([nextFactory], args, false));
-                                });
-                            };
-                            return [4, Promise.allSettled(requiredFactories.map(function (factory) {
-                                    return tryWithFallback.apply(void 0, tslib_1.__spreadArray([factory], args, false));
-                                }))];
-                        case 1:
-                            results = _d.sent();
-                            getErrorStrings = function () {
-                                return errors.map(function (_a) {
-                                    var factory = _a[0], errorText = _a[1];
-                                    return "Provider ".concat(factory.clusterUrl, " failed to call ").concat(method, " with error ").concat(errorText);
-                                });
-                            };
-                            if (!results.every(TypeGuards_1.isPromiseFulfilled)) {
-                                errorTexts = getErrorStrings();
-                                successfulProviderUrls_1 = results.filter(TypeGuards_1.isPromiseFulfilled).map(function (result) { return result.value[0].clusterUrl; });
-                                throw (0, utils_1.createSendErrorWithMessage)("Not enough providers succeeded on ".concat(method, " call. Errors:\n").concat(errorTexts.join("\n"), "\n") +
-                                    "Successful Providers:\n".concat(successfulProviderUrls_1.join("\n")), (_c = results.find(TypeGuards_1.isPromiseRejected)) === null || _c === void 0 ? void 0 : _c.reason);
-                            }
-                            values = results.map(function (result) { return result.value; });
-                            if (values.slice(1).every(function (_a) {
-                                var output = _a[1];
-                                return (0, utils_1.compareSvmRpcResults)(method, values[0][1], output);
-                            })) {
-                                return [2, values[0][1]];
-                            }
-                            getHighestCountResult = function (values) {
-                                var counts = tslib_1.__spreadArray([], values, true).reduce(function (acc, curr) {
-                                    var result = curr[1];
-                                    var existingMatch = acc.find(function (_a) {
-                                        var existingResult = _a[0];
-                                        return (0, utils_1.compareSvmRpcResults)(method, existingResult, result);
-                                    });
-                                    if (existingMatch) {
-                                        existingMatch[1]++;
-                                    }
-                                    else {
-                                        acc.push([result, 1]);
-                                    }
-                                    return acc;
-                                }, [[undefined, 0]]);
-                                counts.sort(function (_a, _b) {
-                                    var a = _a[1];
-                                    var b = _b[1];
-                                    return b - a;
-                                });
-                                var _a = counts[0], mostFrequentResult = _a[0], count = _a[1];
-                                return [mostFrequentResult, count];
-                            };
-                            logQuorumMismatchOrFailureDetails = function (method, params, mismatchedProviders, successfulProviders, errors, quorumResult) {
-                                _this.logger.warn({
-                                    at: "FallbackSolanaRpcFactory#createTransport",
-                                    message: "[".concat(method, "] Some providers mismatched with the quorum result or failed \uD83D\uDEB8"),
-                                    notificationPath: "across-warn",
-                                    method: method,
-                                    params: JSON.stringify(params),
-                                    quorumResult: METHODS_RETURNING_BIGINT.includes(method) ? Number(quorumResult) : undefined,
-                                    mismatchedProviders: mismatchedProviders,
-                                    successfulProviders: successfulProviders,
-                                    erroringProviders: errors.map(function (_a) {
-                                        var factory = _a[0], errorText = _a[1];
-                                        return "Provider ".concat(factory.clusterUrl, " failed with error ").concat(errorText);
-                                    }),
-                                });
-                            };
-                            throwQuorumError = function (mostFrequentResult, allValues) {
-                                var errorTexts = getErrorStrings();
-                                var successfulProviderUrls = values.map(function (_a) {
-                                    var provider = _a[0];
-                                    return provider.clusterUrl;
-                                });
-                                var mismatchedProviders = allValues
-                                    .filter(function (_a) {
-                                    var result = _a[1];
-                                    return !(0, utils_1.compareSvmRpcResults)(method, result, mostFrequentResult);
-                                })
-                                    .map(function (_a) {
-                                    var factory = _a[0];
-                                    return factory.clusterUrl;
-                                });
-                                logQuorumMismatchOrFailureDetails(method, params !== null && params !== void 0 ? params : [], mismatchedProviders, successfulProviderUrls, errors, mostFrequentResult);
-                                throw new Error("Not enough providers agreed to meet quorum.\n" +
-                                    "Providers that errored:\n" +
-                                    "".concat(errorTexts.join("\n"), "\n") +
-                                    "Providers that succeeded, but some failed to match:\n" +
-                                    successfulProviderUrls.join("\n"));
-                            };
-                            if (fallbackFactories.length === 0) {
-                                mostFrequentResult = getHighestCountResult(values)[0];
-                                throwQuorumError(mostFrequentResult, values);
-                            }
-                            return [4, Promise.allSettled(fallbackFactories.map(function (factory) {
-                                    return factory
-                                        .transport.apply(factory, args).then(function (result) { return [factory.rpcFactory, result]; })
-                                        .catch(function (err) {
-                                        errors.push([factory.rpcFactory, (err === null || err === void 0 ? void 0 : err.stack) || (err === null || err === void 0 ? void 0 : err.toString())]);
-                                        throw new Error("Fallback RPC call failed while trying to reach quorum");
-                                    });
-                                }))];
-                        case 2:
-                            fallbackResults = _d.sent();
-                            fallbackValues = fallbackResults.filter(TypeGuards_1.isPromiseFulfilled).map(function (promise) { return promise.value; });
-                            _b = getHighestCountResult(tslib_1.__spreadArray(tslib_1.__spreadArray([], values, true), fallbackValues, true)), quorumResult = _b[0], count = _b[1];
-                            if (count < quorumThreshold) {
-                                throwQuorumError(quorumResult, tslib_1.__spreadArray(tslib_1.__spreadArray([], values, true), fallbackValues, true));
-                            }
-                            mismatchedProviders = tslib_1.__spreadArray(tslib_1.__spreadArray([], values, true), fallbackValues, true).filter(function (_a) {
-                                var result = _a[1];
-                                return !(0, utils_1.compareSvmRpcResults)(method, result, quorumResult);
-                            })
-                                .map(function (_a) {
-                                var factory = _a[0];
-                                return factory.clusterUrl;
-                            });
-                            successfulProviderUrls = tslib_1.__spreadArray(tslib_1.__spreadArray([], values, true), fallbackValues, true).map(function (_a) {
-                                var provider = _a[0];
-                                return provider.clusterUrl;
-                            });
-                            if (mismatchedProviders.length > 0 || errors.length > 0) {
-                                logQuorumMismatchOrFailureDetails(method, params !== null && params !== void 0 ? params : [], mismatchedProviders, successfulProviderUrls, errors, quorumResult);
-                            }
-                            return [2, quorumResult];
+            const values = results.map((result) => result.value);
+            if (values.slice(1).every(([, output]) => (0, utils_1.compareSvmRpcResults)(method, values[0][1], output))) {
+                return values[0][1];
+            }
+            const getHighestCountResult = (values) => {
+                const counts = [...values].reduce((acc, curr) => {
+                    const [, result] = curr;
+                    const existingMatch = acc.find(([existingResult]) => (0, utils_1.compareSvmRpcResults)(method, existingResult, result));
+                    if (existingMatch) {
+                        existingMatch[1]++;
+                    }
+                    else {
+                        acc.push([result, 1]);
                     }
+                    return acc;
+                }, [[undefined, 0]]);
+                counts.sort(([, a], [, b]) => b - a);
+                const [mostFrequentResult, count] = counts[0];
+                return [mostFrequentResult, count];
+            };
+            const logQuorumMismatchOrFailureDetails = (method, params, mismatchedProviders, successfulProviders, errors, quorumResult) => {
+                this.logger.warn({
+                    at: "FallbackSolanaRpcFactory#createTransport",
+                    message: `[${method}] Some providers mismatched with the quorum result or failed 🚸`,
+                    notificationPath: "across-warn",
+                    method,
+                    params: JSON.stringify(params),
+                    quorumResult: METHODS_RETURNING_BIGINT.includes(method) ? Number(quorumResult) : undefined,
+                    mismatchedProviders,
+                    successfulProviders,
+                    erroringProviders: errors.map(([factory, errorText]) => `Provider ${factory.clusterUrl} failed with error ${errorText}`),
                 });
-            });
+            };
+            const throwQuorumError = (mostFrequentResult, allValues) => {
+                const errorTexts = getErrorStrings();
+                const successfulProviderUrls = values.map(([provider]) => provider.clusterUrl);
+                const mismatchedProviders = allValues
+                    .filter(([, result]) => !(0, utils_1.compareSvmRpcResults)(method, result, mostFrequentResult))
+                    .map(([factory]) => factory.clusterUrl);
+                logQuorumMismatchOrFailureDetails(method, params ?? [], mismatchedProviders, successfulProviderUrls, errors, mostFrequentResult);
+                throw new Error("Not enough providers agreed to meet quorum.\n" +
+                    "Providers that errored:\n" +
+                    `${errorTexts.join("\n")}\n` +
+                    "Providers that succeeded, but some failed to match:\n" +
+                    successfulProviderUrls.join("\n"));
+            };
+            if (fallbackFactories.length === 0) {
+                const [mostFrequentResult] = getHighestCountResult(values);
+                throwQuorumError(mostFrequentResult, values);
+            }
+            const fallbackResults = await Promise.allSettled(fallbackFactories.map((factory) => {
+                return factory
+                    .transport(...args)
+                    .then((result) => [factory.rpcFactory, result])
+                    .catch((err) => {
+                    errors.push([factory.rpcFactory, err?.stack || err?.toString()]);
+                    throw new Error("Fallback RPC call failed while trying to reach quorum");
+                });
+            }));
+            const fallbackValues = fallbackResults.filter(TypeGuards_1.isPromiseFulfilled).map((promise) => promise.value);
+            const [quorumResult, count] = getHighestCountResult([...values, ...fallbackValues]);
+            if (count < quorumThreshold) {
+                throwQuorumError(quorumResult, [...values, ...fallbackValues]);
+            }
+            const mismatchedProviders = [...values, ...fallbackValues]
+                .filter(([, result]) => !(0, utils_1.compareSvmRpcResults)(method, result, quorumResult))
+                .map(([factory]) => factory.clusterUrl);
+            const successfulProviderUrls = [...values, ...fallbackValues].map(([provider]) => provider.clusterUrl);
+            if (mismatchedProviders.length > 0 || errors.length > 0) {
+                logQuorumMismatchOrFailureDetails(method, params ?? [], mismatchedProviders, successfulProviderUrls, errors, quorumResult);
+            }
+            return quorumResult;
         };
-    };
-    QuorumFallbackSolanaRpcFactory.prototype._getQuorum = function (method, _params) {
+    }
+    _getQuorum(method, _params) {
         switch (method) {
             case "getBlock":
             case "getBlockTime":
                 return this.nodeQuorumThreshold;
         }
         return 1;
-    };
-    return QuorumFallbackSolanaRpcFactory;
-}(baseRpcFactories_1.SolanaBaseRpcFactory));
+    }
+}
 exports.QuorumFallbackSolanaRpcFactory = QuorumFallbackSolanaRpcFactory;
-var METHODS_RETURNING_BIGINT = ["getBlockTime", "getSlot"];
+const METHODS_RETURNING_BIGINT = ["getBlockTime", "getSlot"];
 //# sourceMappingURL=quorumFallbackRpcFactory.js.map