@paraspell/sdk-core 11.12.5 → 11.12.7

package/dist/index.cjs

@@ -849,6 +849,7 @@ var isConfig = function isConfig(value) {
 };
 
 var computeOverridenAmount = function computeOverridenAmount(options, increaseAmount) {
+  var relative = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var from = options.from,
     to = options.to,
     currency = options.currency,
@@ -856,21 +857,23 @@ var computeOverridenAmount = function computeOverridenAmount(options, increaseAm
   var amount = options.currency.amount;
   var config = api.getConfig();
   if (isConfig(config) && config.abstractDecimals && typeof amount !== 'bigint') {
-    return Number(increaseAmount) + Number(amount);
+    var base = relative ? Number(amount) : 0;
+    return Number(increaseAmount) + base;
   } else {
     assertToIsString(to);
     var asset = assets.findAssetInfoOrThrow(from, currency, to);
-    return parseUnits(increaseAmount, asset.decimals) + BigInt(amount);
+    var _base = relative ? BigInt(amount) : 0n;
+    return parseUnits(increaseAmount, asset.decimals) + _base;
   }
 };
 var overrideTxAmount = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, builder, amount) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, builder, amount, relative) {
     var modifiedBuilder, _yield$modifiedBuilde, tx;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           modifiedBuilder = builder.currency(_objectSpread2(_objectSpread2({}, options.currency), {}, {
-            amount: computeOverridenAmount(options, amount)
+            amount: computeOverridenAmount(options, amount, relative)
           }));
           _context.n = 1;
           return modifiedBuilder['buildInternal']();
@@ -881,12 +884,12 @@ var overrideTxAmount = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function overrideTxAmount(_x, _x2, _x3) {
+  return function overrideTxAmount(_x, _x2, _x3, _x4) {
     return _ref.apply(this, arguments);
   };
 }();
 var createTx = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, builder, amount) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, builder, amount, relative) {
     var _yield$builder$buildI, tx;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
@@ -903,13 +906,13 @@ var createTx = /*#__PURE__*/function () {
           return _context2.a(2, tx);
         case 2:
           _context2.n = 3;
-          return overrideTxAmount(options, builder, amount);
+          return overrideTxAmount(options, builder, amount, relative);
         case 3:
           return _context2.a(2, _context2.v);
       }
     }, _callee2);
   }));
