@paraspell/sdk-pjs 13.2.1 → 13.3.0

package/dist/index.mjs

@@ -1,11 +1,12 @@
-import { getNativeAssetSymbol, getOtherAssets, hasJunction, getJunctionValue, getEvmPrivateKeyHex, UnsupportedOperationError, createClientCache, MAX_CLIENTS, EXTENSION_MS, createClientPoolHelpers, BatchMode, isConfig, findNativeAssetInfoOrThrow, getChainProviders, isSenderSigner, PolkadotApi, resolveChainApi, DEFAULT_TTL_MS, isExternalChain, findAssetInfoOrThrow, hasXcmPaymentApiSupport, resolveModuleError, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, normalizeLocation, localizeLocation, createAssetId, addXcmVersionHeader, isAssetXcEqual, RELAY_LOCATION, getRelayChainOf, SubmitTransactionError, createChainClient as createChainClient$1, getBalance as getBalance$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, assertHasId, getParaId, RoutingResolutionError, abstractDecimals, MissingParameterError, isOverrideLocationSpecifier, transferMoonbeamEvm, transferMoonbeamToEth, validateAddress as validateAddress$1, Builder as Builder$1, getBridgeStatus as getBridgeStatus$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1 } from '@paraspell/sdk-core';
+import { getNativeAssetSymbol, getOtherAssets, hasJunction, getJunctionValue, getEvmPrivateKeyHex, UnsupportedOperationError, createClientCache, MAX_CLIENTS, EXTENSION_MS, createClientPoolHelpers, BatchMode, isConfig, findNativeAssetInfoOrThrow, getChainProviders, isSenderSigner, PolkadotApi, findAssetInfoOrThrow, hasXcmPaymentApiSupport, resolveModuleError, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, normalizeLocation, localizeLocation, createAssetId, addXcmVersionHeader, isAssetXcEqual, RELAY_LOCATION, getRelayChainOf, SubmitTransactionError, createChainClient as createChainClient$1, getBalance as getBalance$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, assertHasId, getParaId, RoutingResolutionError, abstractDecimals, MissingParameterError, isOverrideLocationSpecifier, transferMoonbeamEvm, transferMoonbeamToEth, validateAddress as validateAddress$1, Builder as Builder$1, getBridgeStatus as getBridgeStatus$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1 } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
 import { Keyring, WsProvider, ApiPromise } from '@polkadot/api';
 import { u8aConcat, compactToU8a, u8aEq, isHex, u8aToHex, hexToU8a, stringToU8a } from '@polkadot/util';
 import { decodeAddress, blake2AsHex, validateAddress } from '@polkadot/util-crypto';
 import { WETH9__factory } from '@snowbridge/contract-types';
 import { bridgeInfoFor } from '@snowbridge/registry';
-import { Context, toPolkadotV2 } from '@snowbridge/api';
+import { toPolkadotV2, SnowbridgeApi } from '@snowbridge/api';
+import { EthersEthereumProvider } from '@snowbridge/provider-ethers';
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -485,7 +486,7 @@ var createPolkadotJsClient = /*#__PURE__*/function () {
   };
 }();
 var _createClientPoolHelp = createClientPoolHelpers(clientPool, createPolkadotJsClient),
