@across-protocol/sdk 4.1.43 → 4.1.45-beta.0

package/dist/esm/addressAggregator/adapters/abstract.js

@@ -0,0 +1,80 @@
+import { __awaiter, __generator } from "tslib";
+import axios from "axios";
+var _a = process.env.ACROSS_USER_AGENT, ACROSS_USER_AGENT = _a === void 0 ? "across-protocol" : _a;
+var AbstractAdapter = /** @class */ (function () {
+    function AbstractAdapter(name, path, opts) {
+        var _a, _b, _c;
+        this.name = name;
+        this.path = path;
+        this.timeout = (_a = opts === null || opts === void 0 ? void 0 : opts.timeout) !== null && _a !== void 0 ? _a : 2000;
+        this.retries = (_b = opts === null || opts === void 0 ? void 0 : opts.retries) !== null && _b !== void 0 ? _b : 1;
+        this.throw = (_c = opts === null || opts === void 0 ? void 0 : opts.throwOnError) !== null && _c !== void 0 ? _c : true;
+        this.logger = opts === null || opts === void 0 ? void 0 : opts.logger;
+    }
+    AbstractAdapter.prototype.sleep = function (ms) {
+        return new Promise(function (r) { return setTimeout(r, ms); });
+    };
+    AbstractAdapter.prototype.fetch = function (name, url, timeout, retries) {
+        if (timeout === void 0) { timeout = 2000; }
+        if (retries === void 0) { retries = 1; }
+        return __awaiter(this, void 0, void 0, function () {
+            var args, errs, tries, err_1, errMsg;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        args = {
+                            headers: { "User-Agent": ACROSS_USER_AGENT },
+                            timeout: timeout,
+                        };
+                        errs = [];
+                        tries = 0;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 6]);
+                        return [4 /*yield*/, axios(url, args)];
+                    case 2: return [2 /*return*/, (_a.sent()).data];
+                    case 3:
+                        err_1 = _a.sent();
+                        errMsg = axios.isAxiosError(err_1) || err_1 instanceof Error ? err_1.message : "unknown error";
+                        errs.push(errMsg);
+                        if (!(++tries <= retries)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.sleep(Math.pow(1.5, tries) * 1000)];
+                    case 4:
+                        _a.sent(); // simple backoff
+                        _a.label = 5;
+                    case 5: return [3 /*break*/, 6];
+                    case 6:
+                        if (tries <= retries) return [3 /*break*/, 1];
+                        _a.label = 7;
+                    case 7: throw new Error("".concat(name, " retrieval failure (").concat(errs.join(", "), ")"));
+                }
+            });
+        });
+    };
+    AbstractAdapter.prototype.error = function (error) {
+        var _a;
+        if (this.throw) {
+            throw error;
+        }
+        var reason;
+        if (error instanceof Error) {
+            reason = error.message;
+        }
+        else {
+            reason = typeof error === "string" ? error : "unknown error";
+        }
+        var _b = this, name = _b.name, path = _b.path, timeout = _b.timeout, retries = _b.retries;
+        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.warn({
+            at: "".concat(name, "::update"),
+            message: "Failed to read addresses from ".concat(name, "."),
+            reason: reason,
+            path: path,
+            retries: retries,
+            timeout: timeout,
+        });
+        return Promise.resolve([]);
+    };
+    return AbstractAdapter;
+}());
+export { AbstractAdapter };
+//# sourceMappingURL=abstract.js.map

package/dist/esm/addressAggregator/adapters/abstract.js.map

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

package/dist/esm/addressAggregator/adapters/bybit.d.ts

