@stellar/stellar-sdk 14.2.0 → 14.3.1

package/dist/stellar-sdk-no-axios.js

@@ -1473,6 +1473,7 @@ module.exports = $defineProperty;
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   $D: () => (/* binding */ parseRawLedgerEntries),
+/* harmony export */   $E: () => (/* binding */ parseRawLedger),
 /* harmony export */   Af: () => (/* binding */ parseRawSendTransaction),
 /* harmony export */   WC: () => (/* binding */ parseTransactionInfo),
 /* harmony export */   fG: () => (/* binding */ parseRawEvents),
@@ -1646,6 +1647,28 @@ function parseRawSimulation(sim) {
   }
   return parseSuccessful(sim, base);
 }
+function parseRawLedger(raw) {
+  if (!raw.metadataXdr || !raw.headerXdr) {
+    var missingFields;
+    if (!raw.metadataXdr && !raw.headerXdr) {
+      missingFields = "metadataXdr and headerXdr";
+    } else if (!raw.metadataXdr) {
+      missingFields = "metadataXdr";
+    } else {
+      missingFields = "headerXdr";
+    }
+    throw new TypeError("invalid ledger missing fields: ".concat(missingFields));
+  }
+  var metadataXdr = _stellar_stellar_base__WEBPACK_IMPORTED_MODULE_0__.xdr.LedgerCloseMeta.fromXDR(raw.metadataXdr, "base64");
+  var headerXdr = _stellar_stellar_base__WEBPACK_IMPORTED_MODULE_0__.xdr.LedgerHeaderHistoryEntry.fromXDR(raw.headerXdr, "base64");
+  return {
+    hash: raw.hash,
+    sequence: raw.sequence,
+    ledgerCloseTime: raw.ledgerCloseTime,
+    metadataXdr: metadataXdr,
+    headerXdr: headerXdr
+  };
+}
 
 /***/ }),
 
@@ -4867,7 +4890,6 @@ __webpack_require__.r(__webpack_exports__);
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
   Api: () => (/* reexport */ api/* Api */.j),
-  AxiosClient: () => (/* reexport */ axios),
   BasicSleepStrategy: () => (/* reexport */ BasicSleepStrategy),
   Durability: () => (/* reexport */ Durability),
   LinearSleepStrategy: () => (/* reexport */ LinearSleepStrategy),
