@imtbl/sdk 0.27.8 → 0.27.9

package/dist/checkout_sdk.js

@@ -14735,18 +14735,45 @@ const newAmount = (amount, token) => ({
     token,
 });
 const isERC20Amount = (amount) => amount.token.type === 'erc20';
+const isNativeAmount = (amount) => amount.token.type === 'native';
 const addERC20Amount = (a, b) => {
     // Make sure the ERC20s have the same address
     if (a.token.address !== b.token.address)
         throw new Error('Token mismatch: token addresses must be the same');
     return { value: a.value.add(b.value), token: a.token };
 };
+const addNativeAmount = (a, b) => ({
+    value: a.value.add(b.value),
+    token: a.token,
+});
+const addAmount = (a, b) => {
+    if (isERC20Amount(a) && isERC20Amount(b)) {
+        return addERC20Amount(a, b);
+    }
+    if (isNativeAmount(a) && isNativeAmount(b)) {
+        return addNativeAmount(a, b);
+    }
+    throw new Error('Token mismatch: token types must be the same');
+};
 const subtractERC20Amount = (a, b) => {
     // Make sure the ERC20s have the same address
     if (a.token.address !== b.token.address)
         throw new Error('Token mismatch: token addresses must be the same');
     return { value: a.value.sub(b.value), token: a.token };
 };
+const subtractNativeAmount = (a, b) => ({
+    value: a.value.sub(b.value),
+    token: a.token,
+});
+const subtractAmount = (a, b) => {
+    if (isERC20Amount(a) && isERC20Amount(b)) {
+        return subtractERC20Amount(a, b);
+    }
+    if (isNativeAmount(a) && isNativeAmount(b)) {
+        return subtractNativeAmount(a, b);
+    }
+    throw new Error('Token mismatch: token types must be the same');
+};
 
 const amountIndex = 0;
 const gasEstimateIndex = 3;
@@ -15120,11 +15147,11 @@ const getUnsignedERC20ApproveTransaction = (ownerAddress, tokenAmount, spenderAd
         from: ownerAddress,
     };
 };