-  leaseClient = _createClientPoolHelp.leaseClient,
+  _leaseClient = _createClientPoolHelp.leaseClient,
   releaseClient = _createClientPoolHelp.releaseClient;
 var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   function PolkadotJsApi() {
@@ -497,44 +498,9 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }
   _inherits(PolkadotJsApi, _PolkadotApi);
   return _createClass(PolkadotJsApi, [{
-    key: "init",
-    value: function () {
-      var _init = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(chain) {
-        var _this2 = this;
-        var clientTtlMs,
-          _args = arguments;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
-            case 0:
-              clientTtlMs = _args.length > 1 && _args[1] !== undefined ? _args[1] : DEFAULT_TTL_MS;
-              if (!(this._chain !== undefined || isExternalChain(chain))) {
-                _context3.n = 1;
-                break;
-              }
-              return _context3.a(2);
-            case 1:
-              this._ttlMs = clientTtlMs;
-              this._chain = chain;
-              _context3.n = 2;
-              return resolveChainApi(this._config, chain, function (wsUrl) {
-                return leaseClient(wsUrl, _this2._ttlMs);
-              });
-            case 2:
-              this._api = _context3.v;
-            case 3:
-              return _context3.a(2);
-          }
-        }, _callee3, this);
-      }));
-      function init(_x3) {
-        return _init.apply(this, arguments);
-      }
-      return init;
-    }()
-  }, {
-    key: "createApiInstance",
-    value: function createApiInstance(wsUrl, _chain) {
-      return leaseClient(wsUrl, this._ttlMs);
+    key: "leaseClient",
+    value: function leaseClient(wsUrl, ttlMs) {
+      return _leaseClient(wsUrl, ttlMs);
     }
   }, {
     key: "accountToHex",
@@ -585,26 +551,38 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
     value: function txFromHex$1(hex) {
       return Promise.resolve(txFromHex(this.api, hex));
     }
+  }, {
+    key: "txToHex",
+    value: function txToHex(tx) {
+      return Promise.resolve(tx.toHex());
+    }
+  }, {
+    key: "encodeTx",
+    value: function encodeTx(hex) {
+      return {
+        encoded: hex
+      };
+    }
   }, {
     key: "queryState",
     value: function () {
-      var _queryState = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(serialized) {
+      var _queryState = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(serialized) {
         var _this$api$query$modul;
         var params, _this$convertToPjsSta, module, method, res;
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.n) {
+        return _regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
             case 0:
               params = serialized.params;
               _this$convertToPjsSta = this.convertToPjsStateQuery(serialized), module = _this$convertToPjsSta.module, method = _this$convertToPjsSta.method;
-              _context4.n = 1;
+              _context3.n = 1;
               return (_this$api$query$modul = this.api.query[module])[method].apply(_this$api$query$modul, _toConsumableArray(params));
             case 1:
-              res = _context4.v;
-              return _context4.a(2, res.toJSON());
+              res = _context3.v;
+              return _context3.a(2, res.toJSON());
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
-      function queryState(_x4) {
+      function queryState(_x3) {
         return _queryState.apply(this, arguments);
       }
       return queryState;
@@ -612,23 +590,23 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "queryRuntimeApi",
     value: function () {
-      var _queryRuntimeApi = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(serialized) {
+      var _queryRuntimeApi = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(serialized) {
         var _this$api$call$module;
         var params, _this$convertToPjsTxC2, module, method, res;
-        return _regenerator().w(function (_context5) {
-          while (1) switch (_context5.n) {
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.n) {
             case 0:
               params = serialized.params;
               _this$convertToPjsTxC2 = this.convertToPjsTxCall(serialized), module = _this$convertToPjsTxC2.module, method = _this$convertToPjsTxC2.method;
-              _context5.n = 1;
+              _context4.n = 1;
               return (_this$api$call$module = this.api.call[module])[method].apply(_this$api$call$module, _toConsumableArray(params));
             case 1:
-              res = _context5.v;
-              return _context5.a(2, res.toJSON());
+              res = _context4.v;
+              return _context4.a(2, res.toJSON());
           }
-        }, _callee5, this);
+        }, _callee4, this);
       }));
-      function queryRuntimeApi(_x5) {
+      function queryRuntimeApi(_x4) {
         return _queryRuntimeApi.apply(this, arguments);
       }
       return queryRuntimeApi;
@@ -667,20 +645,20 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getPaymentInfo",
     value: function () {
-      var _getPaymentInfo = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(tx, address) {
+      var _getPaymentInfo = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(tx, address) {
         var _yield$tx$paymentInfo, _yield$tx$paymentInfo2, proofSize, refTime, partialFee;
-        return _regenerator().w(function (_context6) {
-          while (1) switch (_context6.n) {
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.n) {
             case 0:
-              _context6.n = 1;
+              _context5.n = 1;
               return tx.paymentInfo(address);
             case 1:
-              _yield$tx$paymentInfo = _context6.v;
+              _yield$tx$paymentInfo = _context5.v;
               _yield$tx$paymentInfo2 = _yield$tx$paymentInfo.weight;
               proofSize = _yield$tx$paymentInfo2.proofSize;
               refTime = _yield$tx$paymentInfo2.refTime;
               partialFee = _yield$tx$paymentInfo.partialFee;
-              return _context6.a(2, {
+              return _context5.a(2, {
                 weight: {
                   proofSize: proofSize.toBigInt(),
                   refTime: refTime.toBigInt()
@@ -688,37 +666,13 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 partialFee: partialFee.toBigInt()
               });
           }
-        }, _callee6);
+        }, _callee5);
       }));
-      function getPaymentInfo(_x6, _x7) {
+      function getPaymentInfo(_x5, _x6) {
         return _getPaymentInfo.apply(this, arguments);
       }
       return getPaymentInfo;
     }()
-  }, {
-    key: "quoteAhPrice",
-    value: function () {
-      var _quoteAhPrice = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(fromMl, toMl, amountIn) {
-        var includeFee,
-          quoted,
-          _args5 = arguments;
-        return _regenerator().w(function (_context7) {
-          while (1) switch (_context7.n) {
-            case 0:
-              includeFee = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : true;
-              _context7.n = 1;
-              return this.api.call.assetConversionApi.quotePriceExactTokensForTokens(fromMl, toMl, amountIn.toString(), includeFee);
-            case 1:
-              quoted = _context7.v;
-              return _context7.a(2, quoted.toJSON() !== null ? BigInt(quoted.toString()) : undefined);
-          }
-        }, _callee7, this);
-      }));
-      function quoteAhPrice(_x8, _x9, _x0) {
-        return _quoteAhPrice.apply(this, arguments);
-      }
-      return quoteAhPrice;
-    }()
   }, {
     key: "getEvmStorage",
     value: function getEvmStorage(contract, slot) {
@@ -747,27 +701,27 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getFromRpc",
     value: function () {
-      var _getFromRpc = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(module, method, key) {
+      var _getFromRpc = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(module, method, key) {
         var rpcModule, response;
-        return _regenerator().w(function (_context8) {
-          while (1) switch (_context8.n) {
+        return _regenerator().w(function (_context6) {
+          while (1) switch (_context6.n) {
             case 0:
               rpcModule = this.api.rpc[module];
               if (!(!rpcModule || !rpcModule[method])) {
-                _context8.n = 1;
+                _context6.n = 1;
                 break;
               }
               throw new UnsupportedOperationError("RPC method ".concat(module, ".").concat(method, " not available"));
             case 1:
-              _context8.n = 2;
+              _context6.n = 2;
               return rpcModule[method](key);
             case 2:
-              response = _context8.v;
-              return _context8.a(2, response.toHex());
+              response = _context6.v;
+              return _context6.a(2, response.toHex());
           }
-        }, _callee8, this);
+        }, _callee6, this);
       }));
-      function getFromRpc(_x1, _x10, _x11) {
+      function getFromRpc(_x7, _x8, _x9) {
         return _getFromRpc.apply(this, arguments);
       }
       return getFromRpc;
@@ -785,20 +739,20 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "createApiForChain",
     value: function () {
-      var _createApiForChain = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(chain) {
+      var _createApiForChain = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(chain) {
         var api;
-        return _regenerator().w(function (_context9) {
-          while (1) switch (_context9.n) {
+        return _regenerator().w(function (_context7) {
+          while (1) switch (_context7.n) {
             case 0:
               api = new PolkadotJsApi(isConfig(this._config) ? this._config : undefined);
-              _context9.n = 1;
+              _context7.n = 1;
               return api.init(chain);
             case 1:
-              return _context9.a(2, api);
+              return _context7.a(2, api);
           }
-        }, _callee9, this);
+        }, _callee7, this);
       }));
-      function createApiForChain(_x12) {
+      function createApiForChain(_x0) {
         return _createApiForChain.apply(this, arguments);
       }
       return createApiForChain;
@@ -813,45 +767,45 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "resolveFeeAsset",
     value: function () {
-      var _resolveFeeAsset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(options) {
+      var _resolveFeeAsset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(options) {
         var chain, address, response, assetId;
-        return _regenerator().w(function (_context0) {
-          while (1) switch (_context0.n) {
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.n) {
             case 0:
               chain = options.chain, address = options.address;
               if (chain.startsWith('Hydration')) {
-                _context0.n = 1;
+                _context8.n = 1;
                 break;
               }
-              return _context0.a(2, {
+              return _context8.a(2, {
                 isCustomAsset: false,
                 asset: this.resolveDefaultFeeAsset(options)
               });
             case 1:
-              _context0.n = 2;
+              _context8.n = 2;
               return this.api.query.multiTransactionPayment.accountCurrencyMap(address);
             case 2:
-              response = _context0.v;
+              response = _context8.v;
               assetId = response.toJSON();
               if (!(assetId === null)) {
-                _context0.n = 3;
+                _context8.n = 3;
                 break;
               }
-              return _context0.a(2, {
+              return _context8.a(2, {
                 isCustomAsset: false,
                 asset: this.resolveDefaultFeeAsset(options)
               });
             case 3:
-              return _context0.a(2, {
+              return _context8.a(2, {
                 isCustomAsset: true,
                 asset: findAssetInfoOrThrow(chain, {
                   id: assetId
                 })
               });
           }
-        }, _callee0, this);
+        }, _callee8, this);
       }));
-      function resolveFeeAsset(_x13) {
+      function resolveFeeAsset(_x1) {
         return _resolveFeeAsset.apply(this, arguments);
       }
       return resolveFeeAsset;
@@ -859,16 +813,16 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getDryRunCall",
     value: function () {
-      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(options) {
-        var _this3 = this;
+      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(options) {
+        var _this2 = this;
         var tx, address, feeAsset, chain, destination, version, _options$useRootOrigi, useRootOrigin, bypassOptions, supportsDryRunApi, basePayload, resolvedTx, resolvedFeeAsset, performDryRunCall, findFailingEventInResult, getExecutionSuccessFromResult, extractFailureReasonFromResult, response, resultHuman, resultJson, isSuccess, failureErr, shouldRetryWithVersion, msg, _msg, forwardedXcms, actualWeight, weight, destParaId, overriddenWeight, xcmFee, _yield$this$getPaymen, executionFee, fee, _t, _t2, _t3, _t4;
-        return _regenerator().w(function (_context10) {
-          while (1) switch (_context10.p = _context10.n) {
+        return _regenerator().w(function (_context0) {
+          while (1) switch (_context0.p = _context0.n) {
             case 0:
               tx = options.tx, address = options.address, feeAsset = options.feeAsset, chain = options.chain, destination = options.destination, version = options.version, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi, bypassOptions = options.bypassOptions;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context10.n = 1;
+                _context0.n = 1;
                 break;
               }
               throw new RuntimeApiUnavailableError(chain, 'DryRunApi');
@@ -883,38 +837,38 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 }
               };
               if (!useRootOrigin) {
-                _context10.n = 3;
+                _context0.n = 3;
                 break;
               }
-              _context10.n = 2;
+              _context0.n = 2;
               return wrapTxBypass(_objectSpread2(_objectSpread2({}, options), {}, {
                 api: this
               }), bypassOptions);
             case 2:
-              _t = _context10.v;
-              _context10.n = 4;
+              _t = _context0.v;
+              _context0.n = 4;
               break;
             case 3:
               _t = tx;
             case 4:
               resolvedTx = _t;
-              _context10.n = 5;
+              _context0.n = 5;
               return this.resolveFeeAsset(options);
             case 5:
-              resolvedFeeAsset = _context10.v;
+              resolvedFeeAsset = _context0.v;
               performDryRunCall = /*#__PURE__*/function () {
-                var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(includeVersion) {
-                  var _this3$api$call$dryRu;
+                var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(includeVersion) {
+                  var _this2$api$call$dryRu;
                   var versionNum;
-                  return _regenerator().w(function (_context1) {
-                    while (1) switch (_context1.n) {
+                  return _regenerator().w(function (_context9) {
+                    while (1) switch (_context9.n) {
                       case 0:
                         versionNum = Number(version.charAt(1));
-                        return _context1.a(2, (_this3$api$call$dryRu = _this3.api.call.dryRunApi).dryRunCall.apply(_this3$api$call$dryRu, [basePayload, resolvedTx].concat(_toConsumableArray(includeVersion ? [versionNum] : []))));
+                        return _context9.a(2, (_this2$api$call$dryRu = _this2.api.call.dryRunApi).dryRunCall.apply(_this2$api$call$dryRu, [basePayload, resolvedTx].concat(_toConsumableArray(includeVersion ? [versionNum] : []))));
                     }
-                  }, _callee1);
+                  }, _callee9);
                 }));
-                return function performDryRunCall(_x15) {
+                return function performDryRunCall(_x11) {
                   return _ref6.apply(this, arguments);
                 };
               }();
@@ -979,11 +933,11 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 failureReason: ''
               };
               shouldRetryWithVersion = false;
-              _context10.p = 6;
-              _context10.n = 7;
+              _context0.p = 6;
+              _context0.n = 7;
               return performDryRunCall(false);
             case 7:
-              response = _context10.v;
+              response = _context0.v;
               resultHuman = response.toHuman();
               resultJson = response.toJSON();
               isSuccess = getExecutionSuccessFromResult(resultHuman);
@@ -993,49 +947,49 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                   shouldRetryWithVersion = true;
                 }
               }
-              _context10.n = 10;
+              _context0.n = 10;
               break;
             case 8:
-              _context10.p = 8;
-              _t2 = _context10.v;
+              _context0.p = 8;
+              _t2 = _context0.v;
               msg = _t2 instanceof Error ? _t2.message : String(_t2);
               if (!msg.includes('Expected 3 arguments')) {
-                _context10.n = 9;
+                _context0.n = 9;
                 break;
               }
               shouldRetryWithVersion = true;
-              _context10.n = 10;
+              _context0.n = 10;
               break;
             case 9:
-              return _context10.a(2, {
+              return _context0.a(2, {
                 success: false,
                 failureReason: msg,
                 asset: resolvedFeeAsset.asset
               });
             case 10:
               if (!shouldRetryWithVersion) {
-                _context10.n = 14;
+                _context0.n = 14;
                 break;
               }
-              _context10.p = 11;
-              _context10.n = 12;
+              _context0.p = 11;
+              _context0.n = 12;
               return performDryRunCall(true);
             case 12:
-              response = _context10.v;
+              response = _context0.v;
               resultHuman = response.toHuman();
               resultJson = response.toJSON();
               isSuccess = getExecutionSuccessFromResult(resultHuman);
               if (!isSuccess) {
                 failureErr = extractFailureReasonFromResult(resultHuman, resultJson);
               }
-              _context10.n = 14;
+              _context0.n = 14;
               break;
             case 13:
-              _context10.p = 13;
-              _t3 = _context10.v;
+              _context0.p = 13;
+              _t3 = _context0.v;
               _msg = _t3 instanceof Error ? _t3.message : String(_t3);
               failureErr = failureErr || _msg;
-              return _context10.a(2, {
+              return _context0.a(2, {
                 success: false,
                 failureReason: failureErr.failureReason,
                 failureSubReason: failureErr.failureSubReason,
@@ -1043,10 +997,10 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
               });
             case 14:
               if (isSuccess) {
-                _context10.n = 15;
+                _context0.n = 15;
                 break;
               }
-              return _context10.a(2, {
+              return _context0.a(2, {
                 success: false,
                 failureReason: failureErr.failureReason || 'Unknown error',
                 failureSubReason: failureErr.failureSubReason,
@@ -1063,32 +1017,32 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 return i.here === null ? 0 : (_ref8 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref8 === void 0 ? void 0 : _ref8.parachain;
               }(Object.values(forwardedXcms[0])[0].interior);
               if (!(hasXcmPaymentApiSupport(chain) && resultJson.ok.local_xcm && (feeAsset || chain.startsWith('AssetHub') && destination === 'Ethereum') || resolvedFeeAsset.isCustomAsset)) {
-                _context10.n = 21;
+                _context0.n = 21;
                 break;
               }
               if (resultJson.ok.local_xcm) {
-                _context10.n = 17;
+                _context0.n = 17;
                 break;
               }
-              _context10.n = 16;
+              _context0.n = 16;
               return this.getPaymentInfo(tx, address);
             case 16:
-              _t4 = _context10.v.weight;
-              _context10.n = 18;
+              _t4 = _context0.v.weight;
+              _context0.n = 18;
               break;
             case 17:
               _t4 = undefined;
             case 18:
               overriddenWeight = _t4;
-              _context10.n = 19;
+              _context0.n = 19;
               return this.getXcmPaymentApiFee(chain, resultJson.ok.local_xcm, forwardedXcms, resolvedFeeAsset.asset, version, false, overriddenWeight);
             case 19:
-              xcmFee = _context10.v;
+              xcmFee = _context0.v;
               if (!(typeof xcmFee === 'bigint')) {
-                _context10.n = 20;
+                _context0.n = 20;
                 break;
               }
-              return _context10.a(2, Promise.resolve({
+              return _context0.a(2, Promise.resolve({
                 success: true,
                 fee: xcmFee,
                 asset: resolvedFeeAsset.asset,
@@ -1102,13 +1056,13 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 asset: this.resolveDefaultFeeAsset(options)
               };
             case 21:
-              _context10.n = 22;
+              _context0.n = 22;
               return this.getPaymentInfo(tx, address);
             case 22:
-              _yield$this$getPaymen = _context10.v;
+              _yield$this$getPaymen = _context0.v;
               executionFee = _yield$this$getPaymen.partialFee;
               fee = computeOriginFee(resultHuman, chain, executionFee);
-              return _context10.a(2, {
+              return _context0.a(2, {
                 success: true,
                 fee: fee,
                 asset: resolvedFeeAsset.asset,
@@ -1117,9 +1071,9 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 destParaId: destParaId
               });
           }
-        }, _callee10, this, [[11, 13], [6, 8]]);
+        }, _callee0, this, [[11, 13], [6, 8]]);
       }));
-      function getDryRunCall(_x14) {
+      function getDryRunCall(_x10) {
         return _getDryRunCall.apply(this, arguments);
       }
       return getDryRunCall;
@@ -1127,7 +1081,7 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getXcmPaymentApiFee",
     value: function () {
-      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(chain, localXcm, forwardedXcm, asset, version) {
+      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(chain, localXcm, forwardedXcm, asset, version) {
         var overridenWeight,
           weight,
           assetLocalizedLoc,
@@ -1139,57 +1093,57 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
           isAssetNotFound,
           bridgeHubExecFee,
           deliveryFee,
-          _args1 = arguments,
+          _args9 = arguments,
           _t5;
-        return _regenerator().w(function (_context11) {
-          while (1) switch (_context11.n) {
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.n) {
             case 0:
-              overridenWeight = _args1.length > 6 ? _args1[6] : undefined;
+              overridenWeight = _args9.length > 6 ? _args9[6] : undefined;
               if (!(overridenWeight !== null && overridenWeight !== void 0)) {
-                _context11.n = 1;
+                _context1.n = 1;
                 break;
               }
               _t5 = overridenWeight;
-              _context11.n = 3;
+              _context1.n = 3;
               break;
             case 1:
-              _context11.n = 2;
+              _context1.n = 2;
               return this.getXcmWeight(localXcm);
             case 2:
-              _t5 = _context11.v;
+              _t5 = _context1.v;
             case 3:
               weight = _t5;
               assetLocalizedLoc = normalizeLocation(localizeLocation(chain, asset.location), version);
               assetId = createAssetId(version, assetLocalizedLoc);
-              _context11.n = 4;
+              _context1.n = 4;
               return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weight, addXcmVersionHeader(assetId, version));
             case 4:
-              feeResult = _context11.v;
+              feeResult = _context1.v;
               execFeeRes = feeResult.toJSON();
               execFeeOk = execFeeRes === null || execFeeRes === void 0 ? void 0 : execFeeRes.ok;
               execFee = typeof execFeeOk === 'string' || typeof execFeeOk === 'number' ? BigInt(execFeeOk) : 0n;
               isAssetNotFound = (execFeeRes === null || execFeeRes === void 0 ? void 0 : execFeeRes.err) === 'AssetNotFound';
               if (!(chain.startsWith('BridgeHub') && isAssetNotFound)) {
-                _context11.n = 6;
+                _context1.n = 6;
                 break;
               }
-              _context11.n = 5;
+              _context1.n = 5;
               return this.getBridgeHubFallbackExecFee(chain, weight, asset, version);
             case 5:
-              bridgeHubExecFee = _context11.v;
+              bridgeHubExecFee = _context1.v;
               if (typeof bridgeHubExecFee === 'bigint') {
                 execFee = bridgeHubExecFee;
               }
             case 6:
-              _context11.n = 7;
+              _context1.n = 7;
               return this.getDeliveryFee(chain, forwardedXcm, asset, assetLocalizedLoc, version);
             case 7:
-              deliveryFee = _context11.v;
-              return _context11.a(2, execFee + deliveryFee);
+              deliveryFee = _context1.v;
+              return _context1.a(2, execFee + deliveryFee);
           }
-        }, _callee11, this);
+        }, _callee1, this);
       }));
-      function getXcmPaymentApiFee(_x16, _x17, _x18, _x19, _x20) {
+      function getXcmPaymentApiFee(_x12, _x13, _x14, _x15, _x16) {
         return _getXcmPaymentApiFee.apply(this, arguments);
       }
       return getXcmPaymentApiFee;
@@ -1197,41 +1151,41 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getDeliveryFee",
     value: function () {
-      var _getDeliveryFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(chain, forwardedXcm, asset, assetLocalizedLoc, version) {
+      var _getDeliveryFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(chain, forwardedXcm, asset, assetLocalizedLoc, version) {
         var _deliveryFeeRes, _ref9, _deliveryFeeResJson$o, _deliveryFeeResJson$o2, _deliveryFeeResJson$o3, _ref0, _deliveryFeeResJson$o4, _deliveryFeeResJson$o5, _deliveryFeeResJson$o6;
         var usedThirdParam, deliveryFeeRes, baseArgs, _this$api$call$xcmPay, message, _this$api$call$xcmPay2, assetId, versionedAssetLoc, deliveryFeeResJson, deliveryFeeResolved, nativeAsset, res, _t6;
-        return _regenerator().w(function (_context12) {
-          while (1) switch (_context12.p = _context12.n) {
+        return _regenerator().w(function (_context10) {
+          while (1) switch (_context10.p = _context10.n) {
             case 0:
               usedThirdParam = false;
               if (!(forwardedXcm.length > 0)) {
-                _context12.n = 6;
+                _context10.n = 6;
                 break;
               }
               baseArgs = [forwardedXcm[0], forwardedXcm[1][0]];
-              _context12.p = 1;
-              _context12.n = 2;
+              _context10.p = 1;
+              _context10.n = 2;
               return (_this$api$call$xcmPay = this.api.call.xcmPaymentApi).queryDeliveryFees.apply(_this$api$call$xcmPay, baseArgs);
             case 2:
-              deliveryFeeRes = _context12.v;
-              _context12.n = 6;
+              deliveryFeeRes = _context10.v;
+              _context10.n = 6;
               break;
             case 3:
-              _context12.p = 3;
-              _t6 = _context12.v;
+              _context10.p = 3;
+              _t6 = _context10.v;
               message = _t6 instanceof Error ? _t6.message : String(_t6);
               if (!message.includes('Expected 3 arguments')) {
-                _context12.n = 5;
+                _context10.n = 5;
                 break;
               }
               usedThirdParam = true;
               assetId = createAssetId(version, assetLocalizedLoc);
               versionedAssetLoc = addXcmVersionHeader(assetId, version);
-              _context12.n = 4;
+              _context10.n = 4;
               return (_this$api$call$xcmPay2 = this.api.call.xcmPaymentApi).queryDeliveryFees.apply(_this$api$call$xcmPay2, baseArgs.concat([versionedAssetLoc]));
             case 4:
-              deliveryFeeRes = _context12.v;
-              _context12.n = 6;
+              deliveryFeeRes = _context10.v;
+              _context10.n = 6;
               break;
             case 5:
               throw _t6;
@@ -1240,25 +1194,29 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
               deliveryFeeResolved = deliveryFeeRes && ((_ref9 = (_deliveryFeeResJson$o = (_deliveryFeeResJson$o2 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o2 === void 0 ? void 0 : _deliveryFeeResJson$o2.v4) !== null && _deliveryFeeResJson$o !== void 0 ? _deliveryFeeResJson$o : (_deliveryFeeResJson$o3 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o3 === void 0 ? void 0 : _deliveryFeeResJson$o3.v3) === null || _ref9 === void 0 ? void 0 : _ref9.length) > 0 ? BigInt((_ref0 = (_deliveryFeeResJson$o4 = deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o5 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o5 === void 0 ? void 0 : _deliveryFeeResJson$o5.v4) !== null && _deliveryFeeResJson$o4 !== void 0 ? _deliveryFeeResJson$o4 : deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o6 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o6 === void 0 ? void 0 : _deliveryFeeResJson$o6.v3) === null || _ref0 === void 0 || (_ref0 = _ref0[0]) === null || _ref0 === void 0 || (_ref0 = _ref0.fun) === null || _ref0 === void 0 ? void 0 : _ref0.fungible) : 0n;
               nativeAsset = findNativeAssetInfoOrThrow(chain);
               if (!(isAssetXcEqual(asset, nativeAsset) || usedThirdParam)) {
-                _context12.n = 7;
+                _context10.n = 7;
                 break;
               }
-              return _context12.a(2, deliveryFeeResolved);
+              return _context10.a(2, deliveryFeeResolved);
             case 7:
-              _context12.p = 7;
-              _context12.n = 8;
-              return this.quoteAhPrice(localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false);
+              _context10.p = 7;
+              _context10.n = 8;
+              return this.queryRuntimeApi({
+                module: 'AssetConversionApi',
+                method: 'quote_price_exact_tokens_for_tokens',
+                params: [localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false]
+              });
             case 8:
-              res = _context12.v;
-              return _context12.a(2, res !== null && res !== void 0 ? res : 0n);
+              res = _context10.v;
+              return _context10.a(2, res != null ? BigInt(res) : 0n);
             case 9:
-              _context12.p = 9;
-              _context12.v;
-              return _context12.a(2, 0n);
+              _context10.p = 9;
+              _context10.v;
+              return _context10.a(2, 0n);
           }
-        }, _callee12, this, [[7, 9], [1, 3]]);
+        }, _callee10, this, [[7, 9], [1, 3]]);
       }));
-      function getDeliveryFee(_x21, _x22, _x23, _x24, _x25) {
+      function getDeliveryFee(_x17, _x18, _x19, _x20, _x21) {
         return _getDeliveryFee.apply(this, arguments);
       }
       return getDeliveryFee;
@@ -1266,45 +1224,49 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getBridgeHubFallbackExecFee",
     value: function () {
-      var _getBridgeHubFallbackExecFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(chain, weightValue, asset, version) {
+      var _getBridgeHubFallbackExecFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(chain, weightValue, asset, version) {
         var fallbackExecFeeRes, fallbackJson, fallbackOk, fallbackExecFee, ahApi, assetHubChain, ahLocalizedLoc, convertedExecFee;
-        return _regenerator().w(function (_context13) {
-          while (1) switch (_context13.n) {
+        return _regenerator().w(function (_context11) {
+          while (1) switch (_context11.n) {
             case 0:
-              _context13.n = 1;
+              _context11.n = 1;
               return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weightValue, addXcmVersionHeader(RELAY_LOCATION, version));
             case 1:
-              fallbackExecFeeRes = _context13.v;
+              fallbackExecFeeRes = _context11.v;
               fallbackJson = fallbackExecFeeRes.toJSON();
               fallbackOk = fallbackJson === null || fallbackJson === void 0 ? void 0 : fallbackJson.ok;
               fallbackExecFee = typeof fallbackOk === 'string' || typeof fallbackOk === 'number' ? BigInt(fallbackOk) : undefined;
               if (!(fallbackExecFee === undefined)) {
-                _context13.n = 2;
+                _context11.n = 2;
                 break;
               }
-              return _context13.a(2, undefined);
+              return _context11.a(2, undefined);
             case 2:
               ahApi = this.clone();
               assetHubChain = "AssetHub".concat(getRelayChainOf(chain));
-              _context13.n = 3;
+              _context11.n = 3;
               return ahApi.init(assetHubChain);
             case 3:
               ahLocalizedLoc = localizeLocation(assetHubChain, asset.location);
-              _context13.n = 4;
-              return ahApi.quoteAhPrice(RELAY_LOCATION, ahLocalizedLoc, fallbackExecFee, false);
+              _context11.n = 4;
+              return ahApi.queryRuntimeApi({
+                module: 'AssetConversionApi',
+                method: 'quote_price_exact_tokens_for_tokens',
+                params: [RELAY_LOCATION, ahLocalizedLoc, fallbackExecFee, false]
+              });
             case 4:
-              convertedExecFee = _context13.v;
-              if (!(typeof convertedExecFee === 'bigint')) {
-                _context13.n = 5;
+              convertedExecFee = _context11.v;
+              if (!(convertedExecFee != null)) {
+                _context11.n = 5;
                 break;
               }
-              return _context13.a(2, convertedExecFee);
+              return _context11.a(2, BigInt(convertedExecFee));
             case 5:
-              return _context13.a(2, undefined);
+              return _context11.a(2, undefined);
           }
-        }, _callee13, this);
+        }, _callee11, this);
       }));
-      function getBridgeHubFallbackExecFee(_x26, _x27, _x28, _x29) {
+      function getBridgeHubFallbackExecFee(_x22, _x23, _x24, _x25) {
         return _getBridgeHubFallbackExecFee.apply(this, arguments);
       }
       return getBridgeHubFallbackExecFee;
@@ -1312,21 +1274,21 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getXcmWeight",
     value: function () {
-      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(xcm) {
+      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(xcm) {
         var result, resultJson;
-        return _regenerator().w(function (_context14) {
-          while (1) switch (_context14.n) {
+        return _regenerator().w(function (_context12) {
+          while (1) switch (_context12.n) {
             case 0:
-              _context14.n = 1;
+              _context12.n = 1;
               return this.api.call.xcmPaymentApi.queryXcmWeight(xcm);
             case 1:
-              result = _context14.v;
+              result = _context12.v;
               resultJson = result.toJSON();
-              return _context14.a(2, resultJson.ok);
+              return _context12.a(2, resultJson.ok);
           }
-        }, _callee14, this);
+        }, _callee12, this);
       }));
-      function getXcmWeight(_x30) {
+      function getXcmWeight(_x26) {
         return _getXcmWeight.apply(this, arguments);
       }
       return getXcmWeight;
@@ -1334,34 +1296,35 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getDryRunXcm",
     value: function () {
-      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(_ref1) {
+      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(_ref1) {
         var _ref11, _ref12, _ref13;
-        var originLocation, xcm, asset, chain, version, origin, supportsDryRunApi, response, result, resultJson, isSuccess, error, failureReason, forwardedXcms, actualWeight, weight, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, feeEvent, feeAmount, fee;
-        return _regenerator().w(function (_context15) {
-          while (1) switch (_context15.n) {
+        var originLocation, xcm, asset, chain, version, origin, supportsDryRunApi, response, result, resultJson, isSuccess, _result$Ok, _execRes$Incomplete$e, _execRes$Incomplete, _execRes$Error, execRes, error, failureReason, forwardedXcms, actualWeight, weight, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, feeEvent, feeAmount, fee;
+        return _regenerator().w(function (_context13) {
+          while (1) switch (_context13.n) {
             case 0:
               originLocation = _ref1.originLocation, xcm = _ref1.xcm, asset = _ref1.asset, chain = _ref1.chain, version = _ref1.version, origin = _ref1.origin;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context15.n = 1;
+                _context13.n = 1;
                 break;
               }
               throw new RuntimeApiUnavailableError(chain, 'DryRunApi');
             case 1:
-              _context15.n = 2;
+              _context13.n = 2;
               return this.api.call.dryRunApi.dryRunXcm(originLocation, xcm);
             case 2:
-              response = _context15.v;
+              response = _context13.v;
               result = response.toHuman();
               resultJson = response.toJSON();
               isSuccess = result.Ok && result.Ok.executionResult.Complete;
               if (isSuccess) {
-                _context15.n = 3;
+                _context13.n = 3;
                 break;
               }
-              error = result.Ok.executionResult.Incomplete.error;
+              execRes = (_result$Ok = result.Ok) === null || _result$Ok === void 0 ? void 0 : _result$Ok.executionResult;
+              error = (_execRes$Incomplete$e = execRes === null || execRes === void 0 || (_execRes$Incomplete = execRes.Incomplete) === null || _execRes$Incomplete === void 0 ? void 0 : _execRes$Incomplete.error) !== null && _execRes$Incomplete$e !== void 0 ? _execRes$Incomplete$e : execRes === null || execRes === void 0 || (_execRes$Error = execRes.Error) === null || _execRes$Error === void 0 ? void 0 : _execRes$Error.error;
               failureReason = typeof error === 'string' ? error : error.error;
-              return _context15.a(2, {
+              return _context13.a(2, {
                 success: false,
                 failureReason: failureReason,
                 asset: asset
@@ -1377,18 +1340,18 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 return i.Here ? 0 : (_ref10 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref10 === void 0 ? void 0 : _ref10.parachain;
               }(Object.values(forwardedXcms[0])[0].interior);
               if (!(hasXcmPaymentApiSupport(chain) && asset)) {
-                _context15.n = 5;
+                _context13.n = 5;
                 break;
               }
-              _context15.n = 4;
+              _context13.n = 4;
               return this.getXcmPaymentApiFee(chain, xcm, forwardedXcms, asset, version);
             case 4:
-              _fee = _context15.v;
+              _fee = _context13.v;
               if (!(typeof _fee === 'bigint')) {
-                _context15.n = 5;
+                _context13.n = 5;
                 break;
               }
-              return _context15.a(2, {
+              return _context13.a(2, {
                 success: true,
                 fee: _fee,
                 asset: asset,
@@ -1414,10 +1377,10 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 return ['currencies', 'tokens'].includes(event.section) && event.method === 'Deposited';
               });
               if (feeEvent) {
-                _context15.n = 6;
+                _context13.n = 6;
                 break;
               }
-              return _context15.a(2, Promise.resolve({
+              return _context13.a(2, Promise.resolve({
                 success: false,
                 failureReason: 'Cannot determine destination fee. No Issued event found',
                 asset: asset
@@ -1425,7 +1388,7 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
             case 6:
               feeAmount = feeEvent.section === 'assetConversion' ? feeEvent.data.amountIn : feeEvent.data.amount;
               fee = BigInt(feeAmount.replace(/,/g, ''));
-              return _context15.a(2, {
+              return _context13.a(2, {
                 success: true,
                 fee: fee,
                 asset: asset,
@@ -1434,9 +1397,9 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 destParaId: destParaId
               });
           }
-        }, _callee15, this);
+        }, _callee13, this);
       }));
-      function getDryRunXcm(_x31) {
+      function getDryRunXcm(_x27) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;
@@ -1444,18 +1407,18 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getBridgeStatus",
     value: function () {
-      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16() {
+      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14() {
         var outboundOperatingMode;
-        return _regenerator().w(function (_context16) {
-          while (1) switch (_context16.n) {
+        return _regenerator().w(function (_context14) {
+          while (1) switch (_context14.n) {
             case 0:
-              _context16.n = 1;
+              _context14.n = 1;
               return this.api.query.ethereumOutboundQueue.operatingMode();
             case 1:
-              outboundOperatingMode = _context16.v;
-              return _context16.a(2, outboundOperatingMode.toPrimitive());
+              outboundOperatingMode = _context14.v;
+              return _context14.a(2, outboundOperatingMode.toPrimitive());
           }
-        }, _callee16, this);
+        }, _callee14, this);
       }));
       function getBridgeStatus() {
         return _getBridgeStatus.apply(this, arguments);
@@ -1506,35 +1469,35 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "signAndSubmit",
     value: function () {
-      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(tx, sender) {
+      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(tx, sender) {
         var hash, _t8;
-        return _regenerator().w(function (_context17) {
-          while (1) switch (_context17.n) {
+        return _regenerator().w(function (_context15) {
+          while (1) switch (_context15.n) {
             case 0:
               if (!isSenderSigner(sender)) {
-                _context17.n = 2;
+                _context15.n = 2;
                 break;
               }
-              _context17.n = 1;
+              _context15.n = 1;
               return tx.signAndSend(sender.address, {
                 signer: sender.signer
               });
             case 1:
-              _t8 = _context17.v;
-              _context17.n = 4;
+              _t8 = _context15.v;
+              _context15.n = 4;
               break;
             case 2:
-              _context17.n = 3;
+              _context15.n = 3;
               return tx.signAndSend(createKeyringPair(sender));
             case 3:
-              _t8 = _context17.v;
+              _t8 = _context15.v;
             case 4:
               hash = _t8;
-              return _context17.a(2, hash.toHex());
+              return _context15.a(2, hash.toHex());
           }
-        }, _callee17);
+        }, _callee15);
       }));
-      function signAndSubmit(_x32, _x33) {
+      function signAndSubmit(_x28, _x29) {
         return _signAndSubmit.apply(this, arguments);
       }
       return signAndSubmit;
@@ -1542,27 +1505,27 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "signAndSubmitFinalized",
     value: function () {
-      var _signAndSubmitFinalized = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee18(tx, sender) {
-        var _this4 = this;
-        return _regenerator().w(function (_context18) {
-          while (1) switch (_context18.n) {
+      var _signAndSubmitFinalized = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(tx, sender) {
+        var _this3 = this;
+        return _regenerator().w(function (_context16) {
+          while (1) switch (_context16.n) {
             case 0:
               if (!isSenderSigner(sender)) {
-                _context18.n = 2;
+                _context16.n = 2;
                 break;
               }
-              _context18.n = 1;
+              _context16.n = 1;
               return tx.signAsync(sender.address, {
                 signer: sender.signer
               });
             case 1:
-              _context18.n = 3;
+              _context16.n = 3;
               break;
             case 2:
-              _context18.n = 3;
+              _context16.n = 3;
               return tx.signAsync(createKeyringPair(sender));
             case 3:
-              return _context18.a(2, new Promise(function (resolve, reject) {
+              return _context16.a(2, new Promise(function (resolve, reject) {
                 tx.send(function (_ref14) {
                   var status = _ref14.status,
                     dispatchError = _ref14.dispatchError,
@@ -1570,7 +1533,7 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                   if (status.isFinalized) {
                     if (dispatchError !== undefined) {
                       if (dispatchError.isModule) {
-                        var decoded = _this4.api.registry.findMetaError(dispatchError.asModule);
+                        var decoded = _this3.api.registry.findMetaError(dispatchError.asModule);
                         var docs = decoded.docs,
                           name = decoded.name,
                           section = decoded.section;
@@ -1587,9 +1550,9 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 });
               }));
           }
-        }, _callee18);
+        }, _callee16);
       }));
-      function signAndSubmitFinalized(_x34, _x35) {
+      function signAndSubmitFinalized(_x30, _x31) {
         return _signAndSubmitFinalized.apply(this, arguments);
       }
       return signAndSubmitFinalized;
@@ -1726,9 +1689,8 @@ var depositToken = /*#__PURE__*/function () {
   };
 }();
 
-var createContext = function createContext(executionUrl, env) {
-  var isStringProvider = typeof executionUrl === 'string';
-  var context = new Context(_objectSpread2(_objectSpread2({}, env), {}, {
+var createEnvironment = function createEnvironment(env, executionUrl) {
+  return _objectSpread2(_objectSpread2({}, env), {}, {
     assetOverrides: {
       '3369': [{
         token: '0xba41ddf06b7ffd89d1267b5a93bfef2424eb2003',
@@ -1742,10 +1704,8 @@ var createContext = function createContext(executionUrl, env) {
     precompiles: {
       '2004': '0x000000000000000000000000000000000000081A'
     },
-    ethereumChains: _objectSpread2(_objectSpread2({}, isStringProvider ? _defineProperty({}, env.ethChainId.toString(), executionUrl) : {}), {}, _defineProperty({}, getParaId('Moonbeam'), 'https://rpc.api.moonbeam.network'))
-  }));
-  if (!isStringProvider) context.setEthProvider(env.ethChainId, executionUrl);
-  return context;
+    ethereumChains: _objectSpread2(_objectSpread2(_objectSpread2({}, env.ethereumChains), executionUrl !== undefined ? _defineProperty({}, env.ethChainId.toString(), executionUrl) : {}), {}, _defineProperty({}, getParaId('Moonbeam'), 'https://rpc.api.moonbeam.network'))
+  });
 };
 
 /**
@@ -1760,7 +1720,7 @@ var createContext = function createContext(executionUrl, env) {
  */
 var transferEthToPolkadot$1 = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, provider, signer, recipient, to, currency, ethAsset, amount, _bridgeInfoFor, environment, registry, context, destParaId, fee, sourceAddress, transfer, validation, tx, response, receipt, messageReceipt, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9, _t0, _t1;
+    var api, provider, signer, recipient, to, currency, ethAsset, amount, info, environment, snowbridgeApi, destParaId, sender, sourceAddress, fee, transfer, validated, response, receipt, messageReceipt;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -1791,108 +1751,78 @@ var transferEthToPolkadot$1 = /*#__PURE__*/function () {
         case 4:
           ethAsset = findAssetInfoOrThrow('Ethereum', currency, to);
           amount = abstractDecimals(currency.amount, ethAsset.decimals, api);
-          _bridgeInfoFor = bridgeInfoFor('polkadot_mainnet'), environment = _bridgeInfoFor.environment, registry = _bridgeInfoFor.registry;
-          context = createContext(provider, environment);
+          info = bridgeInfoFor('polkadot_mainnet');
+          environment = createEnvironment(info.environment, typeof provider === 'string' ? provider : undefined);
+          snowbridgeApi = new SnowbridgeApi({
+            info: _objectSpread2(_objectSpread2({}, info), {}, {
+              environment: environment
+            }),
+            ethereumProvider: new EthersEthereumProvider()
+          });
+          if (typeof provider !== 'string') {
+            snowbridgeApi.context.setEthProvider(environment.ethChainId, provider);
+          }
           destParaId = getParaId(to);
           assertHasId(ethAsset);
-          _t = toPolkadotV2;
-          _t2 = context.gateway();
+          sender = snowbridgeApi.sender({
+            kind: 'ethereum',
+            id: environment.ethChainId
+          }, {
+            kind: 'polkadot',
+            id: destParaId
+          });
           _context.n = 5;
-          return context.assetHub();
+          return signer.getAddress();
         case 5:
-          _t3 = _context.v;
+          sourceAddress = _context.v;
           _context.n = 6;
-          return context.parachain(destParaId);
+          return sender.fee(ethAsset.assetId);
         case 6:
-          _t4 = _context.v;
+          fee = _context.v;
           _context.n = 7;
-          return _t.getDeliveryFee.call(_t, {
-            gateway: _t2,
-            assetHub: _t3,
-            destination: _t4
-          }, registry, ethAsset.assetId, destParaId);
+          return sender.tx(sourceAddress, recipient, ethAsset.assetId, amount, fee);
         case 7:
-          fee = _context.v;
+          transfer = _context.v;
           _context.n = 8;
-          return signer.getAddress();
+          return sender.validate(transfer);
         case 8:
-          sourceAddress = _context.v;
-          _context.n = 9;
-          return toPolkadotV2.createTransfer(registry, sourceAddress, recipient, ethAsset.assetId, destParaId, amount, fee);
-        case 9:
-          transfer = _context.v;
-          _t5 = toPolkadotV2;
-          _t6 = context.ethereum();
-          _t7 = context.gateway();
-          _context.n = 10;
-          return context.bridgeHub();
-        case 10:
-          _t8 = _context.v;
-          _context.n = 11;
-          return context.assetHub();
-        case 11:
-          _t9 = _context.v;
-          if (!(destParaId !== getParaId('AssetHubPolkadot'))) {
-            _context.n = 13;
-            break;
-          }
-          _context.n = 12;
-          return context.parachain(destParaId);
-        case 12:
-          _t0 = _context.v;
-          _context.n = 14;
-          break;
-        case 13:
-          _t0 = undefined;
-        case 14:
-          _t1 = _t0;
-          _context.n = 15;
-          return _t5.validateTransfer.call(_t5, {
-            ethereum: _t6,
-            gateway: _t7,
-            bridgeHub: _t8,
-            assetHub: _t9,
-            destParachain: _t1
-          }, transfer);
-        case 15:
-          validation = _context.v;
-          if (!validation.logs.find(function (l) {
-            return l.kind == toPolkadotV2.ValidationKind.Error;
+          validated = _context.v;
+          if (!validated.logs.find(function (l) {
+            return l.kind === toPolkadotV2.ValidationKind.Error;
           })) {
-            _context.n = 16;
+            _context.n = 9;
             break;
           }
-          throw new RoutingResolutionError("Validation failed with following errors: \n\n ".concat(validation.logs.filter(function (l) {
-            return l.kind == toPolkadotV2.ValidationKind.Error;
+          throw new RoutingResolutionError("Validation failed with following errors: \n\n ".concat(validated.logs.filter(function (l) {
+            return l.kind === toPolkadotV2.ValidationKind.Error;
           }).map(function (l) {
             return l.message;
           }).join('\n\n')));
-        case 16:
-          tx = transfer.tx;
-          _context.n = 17;
-          return signer.sendTransaction(tx);
-        case 17:
+        case 9:
+          _context.n = 10;
+          return signer.sendTransaction(transfer.tx);
+        case 10:
           response = _context.v;
-          _context.n = 18;
+          _context.n = 11;
           return response.wait(1);
-        case 18:
+        case 11:
           receipt = _context.v;
           if (receipt) {
-            _context.n = 19;
+            _context.n = 12;
             break;
           }
           throw new RoutingResolutionError("Transaction ".concat(response.hash, " not included."));
-        case 19:
-          _context.n = 20;
-          return toPolkadotV2.getMessageReceipt(receipt);
-        case 20:
+        case 12:
+          _context.n = 13;
+          return sender.messageId(receipt);
+        case 13:
           messageReceipt = _context.v;
           if (messageReceipt) {
-            _context.n = 21;
+            _context.n = 14;
             break;
           }
           throw new RoutingResolutionError("Transaction ".concat(receipt.hash, " did not emit a message."));
-        case 21:
+        case 14:
           return _context.a(2, {
             response: response,
             messageReceipt: messageReceipt
@@ -1931,6 +1861,8 @@ var getTokenBalance = /*#__PURE__*/function () {
 
 /**
  * Builder class for constructing transfers from Ethereum to Polkadot.
+ *
+ * @deprecated EvmBuilder is deprecated. Please use the Builder class instead.
  */
 var EvmBuilderCore = /*#__PURE__*/function () {
   function EvmBuilderCore(options) {
@@ -2075,6 +2007,7 @@ var EvmBuilderCore = /*#__PURE__*/function () {
  *
  * @param provider - The Ethereum provider to use for the transfer.
  * @returns An instance of EvmBuilder class
+ * @deprecated EvmBuilder is deprecated. Please use the Builder class instead.
  */
 var EvmBuilder$1 = function EvmBuilder(api, provider) {
   return new EvmBuilderCore({
@@ -2093,6 +2026,7 @@ var Builder = function Builder(api) {
   var pjsApi = new PolkadotJsApi(api);
   return Builder$1(pjsApi);
 };
+/** @deprecated EvmBuilder is deprecated. Please use the Builder class instead. */
 var EvmBuilder = function EvmBuilder(provider, api) {
   var pjsApi = new PolkadotJsApi(api);
   return EvmBuilder$1(pjsApi, provider);