@@ -1,10 +1,6 @@
-import { AddressListAdapter } from "../types";
-import { Logger } from "./util";
-export declare class AddressList implements AddressListAdapter {
-    readonly url: string;
-    readonly timeout = 2000;
-    readonly retries = 1;
-    readonly name = "bybit";
-    constructor(url?: string);
-    update(logger?: Logger): Promise<string[]>;
+import { AdapterOptions } from "../types";
+import { AbstractAdapter } from "./abstract";
+export declare class AddressList extends AbstractAdapter {
+    constructor(opts?: AdapterOptions);
+    update(): Promise<string[]>;
 }

package/dist/esm/addressAggregator/adapters/bybit.js

@@ -1,6 +1,7 @@
-import { __awaiter, __generator, __spreadArray } from "tslib";
+import { __awaiter, __extends, __generator, __spreadArray } from "tslib";
 import { array, defaulted, string, type } from "superstruct";
-import { logError, fetch } from "./util";
+import { AbstractAdapter } from "./abstract";
+var DEFAULT_NAME = "bybit";
 var DEFAULT_URL = "https://hackscan.hackbounty.io/public/hack-address.json";
 // This type is a bit message and unweildy. Additional fields representing new chains may be added without notification.
 var bybitResponse = type({
@@ -10,25 +11,23 @@ var bybitResponse = type({
         arbi: defaulted(array(string()), []),
     }),
 });
-var AddressList = /** @class */ (function () {
-    function AddressList(url) {
-        if (url === void 0) { url = DEFAULT_URL; }
-        this.url = url;
-        this.timeout = 2000; // ms
-        this.retries = 1;
-        this.name = "bybit";
+var AddressList = /** @class */ (function (_super) {
+    __extends(AddressList, _super);
+    function AddressList(opts) {
+        var _a, _b;
+        return _super.call(this, (_a = opts === null || opts === void 0 ? void 0 : opts.name) !== null && _a !== void 0 ? _a : DEFAULT_NAME, (_b = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _b !== void 0 ? _b : DEFAULT_URL, opts) || this;
     }
-    AddressList.prototype.update = function (logger) {
+    AddressList.prototype.update = function () {
         return __awaiter(this, void 0, void 0, function () {
             var response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, fetch(this.name, this.url, this.timeout, this.retries)];
+                    case 0: return [4 /*yield*/, this.fetch(this.name, this.path, this.timeout, this.retries)];
                     case 1:
                         response = _a.sent();
                         if (!bybitResponse.is(response)) {
                             // nb. don't log the response because it might be very large.
-                            return [2 /*return*/, logError(this.name, "Failed to validate response", logger)];
+                            return [2 /*return*/, this.error("Failed to validate response")];
                         }
                         return [2 /*return*/, __spreadArray(__spreadArray(__spreadArray([], response["0221"].eth, true), response["0221"].bsc, true), response["0221"].arbi, true)];
                 }
@@ -36,6 +35,6 @@ var AddressList = /** @class */ (function () {
         });
     };
     return AddressList;
-}());
+}(AbstractAdapter));
 export { AddressList };
 //# sourceMappingURL=bybit.js.map

package/dist/esm/addressAggregator/adapters/bybit.js.map

@@ -1 +1 @@
-{"version":3,"file":"bybit.js","sourceRoot":"","sources":["../../../../src/addressAggregator/adapters/bybit.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAE7D,OAAO,EAAE,QAAQ,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEjD,IAAM,WAAW,GAAG,yDAAyD,CAAC;AAE9E,wHAAwH;AACxH,IAAM,aAAa,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,IAAI,CAAC;QACX,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;KACrC,CAAC;CACH,CAAC,CAAC;AAEH;IAKE,qBAAqB,GAAiB;QAAjB,oBAAA,EAAA,iBAAiB;QAAjB,QAAG,GAAH,GAAG,CAAc;QAJ7B,YAAO,GAAG,IAAI,CAAC,CAAC,KAAK;QACrB,YAAO,GAAG,CAAC,CAAC;QACZ,SAAI,GAAG,OAAO,CAAC;IAEiB,CAAC;IAEpC,4BAAM,GAAZ,UAAa,MAAe;;;;;4BACT,qBAAM,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAA;;wBAAvE,QAAQ,GAAG,SAA4D;wBAC7E,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;4BAC/B,6DAA6D;4BAC7D,sBAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,6BAA6B,EAAE,MAAM,CAAC,EAAC;yBACnE;wBAED,oEAAW,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,SAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,SAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,SAAE;;;;KACrF;IACH,kBAAC;AAAD,CAAC,AAhBD,IAgBC"}
+{"version":3,"file":"bybit.js","sourceRoot":"","sources":["../../../../src/addressAggregator/adapters/bybit.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,IAAM,YAAY,GAAG,OAAO,CAAC;AAC7B,IAAM,WAAW,GAAG,yDAAyD,CAAC;AAE9E,wHAAwH;AACxH,IAAM,aAAa,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,IAAI,CAAC;QACX,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;KACrC,CAAC;CACH,CAAC,CAAC;AAEH;IAAiC,+BAAe;IAC9C,qBAAY,IAAqB;;eAC/B,kBAAM,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,YAAY,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,WAAW,EAAE,IAAI,CAAC;IACpE,CAAC;IAEK,4BAAM,GAAZ;;;;;4BACmB,qBAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAA;;wBAA7E,QAAQ,GAAG,SAAkE;wBACnF,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;4BAC/B,6DAA6D;4BAC7D,sBAAO,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,EAAC;yBAClD;wBAED,oEAAW,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,SAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,SAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,SAAE;;;;KACrF;IACH,kBAAC;AAAD,CAAC,AAdD,CAAiC,eAAe,GAc/C"}

package/dist/esm/addressAggregator/adapters/env.d.ts

@@ -1,8 +1,6 @@
-import { AddressListAdapter } from "../types";
-import { Logger } from "./util";
-export declare class AddressList implements AddressListAdapter {
-    readonly envVar: string;
-    readonly name = "process.env";
-    constructor(envVar?: string);
-    update(logger?: Logger): Promise<string[]>;
+import { AdapterOptions } from "../types";
+import { AbstractAdapter } from "./abstract";
+export declare class AddressList extends AbstractAdapter {
+    constructor(opts?: AdapterOptions);
+    update(): Promise<string[]>;
 }

package/dist/esm/addressAggregator/adapters/env.js

@@ -1,14 +1,15 @@
+import { __extends } from "tslib";
 import { array, defaulted, string } from "superstruct";
-import { logError } from "./util";
+import { AbstractAdapter } from "./abstract";
 var envConfig = defaulted(array(string()), []);
-var AddressList = /** @class */ (function () {
-    function AddressList(envVar) {
-        if (envVar === void 0) { envVar = "ACROSS_IGNORED_ADDRESSES"; }
-        this.envVar = envVar;
-        this.name = "process.env";
+var AddressList = /** @class */ (function (_super) {
+    __extends(AddressList, _super);
+    function AddressList(opts) {
+        var _a, _b;
+        return _super.call(this, (_a = opts === null || opts === void 0 ? void 0 : opts.name) !== null && _a !== void 0 ? _a : "process.env", (_b = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _b !== void 0 ? _b : "ACROSS_IGNORED_ADDRESSES", opts) || this;
     }
-    AddressList.prototype.update = function (logger) {
-        var config = process.env[this.envVar];
+    AddressList.prototype.update = function () {
+        var config = process.env[this.path];
         if (!config) {
             return Promise.resolve([]);
         }
@@ -16,15 +17,15 @@ var AddressList = /** @class */ (function () {
         try {
             addresses = JSON.parse(config);
             if (!envConfig.is(addresses)) {
-                return logError(this.name, "Address format validation failure.", logger);
+                return this.error("Address format validation failure.");
             }
         }
         catch (err) {
-            return logError(this.name, err, logger);
+            return this.error(err);
         }
         return Promise.resolve(addresses);
     };
     return AddressList;
-}());
+}(AbstractAdapter));
 export { AddressList };
 //# sourceMappingURL=env.js.map

package/dist/esm/addressAggregator/adapters/env.js.map

@@ -1 +1 @@
-{"version":3,"file":"env.js","sourceRoot":"","sources":["../../../../src/addressAggregator/adapters/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAU,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAE1C,IAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAEjD;IAGE,qBAAqB,MAAmC;QAAnC,uBAAA,EAAA,mCAAmC;QAAnC,WAAM,GAAN,MAAM,CAA6B;QAF/C,SAAI,GAAG,aAAa,CAAC;IAE6B,CAAC;IAE5D,4BAAM,GAAN,UAAO,MAAe;QACpB,IAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAC5B;QAED,IAAI,SAAkB,CAAC;QACvB,IAAI;YACF,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE;gBAC5B,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,oCAAoC,EAAE,MAAM,CAAC,CAAC;aAC1E;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;SACzC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACH,kBAAC;AAAD,CAAC,AAvBD,IAuBC"}
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../../../../src/addressAggregator/adapters/env.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,IAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAEjD;IAAiC,+BAAe;IAC9C,qBAAY,IAAqB;;eAC/B,kBAAM,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,aAAa,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,0BAA0B,EAAE,IAAI,CAAC;IACpF,CAAC;IAED,4BAAM,GAAN;QACE,IAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAC5B;QAED,IAAI,SAAkB,CAAC;QACvB,IAAI;YACF,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE;gBAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;aACzD;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACxB;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACH,kBAAC;AAAD,CAAC,AAvBD,CAAiC,eAAe,GAuB/C"}

package/dist/esm/addressAggregator/adapters/file.d.ts

@@ -1,8 +1,6 @@
-import { AddressListAdapter } from "../types";
-import { Logger } from "./util";
-export declare class AddressList implements AddressListAdapter {
-    readonly path: string;
-    readonly name: string;
-    constructor(path?: string);
-    update(logger?: Logger): Promise<string[]>;
+import { AdapterOptions } from "../types";
+import { AbstractAdapter } from "./abstract";
+export declare class AddressList extends AbstractAdapter {
+    constructor(opts?: AdapterOptions);
+    update(): Promise<string[]>;
 }

package/dist/esm/addressAggregator/adapters/file.js

@@ -1,15 +1,16 @@
-import { __awaiter, __generator } from "tslib";
+import { __awaiter, __extends, __generator } from "tslib";
 import { readFile } from "node:fs/promises";
 import { array, defaulted, string } from "superstruct";
-import { logError } from "./util";
+import { AbstractAdapter } from "./abstract";
 var fileConfig = defaulted(array(string()), []);
-var AddressList = /** @class */ (function () {
-    function AddressList(path) {
-        if (path === void 0) { path = "./addresses.json"; }
-        this.path = path;
-        this.name = "fs:".concat(path);
+var AddressList = /** @class */ (function (_super) {
+    __extends(AddressList, _super);
+    function AddressList(opts) {
+        var _a;
+        var _b = (opts !== null && opts !== void 0 ? opts : {}).path, path = _b === void 0 ? "addresses.json" : _b;
+        return _super.call(this, (_a = opts === null || opts === void 0 ? void 0 : opts.name) !== null && _a !== void 0 ? _a : "fs:".concat(path), path, opts) || this;
     }
-    AddressList.prototype.update = function (logger) {
+    AddressList.prototype.update = function () {
         return __awaiter(this, void 0, void 0, function () {
             var data, err_1, addresses;
             return __generator(this, function (_a) {
@@ -22,19 +23,19 @@ var AddressList = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 2:
                         err_1 = _a.sent();
-                        return [2 /*return*/, logError(this.name, err_1, logger)];
+                        return [2 /*return*/, this.error(err_1)];
                     case 3:
                         if (!data) {
-                            return [2 /*return*/, logError(this.name, "No addresses found in \"".concat(this.path, "\""), logger)];
+                            return [2 /*return*/, this.error("No addresses found")];
                         }
                         try {
                             addresses = JSON.parse(data);
                             if (!fileConfig.is(addresses)) {
-                                return [2 /*return*/, logError(this.name, "Address format validation failure.", logger)];
+                                return [2 /*return*/, this.error("Address format validation failure.")];
                             }
                         }
                         catch (err) {
-                            return [2 /*return*/, logError(this.name, err, logger)];
+                            return [2 /*return*/, this.error(err)];
                         }
                         return [2 /*return*/, Promise.resolve(addresses)];
                 }
@@ -42,6 +43,6 @@ var AddressList = /** @class */ (function () {
         });
     };
     return AddressList;
-}());
+}(AbstractAdapter));
 export { AddressList };
 //# sourceMappingURL=file.js.map

package/dist/esm/addressAggregator/adapters/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../src/addressAggregator/adapters/file.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAU,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAE1C,IAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAElD;IAGE,qBAAqB,IAAyB;QAAzB,qBAAA,EAAA,yBAAyB;QAAzB,SAAI,GAAJ,IAAI,CAAqB;QAC5C,IAAI,CAAC,IAAI,GAAG,aAAM,IAAI,CAAE,CAAC;IAC3B,CAAC;IAEK,4BAAM,GAAZ,UAAa,MAAe;;;;;;;wBAGjB,qBAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAA;;wBAAtD,IAAI,GAAG,SAA+C,CAAC;;;;wBAEvD,sBAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAG,EAAE,MAAM,CAAC,EAAC;;wBAG1C,IAAI,CAAC,IAAI,EAAE;4BACT,sBAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,kCAA0B,IAAI,CAAC,IAAI,OAAG,EAAE,MAAM,CAAC,EAAC;yBAC5E;wBAGD,IAAI;4BACF,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;4BAC7B,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE;gCAC7B,sBAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,oCAAoC,EAAE,MAAM,CAAC,EAAC;6BAC1E;yBACF;wBAAC,OAAO,GAAG,EAAE;4BACZ,sBAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAC;yBACzC;wBAED,sBAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAC;;;;KACnC;IACH,kBAAC;AAAD,CAAC,AA/BD,IA+BC"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../src/addressAggregator/adapters/file.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,IAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAElD;IAAiC,+BAAe;IAC9C,qBAAY,IAAqB;;QACvB,IAAA,KAA4B,CAAA,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAA,KAAf,EAAvB,IAAI,mBAAG,gBAAgB,KAAA,CAAgB;eAC/C,kBAAM,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,aAAM,IAAI,CAAE,EAAE,IAAI,EAAE,IAAI,CAAC;IAC/C,CAAC;IAEK,4BAAM,GAAZ;;;;;;;wBAGW,qBAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAA;;wBAAtD,IAAI,GAAG,SAA+C,CAAC;;;;wBAEvD,sBAAO,IAAI,CAAC,KAAK,CAAC,KAAG,CAAC,EAAC;;wBAGzB,IAAI,CAAC,IAAI,EAAE;4BACT,sBAAO,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAC;yBACzC;wBAGD,IAAI;4BACF,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;4BAC7B,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE;gCAC7B,sBAAO,IAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,EAAC;6BACzD;yBACF;wBAAC,OAAO,GAAG,EAAE;4BACZ,sBAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAC;yBACxB;wBAED,sBAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAC;;;;KACnC;IACH,kBAAC;AAAD,CAAC,AA9BD,CAAiC,eAAe,GA8B/C"}

package/dist/esm/addressAggregator/adapters/risklabs.d.ts

@@ -1,10 +1,6 @@
-import { AddressListAdapter } from "../types";
-import { Logger } from "./util";
-export declare class AddressList implements AddressListAdapter {
-    readonly name: string;
-    readonly url: string;
-    readonly timeout = 2000;
-    readonly retries = 1;
-    constructor(name?: string, url?: string);
-    update(logger?: Logger): Promise<string[]>;
+import { AdapterOptions } from "../types";
+import { AbstractAdapter } from "./abstract";
+export declare class AddressList extends AbstractAdapter {
+    constructor(opts?: AdapterOptions);
+    update(): Promise<string[]>;
 }

package/dist/esm/addressAggregator/adapters/risklabs.js

@@ -1,28 +1,32 @@
-import { __awaiter, __generator } from "tslib";
+import { __awaiter, __extends, __generator } from "tslib";
 import { array, string } from "superstruct";
-import { logError, fetch } from "./util";
+import { AbstractAdapter } from "./abstract";
 var RESPONSE_TYPE = array(string());
 var DEFAULT_NAME = "Risk Labs";
 var DEFAULT_URL = "https://blacklist.risklabs.foundation/api/blacklist";
-var AddressList = /** @class */ (function () {
-    function AddressList(name, url) {
-        if (name === void 0) { name = DEFAULT_NAME; }
-        if (url === void 0) { url = DEFAULT_URL; }
-        this.name = name;
-        this.url = url;
-        this.timeout = 2000; // ms
-        this.retries = 1;
+var AddressList = /** @class */ (function (_super) {
+    __extends(AddressList, _super);
+    function AddressList(opts) {
+        var _a, _b;
+        return _super.call(this, (_a = opts === null || opts === void 0 ? void 0 : opts.name) !== null && _a !== void 0 ? _a : DEFAULT_NAME, (_b = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _b !== void 0 ? _b : DEFAULT_URL, opts) || this;
     }
-    AddressList.prototype.update = function (logger) {
+    AddressList.prototype.update = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var response;
+            var response, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, fetch(this.name, this.url, this.timeout, this.retries)];
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, this.fetch(this.name, this.path, this.timeout, this.retries)];
                     case 1:
                         response = _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        err_1 = _a.sent();
+                        return [2 /*return*/, this.error(err_1)];
+                    case 3:
                         if (!RESPONSE_TYPE.is(response)) {
-                            return [2 /*return*/, logError(this.name, "Failed to validate response", logger)];
+                            return [2 /*return*/, this.error("Failed to validate response")];
                         }
                         return [2 /*return*/, response];
                 }
@@ -30,6 +34,6 @@ var AddressList = /** @class */ (function () {
         });
     };
     return AddressList;
-}());
+}(AbstractAdapter));
 export { AddressList };
 //# sourceMappingURL=risklabs.js.map

package/dist/esm/addressAggregator/adapters/risklabs.js.map

@@ -1 +1 @@
-{"version":3,"file":"risklabs.js","sourceRoot":"","sources":["../../../../src/addressAggregator/adapters/risklabs.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEjD,IAAM,aAAa,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;AACtC,IAAM,YAAY,GAAG,WAAW,CAAC;AACjC,IAAM,WAAW,GAAG,qDAAqD,CAAC;AAE1E;IAIE,qBACW,IAAmB,EACnB,GAAiB;QADjB,qBAAA,EAAA,mBAAmB;QACnB,oBAAA,EAAA,iBAAiB;QADjB,SAAI,GAAJ,IAAI,CAAe;QACnB,QAAG,GAAH,GAAG,CAAc;QALnB,YAAO,GAAG,IAAI,CAAC,CAAC,KAAK;QACrB,YAAO,GAAG,CAAC,CAAC;IAKlB,CAAC;IAEE,4BAAM,GAAZ,UAAa,MAAe;;;;;4BACT,qBAAM,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAA;;wBAAvE,QAAQ,GAAG,SAA4D;wBAE7E,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;4BAC/B,sBAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,6BAA6B,EAAE,MAAM,CAAC,EAAC;yBACnE;wBAED,sBAAO,QAAQ,EAAC;;;;KACjB;IACH,kBAAC;AAAD,CAAC,AAlBD,IAkBC"}
+{"version":3,"file":"risklabs.js","sourceRoot":"","sources":["../../../../src/addressAggregator/adapters/risklabs.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,IAAM,aAAa,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;AACtC,IAAM,YAAY,GAAG,WAAW,CAAC;AACjC,IAAM,WAAW,GAAG,qDAAqD,CAAC;AAE1E;IAAiC,+BAAe;IAC9C,qBAAY,IAAqB;;eAC/B,kBAAM,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,YAAY,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,WAAW,EAAE,IAAI,CAAC;IACpE,CAAC;IAEK,4BAAM,GAAZ;;;;;;;wBAGe,qBAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAA;;wBAA7E,QAAQ,GAAG,SAAkE,CAAC;;;;wBAE9E,sBAAO,IAAI,CAAC,KAAK,CAAC,KAAG,CAAC,EAAC;;wBAGzB,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;4BAC/B,sBAAO,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,EAAC;yBAClD;wBAED,sBAAO,QAAQ,EAAC;;;;KACjB;IACH,kBAAC;AAAD,CAAC,AAnBD,CAAiC,eAAe,GAmB/C"}

package/dist/esm/addressAggregator/index.js

@@ -34,7 +34,7 @@ var AddressAggregator = /** @class */ (function () {
                                     switch (_c.label) {
                                         case 0:
                                             invalidAddresses = [];
-                                            return [4 /*yield*/, adapter.update(this.logger)];
+                                            return [4 /*yield*/, adapter.update()];
                                         case 1:
                                             addresses = (_c.sent())
                                                 .map(function (address) {
@@ -84,7 +84,7 @@ function run() {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    addressList = new AddressAggregator([new adapters.risklabs.AddressList()]);
+                    addressList = new AddressAggregator([new adapters.risklabs.AddressList({ throwOnError: true })]);
                     return [4 /*yield*/, addressList.update()];
                 case 1:
                     addresses = _a.sent();

package/dist/esm/addressAggregator/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/addressAggregator/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAU,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAsB,eAAe,EAAE,MAAM,SAAS,CAAC;AAC9D,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;4BAEb,YAAY;uBAA1B,QAAQ;AAEpB;IACE,2BACW,QAA8B,EACpB,MAAe;QADzB,aAAQ,GAAR,QAAQ,CAAsB;QACpB,WAAM,GAAN,MAAM,CAAS;IACjC,CAAC;IAEG,yBAAO,GAAd;QACE,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAEK,kCAAM,GAAZ;;;;;;;;wBACE,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC;4BACjB,EAAE,EAAE,2BAA2B;4BAC/B,OAAO,EAAE,qBAAqB;4BAC9B,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,IAAI,EAAZ,CAAY,CAAC;4BACrD,gBAAgB,EAAE,iBAAiB,CAAC,OAAO,EAAE;yBAC9C,CAAC,CAAC;wBAEkB,qBAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAO,OAAO;;;;;;4CACzD,gBAAgB,GAAa,EAAE,CAAC;4CACnB,qBAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAA;;4CAA9C,SAAS,GAAG,CAAC,SAAiC,CAAC;iDAClD,GAAG,CAAC,UAAC,OAAO;gDACX,IAAI;oDACF,OAAO,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;iDACtD;gDAAC,WAAM;oDACN,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oDAC/B,OAAO,eAAe,CAAC;iDACxB;4CACH,CAAC,CAAC;iDACD,MAAM,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,KAAK,eAAe,EAA3B,CAA2B,CAAC;4CAEnD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;gDAC/B,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC;oDAChB,EAAE,EAAE,6BAA6B;oDACjC,OAAO,EAAE,eAAQ,gBAAgB,CAAC,MAAM,qCAA2B,OAAO,CAAC,IAAI,MAAG;oDAClF,gBAAgB,kBAAA;iDACjB,CAAC,CAAC;6CACJ;4CAED,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC;gDACjB,EAAE,EAAE,2BAA2B;gDAC/B,OAAO,EAAE,iBAAU,SAAS,CAAC,MAAM,6BAAmB,OAAO,CAAC,IAAI,MAAG;6CACtE,CAAC,CAAC;4CAEH,sBAAO,SAAS,EAAC;;;iCAClB,CAAC,EAAA;;wBA3BI,YAAY,GAAG,SA2BnB;wBAGI,SAAS,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;wBAE/C,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC;4BACjB,EAAE,EAAE,2BAA2B;4BAC/B,OAAO,EAAE,iBAAU,SAAS,CAAC,IAAI,gBAAa;4BAC9C,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,IAAI,EAAZ,CAAY,CAAC;yBACtD,CAAC,CAAC;wBAEH,sBAAO,SAAS,EAAC;;;;KAClB;IACH,wBAAC;AAAD,CAAC,AA1DD,IA0DC;;AAED,SAAe,GAAG;;;;;;oBACV,WAAW,GAAG,IAAI,iBAAiB,CAAC,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;oBAE/D,qBAAM,WAAW,CAAC,MAAM,EAAE,EAAA;;oBAAtC,SAAS,GAAG,SAA0B;oBAC5C,OAAO,CAAC,GAAG,CAAC,oBAAa,SAAS,CAAC,IAAI,yBAAe,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC;oBAExG,sBAAO,CAAC,EAAC;;;;CACV;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IAC3B,GAAG,EAAE;SACF,IAAI,CAAC,UAAC,MAAc;QACnB,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC;IAC5B,CAAC,CAAC;SACD,KAAK,CAAC,UAAC,KAAK;QACX,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;QAC5C,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAC;IACzB,CAAC,CAAC,CAAC;CACN"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/addressAggregator/index.ts"],"names":[],"mappings":"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"}

package/dist/esm/addressAggregator/types.d.ts

@@ -1,6 +1,14 @@
 import { Logger } from "../utils";
+export type AdapterOptions = {
+    name?: string;
+    path?: string;
+    retries?: number;
+    timeout?: number;
+    throwOnError?: boolean;
+    logger?: Logger;
+};
 export interface AddressListAdapter {
     readonly name: string;
-    update(logger?: Logger): Promise<string[]>;
+    update(): Promise<string[]>;
 }
 export declare const INVALID_ADDRESS = "";

package/dist/esm/addressAggregator/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/addressAggregator/types.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,IAAM,eAAe,GAAG,EAAE,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/addressAggregator/types.ts"],"names":[],"mappings":"AAgBA,MAAM,CAAC,IAAM,eAAe,GAAG,EAAE,CAAC"}

package/dist/esm/clients/BundleDataClient/BundleDataClient.js

@@ -3,7 +3,7 @@ import assert from "assert";
 import _ from "lodash";
 import { FillType, FillStatus, } from "../../interfaces";
 import { findFillEvent } from "../../arch/evm";
-import { BigNumber, bnZero, queryHistoricalDepositForFill, assign, fixedPointAdjustment, isDefined, toBN, forEachAsync, getBlockRangeForChain, getImpliedBundleBlockRanges, getMessageHash, getRelayEventKey, isSlowFill, mapAsync, bnUint32Max, isZeroValueDeposit, isZeroValueFillOrSlowFillRequest, chainIsEvm, isValidEvmAddress, duplicateEvent, } from "../../utils";
+import { BigNumber, bnZero, queryHistoricalDepositForFill, assign, fixedPointAdjustment, isDefined, toBN, forEachAsync, getBlockRangeForChain, getImpliedBundleBlockRanges, getMessageHash, getRelayEventKey, isSlowFill, mapAsync, bnUint32Max, isZeroValueDeposit, isZeroValueFillOrSlowFillRequest, chainIsEvm, isValidEvmAddress, duplicateEvent, invalidOutputToken, } from "../../utils";
 import { BundleDataSS, getEndBlockBuffers, getRefundInformationFromFill, getRefundsFromBundle, getWidestPossibleExpectedBlockRange, isChainDisabled, prettyPrintV3SpokePoolEvents, verifyFillRepayment, } from "./utils";
 import { UNDEFINED_MESSAGE_HASH } from "../../constants";
 import { isEVMSpokePoolClient } from "../SpokePoolClient";
@@ -297,7 +297,8 @@ var BundleDataClient = /** @class */ (function () {
                                         fillsToCount = this_1.spokePoolClients[chainId].getFills().filter(function (fill) {
                                             if (fill.blockNumber < blockRanges[chainIndex][0] ||
                                                 fill.blockNumber > blockRanges[chainIndex][1] ||
-                                                isZeroValueFillOrSlowFillRequest(fill)) {
+                                                isZeroValueFillOrSlowFillRequest(fill) ||
+                                                invalidOutputToken(fill)) {
                                                 return false;
                                             }
                                             // If origin spoke pool client isn't defined, we can't validate it.
@@ -328,7 +329,7 @@ var BundleDataClient = /** @class */ (function () {
                                                             if (!isDefined(fill)) {
                                                                 return [2 /*return*/];
                                                             }
-                                                            _a = getRefundInformationFromFill(fill, this.clients.hubPoolClient, blockRanges, this.chainIdListForBundleEvaluationBlockNumbers, matchingDeposit.fromLiteChain), chainToSendRefundTo = _a.chainToSendRefundTo, repaymentToken = _a.repaymentToken;
+                                                            _a = getRefundInformationFromFill(__assign(__assign({}, fill), { fromLiteChain: matchingDeposit.fromLiteChain, quoteBlockNumber: matchingDeposit.quoteBlockNumber }), this.clients.hubPoolClient), chainToSendRefundTo = _a.chainToSendRefundTo, repaymentToken = _a.repaymentToken;
                                                             relayer = fill.relayer, refundAmount = fill.inputAmount;
                                                             (_b = refundsForChain[chainToSendRefundTo]) !== null && _b !== void 0 ? _b : (refundsForChain[chainToSendRefundTo] = {});
                                                             (_c = (_e = refundsForChain[chainToSendRefundTo])[repaymentToken]) !== null && _c !== void 0 ? _c : (_e[repaymentToken] = {});
@@ -755,7 +756,11 @@ var BundleDataClient = /** @class */ (function () {
                                                                 // We can remove fills for deposits with input amount equal to zero because these will result in 0 refunded
                                                                 // tokens to the filler. We can't remove non-empty message deposit here in case there is a slow fill
                                                                 // request for the deposit, we'd want to see the fill took place.
-                                                                .filter(function (fill) { return fill.blockNumber <= destinationChainBlockRange[1] && !isZeroValueFillOrSlowFillRequest(fill); }), function (fill) { return __awaiter(_this, void 0, void 0, function () {
+                                                                .filter(function (fill) {
+                                                                return fill.blockNumber <= destinationChainBlockRange[1] &&
+                                                                    !isZeroValueFillOrSlowFillRequest(fill) &&
+                                                                    !invalidOutputToken(fill);
+                                                            }), function (fill) { return __awaiter(_this, void 0, void 0, function () {
                                                                 var relayDataHash, deposits, fillToRefund_1, duplicateDeposits, historicalDeposit, matchedDeposit, fillToRefund;
                                                                 return __generator(this, function (_a) {
                                                                     switch (_a.label) {
@@ -885,7 +890,9 @@ var BundleDataClient = /** @class */ (function () {
                                                         return [4 /*yield*/, forEachAsync(destinationClient
                                                                 .getSlowFillRequestsForOriginChain(originChainId)
                                                                 .filter(function (request) {
-                                                                return request.blockNumber <= destinationChainBlockRange[1] && !isZeroValueFillOrSlowFillRequest(request);
+                                                                return request.blockNumber <= destinationChainBlockRange[1] &&
+                                                                    !isZeroValueFillOrSlowFillRequest(request) &&
+                                                                    !invalidOutputToken(request);
                                                             }), function (slowFillRequest) { return __awaiter(_this, void 0, void 0, function () {
                                                                 var relayDataHash, _a, deposits, fill, matchedDeposit, historicalDeposit, matchedDeposit;
                                                                 return __generator(this, function (_b) {
@@ -1242,7 +1249,7 @@ var BundleDataClient = /** @class */ (function () {
                                     assert(isDefined(deposits) && deposits.length > 0, "Deposit should exist in relay hash dictionary.");
                                     var matchedDeposit = deposits[0];
                                     assert(isDefined(matchedDeposit), "Deposit should exist in relay hash dictionary.");
-                                    var paymentChainId = getRefundInformationFromFill(fill, _this.clients.hubPoolClient, blockRangesForChains, chainIds, matchedDeposit.fromLiteChain).chainToSendRefundTo;
+                                    var paymentChainId = getRefundInformationFromFill(__assign(__assign({}, fill), { fromLiteChain: matchedDeposit.fromLiteChain, quoteBlockNumber: matchedDeposit.quoteBlockNumber }), _this.clients.hubPoolClient).chainToSendRefundTo;
                                     return __assign(__assign({}, fill), { paymentChainId: paymentChainId });
                                 }))
                                 : [],
@@ -1271,7 +1278,7 @@ var BundleDataClient = /** @class */ (function () {
                             assert(isDefined(deposits) && deposits.length > 0, "Deposit should exist in relay hash dictionary.");
                             var associatedDeposit = deposits[0];
                             assert(isDefined(associatedDeposit), "Deposit should exist in relay hash dictionary.");
-                            var _b = getRefundInformationFromFill(fill, _this.clients.hubPoolClient, blockRangesForChains, chainIds, associatedDeposit.fromLiteChain), chainToSendRefundTo = _b.chainToSendRefundTo, repaymentToken = _b.repaymentToken;
+                            var _b = getRefundInformationFromFill(__assign(__assign({}, fill), { fromLiteChain: associatedDeposit.fromLiteChain, quoteBlockNumber: associatedDeposit.quoteBlockNumber }), _this.clients.hubPoolClient), chainToSendRefundTo = _b.chainToSendRefundTo, repaymentToken = _b.repaymentToken;
                             updateBundleFillsV3(bundleFillsV3, fill, realizedLpFeePct, chainToSendRefundTo, repaymentToken, fill.relayer);
                         });
                         v3SlowFillLpFees.forEach(function (_a, idx) {