@parallel-protocol/cli 0.2.2 → 0.2.3

package/dist/index.js

@@ -8068,6 +8068,15 @@ var PREVIEW_WITHDRAW_ABI = [
     outputs: [{ type: "uint256" }]
   }
 ];
+var PREVIEW_MINT_ABI = [
+  {
+    name: "previewMint",
+    type: "function",
+    stateMutability: "view",
+    inputs: [{ type: "uint256", name: "shares" }],
+    outputs: [{ type: "uint256" }]
+  }
+];
 function buildTiming() {
   const now = BigInt(Math.floor(Date.now() / 1e3));
   return { validAfter: now - 60n, validBefore: now + 300n };
@@ -8075,8 +8084,21 @@ function buildTiming() {
 function slippageUp(amount) {
   return amount + amount * SLIPPAGE_BPS / 10000n;
 }
-function slippageDown(amount) {
-  return amount - amount * SLIPPAGE_BPS / 10000n;
+async function previewMintAssets(chain, susdp, shares) {
+  return await getClient(chain).readContract({
+    address: susdp,
+    abi: PREVIEW_MINT_ABI,
+    functionName: "previewMint",
+    args: [shares]
+  });
+}
+async function previewWithdrawShares(chain, susdp, assets) {
+  return await getClient(chain).readContract({
+    address: susdp,
+    abi: PREVIEW_WITHDRAW_ABI,
+    functionName: "previewWithdraw",
+    args: [assets]
+  });
 }
 async function readTokenDomain(chain, token) {
   return readTokenDomainFull(chain, token);
@@ -8216,15 +8238,6 @@ async function quoteSwapOut(chain, amountOut, tokenIn, tokenOut) {
     args: [amountOut, tokenIn, tokenOut]
   });
 }
-async function quoteSwapIn(chain, amountIn, tokenIn, tokenOut) {
-  const parallelizer = getParallelizerAddress(chain);
-  return await getClient(chain).readContract({
-    address: parallelizer,
-    abi: PARALLELIZER_ABI,
-    functionName: "quoteIn",
-    args: [amountIn, tokenIn, tokenOut]
-  });
-}
 async function prepareRouteA(chain, senderAddress, amount, recipient) {
   const usdpAddress = getUSDpAddress(chain);
   if (!usdpAddress) throw new Error(`USDp not deployed on ${chain}`);
@@ -8375,13 +8388,15 @@ async function prepareRouteC(chain, senderAddress, amount, recipient) {
   const susdpAddress = getSUSDpAddress(chain);
   if (!usdpAddress) throw new Error(`USDp not deployed on ${chain}`);
   if (!susdpAddress) throw new Error(`sUSDp not deployed on ${chain}`);
-  const amountWei = parseUnits(amount, 18);
+  const sharesWei = parseUnits(amount, 18);
   const { validAfter, validBefore } = buildTiming();
   const sharedNonce = generateNonce();
-  const [susdpDomain, usdpDomain] = await Promise.all([
+  const [assetsNeeded, susdpDomain, usdpDomain] = await Promise.all([
+    previewMintAssets(chain, susdpAddress, sharesWei),
     readTokenDomain(chain, susdpAddress),
     readTokenDomain(chain, usdpAddress)
   ]);
+  const amountWei = slippageUp(assetsNeeded);
   const depositTd = buildDepositTypedData(susdpDomain, {
     vault: susdpAddress,
     owner: senderAddress,
@@ -8410,7 +8425,9 @@ async function prepareRouteC(chain, senderAddress, amount, recipient) {
     route: "C",
     steps: [
       {
-        label: "depositSignature",
+        // Steps are keyed by label: "signature" is the payload's required
+        // signature ("depositSignature" is Route G's extra deposit sig).
+        label: "signature",
         description: "DepositWithAuthorization on sUSDp domain",
         messageHash: sig1MessageHash,
         typedData: depositTd
@@ -8589,14 +8606,19 @@ async function prepareRouteG(chain, senderAddress, amount, recipient) {
   if (!usdcAddress) throw new Error(`USDC not configured on ${chain}`);
   if (!susdpAddress) throw new Error(`sUSDp not deployed on ${chain}`);
   const parallelizer = getParallelizerAddress(chain);
-  const amountInWei = parseUnits(amount, 6);
-  const expectedUSDpOut = await quoteSwapIn(
-    chain,
-    amountInWei,
-    usdcAddress,
-    usdpAddress
+  const sharesWei = parseUnits(amount, 18);
+  const domainsPromise = Promise.all([
+    readTokenDomain(chain, usdcAddress),
+    readTokenDomain(chain, susdpAddress),
+    readTokenDomain(chain, usdpAddress)
+  ]);
+  domainsPromise.catch(() => {
+  });
+  const usdpNeeded = await previewMintAssets(chain, susdpAddress, sharesWei);
+  const amountOutMin = slippageUp(usdpNeeded);
+  const amountInWei = slippageUp(
+    await quoteSwapOut(chain, amountOutMin, usdcAddress, usdpAddress)
   );
-  const amountOutMin = slippageDown(expectedUSDpOut);
   const { validAfter, validBefore } = buildTiming();
   const swapUserSalt = generateNonce();
   const depositNonce = generateNonce();
@@ -8611,11 +8633,7 @@ async function prepareRouteG(chain, senderAddress, amount, recipient) {
     // swap recipient = payer, not merchant
     validBefore
   );
-  const [usdcDomain, susdpDomain, usdpDomain] = await Promise.all([
-    readTokenDomain(chain, usdcAddress),
-    readTokenDomain(chain, susdpAddress),
-    readTokenDomain(chain, usdpAddress)
-  ]);
+  const [usdcDomain, susdpDomain, usdpDomain] = await domainsPromise;
   const swapTd = buildReceiveAuthorizationTypedData(usdcDomain, {
     from: senderAddress,
     to: parallelizer,
@@ -8704,8 +8722,8 @@ async function prepareRouteG(chain, senderAddress, amount, recipient) {
       }
     },
     quote: {
-      amountIn: amount,
-      amountOut: formatUnits(expectedUSDpOut, 18),
+      amountIn: formatUnits(amountInWei, 6),
+      amountOut: amount,
       slippageBps: Number(SLIPPAGE_BPS)
     },
     gasEstimate: 2e5
@@ -8714,10 +8732,13 @@ async function prepareRouteG(chain, senderAddress, amount, recipient) {
 async function prepareRouteH(chain, senderAddress, amount, recipient) {
   const susdpAddress = getSUSDpAddress(chain);
   if (!susdpAddress) throw new Error(`sUSDp not deployed on ${chain}`);
-  const sharesWei = parseUnits(amount, 18);
+  const assetsWei = parseUnits(amount, 18);
   const { validAfter, validBefore } = buildTiming();
   const nonce = generateNonce();
-  const susdpDomain = await readTokenDomain(chain, susdpAddress);
+  const [sharesWei, susdpDomain] = await Promise.all([
+    previewWithdrawShares(chain, susdpAddress, assetsWei),
+    readTokenDomain(chain, susdpAddress)
+  ]);
   const redeemTd = buildRedeemTypedData(susdpDomain, {
     vault: susdpAddress,
     owner: senderAddress,
@@ -9182,10 +9203,12 @@ async function preparePayment(params) {
   const { chain, amount } = params;
   const sender = params.senderAddress;
   const recv = params.recipient;
-  const target = params.targetToken;
   const tokenIn = params.tokenIn ?? "usdp";
+  const usdpAddress = getUSDpAddress(chain);
+  const target = params.targetToken ?? usdpAddress;
+  const wantsUSDp = !target || !!usdpAddress && target.toLowerCase() === usdpAddress.toLowerCase();
   if (tokenIn === "usdp") {
-    if (!target) return prepareRouteA(chain, sender, amount, recv);
+    if (!target || wantsUSDp) return prepareRouteA(chain, sender, amount, recv);
     const susdpAddress = getSUSDpAddress(chain);
     if (susdpAddress && target.toLowerCase() === susdpAddress.toLowerCase()) {
       return prepareRouteC(chain, sender, amount, recv);
@@ -9199,13 +9222,10 @@ async function preparePayment(params) {
   if (tokenIn === "usdc") {
     const usdcAddress = getUSDCAddress(chain);
     if (!usdcAddress) throw new Error(`USDC not configured on ${chain}`);
-    if (!target || target.toLowerCase() === usdcAddress.toLowerCase()) {
+    if (!target || wantsUSDp) return prepareRouteE(chain, sender, amount, recv);
+    if (target.toLowerCase() === usdcAddress.toLowerCase()) {
       return prepareRouteF(chain, sender, amount, recv);
     }
-    const usdpAddress = getUSDpAddress(chain);
-    if (usdpAddress && target.toLowerCase() === usdpAddress.toLowerCase()) {
-      return prepareRouteE(chain, sender, amount, recv);
-    }
     const susdpAddress = getSUSDpAddress(chain);
     if (susdpAddress && target.toLowerCase() === susdpAddress.toLowerCase()) {
       return prepareRouteG(chain, sender, amount, recv);
@@ -9217,13 +9237,10 @@ async function preparePayment(params) {
   if (tokenIn === "susdp") {
     const susdpAddress = getSUSDpAddress(chain);
     if (!susdpAddress) throw new Error(`sUSDp not deployed on ${chain}`);
-    if (!target || target.toLowerCase() === susdpAddress.toLowerCase()) {
+    if (!target || wantsUSDp) return prepareRouteH(chain, sender, amount, recv);
+    if (target.toLowerCase() === susdpAddress.toLowerCase()) {
       return prepareRouteJ(chain, sender, amount, recv);
     }
-    const usdpAddress = getUSDpAddress(chain);
-    if (usdpAddress && target.toLowerCase() === usdpAddress.toLowerCase()) {
-      return prepareRouteH(chain, sender, amount, recv);
-    }
     const usdcAddressForI = getUSDCAddress(chain);
     if (usdcAddressForI && target.toLowerCase() === usdcAddressForI.toLowerCase()) {
       return prepareRouteI(chain, sender, amount, recv, target);
@@ -14561,7 +14578,7 @@ var package_default = {
 
 // package.json
 var package_default2 = {
-  version: "0.2.2"};
+  version: "0.2.3"};
 
 // src/commands/version.ts
 function versionCommand() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@parallel-protocol/cli",
-	"version": "0.2.2",
+	"version": "0.2.3",
 	"private": false,
 	"type": "module",
 	"files": [