-  return function createTx(_x4, _x5, _x6) {
+  return function createTx(_x5, _x6, _x7, _x8) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -4527,15 +4530,20 @@ var resolveAsset = function resolveAsset(currency, origin, destination, assetChe
 };
 
 var resolveHopAsset = function resolveHopAsset(_ref) {
-  var _asset$location, _findAssetInfoOnDest;
-  var originChain = _ref.originChain,
+  var _findAssetInfoOnDest;
+  var api = _ref.api,
+    tx = _ref.tx,
+    originChain = _ref.originChain,
     currentChain = _ref.currentChain,
+    destination = _ref.destination,
     swapConfig = _ref.swapConfig,
     asset = _ref.asset,
     hasPassedExchange = _ref.hasPassedExchange,
     currency = _ref.currency;
-  var isExternalAsset = ((_asset$location = asset.location) === null || _asset$location === void 0 ? void 0 : _asset$location.parents) === sdkCommon.Parents.TWO;
-  if (isExternalAsset) {
+  var isRelayAssetIncluded = api.getTypeThenAssetCount(tx) === 2;
+  var isSubBridge = !sdkCommon.isTLocation(destination) && sdkCommon.isSubstrateBridge(originChain, destination);
+  var useRelayAssetAsFee = destination === 'Ethereum' || isSubBridge || isRelayAssetIncluded;
+  if (useRelayAssetAsFee) {
     return assets.findNativeAssetInfoOrThrow(getRelayChainOf(currentChain));
   }
   if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
@@ -5558,8 +5566,11 @@ var dryRunInternal = /*#__PURE__*/function () {
                   case 0:
                     hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange;
                     hopAsset = resolveHopAsset({
+                      api: api,
+                      tx: tx,
                       originChain: origin,
                       currentChain: currentChain,
+                      destination: destination,
                       asset: currentAsset,
                       currency: currency,
                       swapConfig: swapConfig,
@@ -9356,6 +9367,16 @@ var Manta = /*#__PURE__*/function (_Parachain) {
       };
       return transferXTokens(input, currencySelection);
     }
+  }, {
+    key: "isSendingTempDisabled",
+    value: function isSendingTempDisabled(_options) {
+      return true;
+    }
+  }, {
+    key: "isReceivingTempDisabled",
+    value: function isReceivingTempDisabled(_scenario) {
+      return true;
+    }
   }, {
     key: "transferLocalNonNativeAsset",
     value: function transferLocalNonNativeAsset(options) {
@@ -10646,14 +10667,16 @@ var CurrenciesPallet = /*#__PURE__*/function (_BaseAssetsPallet) {
     key: "mint",
     value: function mint(address, asset, balance, chain) {
       var isKarura = chain.startsWith('Karura');
-      var id = isKarura ? getChain('Karura').getCurrencySelection(asset) : (assertHasId(asset), Number(asset.assetId));
+      var isAcala = chain.startsWith('Acala');
+      var isAcalaLike = isKarura || isAcala;
+      var id = isAcalaLike ? getChain(isKarura ? 'Karura' : 'Acala').getCurrencySelection(asset) : (assertHasId(asset), Number(asset.assetId));
       var amount = asset.amount;
       return Promise.resolve({
         balanceTx: {
           module: this.palletName,
           method: 'update_balance',
           parameters: {
-            who: isKarura ? {
+            who: isAcalaLike ? {
               Id: address
             } : address,
             currency_id: id,
@@ -10773,6 +10796,20 @@ var SystemPallet = /*#__PURE__*/function (_BaseAssetsPallet) {
   }]);
 }(BaseAssetsPallet);
 
+var resolveId = function resolveId(asset, chain) {
+  var isBifrost = chain.startsWith('Bifrost');
+  if (isBifrost) {
+    var _asset$assetId;
+    var isEthAsset = assets.isForeignAsset(asset) && ((_asset$assetId = asset.assetId) === null || _asset$assetId === void 0 ? void 0 : _asset$assetId.startsWith('0x'));
+    var resolvedAsset = isEthAsset && asset.location ? assets.findAssetInfoOrThrow(chain, {
+      location: asset.location
+    }, null) : asset;
+    return getChain('BifrostPolkadot').getCurrencySelection(resolvedAsset);
+  } else {
+    assertHasId(asset);
+    return asset.assetId;
+  }
+};
 var TokensPallet = /*#__PURE__*/function (_BaseAssetsPallet) {
   function TokensPallet() {
     _classCallCheck(this, TokensPallet);
@@ -10784,7 +10821,7 @@ var TokensPallet = /*#__PURE__*/function (_BaseAssetsPallet) {
     value: function mint(address, asset, balance, chain) {
       var isBifrost = chain.startsWith('Bifrost');
       if (!isBifrost) assertHasId(asset);
-      var id = isBifrost ? getChain('BifrostPolkadot').getCurrencySelection(asset) : (assertHasId(asset), asset.assetId);
+      var id = resolveId(asset, chain);
       var amount = asset.amount;
       return Promise.resolve({
         balanceTx: {
@@ -11022,130 +11059,212 @@ var wrapTxBypass = /*#__PURE__*/function () {
   };
 }();
 
+var MAX_INCREASE_RETRIES = 5;
+var INCREASE_BUMP_STEP = 100;
+var DECREASE_START_AMOUNT = 1;
+var MAX_DECREASE_RETRIES = 5;
+var DECREASE_DIVIDE_FACTOR = 5;
+var FAILED_TO_TRANSACT_ASSET = 'FailedToTransactAsset';
 var getBypassResultWithRetries = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, internalFn, initialTx) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options, internalFn, initialTx) {
     var maxRetries,
       bumpStep,
-      hasError,
+      getResultError,
+      isFailedToTransact,
+      isAmountTooLow,
+      attempt,
+      retryWithReducedAmount,
       first,
-      result,
       i,
       amount,
-      bumpedTx,
-      _args = arguments,
-      _t,
+      res,
+      err,
+      _args3 = arguments,
       _t2,
       _t3;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.p = _context3.n) {
         case 0:
-          maxRetries = _args.length > 3 && _args[3] !== undefined ? _args[3] : 5;
-          bumpStep = _args.length > 4 && _args[4] !== undefined ? _args[4] : 100;
-          hasError = function hasError(res) {
-            return 'failureReason' in res ? !!res.failureReason : 'dryRunError' in res ? !!res.dryRunError : false;
+          maxRetries = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : MAX_INCREASE_RETRIES;
+          bumpStep = _args3.length > 4 && _args3[4] !== undefined ? _args3[4] : INCREASE_BUMP_STEP;
+          getResultError = function getResultError(res) {
+            return 'failureReason' in res ? res.failureReason : 'dryRunError' in res ? res.dryRunError : undefined;
           };
+          isFailedToTransact = function isFailedToTransact(res) {
+            return 'failureReason' in res && res.failureReason === FAILED_TO_TRANSACT_ASSET;
+          };
+          isAmountTooLow = function isAmountTooLow(e) {
+            return e instanceof AmountTooLowError;
+          };
+          attempt = /*#__PURE__*/function () {
+            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(amount, relative) {
+              var tx;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    _context.n = 1;
+                    return options.buildTx(amount, relative);
+                  case 1:
+                    tx = _context.v;
+                    return _context.a(2, internalFn(_objectSpread2(_objectSpread2({}, options), {}, {
+                      tx: tx,
+                      useRootOrigin: true
+                    })));
+                }
+              }, _callee);
+            }));
+            return function attempt(_x4, _x5) {
+              return _ref2.apply(this, arguments);
+            };
+          }();
+          retryWithReducedAmount = /*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+              var start,
+                divide,
+                amount,
+                attemptIdx,
+                res,
+                err,
+                _args2 = arguments,
+                _t;
+              return _regenerator().w(function (_context2) {
+                while (1) switch (_context2.p = _context2.n) {
+                  case 0:
+                    start = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : DECREASE_START_AMOUNT;
+                    divide = function divide(v) {
+                      var next = v / DECREASE_DIVIDE_FACTOR;
+                      return next > 0 ? next : 1;
+                    };
+                    amount = divide(start);
+                    attemptIdx = 0;
+                  case 1:
+                    if (!(attemptIdx < MAX_DECREASE_RETRIES && amount > 0)) {
+                      _context2.n = 9;
+                      break;
+                    }
+                    _context2.p = 2;
+                    _context2.n = 3;
+                    return attempt(amount.toString(), false);
+                  case 3:
+                    res = _context2.v;
+                    err = getResultError(res);
+                    if (err) {
+                      _context2.n = 4;
+                      break;
+                    }
+                    return _context2.a(2, res);
+                  case 4:
+                    if (!isFailedToTransact(res)) {
+                      _context2.n = 5;
+                      break;
+                    }
+                    amount = divide(amount);
+                    return _context2.a(3, 8);
+                  case 5:
+                    return _context2.a(2, res);
+                  case 6:
+                    _context2.p = 6;
+                    _t = _context2.v;
+                    if (!isAmountTooLow(_t)) {
+                      _context2.n = 7;
+                      break;
+                    }
+                    amount = divide(amount);
+                    return _context2.a(3, 8);
+                  case 7:
+                    throw _t;
+                  case 8:
+                    attemptIdx++;
+                    _context2.n = 1;
+                    break;
+                  case 9:
+                    return _context2.a(2, attempt(amount.toString(), false));
+                }
+              }, _callee2, null, [[2, 6]]);
+            }));
+            return function retryWithReducedAmount() {
+              return _ref3.apply(this, arguments);
+            };
+          }();
           if (!initialTx) {
-            _context.n = 5;
+            _context3.n = 5;
             break;
           }
-          _context.p = 1;
-          _context.n = 2;
+          _context3.p = 1;
+          _context3.n = 2;
           return internalFn(_objectSpread2(_objectSpread2({}, options), {}, {
             tx: initialTx,
             useRootOrigin: true
           }));
         case 2:
-          first = _context.v;
-          if (hasError(first)) {
-            _context.n = 3;
+          first = _context3.v;
+          if (getResultError(first)) {
+            _context3.n = 3;
             break;
           }
-          return _context.a(2, first);
+          return _context3.a(2, first);
         case 3:
-          _context.n = 5;
+          _context3.n = 5;
           break;
         case 4:
-          _context.p = 4;
-          _t = _context.v;
-          if (_t instanceof AmountTooLowError) {
-            _context.n = 5;
+          _context3.p = 4;
+          _t2 = _context3.v;
+          if (isAmountTooLow(_t2)) {
+            _context3.n = 5;
             break;
           }
-          throw _t;
+          throw _t2;
         case 5:
-          result = null;
           i = 1;
         case 6:
           if (!(i <= maxRetries)) {
-            _context.n = 19;
+            _context3.n = 15;
             break;
           }
-          amount = (bumpStep * i).toString();
-          bumpedTx = void 0;
-          _context.p = 7;
-          _context.n = 8;
-          return options.buildTx(amount);
+          amount = bumpStep * i;
+          _context3.p = 7;
+          _context3.n = 8;
+          return attempt(amount.toString());
         case 8:
-          bumpedTx = _context.v;
-          _context.n = 12;
-          break;
-        case 9:
-          _context.p = 9;
-          _t2 = _context.v;
-          if (!(_t2 instanceof AmountTooLowError)) {
-            _context.n = 11;
+          res = _context3.v;
+          err = getResultError(res);
+          if (err) {
+            _context3.n = 9;
             break;
           }
-          if (!(i === maxRetries)) {
-            _context.n = 10;
+          return _context3.a(2, res);
+        case 9:
+          if (!isFailedToTransact(res)) {
+            _context3.n = 10;
             break;
           }
-          throw _t2;
+          return _context3.a(2, retryWithReducedAmount(DECREASE_START_AMOUNT));
         case 10:
-          return _context.a(3, 18);
+          return _context3.a(3, 14);
         case 11:
-          throw _t2;
-        case 12:
-          _context.p = 12;
-          _context.n = 13;
-          return internalFn(_objectSpread2(_objectSpread2({}, options), {}, {
-            tx: bumpedTx,
-            useRootOrigin: true
-          }));
-        case 13:
-          result = _context.v;
-          if (hasError(result)) {
-            _context.n = 14;
-            break;
-          }
-          return _context.a(2, result);
-        case 14:
-          _context.n = 18;
-          break;
-        case 15:
-          _context.p = 15;
-          _t3 = _context.v;
-          if (!(_t3 instanceof AmountTooLowError)) {
-            _context.n = 17;
+          _context3.p = 11;
+          _t3 = _context3.v;
+          if (!isAmountTooLow(_t3)) {
+            _context3.n = 13;
             break;
           }
           if (!(i === maxRetries)) {
-            _context.n = 16;
+            _context3.n = 12;
             break;
           }
           throw _t3;
-        case 16:
-          return _context.a(3, 18);
-        case 17:
+        case 12:
+          return _context3.a(3, 14);
+        case 13:
           throw _t3;
-        case 18:
+        case 14:
           i++;
-          _context.n = 6;
+          _context3.n = 6;
           break;
-        case 19:
-          return _context.a(2, result);
+        case 15:
+          return _context3.a(2, attempt(String(bumpStep * maxRetries)));
       }
-    }, _callee, null, [[12, 15], [7, 9], [1, 4]]);
+    }, _callee3, null, [[7, 11], [1, 4]]);
   }));
   return function getBypassResultWithRetries(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
@@ -11506,8 +11625,11 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
                   case 0:
                     hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange;
                     hopAsset = resolveHopAsset({
+                      api: api,
+                      tx: tx,
                       originChain: origin,
                       currentChain: currentChain,
+                      destination: destination,
                       asset: currentAsset,
                       currency: currency,
                       swapConfig: swapConfig,
@@ -12716,35 +12838,45 @@ var buildTypeAndThenCall = function buildTypeAndThenCall(_ref, isDotAsset, custo
 };
 
 var FEE_PADDING_PERCENTAGE = 20;
+var FEE_ETH_ASSET_PADDING_PERCENTAGE = 100;
 var FEE_PADDING_HYDRATION = 500;
+var getPadding = function getPadding(chain, _ref) {
+  var assetInfo = _ref.assetInfo,
+    dest = _ref.dest;
+  var isEthAsset = assetInfo.location && assets.findAssetInfoByLoc(assets.getOtherAssets('Ethereum'), assetInfo.location);
+  if (chain === 'Hydration') return FEE_PADDING_HYDRATION;
+  if (isEthAsset && dest.chain.startsWith('AssetHub')) return FEE_ETH_ASSET_PADDING_PERCENTAGE;
+  return FEE_PADDING_PERCENTAGE;
+};
 var computeInstructionFee = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, version, xcm) {
-    var chain, api, _t;
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref2, version, xcm, context) {
+    var chain, api, padding, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          chain = _ref.chain, api = _ref.api;
+          chain = _ref2.chain, api = _ref2.api;
+          padding = getPadding(chain, context);
           _t = padValueBy;
           _context.n = 1;
           return api.getXcmPaymentApiFee(chain, addXcmVersionHeader(xcm, version), [], {
             location: DOT_LOCATION
           }, true);
         case 1:
-          return _context.a(2, _t(_context.v, chain === 'Hydration' ? FEE_PADDING_HYDRATION : FEE_PADDING_PERCENTAGE));
+          return _context.a(2, _t(_context.v, padding));
       }
     }, _callee);
   }));
-  return function computeInstructionFee(_x, _x2, _x3) {
-    return _ref2.apply(this, arguments);
+  return function computeInstructionFee(_x, _x2, _x3, _x4) {
+    return _ref3.apply(this, arguments);
   };
 }();
 var computeAllFees = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref3, customXcm, isDotAsset, refundInstruction) {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(context, customXcm, isDotAsset, refundInstruction) {
     var reserve, dest, version, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9, _t0;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
-          reserve = _ref3.reserve, dest = _ref3.dest, version = _ref3.options.version;
+          reserve = context.reserve, dest = context.dest, version = context.options.version;
           if (!customXcm.some(function (x) {
             return 'DepositReserveAsset' in x || 'InitiateTeleport' in x;
           })) {
@@ -12752,7 +12884,7 @@ var computeAllFees = /*#__PURE__*/function () {
             break;
           }
           _context2.n = 1;
-          return computeInstructionFee(reserve, version, customXcm);
+          return computeInstructionFee(reserve, version, customXcm, context);
         case 1:
           _t3 = _context2.v;
           if (!refundInstruction) {
@@ -12760,7 +12892,7 @@ var computeAllFees = /*#__PURE__*/function () {
             break;
           }
           _context2.n = 2;
-          return computeInstructionFee(reserve, version, [refundInstruction]);
+          return computeInstructionFee(reserve, version, [refundInstruction], context);
         case 2:
           _t4 = _context2.v;
           _context2.n = 4;
@@ -12775,7 +12907,7 @@ var computeAllFees = /*#__PURE__*/function () {
               return 'DepositReserveAsset' in j || 'InitiateTeleport' in j;
             });
             return instr ? 'DepositReserveAsset' in instr ? instr.DepositReserveAsset.xcm : instr.InitiateTeleport.xcm : undefined;
-          }());
+          }(), context);
         case 5:
           _t6 = _context2.v;
           _t2 = {
@@ -12791,7 +12923,7 @@ var computeAllFees = /*#__PURE__*/function () {
             break;
           }
           _context2.n = 7;
-          return computeInstructionFee(assets.hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, customXcm);
+          return computeInstructionFee(assets.hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, customXcm, context);
         case 7:
           _t7 = _context2.v;
           _context2.n = 9;
@@ -12805,7 +12937,7 @@ var computeAllFees = /*#__PURE__*/function () {
             break;
           }
           _context2.n = 10;
-          return computeInstructionFee(assets.hasXcmPaymentApiSupport(reserve.chain) ? reserve : dest, version, [refundInstruction]);
+          return computeInstructionFee(assets.hasXcmPaymentApiSupport(reserve.chain) ? reserve : dest, version, [refundInstruction], context);
         case 10:
           _t9 = _context2.v;
           _context2.n = 12;
@@ -12824,7 +12956,7 @@ var computeAllFees = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function computeAllFees(_x4, _x5, _x6, _x7) {
+  return function computeAllFees(_x5, _x6, _x7, _x8) {
     return _ref4.apply(this, arguments);
   };
 }();
@@ -13473,8 +13605,8 @@ var AssetClaimBuilder = /*#__PURE__*/function () {
 }();
 
 var normalizeAmountAll = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, buildTx, options) {
-    var currency, isAmountAll, transferable;
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, builder, options) {
+    var currency, isAmountAll, builderWithMinAmount, buildTx, transferable, finalBuildTx;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -13484,11 +13616,18 @@ var normalizeAmountAll = /*#__PURE__*/function () {
             _context.n = 1;
             break;
           }
-          return _context.a(2, _objectSpread2({
-            api: api,
-            isAmountAll: isAmountAll
-          }, options));
+          return _context.a(2, {
+            options: _objectSpread2({
+              api: api,
+              isAmountAll: isAmountAll
+            }, options),
+            buildTx: builder['createTxFactory']()
+          });
         case 1:
+          builderWithMinAmount = builder.currency(_objectSpread2(_objectSpread2({}, options.currency), {}, {
+            amount: MIN_AMOUNT
+          }));
+          buildTx = builderWithMinAmount['createTxFactory']();
           assertToIsString(options.to);
           assertSenderAddress(options.senderAddress);
           _context.n = 2;
@@ -13505,13 +13644,19 @@ var normalizeAmountAll = /*#__PURE__*/function () {
           });
         case 2:
           transferable = _context.v;
-          return _context.a(2, _objectSpread2(_objectSpread2({}, options), {}, {
-            api: api,
-            isAmountAll: isAmountAll,
-            currency: _objectSpread2(_objectSpread2({}, currency), {}, {
-              amount: transferable
-            })
-          }));
+          finalBuildTx = builder.currency(_objectSpread2(_objectSpread2({}, options.currency), {}, {
+            amount: transferable
+          }))['createTxFactory']();
+          return _context.a(2, {
+            options: _objectSpread2(_objectSpread2({}, options), {}, {
+              api: api,
+              isAmountAll: isAmountAll,
+              currency: _objectSpread2(_objectSpread2({}, currency), {}, {
+                amount: transferable
+              })
+            }),
+            buildTx: finalBuildTx
+          });
       }
     }, _callee);
   }));
@@ -13573,12 +13718,12 @@ var BatchTransactionManager = /*#__PURE__*/function () {
               _context2.n = 4;
               return Promise.all(this.transactionOptions.map(/*#__PURE__*/function () {
                 var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(opts) {
-                  var buildTx;
+                  var builder;
                   return _regenerator().w(function (_context) {
                     while (1) switch (_context.n) {
                       case 0:
-                        buildTx = opts.buildTx;
-                        return _context.a(2, normalizeAmountAll(api, buildTx, opts));
+                        builder = opts.builder;
+                        return _context.a(2, normalizeAmountAll(api, builder, opts));
                     }
                   }, _callee);
                 }));
@@ -13589,8 +13734,9 @@ var BatchTransactionManager = /*#__PURE__*/function () {
             case 4:
               normalized = _context2.v;
               _context2.n = 5;
-              return Promise.all(normalized.map(function (o) {
-                return send(o);
+              return Promise.all(normalized.map(function (_ref2) {
+                var options = _ref2.options;
+                return send(options);
               }));
             case 5:
               txs = _context2.v;
@@ -13789,11 +13935,10 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "addToBatch",
     value: function addToBatch() {
-      var buildTx = this.createTxFactory();
       this.batchManager.addTransaction(_objectSpread2(_objectSpread2({
         api: this.api
       }, this._options), {}, {
-        buildTx: buildTx
+        builder: this
       }));
       return new GeneralBuilder(this.api, this.batchManager, {
         from: this._options.from
@@ -13830,18 +13975,16 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "prepareNormalizedOptions",
     value: function () {
       var _prepareNormalizedOptions = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-        var builder, buildTx, normalizedOptions;
+        var _yield$normalizeAmoun, normalizedOptions, buildTx;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              builder = this.currency(_objectSpread2(_objectSpread2({}, options.currency), {}, {
-                amount: MIN_AMOUNT.toString()
-              }));
-              buildTx = builder.createTxFactory();
               _context2.n = 1;
-              return normalizeAmountAll(this.api, buildTx, options);
+              return normalizeAmountAll(this.api, this, options);
             case 1:
-              normalizedOptions = _context2.v;
+              _yield$normalizeAmoun = _context2.v;
+              normalizedOptions = _yield$normalizeAmoun.options;
+              buildTx = _yield$normalizeAmoun.buildTx;
               return _context2.a(2, {
                 normalizedOptions: normalizedOptions,
                 buildTx: buildTx
@@ -14015,10 +14158,10 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "createTxFactory",
     value: function createTxFactory() {
       var _this = this;
-      return function (amount) {
+      return function (amount, relative) {
         return createTx(_objectSpread2(_objectSpread2({}, _this._options), {}, {
           api: _this.api
-        }), _this, amount);
+        }), _this, amount, relative);
       };
     }
     /**