-const prepareApproval = (tradeType, amountSpecified, amountWithSlippage, routingContracts, secondaryFees) => {
+const prepareApproval = (tradeType, amountSpecified, amountWithSlippage, contracts, secondaryFees) => {
     const amountOfTokenIn = tradeType === TradeType.EXACT_INPUT ? amountSpecified : amountWithSlippage;
     const spender = secondaryFees.length === 0
-        ? routingContracts.peripheryRouterAddress
-        : routingContracts.secondaryFeeAddress;
+        ? contracts.routerAddress
+        : contracts.secondaryFeeAddress;
     return { spender, amount: amountOfTokenIn };
 };
 /**
@@ -15203,7 +15230,7 @@ function applySlippage(tradeType, amount, slippage) {
     const amountWithSlippage = maybeInverted.multiply(amount.toString()).quotient;
     return ethers.BigNumber.from(amountWithSlippage.toString());
 }
-function prepareUserQuote(otherToken, tradeInfo, slippage, fees) {
+function prepareUserQuote(otherToken, tradeInfo, slippage, fees, nativeTokenService) {
     const quote = getQuoteAmountFromTradeType(tradeInfo);
     const amountWithSlippage = applySlippage(tradeInfo.tradeType, quote.value, slippage);
     return {
@@ -15213,15 +15240,14 @@ function prepareUserQuote(otherToken, tradeInfo, slippage, fees) {
             value: amountWithSlippage,
         },
         slippage,
-        fees: fees.withAmounts(),
+        fees: fees.withAmounts().map((fee) => ({
+            ...fee,
+            amount: nativeTokenService.maybeWrapAmount(fee.amount),
+        })),
     };
 }
 function getOurQuoteReqAmount(amountSpecified, // the amount specified by the user, either exactIn or exactOut
 fees, tradeType, nativeTokenService) {
-    // TODO: TP-1649: Remove this when we support Native
-    if (!isERC20Amount(amountSpecified)) {
-        throw new Error('Not implemented yet!');
-    }
     if (tradeType === TradeType.EXACT_OUTPUT) {
         // For an exact output swap, we do not need to subtract fees from the given amount
         return nativeTokenService.maybeWrapAmount(amountSpecified);
@@ -15252,14 +15278,17 @@ class Fees {
         this.secondaryFees = secondaryFees;
         this.amount = newAmount(BigNumber$1.from(0), token);
     }
+    get token() {
+        return this.amount.token;
+    }
     addAmount(amount) {
-        this.amount = addERC20Amount(this.amount, amount);
+        this.amount = addAmount(this.amount, amount);
     }
     amountWithFeesApplied() {
-        return addERC20Amount(this.amount, this.total());
+        return addAmount(this.amount, this.total());
     }
     amountLessFees() {
-        return subtractERC20Amount(this.amount, this.total());
+        return subtractAmount(this.amount, this.total());
     }
     withAmounts() {
         return this.secondaryFees.map((fee) => {
@@ -15278,7 +15307,7 @@ class Fees {
             const feeAmount = this.amount.value
                 .mul(fee.basisPoints)
                 .div(BASIS_POINT_PRECISION);
-            totalFees = addERC20Amount(totalFees, newAmount(feeAmount, this.amount.token));
+            totalFees = addAmount(totalFees, newAmount(feeAmount, this.amount.token));
         }
         return totalFees;
     }
@@ -15454,21 +15483,33 @@ function getSwap(adjustedQuote, fromAddress, slippage, deadline, peripheryRouter
         gasFeeEstimate: gasFeeEstimate ? nativeTokenService.maybeWrapAmount(gasFeeEstimate) : null,
     };
 }
-function prepareSwap(ourQuote, amountSpecified, fees) {
+const adjustAmountIn = (ourQuote, amountSpecified, fees, nativeTokenService) => {
     if (ourQuote.tradeType === TradeType.EXACT_OUTPUT) {
-        fees.addAmount(ourQuote.amountIn);
-        return {
-            gasEstimate: ourQuote.gasEstimate,
-            route: ourQuote.route,
-            amountIn: fees.amountWithFeesApplied(),
-            amountOut: amountSpecified,
-            tradeType: ourQuote.tradeType,
-        };
-    }
+        // when doing exact output, calculate the fees based on the amountIn
+        const amountToAdd = nativeTokenService.isNativeToken(fees.token)
+            ? nativeTokenService.unwrapAmount(ourQuote.amountIn)
+            : ourQuote.amountIn;
+        fees.addAmount(amountToAdd);
+        return nativeTokenService.maybeWrapAmount(fees.amountWithFeesApplied());
+    }
+    return nativeTokenService.maybeWrapAmount(amountSpecified);
+};
+/**
+ * adjustQuoteWithFees adjusts the amountIn of the quote to account for fees
+ * EXACT_OUTPUT swaps will have the fees added to the amountIn if there are fees specified
+ * EXACT_INPUT swaps will have amountIn set to the user-specified amount
+ * @param ourQuote The quote from calling the Quoter contract
+ * @param amountSpecified The user-specified amount for the swap (EXACT...)
+ * @param fees The fees applied to the swap
+ * @param tokenWrapper Helper class for the native token and associated ERC20
+ * @returns {QuoteResult} The adjusted quote
+ */
+function adjustQuoteWithFees(ourQuote, amountSpecified, fees, nativeTokenService) {
+    const adjustedAmountIn = adjustAmountIn(ourQuote, amountSpecified, fees, nativeTokenService);
     return {
         gasEstimate: ourQuote.gasEstimate,
         route: ourQuote.route,
-        amountIn: amountSpecified,
+        amountIn: adjustedAmountIn,
         amountOut: ourQuote.amountOut,
         tradeType: ourQuote.tradeType,
     };
@@ -15569,6 +15610,8 @@ class Exchange {
     wrappedNativeToken;
     secondaryFees;
     nativeTokenService;
+    secondaryFeeContractAddress;
+    routerContractAddress;
     constructor(configuration) {
         const config = new ExchangeConfiguration(configuration);
         this.chainId = config.chain.chainId;
@@ -15576,13 +15619,13 @@ class Exchange {
         this.wrappedNativeToken = config.chain.wrappedNativeToken;
         this.nativeTokenService = new NativeTokenService(this.nativeToken, this.wrappedNativeToken);
         this.secondaryFees = config.secondaryFees;
+        this.routerContractAddress = config.chain.contracts.peripheryRouter;
+        this.secondaryFeeContractAddress = config.chain.contracts.secondaryFee;
         this.provider = new ethers.providers.JsonRpcProvider(config.chain.rpcUrl);
         this.router = new Router(this.provider, config.chain.commonRoutingTokens, {
             multicallAddress: config.chain.contracts.multicall,
             factoryAddress: config.chain.contracts.coreFactory,
             quoterAddress: config.chain.contracts.quoterV2,
-            peripheryRouterAddress: config.chain.contracts.peripheryRouter,
-            secondaryFeeAddress: config.chain.contracts.secondaryFee,
         });
     }
     static validate(tokenInAddress, tokenOutAddress, maxHops, slippagePercent, fromAddress) {
@@ -15599,7 +15642,7 @@ class Exchange {
         if (this.secondaryFees.length === 0) {
             return [];
         }
-        const secondaryFeeContract = SecondaryFee__factory.connect(this.router.routingContracts.secondaryFeeAddress, this.provider);
+        const secondaryFeeContract = SecondaryFee__factory.connect(this.secondaryFeeContractAddress, this.provider);
         if (await secondaryFeeContract.paused()) {
             // Do not use secondary fees if the contract is paused
             return [];
@@ -15627,8 +15670,7 @@ class Exchange {
             decimals: tokenOutDecimals,
         };
         // determine which amount was specified for the swap from the TradeType
-        const [tokenSpecified, otherToken] = tradeType === TradeType.EXACT_INPUT
-            ? [tokenIn, tokenOut] : [tokenOut, tokenIn];
+        const [tokenSpecified, otherToken] = tradeType === TradeType.EXACT_INPUT ? [tokenIn, tokenOut] : [tokenOut, tokenIn];
         const amountSpecified = newAmount(amount, tokenSpecified);
         const fees = new Fees(secondaryFees, tokenIn);
         const ourQuoteReqAmount = getOurQuoteReqAmount(amountSpecified, fees, tradeType, this.nativeTokenService);
@@ -15637,10 +15679,13 @@ class Exchange {
             this.router.findOptimalRoute(ourQuoteReqAmount, otherToken, tradeType, maxHops),
             fetchGasPrice(this.provider, this.nativeToken),
         ]);
-        const adjustedQuote = prepareSwap(ourQuote, amountSpecified, fees);
-        const swap = getSwap(adjustedQuote, fromAddress, slippagePercent, deadline, this.router.routingContracts.peripheryRouterAddress, this.router.routingContracts.secondaryFeeAddress, gasPrice, secondaryFees, this.nativeTokenService);
-        const userQuote = prepareUserQuote(otherToken, adjustedQuote, slippagePercent, fees);
-        const preparedApproval = prepareApproval(tradeType, amountSpecified, userQuote.amountWithMaxSlippage, this.router.routingContracts, secondaryFees);
+        const adjustedQuote = adjustQuoteWithFees(ourQuote, amountSpecified, fees, this.nativeTokenService);
+        const swap = getSwap(adjustedQuote, fromAddress, slippagePercent, deadline, this.routerContractAddress, this.secondaryFeeContractAddress, gasPrice, secondaryFees, this.nativeTokenService);
+        const userQuote = prepareUserQuote(otherToken, adjustedQuote, slippagePercent, fees, this.nativeTokenService);
+        const preparedApproval = prepareApproval(tradeType, amountSpecified, userQuote.amountWithMaxSlippage, {
+            routerAddress: this.routerContractAddress,
+            secondaryFeeAddress: this.secondaryFeeContractAddress,
+        }, secondaryFees);
         // preparedApproval always uses the tokenIn address because we are always selling the tokenIn
         const approval = await getApproval(this.provider, fromAddress, preparedApproval, gasPrice, this.nativeTokenService);
         return {
@@ -20503,7 +20548,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.27.8',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.27.9',
 };
 /**
  * createAPIConfiguration to create a custom Configuration

package/dist/checkout_widgets.js

@@ -25,7 +25,7 @@ var $045213b18e9f1f94$export$75be0f6af9650f2c;
 })($045213b18e9f1f94$export$75be0f6af9650f2c || ($045213b18e9f1f94$export$75be0f6af9650f2c = {}));
 
 
-const $d663162fd5a0853f$export$38a083d9fb5551ca = "0.27.8";
+const $d663162fd5a0853f$export$38a083d9fb5551ca = "0.27.9";
 const $d663162fd5a0853f$export$83bf90b30cdfd29f = ()=>false;
 const $d663162fd5a0853f$export$1169f5475725171b = ()=>$d663162fd5a0853f$export$38a083d9fb5551ca;
 

package/dist/immutablex_client.js

@@ -16,7 +16,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.27.8',
+    sdkVersion: 'ts-immutable-sdk-0.27.9',
 });
 /**
  * Sets `sdkVersion` at the time of build