@@ -4888,29 +4910,35 @@ var stellar_base_min = __webpack_require__(8950);
 // EXTERNAL MODULE: ./src/http-client/index.ts
 var http_client = __webpack_require__(6371);
 ;// ./src/rpc/axios.ts
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 
-var version = "14.2.0";
-var AxiosClient = (0,http_client/* create */.vt)({
-  headers: {
-    "X-Client-Name": "js-soroban-client",
-    "X-Client-Version": version
-  }
-});
-/* harmony default export */ const axios = (AxiosClient);
+var version = "14.3.1";
+function createHttpClient(headers) {
+  return (0,http_client/* create */.vt)({
+    headers: _objectSpread(_objectSpread({}, headers), {}, {
+      "X-Client-Name": "js-stellar-sdk",
+      "X-Client-Version": version
+    })
+  });
+}
 ;// ./src/rpc/jsonrpc.ts
 function _regenerator() { var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
-
 function jsonrpc_hasOwnProperty(obj, prop) {
   return obj.hasOwnProperty(prop);
 }
-function postObject(_x, _x2) {
+function postObject(_x, _x2, _x3) {
   return _postObject.apply(this, arguments);
 }
 function _postObject() {
-  _postObject = _asyncToGenerator(_regenerator().m(function _callee(url, method) {
+  _postObject = _asyncToGenerator(_regenerator().m(function _callee(client, url, method) {
     var param,
       response,
       _response$data,
@@ -4918,9 +4946,9 @@ function _postObject() {
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          param = _args.length > 2 && _args[2] !== undefined ? _args[2] : null;
+          param = _args.length > 3 && _args[3] !== undefined ? _args[3] : null;
           _context.n = 1;
-          return axios.post(url, {
+          return client.post(url, {
             jsonrpc: "2.0",
             id: 1,
             method: method,
@@ -4950,19 +4978,19 @@ var parsers = __webpack_require__(784);
 var utils = __webpack_require__(3121);
 ;// ./src/rpc/server.ts
 /* provided dependency */ var Buffer = __webpack_require__(8287)["Buffer"];
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function server_typeof(o) { "@babel/helpers - typeof"; return server_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, server_typeof(o); }
+function server_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function server_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? server_ownKeys(Object(t), !0).forEach(function (r) { server_defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : server_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function server_defineProperty(e, r, t) { return (r = server_toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function server_regenerator() { var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return server_regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (server_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, server_regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, server_regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), server_regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", server_regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), server_regeneratorDefine2(u), server_regeneratorDefine2(u, o, "Generator"), server_regeneratorDefine2(u, n, function () { return this; }), server_regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (server_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function server_regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } server_regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { server_regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, server_regeneratorDefine2(e, r, n, t); }
 function server_asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function server_asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { server_asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { server_asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, server_toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function server_toPropertyKey(t) { var i = server_toPrimitive(t, "string"); return "symbol" == server_typeof(i) ? i : i + ""; }
+function server_toPrimitive(t, r) { if ("object" != server_typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != server_typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 
 
 
@@ -5015,12 +5043,7 @@ var RpcServer = function () {
     var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     _classCallCheck(this, RpcServer);
     this.serverURL = URI_default()(serverURL);
-    if (opts.headers && Object.keys(opts.headers).length !== 0) {
-      axios.interceptors.request.use(function (config) {
-        config.headers = Object.assign(config.headers, opts.headers);
-        return config;
-      });
-    }
+    this.httpClient = createHttpClient(opts.headers);
     if (this.serverURL.protocol() !== "https" && !opts.allowHttp) {
       throw new Error("Cannot connect to insecure Soroban RPC server if `allowHttp` isn't set");
     }
@@ -5175,7 +5198,7 @@ var RpcServer = function () {
         return server_regenerator().w(function (_context5) {
           while (1) switch (_context5.n) {
             case 0:
-              return _context5.a(2, postObject(this.serverURL.toString(), "getHealth"));
+              return _context5.a(2, postObject(this.httpClient, this.serverURL.toString(), "getHealth"));
           }
         }, _callee5, this);
       }));
@@ -5350,7 +5373,7 @@ var RpcServer = function () {
       for (var _len = arguments.length, keys = new Array(_len), _key = 0; _key < _len; _key++) {
         keys[_key] = arguments[_key];
       }
-      return postObject(this.serverURL.toString(), "getLedgerEntries", {
+      return postObject(this.httpClient, this.serverURL.toString(), "getLedgerEntries", {
         keys: keys.map(function (k) {
           return k.toXDR("base64");
         })
@@ -5437,7 +5460,7 @@ var RpcServer = function () {
                 if (raw.status !== api/* Api */.j.GetTransactionStatus.NOT_FOUND) {
                   Object.assign(foundInfo, (0,parsers/* parseTransactionInfo */.WC)(raw));
                 }
-                var result = _objectSpread({
+                var result = server_objectSpread({
                   status: raw.status,
                   txHash: hash,
                   latestLedger: raw.latestLedger,
@@ -5462,7 +5485,7 @@ var RpcServer = function () {
         return server_regenerator().w(function (_context10) {
           while (1) switch (_context10.n) {
             case 0:
-              return _context10.a(2, postObject(this.serverURL.toString(), "getTransaction", {
+              return _context10.a(2, postObject(this.httpClient, this.serverURL.toString(), "getTransaction", {
                 hash: hash
               }));
           }
@@ -5506,7 +5529,7 @@ var RpcServer = function () {
         return server_regenerator().w(function (_context12) {
           while (1) switch (_context12.n) {
             case 0:
-              return _context12.a(2, postObject(this.serverURL.toString(), "getTransactions", request));
+              return _context12.a(2, postObject(this.httpClient, this.serverURL.toString(), "getTransactions", request));
           }
         }, _callee12, this);
       }));
@@ -5539,9 +5562,9 @@ var RpcServer = function () {
         return server_regenerator().w(function (_context14) {
           while (1) switch (_context14.n) {
             case 0:
-              return _context14.a(2, postObject(this.serverURL.toString(), "getEvents", _objectSpread(_objectSpread({
+              return _context14.a(2, postObject(this.httpClient, this.serverURL.toString(), "getEvents", server_objectSpread(server_objectSpread({
                 filters: (_request$filters = request.filters) !== null && _request$filters !== void 0 ? _request$filters : [],
-                pagination: _objectSpread(_objectSpread({}, request.cursor && {
+                pagination: server_objectSpread(server_objectSpread({}, request.cursor && {
                   cursor: request.cursor
                 }), request.limit && {
                   limit: request.limit
@@ -5566,7 +5589,7 @@ var RpcServer = function () {
         return server_regenerator().w(function (_context15) {
           while (1) switch (_context15.n) {
             case 0:
-              return _context15.a(2, postObject(this.serverURL.toString(), "getNetwork"));
+              return _context15.a(2, postObject(this.httpClient, this.serverURL.toString(), "getNetwork"));
           }
         }, _callee15, this);
       }));
@@ -5582,7 +5605,7 @@ var RpcServer = function () {
         return server_regenerator().w(function (_context16) {
           while (1) switch (_context16.n) {
             case 0:
-              return _context16.a(2, postObject(this.serverURL.toString(), "getLatestLedger"));
+              return _context16.a(2, postObject(this.httpClient, this.serverURL.toString(), "getLatestLedger"));
           }
         }, _callee16, this);
       }));
@@ -5614,7 +5637,7 @@ var RpcServer = function () {
         return server_regenerator().w(function (_context18) {
           while (1) switch (_context18.n) {
             case 0:
-              return _context18.a(2, postObject(this.serverURL.toString(), "simulateTransaction", _objectSpread({
+              return _context18.a(2, postObject(this.httpClient, this.serverURL.toString(), "simulateTransaction", server_objectSpread({
                 transaction: transaction.toXDR(),
                 authMode: authMode
               }, addlResources !== undefined && {
@@ -5680,7 +5703,7 @@ var RpcServer = function () {
         return server_regenerator().w(function (_context21) {
           while (1) switch (_context21.n) {
             case 0:
-              return _context21.a(2, postObject(this.serverURL.toString(), "sendTransaction", {
+              return _context21.a(2, postObject(this.httpClient, this.serverURL.toString(), "sendTransaction", {
                 transaction: transaction.toXDR()
               }));
           }
@@ -5719,7 +5742,7 @@ var RpcServer = function () {
             case 3:
               _context22.p = 3;
               _context22.n = 4;
-              return axios.post("".concat(friendbotUrl, "?addr=").concat(encodeURIComponent(account)));
+              return this.httpClient.post("".concat(friendbotUrl, "?addr=").concat(encodeURIComponent(account)));
             case 4:
               response = _context22.v;
               if (response.data.result_meta_xdr) {
@@ -5775,7 +5798,7 @@ var RpcServer = function () {
         return server_regenerator().w(function (_context23) {
           while (1) switch (_context23.n) {
             case 0:
-              return _context23.a(2, postObject(this.serverURL.toString(), "getFeeStats"));
+              return _context23.a(2, postObject(this.httpClient, this.serverURL.toString(), "getFeeStats"));
           }
         }, _callee23, this);
       }));
@@ -5791,7 +5814,7 @@ var RpcServer = function () {
         return server_regenerator().w(function (_context24) {
           while (1) switch (_context24.n) {
             case 0:
-              return _context24.a(2, postObject(this.serverURL.toString(), "getVersionInfo"));
+              return _context24.a(2, postObject(this.httpClient, this.serverURL.toString(), "getVersionInfo"));
           }
         }, _callee24, this);
       }));
@@ -5880,6 +5903,48 @@ var RpcServer = function () {
       }
       return getSACBalance;
     }())
+  }, {
+    key: "getLedgers",
+    value: (function () {
+      var _getLedgers2 = server_asyncToGenerator(server_regenerator().m(function _callee26(request) {
+        return server_regenerator().w(function (_context26) {
+          while (1) switch (_context26.n) {
+            case 0:
+              return _context26.a(2, this._getLedgers(request).then(function (raw) {
+                var result = {
+                  ledgers: (raw.ledgers || []).map(parsers/* parseRawLedger */.$E),
+                  latestLedger: raw.latestLedger,
+                  latestLedgerCloseTime: raw.latestLedgerCloseTime,
+                  oldestLedger: raw.oldestLedger,
+                  oldestLedgerCloseTime: raw.oldestLedgerCloseTime,
+                  cursor: raw.cursor
+                };
+                return result;
+              }));
+          }
+        }, _callee26, this);
+      }));
+      function getLedgers(_x31) {
+        return _getLedgers2.apply(this, arguments);
+      }
+      return getLedgers;
+    }())
+  }, {
+    key: "_getLedgers",
+    value: function () {
+      var _getLedgers3 = server_asyncToGenerator(server_regenerator().m(function _callee27(request) {
+        return server_regenerator().w(function (_context27) {
+          while (1) switch (_context27.n) {
+            case 0:
+              return _context27.a(2, postObject(this.httpClient, this.serverURL.toString(), "getLedgers", request));
+          }
+        }, _callee27, this);
+      }));
+      function _getLedgers(_x32) {
+        return _getLedgers3.apply(this, arguments);
+      }
+      return _getLedgers;
+    }()
   }]);
 }();
 ;// ./src/rpc/index.ts
@@ -5888,7 +5953,6 @@ var RpcServer = function () {
 
 
 
-
 /* harmony default export */ const rpc = (module.exports);
 
 /***/ }),
@@ -10610,15 +10674,9 @@ function _isNativeFunction(t) { try { return -1 !== Function.toString.call(t).in
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
 function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
 var InvalidChallengeError = function (_Error) {
-  function InvalidChallengeError(message) {
-    var _this;
+  function InvalidChallengeError() {
     _classCallCheck(this, InvalidChallengeError);
-    var trueProto = (this instanceof InvalidChallengeError ? this.constructor : void 0).prototype;
-    _this = _callSuper(this, InvalidChallengeError, [message]);
-    _this.__proto__ = trueProto;
-    _this.constructor = InvalidChallengeError;
-    _this.name = "InvalidChallengeError";
-    return _this;
+    return _callSuper(this, InvalidChallengeError, arguments);
   }
   _inherits(InvalidChallengeError, _Error);
   return _createClass(InvalidChallengeError);
@@ -15511,10 +15569,7 @@ var NetworkError = function (_Error) {
   function NetworkError(message, response) {
     var _this;
     _classCallCheck(this, NetworkError);
-    var trueProto = (this instanceof NetworkError ? this.constructor : void 0).prototype;
     _this = _callSuper(this, NetworkError, [message]);
-    _this.__proto__ = trueProto;
-    _this.constructor = NetworkError;
     _this.response = response;
     return _this;
   }
@@ -15542,15 +15597,9 @@ function not_found_inherits(t, e) { if ("function" != typeof e && null !== e) th
 function not_found_setPrototypeOf(t, e) { return not_found_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, not_found_setPrototypeOf(t, e); }
 
 var NotFoundError = function (_NetworkError) {
-  function NotFoundError(message, response) {
-    var _this;
+  function NotFoundError() {
     not_found_classCallCheck(this, NotFoundError);
-    var trueProto = (this instanceof NotFoundError ? this.constructor : void 0).prototype;
-    _this = not_found_callSuper(this, NotFoundError, [message, response]);
-    _this.__proto__ = trueProto;
-    _this.constructor = NotFoundError;
-    _this.name = "NotFoundError";
-    return _this;
+    return not_found_callSuper(this, NotFoundError, arguments);
   }
   not_found_inherits(NotFoundError, _NetworkError);
   return not_found_createClass(NotFoundError);
@@ -15571,15 +15620,9 @@ function bad_request_inherits(t, e) { if ("function" != typeof e && null !== e)
 function bad_request_setPrototypeOf(t, e) { return bad_request_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, bad_request_setPrototypeOf(t, e); }
 
 var BadRequestError = function (_NetworkError) {
-  function BadRequestError(message, response) {
-    var _this;
+  function BadRequestError() {
     bad_request_classCallCheck(this, BadRequestError);
-    var trueProto = (this instanceof BadRequestError ? this.constructor : void 0).prototype;
-    _this = bad_request_callSuper(this, BadRequestError, [message, response]);
-    _this.__proto__ = trueProto;
-    _this.constructor = BadRequestError;
-    _this.name = "BadRequestError";
-    return _this;
+    return bad_request_callSuper(this, BadRequestError, arguments);
   }
   bad_request_inherits(BadRequestError, _NetworkError);
   return bad_request_createClass(BadRequestError);
@@ -15600,15 +15643,9 @@ function bad_response_inherits(t, e) { if ("function" != typeof e && null !== e)
 function bad_response_setPrototypeOf(t, e) { return bad_response_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, bad_response_setPrototypeOf(t, e); }
 
 var BadResponseError = function (_NetworkError) {
-  function BadResponseError(message, response) {
-    var _this;
+  function BadResponseError() {
     bad_response_classCallCheck(this, BadResponseError);
-    var trueProto = (this instanceof BadResponseError ? this.constructor : void 0).prototype;
-    _this = bad_response_callSuper(this, BadResponseError, [message, response]);
-    _this.__proto__ = trueProto;
-    _this.constructor = BadResponseError;
-    _this.name = "BadResponseError";
-    return _this;
+    return bad_response_callSuper(this, BadResponseError, arguments);
   }
   bad_response_inherits(BadResponseError, _NetworkError);
   return bad_response_createClass(BadResponseError);
@@ -15634,11 +15671,7 @@ var AccountRequiresMemoError = function (_Error) {
   function AccountRequiresMemoError(message, accountId, operationIndex) {
     var _this;
     account_requires_memo_classCallCheck(this, AccountRequiresMemoError);
-    var trueProto = (this instanceof AccountRequiresMemoError ? this.constructor : void 0).prototype;
     _this = account_requires_memo_callSuper(this, AccountRequiresMemoError, [message]);
-    _this.__proto__ = trueProto;
-    _this.constructor = AccountRequiresMemoError;
-    _this.name = "AccountRequiresMemoError";
     _this.accountId = accountId;
     _this.operationIndex = operationIndex;
     return _this;
@@ -16215,8 +16248,7 @@ function sent_transaction_toPrimitive(t, r) { if ("object" != sent_transaction_t
 
 var SentTransaction = function () {
   function SentTransaction(assembled) {
-    var _this = this,
-      _this$assembled$optio2;
+    var _this = this;
     sent_transaction_classCallCheck(this, SentTransaction);
     _defineProperty(this, "send", function () {
       var _ref = sent_transaction_asyncToGenerator(sent_transaction_regenerator().m(function _callee2(watcher) {
@@ -16273,8 +16305,14 @@ var SentTransaction = function () {
       };
     }());
     this.assembled = assembled;
-    this.server = new rpc.Server(this.assembled.options.rpcUrl, {
-      allowHttp: (_this$assembled$optio2 = this.assembled.options.allowHttp) !== null && _this$assembled$optio2 !== void 0 ? _this$assembled$optio2 : false
+    var _this$assembled$optio2 = this.assembled.options,
+      server = _this$assembled$optio2.server,
+      allowHttp = _this$assembled$optio2.allowHttp,
+      headers = _this$assembled$optio2.headers,
+      rpcUrl = _this$assembled$optio2.rpcUrl;
+    this.server = server !== null && server !== void 0 ? server : new rpc.Server(rpcUrl, {
+      allowHttp: allowHttp,
+      headers: headers
     });
   }
   return sent_transaction_createClass(SentTransaction, [{
@@ -16395,8 +16433,7 @@ function assembled_transaction_toPrimitive(t, r) { if ("object" != assembled_tra
 var AssembledTransaction = function () {
   function AssembledTransaction(options) {
     var _this = this,
-      _this$options$simulat,
-      _this$options$allowHt;
+      _this$options$simulat;
     assembled_transaction_classCallCheck(this, AssembledTransaction);
     assembled_transaction_defineProperty(this, "simulate", assembled_transaction_asyncToGenerator(assembled_transaction_regenerator().m(function _callee() {
       var _ref2,
@@ -16752,8 +16789,14 @@ var AssembledTransaction = function () {
     })));
     this.options = options;
     this.options.simulate = (_this$options$simulat = this.options.simulate) !== null && _this$options$simulat !== void 0 ? _this$options$simulat : true;
-    this.server = new rpc.Server(this.options.rpcUrl, {
-      allowHttp: (_this$options$allowHt = this.options.allowHttp) !== null && _this$options$allowHt !== void 0 ? _this$options$allowHt : false
+    var _this$options = this.options,
+      server = _this$options.server,
+      allowHttp = _this$options.allowHttp,
+      headers = _this$options.headers,
+      rpcUrl = _this$options.rpcUrl;
+    this.server = server !== null && server !== void 0 ? server : new rpc.Server(rpcUrl, {
+      allowHttp: allowHttp,
+      headers: headers
     });
   }
   return assembled_transaction_createClass(AssembledTransaction, [{
@@ -17769,7 +17812,7 @@ var Spec = function () {
       }
       if (value === stellar_base_min.xdr.ScSpecType.scSpecTypeOption().value) {
         var opt = ty.option();
-        if (val === undefined) {
+        if (val === null || val === undefined) {
           return stellar_base_min.xdr.ScVal.scvVoid();
         }
         return this.nativeToScVal(val, opt.valueType());
@@ -18033,12 +18076,20 @@ var Spec = function () {
       var _this5 = this;
       var t = typeDef.switch();
       var value = t.value;
+      if (value === stellar_base_min.xdr.ScSpecType.scSpecTypeOption().value) {
+        switch (scv.switch().value) {
+          case stellar_base_min.xdr.ScValType.scvVoid().value:
+            return null;
+          default:
+            return this.scValToNative(scv, typeDef.option().valueType());
+        }
+      }
       if (value === stellar_base_min.xdr.ScSpecType.scSpecTypeUdt().value) {
         return this.scValUdtToNative(scv, typeDef.udt());
       }
       switch (scv.switch().value) {
         case stellar_base_min.xdr.ScValType.scvVoid().value:
-          return undefined;
+          return null;
         case stellar_base_min.xdr.ScValType.scvU64().value:
         case stellar_base_min.xdr.ScValType.scvI64().value:
         case stellar_base_min.xdr.ScValType.scvU128().value:
@@ -18289,6 +18340,7 @@ function _specFromWasmHash() {
     var format,
       rpcUrl,
       allowHttp,
+      headers,
       serverOpts,
       server,
       wasm,
@@ -18303,9 +18355,10 @@ function _specFromWasmHash() {
           }
           throw new TypeError("options must contain rpcUrl");
         case 1:
-          rpcUrl = options.rpcUrl, allowHttp = options.allowHttp;
+          rpcUrl = options.rpcUrl, allowHttp = options.allowHttp, headers = options.headers;
           serverOpts = {
-            allowHttp: allowHttp
+            allowHttp: allowHttp,
+            headers: headers
           };
           server = new rpc.Server(rpcUrl, serverOpts);
           _context5.n = 2;
@@ -18338,6 +18391,14 @@ var Client = function () {
     });
     this.spec = spec;
     this.options = options;
+    if (options.server === undefined) {
+      var allowHttp = options.allowHttp,
+        headers = options.headers;
+      options.server = new rpc.Server(options.rpcUrl, {
+        allowHttp: allowHttp,
+        headers: headers
+      });
+    }
     this.spec.funcs().forEach(function (xdrFn) {
       var method = xdrFn.name().toString();
       if (method === CONSTRUCTOR_FUNC) {
@@ -18407,10 +18468,11 @@ var Client = function () {
     key: "fromWasmHash",
     value: (function () {
       var _fromWasmHash = client_asyncToGenerator(client_regenerator().m(function _callee2(wasmHash, options) {
+        var _options$server;
         var format,
           rpcUrl,
           allowHttp,
-          serverOpts,
+          headers,
           server,
           wasm,
           _args2 = arguments;
@@ -18424,11 +18486,11 @@ var Client = function () {
               }
               throw new TypeError("options must contain rpcUrl");
             case 1:
-              rpcUrl = options.rpcUrl, allowHttp = options.allowHttp;
-              serverOpts = {
-                allowHttp: allowHttp
-              };
-              server = new rpc.Server(rpcUrl, serverOpts);
+              rpcUrl = options.rpcUrl, allowHttp = options.allowHttp, headers = options.headers;
+              server = (_options$server = options.server) !== null && _options$server !== void 0 ? _options$server : new rpc.Server(rpcUrl, {
+                allowHttp: allowHttp,
+                headers: headers
+              });
               _context2.n = 2;
               return server.getContractWasmByHash(wasmHash, format);
             case 2:
@@ -18467,7 +18529,7 @@ var Client = function () {
     key: "from",
     value: (function () {
       var _from = client_asyncToGenerator(client_regenerator().m(function _callee4(options) {
-        var rpcUrl, contractId, allowHttp, serverOpts, server, wasm;
+        var rpcUrl, contractId, allowHttp, headers, server, wasm;
         return client_regenerator().w(function (_context4) {
           while (1) switch (_context4.n) {
             case 0:
@@ -18477,11 +18539,11 @@ var Client = function () {
               }
               throw new TypeError("options must contain rpcUrl and contractId");
             case 1:
-              rpcUrl = options.rpcUrl, contractId = options.contractId, allowHttp = options.allowHttp;
-              serverOpts = {
-                allowHttp: allowHttp
-              };
-              server = new rpc.Server(rpcUrl, serverOpts);
+              rpcUrl = options.rpcUrl, contractId = options.contractId, allowHttp = options.allowHttp, headers = options.headers;
+              server = new rpc.Server(rpcUrl, {
+                allowHttp: allowHttp,
+                headers: headers
+              });
               _context4.n = 2;
               return server.getContractWasmByContractId(contractId);
             case 2:
@@ -23843,7 +23905,6 @@ __webpack_require__.r(__webpack_exports__);
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
   AccountResponse: () => (/* reexport */ AccountResponse),
-  AxiosClient: () => (/* reexport */ horizon_axios_client),
   HorizonApi: () => (/* reexport */ HorizonApi),
   SERVER_TIME_MAP: () => (/* reexport */ SERVER_TIME_MAP),
   Server: () => (/* reexport */ HorizonServer),
@@ -26982,43 +27043,50 @@ var errors = __webpack_require__(5976);
 var http_client = __webpack_require__(6371);
 ;// ./src/horizon/horizon_axios_client.ts
 function horizon_axios_client_typeof(o) { "@babel/helpers - typeof"; return horizon_axios_client_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, horizon_axios_client_typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = horizon_axios_client_toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function horizon_axios_client_toPropertyKey(t) { var i = horizon_axios_client_toPrimitive(t, "string"); return "symbol" == horizon_axios_client_typeof(i) ? i : i + ""; }
+function horizon_axios_client_toPrimitive(t, r) { if ("object" != horizon_axios_client_typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != horizon_axios_client_typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 
 
-var version = "14.2.0";
+var version = "14.3.1";
 var SERVER_TIME_MAP = {};
-var AxiosClient = (0,http_client/* create */.vt)({
-  headers: {
-    "X-Client-Name": "js-stellar-sdk",
-    "X-Client-Version": version
-  }
-});
 function toSeconds(ms) {
   return Math.floor(ms / 1000);
 }
-AxiosClient.interceptors.response.use(function (response) {
-  var hostname = URI_default()(response.config.url).hostname();
-  var serverTime = 0;
-  if (response.headers instanceof Headers) {
-    var dateHeader = response.headers.get("date");
-    if (dateHeader) {
-      serverTime = toSeconds(Date.parse(dateHeader));
-    }
-  } else if (horizon_axios_client_typeof(response.headers) === "object" && "date" in response.headers) {
-    var headers = response.headers;
-    if (typeof headers.date === "string") {
-      serverTime = toSeconds(Date.parse(headers.date));
-    }
-  }
-  var localTimeRecorded = toSeconds(new Date().getTime());
-  if (!Number.isNaN(serverTime)) {
-    SERVER_TIME_MAP[hostname] = {
-      serverTime: serverTime,
-      localTimeRecorded: localTimeRecorded
-    };
-  }
-  return response;
-});
-/* harmony default export */ const horizon_axios_client = (AxiosClient);
+function createHttpClient(headers) {
+  var httpClient = (0,http_client/* create */.vt)({
+    headers: _objectSpread(_objectSpread({}, headers), {}, {
+      "X-Client-Name": "js-stellar-sdk",
+      "X-Client-Version": version
+    })
+  });
+  httpClient.interceptors.response.use(function (response) {
+    var hostname = URI_default()(response.config.url).hostname();
+    var serverTime = 0;
+    if (response.headers instanceof Headers) {
+      var dateHeader = response.headers.get("date");
+      if (dateHeader) {
+        serverTime = toSeconds(Date.parse(dateHeader));
+      }
+    } else if (horizon_axios_client_typeof(response.headers) === "object" && "date" in response.headers) {
+      var responseHeader = response.headers;
+      if (typeof responseHeader.date === "string") {
+        serverTime = toSeconds(Date.parse(responseHeader.date));
+      }
+    }
+    var localTimeRecorded = toSeconds(new Date().getTime());
+    if (!Number.isNaN(serverTime)) {
+      SERVER_TIME_MAP[hostname] = {
+        serverTime: serverTime,
+        localTimeRecorded: localTimeRecorded
+      };
+    }
+    return response;
+  });
+  return httpClient;
+}
 function getCurrentServerTime(hostname) {
   var entry = SERVER_TIME_MAP[hostname];
   if (!entry || !entry.localTimeRecorded || !entry.serverTime) {
@@ -27055,13 +27123,14 @@ if (true) {
   EventSource = (_ref = (_anyGlobal$EventSourc = anyGlobal.EventSource) !== null && _anyGlobal$EventSourc !== void 0 ? _anyGlobal$EventSourc : (_anyGlobal$window = anyGlobal.window) === null || _anyGlobal$window === void 0 ? void 0 : _anyGlobal$window.EventSource) !== null && _ref !== void 0 ? _ref : __webpack_require__(1731);
 }
 var CallBuilder = function () {
-  function CallBuilder(serverUrl) {
-    var neighborRoot = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
+  function CallBuilder(serverUrl, httpClient) {
+    var neighborRoot = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "";
     call_builder_classCallCheck(this, CallBuilder);
     this.url = serverUrl.clone();
     this.filter = [];
     this.originalSegments = this.url.segment() || [];
     this.neighborRoot = neighborRoot;
+    this.httpClient = httpClient;
   }
   return call_builder_createClass(CallBuilder, [{
     key: "call",
@@ -27269,7 +27338,7 @@ var CallBuilder = function () {
               if (url.protocol() === "") {
                 url = url.protocol(this.url.protocol());
               }
-              return _context3.a(2, AxiosClient.get(url.toString()).then(function (response) {
+              return _context3.a(2, this.httpClient.get(url.toString()).then(function (response) {
                 return response.data;
               }).catch(this._handleNetworkError));
           }
@@ -27392,10 +27461,10 @@ function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new T
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
 
 var AccountCallBuilder = function (_CallBuilder) {
-  function AccountCallBuilder(serverUrl) {
+  function AccountCallBuilder(serverUrl, httpClient) {
     var _this;
     account_call_builder_classCallCheck(this, AccountCallBuilder);
-    _this = _callSuper(this, AccountCallBuilder, [serverUrl]);
+    _this = _callSuper(this, AccountCallBuilder, [serverUrl, httpClient]);
     _this.url.segment("accounts");
     return _this;
   }
@@ -27403,7 +27472,7 @@ var AccountCallBuilder = function (_CallBuilder) {
   return account_call_builder_createClass(AccountCallBuilder, [{
     key: "accountId",
     value: function accountId(id) {
-      var builder = new CallBuilder(this.url.clone());
+      var builder = new CallBuilder(this.url.clone(), this.httpClient);
       builder.filter.push([id]);
       return builder;
     }
@@ -27449,10 +27518,10 @@ function assets_call_builder_inherits(t, e) { if ("function" != typeof e && null
 function assets_call_builder_setPrototypeOf(t, e) { return assets_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, assets_call_builder_setPrototypeOf(t, e); }
 
 var AssetsCallBuilder = function (_CallBuilder) {
-  function AssetsCallBuilder(serverUrl) {
+  function AssetsCallBuilder(serverUrl, httpClient) {
     var _this;
     assets_call_builder_classCallCheck(this, AssetsCallBuilder);
-    _this = assets_call_builder_callSuper(this, AssetsCallBuilder, [serverUrl]);
+    _this = assets_call_builder_callSuper(this, AssetsCallBuilder, [serverUrl, httpClient]);
     _this.url.segment("assets");
     return _this;
   }
@@ -27487,10 +27556,10 @@ function claimable_balances_call_builder_inherits(t, e) { if ("function" != type
 function claimable_balances_call_builder_setPrototypeOf(t, e) { return claimable_balances_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, claimable_balances_call_builder_setPrototypeOf(t, e); }
 
 var ClaimableBalanceCallBuilder = function (_CallBuilder) {
-  function ClaimableBalanceCallBuilder(serverUrl) {
+  function ClaimableBalanceCallBuilder(serverUrl, httpClient) {
     var _this;
     claimable_balances_call_builder_classCallCheck(this, ClaimableBalanceCallBuilder);
-    _this = claimable_balances_call_builder_callSuper(this, ClaimableBalanceCallBuilder, [serverUrl]);
+    _this = claimable_balances_call_builder_callSuper(this, ClaimableBalanceCallBuilder, [serverUrl, httpClient]);
     _this.url.segment("claimable_balances");
     return _this;
   }
@@ -27498,7 +27567,7 @@ var ClaimableBalanceCallBuilder = function (_CallBuilder) {
   return claimable_balances_call_builder_createClass(ClaimableBalanceCallBuilder, [{
     key: "claimableBalance",
     value: function claimableBalance(claimableBalanceId) {
-      var builder = new CallBuilder(this.url.clone());
+      var builder = new CallBuilder(this.url.clone(), this.httpClient);
       builder.filter.push([claimableBalanceId]);
       return builder;
     }
@@ -27538,10 +27607,10 @@ function effect_call_builder_inherits(t, e) { if ("function" != typeof e && null
 function effect_call_builder_setPrototypeOf(t, e) { return effect_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, effect_call_builder_setPrototypeOf(t, e); }
 
 var EffectCallBuilder = function (_CallBuilder) {
-  function EffectCallBuilder(serverUrl) {
+  function EffectCallBuilder(serverUrl, httpClient) {
     var _this;
     effect_call_builder_classCallCheck(this, EffectCallBuilder);
-    _this = effect_call_builder_callSuper(this, EffectCallBuilder, [serverUrl, "effects"]);
+    _this = effect_call_builder_callSuper(this, EffectCallBuilder, [serverUrl, httpClient, "effects"]);
     _this.url.segment("effects");
     return _this;
   }
@@ -27589,10 +27658,10 @@ function friendbot_builder_inherits(t, e) { if ("function" != typeof e && null !
 function friendbot_builder_setPrototypeOf(t, e) { return friendbot_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, friendbot_builder_setPrototypeOf(t, e); }
 
 var FriendbotBuilder = function (_CallBuilder) {
-  function FriendbotBuilder(serverUrl, address) {
+  function FriendbotBuilder(serverUrl, httpClient, address) {
     var _this;
     friendbot_builder_classCallCheck(this, FriendbotBuilder);
-    _this = friendbot_builder_callSuper(this, FriendbotBuilder, [serverUrl]);
+    _this = friendbot_builder_callSuper(this, FriendbotBuilder, [serverUrl, httpClient]);
     _this.url.segment("friendbot");
     _this.url.setQuery("addr", address);
     return _this;
@@ -27616,10 +27685,10 @@ function ledger_call_builder_inherits(t, e) { if ("function" != typeof e && null
 function ledger_call_builder_setPrototypeOf(t, e) { return ledger_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, ledger_call_builder_setPrototypeOf(t, e); }
 
 var LedgerCallBuilder = function (_CallBuilder) {
-  function LedgerCallBuilder(serverUrl) {
+  function LedgerCallBuilder(serverUrl, httpClient) {
     var _this;
     ledger_call_builder_classCallCheck(this, LedgerCallBuilder);
-    _this = ledger_call_builder_callSuper(this, LedgerCallBuilder, [serverUrl]);
+    _this = ledger_call_builder_callSuper(this, LedgerCallBuilder, [serverUrl, httpClient]);
     _this.url.segment("ledgers");
     return _this;
   }
@@ -27648,10 +27717,10 @@ function liquidity_pool_call_builder_inherits(t, e) { if ("function" != typeof e
 function liquidity_pool_call_builder_setPrototypeOf(t, e) { return liquidity_pool_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, liquidity_pool_call_builder_setPrototypeOf(t, e); }
 
 var LiquidityPoolCallBuilder = function (_CallBuilder) {
-  function LiquidityPoolCallBuilder(serverUrl) {
+  function LiquidityPoolCallBuilder(serverUrl, httpClient) {
     var _this;
     liquidity_pool_call_builder_classCallCheck(this, LiquidityPoolCallBuilder);
-    _this = liquidity_pool_call_builder_callSuper(this, LiquidityPoolCallBuilder, [serverUrl]);
+    _this = liquidity_pool_call_builder_callSuper(this, LiquidityPoolCallBuilder, [serverUrl, httpClient]);
     _this.url.segment("liquidity_pools");
     return _this;
   }
@@ -27680,7 +27749,7 @@ var LiquidityPoolCallBuilder = function (_CallBuilder) {
       if (!id.match(/[a-fA-F0-9]{64}/)) {
         throw new TypeError("".concat(id, " does not look like a liquidity pool ID"));
       }
-      var builder = new CallBuilder(this.url.clone());
+      var builder = new CallBuilder(this.url.clone(), this.httpClient);
       builder.filter.push([id.toLowerCase()]);
       return builder;
     }
@@ -27702,10 +27771,10 @@ function offer_call_builder_inherits(t, e) { if ("function" != typeof e && null
 function offer_call_builder_setPrototypeOf(t, e) { return offer_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, offer_call_builder_setPrototypeOf(t, e); }
 
 var OfferCallBuilder = function (_CallBuilder) {
-  function OfferCallBuilder(serverUrl) {
+  function OfferCallBuilder(serverUrl, httpClient) {
     var _this;
     offer_call_builder_classCallCheck(this, OfferCallBuilder);
-    _this = offer_call_builder_callSuper(this, OfferCallBuilder, [serverUrl, "offers"]);
+    _this = offer_call_builder_callSuper(this, OfferCallBuilder, [serverUrl, httpClient, "offers"]);
     _this.url.segment("offers");
     return _this;
   }
@@ -27713,7 +27782,7 @@ var OfferCallBuilder = function (_CallBuilder) {
   return offer_call_builder_createClass(OfferCallBuilder, [{
     key: "offer",
     value: function offer(offerId) {
-      var builder = new CallBuilder(this.url.clone());
+      var builder = new CallBuilder(this.url.clone(), this.httpClient);
       builder.filter.push([offerId]);
       return builder;
     }
@@ -27776,10 +27845,10 @@ function operation_call_builder_inherits(t, e) { if ("function" != typeof e && n
 function operation_call_builder_setPrototypeOf(t, e) { return operation_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, operation_call_builder_setPrototypeOf(t, e); }
 
 var OperationCallBuilder = function (_CallBuilder) {
-  function OperationCallBuilder(serverUrl) {
+  function OperationCallBuilder(serverUrl, httpClient) {
     var _this;
     operation_call_builder_classCallCheck(this, OperationCallBuilder);
-    _this = operation_call_builder_callSuper(this, OperationCallBuilder, [serverUrl, "operations"]);
+    _this = operation_call_builder_callSuper(this, OperationCallBuilder, [serverUrl, httpClient, "operations"]);
     _this.url.segment("operations");
     return _this;
   }
@@ -27787,7 +27856,7 @@ var OperationCallBuilder = function (_CallBuilder) {
   return operation_call_builder_createClass(OperationCallBuilder, [{
     key: "operation",
     value: function operation(operationId) {
-      var builder = new CallBuilder(this.url.clone());
+      var builder = new CallBuilder(this.url.clone(), this.httpClient);
       builder.filter.push([operationId]);
       return builder;
     }
@@ -27840,10 +27909,10 @@ function orderbook_call_builder_inherits(t, e) { if ("function" != typeof e && n
 function orderbook_call_builder_setPrototypeOf(t, e) { return orderbook_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, orderbook_call_builder_setPrototypeOf(t, e); }
 
 var OrderbookCallBuilder = function (_CallBuilder) {
-  function OrderbookCallBuilder(serverUrl, selling, buying) {
+  function OrderbookCallBuilder(serverUrl, httpClient, selling, buying) {
     var _this;
     orderbook_call_builder_classCallCheck(this, OrderbookCallBuilder);
-    _this = orderbook_call_builder_callSuper(this, OrderbookCallBuilder, [serverUrl]);
+    _this = orderbook_call_builder_callSuper(this, OrderbookCallBuilder, [serverUrl, httpClient]);
     _this.url.segment("order_book");
     if (!selling.isNative()) {
       _this.url.setQuery("selling_asset_type", selling.getAssetType());
@@ -27880,10 +27949,10 @@ function payment_call_builder_inherits(t, e) { if ("function" != typeof e && nul
 function payment_call_builder_setPrototypeOf(t, e) { return payment_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, payment_call_builder_setPrototypeOf(t, e); }
 
 var PaymentCallBuilder = function (_CallBuilder) {
-  function PaymentCallBuilder(serverUrl) {
+  function PaymentCallBuilder(serverUrl, httpClient) {
     var _this;
     payment_call_builder_classCallCheck(this, PaymentCallBuilder);
-    _this = payment_call_builder_callSuper(this, PaymentCallBuilder, [serverUrl, "payments"]);
+    _this = payment_call_builder_callSuper(this, PaymentCallBuilder, [serverUrl, httpClient, "payments"]);
     _this.url.segment("payments");
     return _this;
   }
@@ -27927,10 +27996,10 @@ function strict_receive_path_call_builder_inherits(t, e) { if ("function" != typ
 function strict_receive_path_call_builder_setPrototypeOf(t, e) { return strict_receive_path_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, strict_receive_path_call_builder_setPrototypeOf(t, e); }
 
 var StrictReceivePathCallBuilder = function (_CallBuilder) {
-  function StrictReceivePathCallBuilder(serverUrl, source, destinationAsset, destinationAmount) {
+  function StrictReceivePathCallBuilder(serverUrl, httpClient, source, destinationAsset, destinationAmount) {
     var _this;
     strict_receive_path_call_builder_classCallCheck(this, StrictReceivePathCallBuilder);
-    _this = strict_receive_path_call_builder_callSuper(this, StrictReceivePathCallBuilder, [serverUrl]);
+    _this = strict_receive_path_call_builder_callSuper(this, StrictReceivePathCallBuilder, [serverUrl, httpClient]);
     _this.url.segment("paths/strict-receive");
     if (typeof source === "string") {
       _this.url.setQuery("source_account", source);
@@ -27972,10 +28041,10 @@ function strict_send_path_call_builder_inherits(t, e) { if ("function" != typeof
 function strict_send_path_call_builder_setPrototypeOf(t, e) { return strict_send_path_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, strict_send_path_call_builder_setPrototypeOf(t, e); }
 
 var StrictSendPathCallBuilder = function (_CallBuilder) {
-  function StrictSendPathCallBuilder(serverUrl, sourceAsset, sourceAmount, destination) {
+  function StrictSendPathCallBuilder(serverUrl, httpClient, sourceAsset, sourceAmount, destination) {
     var _this;
     strict_send_path_call_builder_classCallCheck(this, StrictSendPathCallBuilder);
-    _this = strict_send_path_call_builder_callSuper(this, StrictSendPathCallBuilder, [serverUrl]);
+    _this = strict_send_path_call_builder_callSuper(this, StrictSendPathCallBuilder, [serverUrl, httpClient]);
     _this.url.segment("paths/strict-send");
     if (sourceAsset.isNative()) {
       _this.url.setQuery("source_asset_type", "native");
@@ -28019,10 +28088,10 @@ function trade_aggregation_call_builder_setPrototypeOf(t, e) { return trade_aggr
 
 var allowedResolutions = [60000, 300000, 900000, 3600000, 86400000, 604800000];
 var TradeAggregationCallBuilder = function (_CallBuilder) {
-  function TradeAggregationCallBuilder(serverUrl, base, counter, start_time, end_time, resolution, offset) {
+  function TradeAggregationCallBuilder(serverUrl, httpClient, base, counter, start_time, end_time, resolution, offset) {
     var _this;
     trade_aggregation_call_builder_classCallCheck(this, TradeAggregationCallBuilder);
-    _this = trade_aggregation_call_builder_callSuper(this, TradeAggregationCallBuilder, [serverUrl]);
+    _this = trade_aggregation_call_builder_callSuper(this, TradeAggregationCallBuilder, [serverUrl, httpClient]);
     _this.url.segment("trade_aggregations");
     if (!base.isNative()) {
       _this.url.setQuery("base_asset_type", base.getAssetType());
@@ -28088,10 +28157,10 @@ function trades_call_builder_inherits(t, e) { if ("function" != typeof e && null
 function trades_call_builder_setPrototypeOf(t, e) { return trades_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, trades_call_builder_setPrototypeOf(t, e); }
 
 var TradesCallBuilder = function (_CallBuilder) {
-  function TradesCallBuilder(serverUrl) {
+  function TradesCallBuilder(serverUrl, httpClient) {
     var _this;
     trades_call_builder_classCallCheck(this, TradesCallBuilder);
-    _this = trades_call_builder_callSuper(this, TradesCallBuilder, [serverUrl, "trades"]);
+    _this = trades_call_builder_callSuper(this, TradesCallBuilder, [serverUrl, httpClient, "trades"]);
     _this.url.segment("trades");
     return _this;
   }
@@ -28155,10 +28224,10 @@ function transaction_call_builder_inherits(t, e) { if ("function" != typeof e &&
 function transaction_call_builder_setPrototypeOf(t, e) { return transaction_call_builder_setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, transaction_call_builder_setPrototypeOf(t, e); }
 
 var TransactionCallBuilder = function (_CallBuilder) {
-  function TransactionCallBuilder(serverUrl) {
+  function TransactionCallBuilder(serverUrl, httpClient) {
     var _this;
     transaction_call_builder_classCallCheck(this, TransactionCallBuilder);
-    _this = transaction_call_builder_callSuper(this, TransactionCallBuilder, [serverUrl, "transactions"]);
+    _this = transaction_call_builder_callSuper(this, TransactionCallBuilder, [serverUrl, httpClient, "transactions"]);
     _this.url.segment("transactions");
     return _this;
   }
@@ -28166,7 +28235,7 @@ var TransactionCallBuilder = function (_CallBuilder) {
   return transaction_call_builder_createClass(TransactionCallBuilder, [{
     key: "transaction",
     value: function transaction(transactionId) {
-      var builder = new CallBuilder(this.url.clone());
+      var builder = new CallBuilder(this.url.clone(), this.httpClient);
       builder.filter.push([transactionId]);
       return builder;
     }
@@ -28200,9 +28269,9 @@ var TransactionCallBuilder = function (_CallBuilder) {
 }(CallBuilder);
 ;// ./src/horizon/server.ts
 function server_typeof(o) { "@babel/helpers - typeof"; return server_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, server_typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = server_toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function server_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function server_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? server_ownKeys(Object(t), !0).forEach(function (r) { server_defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : server_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function server_defineProperty(e, r, t) { return (r = server_toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function server_regenerator() { var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return server_regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (server_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, server_regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, server_regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), server_regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", server_regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), server_regeneratorDefine2(u), server_regeneratorDefine2(u, o, "Generator"), server_regeneratorDefine2(u, n, function () { return this; }), server_regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (server_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function server_regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } server_regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { server_regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, server_regeneratorDefine2(e, r, n, t); }
 function server_asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
@@ -28261,13 +28330,7 @@ var HorizonServer = function () {
     if (opts.headers) {
       Object.assign(customHeaders, opts.headers);
     }
-    if (Object.keys(customHeaders).length > 0) {
-      horizon_axios_client.interceptors.request.use(function (config) {
-        config.headers = config.headers || {};
-        config.headers = Object.assign(config.headers, customHeaders);
-        return config;
-      });
-    }
+    this.httpClient = createHttpClient(customHeaders);
     if (this.serverURL.protocol() !== "https" && !allowHttp) {
       throw new Error("Cannot connect to insecure horizon server");
     }
@@ -28303,7 +28366,7 @@ var HorizonServer = function () {
               });
             case 2:
               _context.n = 3;
-              return horizon_axios_client.get(URI_default()(this.serverURL).toString());
+              return this.httpClient.get(this.serverURL.toString());
             case 3:
               return _context.a(2, this.fetchTimebounds(seconds, true));
           }
@@ -28343,7 +28406,7 @@ var HorizonServer = function () {
         return server_regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
-              cb = new CallBuilder(URI_default()(this.serverURL));
+              cb = new CallBuilder(this.serverURL, this.httpClient);
               cb.filter.push(["fee_stats"]);
               return _context3.a(2, cb.call());
           }
@@ -28362,7 +28425,7 @@ var HorizonServer = function () {
         return server_regenerator().w(function (_context4) {
           while (1) switch (_context4.n) {
             case 0:
-              cb = new CallBuilder(URI_default()(this.serverURL));
+              cb = new CallBuilder(this.serverURL, this.httpClient);
               return _context4.a(2, cb.call());
           }
         }, _callee4, this);
@@ -28393,7 +28456,7 @@ var HorizonServer = function () {
               return this.checkMemoRequired(transaction);
             case 1:
               tx = encodeURIComponent(transaction.toEnvelope().toXDR().toString("base64"));
-              return _context5.a(2, horizon_axios_client.post(URI_default()(this.serverURL).segment("transactions").toString(), "tx=".concat(tx), {
+              return _context5.a(2, this.httpClient.post(this.serverURL.segment("transactions").toString(), "tx=".concat(tx), {
                 timeout: SUBMIT_TRANSACTION_TIMEOUT,
                 headers: {
                   "Content-Type": "application/x-www-form-urlencoded"
@@ -28496,7 +28559,7 @@ var HorizonServer = function () {
                     return !!result;
                   });
                 }
-                return _objectSpread(_objectSpread({}, response.data), {}, {
+                return server_objectSpread(server_objectSpread({}, response.data), {}, {
                   offerResults: hasManageOffer ? offerResults : undefined
                 });
               }).catch(function (response) {
@@ -28534,7 +28597,7 @@ var HorizonServer = function () {
               return this.checkMemoRequired(transaction);
             case 1:
               tx = encodeURIComponent(transaction.toEnvelope().toXDR().toString("base64"));
-              return _context6.a(2, horizon_axios_client.post(URI_default()(this.serverURL).segment("transactions_async").toString(), "tx=".concat(tx), {
+              return _context6.a(2, this.httpClient.post(this.serverURL.segment("transactions_async").toString(), "tx=".concat(tx), {
                 headers: {
                   "Content-Type": "application/x-www-form-urlencoded"
                 }
@@ -28557,77 +28620,77 @@ var HorizonServer = function () {
   }, {
     key: "accounts",
     value: function accounts() {
-      return new AccountCallBuilder(URI_default()(this.serverURL));
+      return new AccountCallBuilder(this.serverURL, this.httpClient);
     }
   }, {
     key: "claimableBalances",
     value: function claimableBalances() {
-      return new ClaimableBalanceCallBuilder(URI_default()(this.serverURL));
+      return new ClaimableBalanceCallBuilder(this.serverURL, this.httpClient);
     }
   }, {
     key: "ledgers",
     value: function ledgers() {
-      return new LedgerCallBuilder(URI_default()(this.serverURL));
+      return new LedgerCallBuilder(this.serverURL, this.httpClient);
     }
   }, {
     key: "transactions",
     value: function transactions() {
-      return new TransactionCallBuilder(URI_default()(this.serverURL));
+      return new TransactionCallBuilder(this.serverURL, this.httpClient);
     }
   }, {
     key: "offers",
     value: function offers() {
-      return new OfferCallBuilder(URI_default()(this.serverURL));
+      return new OfferCallBuilder(this.serverURL, this.httpClient);
     }
   }, {
     key: "orderbook",
     value: function orderbook(selling, buying) {
-      return new OrderbookCallBuilder(URI_default()(this.serverURL), selling, buying);
+      return new OrderbookCallBuilder(this.serverURL, this.httpClient, selling, buying);
     }
   }, {
     key: "trades",
     value: function trades() {
-      return new TradesCallBuilder(URI_default()(this.serverURL));
+      return new TradesCallBuilder(this.serverURL, this.httpClient);
     }
   }, {
     key: "operations",
     value: function operations() {
-      return new OperationCallBuilder(URI_default()(this.serverURL));
+      return new OperationCallBuilder(this.serverURL, this.httpClient);
     }
   }, {
     key: "liquidityPools",
     value: function liquidityPools() {
-      return new LiquidityPoolCallBuilder(URI_default()(this.serverURL));
+      return new LiquidityPoolCallBuilder(this.serverURL, this.httpClient);
     }
   }, {
     key: "strictReceivePaths",
     value: function strictReceivePaths(source, destinationAsset, destinationAmount) {
-      return new StrictReceivePathCallBuilder(URI_default()(this.serverURL), source, destinationAsset, destinationAmount);
+      return new StrictReceivePathCallBuilder(this.serverURL, this.httpClient, source, destinationAsset, destinationAmount);
     }
   }, {
     key: "strictSendPaths",
     value: function strictSendPaths(sourceAsset, sourceAmount, destination) {
-      return new StrictSendPathCallBuilder(URI_default()(this.serverURL), sourceAsset, sourceAmount, destination);
+      return new StrictSendPathCallBuilder(this.serverURL, this.httpClient, sourceAsset, sourceAmount, destination);
     }
   }, {
     key: "payments",
     value: function payments() {
-      return new PaymentCallBuilder(URI_default()(this.serverURL));
+      return new PaymentCallBuilder(this.serverURL, this.httpClient);
     }
   }, {
     key: "effects",
     value: function effects() {
-      return new EffectCallBuilder(URI_default()(this.serverURL));
+      return new EffectCallBuilder(this.serverURL, this.httpClient);
     }
   }, {
     key: "friendbot",
     value: function friendbot(address) {
-      return new FriendbotBuilder(URI_default()(this.serverURL), address);
+      return new FriendbotBuilder(this.serverURL, this.httpClient, address);
     }
   }, {
     key: "assets",
     value: function assets() {
-      return new AssetsCallBuilder(URI_default()(this.serverURL));
+      return new AssetsCallBuilder(this.serverURL, this.httpClient);
     }
   }, {
     key: "loadAccount",
@@ -28653,7 +28716,7 @@ var HorizonServer = function () {
   }, {
     key: "tradeAggregation",
     value: function tradeAggregation(base, counter, start_time, end_time, resolution, offset) {
-      return new TradeAggregationCallBuilder(URI_default()(this.serverURL), base, counter, start_time, end_time, resolution, offset);
+      return new TradeAggregationCallBuilder(this.serverURL, this.httpClient, base, counter, start_time, end_time, resolution, offset);
     }
   }, {
     key: "checkMemoRequired",