Update swap examples

examples/package.json

@@ -9,8 +9,8 @@
   "author": "Tinyman Core Team",
   "license": "ISC",
   "dependencies": {
-    "algosdk": "^1.22.0",
-    "@tinymanorg/tinyman-js-sdk": "^2.0.1"
+    "algosdk": "^2.1.0",
+    "@tinymanorg/tinyman-js-sdk": "^3.1.0"
   },
   "devDependencies": {
     "@types/node": "^18.8.5",

examples/src/index.ts

@@ -23,7 +23,7 @@ async function main() {
   // await bootstrapPool({ account, asset_1, asset_2 });
 
   // Add some initial liquidity to the pool
-  await addInitialLiquidity({account, asset_1, asset_2});
+  // await addInitialLiquidity({account, asset_1, asset_2});
 
   // Add subsequent liquidity to the pool using the flexible mode
   await addFlexibleLiquidity({account, asset_1, asset_2});

examples/src/operation/bootstrap/bootstrapPool.ts

@@ -54,7 +54,7 @@ export async function bootstrapPool({
   console.log(`✅ Pool address: ${poolAddress}`);
   console.log(`✅ Pool token ID: ${bootstrapExecutionResponse.poolTokenID}`);
   console.log(
-    "✅ See pool account on AlgoExplorer: " +
-      `https://testnet.algoexplorer.io/address/${poolAddress}`
+    "✅ See pool account on PeraExplorer: " +
+      `https://testnet-api.algonode.cloud/v2/accounts/${poolAddress}`
   );
 }

examples/src/operation/swap/fixedInputSwap.ts

@@ -30,29 +30,24 @@ export async function fixedInputSwap({
    * Swap.getQuote method, which will return the best quote (highest rate)
    * after checking both v1 and v2
    */
-  const fixedInputSwapQuote = Swap.v2.getQuote(
-    SwapType.FixedInput,
+
+  const fixedInputSwapQuote = await  Swap.v2.getQuote({
+    type: SwapType.FixedInput,
     pool,
-    {id: pool.asset1ID, amount: 1_000_000},
-    {assetIn: 6, assetOut: 6}
-  );
-  const assetIn = {
-    id: fixedInputSwapQuote.assetInID,
-    amount: fixedInputSwapQuote.assetInAmount
-  };
-  const assetOut = {
-    id: fixedInputSwapQuote.assetOutID,
-    amount: fixedInputSwapQuote.assetOutAmount
-  };
+    amount: 1_000_000,
+    assetIn: {id: pool.asset1ID, decimals: 6},
+    assetOut: {id: pool.asset2ID, decimals: 6},
+    isSwapRouterEnabled: true,
+    network: "testnet"
+  });
 
   const fixedInputSwapTxns = await Swap.v2.generateTxns({
     client: algodClient,
-    swapType: SwapType.FixedInput,
-    pool,
+    network: "testnet",
+    quote: fixedInputSwapQuote,
+    swapType:  SwapType.FixedInput,
+    slippage:  0.05,
     initiatorAddr,
-    assetIn,
-    assetOut,
-    slippage: 0.05
   });
 
   const signedTxns = await Swap.v2.signTxns({
@@ -61,12 +56,10 @@ export async function fixedInputSwap({
   });
 
   const swapExecutionResponse = await Swap.v2.execute({
-    network: "testnet" as SupportedNetwork,
+    quote: fixedInputSwapQuote,
     client: algodClient,
     signedTxns,
-    pool,
-    txGroup: fixedInputSwapTxns,
-    assetIn
+    txGroup: fixedInputSwapTxns
   });
 
   console.log("✅ Fixed Input Swap executed successfully!");

examples/src/operation/swap/fixedOutputSwap.ts

@@ -30,42 +30,33 @@ export async function fixedOutputSwap({
    * Swap.getQuote method, which will return the best quote (highest rate)
    * after checking both v1 and v2
    */
-  const fixedOutputSwapQuote = Swap.v2.getQuote(
-    SwapType.FixedOutput,
+  const fixedOutputSwapQuote =  await  Swap.v2.getQuote({
+    type: SwapType.FixedOutput,
     pool,
-    {id: pool.asset2ID, amount: 1_000_000},
-    {assetIn: 6, assetOut: 6}
-  );
-
-  const assetIn = {
-    id: fixedOutputSwapQuote.assetInID,
-    amount: fixedOutputSwapQuote.assetInAmount
-  };
-  const assetOut = {
-    id: fixedOutputSwapQuote.assetOutID,
-    amount: fixedOutputSwapQuote.assetOutAmount
-  };
+    amount: 1_000_000,
+    assetIn: {id: pool.asset1ID, decimals: 6},
+    assetOut: {id: pool.asset2ID, decimals: 6},
+    isSwapRouterEnabled: true,
+    network: "testnet"
+  });
 
   const fixedOutputSwapTxns = await Swap.v2.generateTxns({
     client: algodClient,
+    network: "testnet",
+    quote: fixedOutputSwapQuote,
     swapType: SwapType.FixedOutput,
-    pool,
+    slippage:  0.05,
     initiatorAddr,
-    assetIn,
-    assetOut,
-    slippage: 0.05
   });
   const signedTxns = await Swap.v2.signTxns({
     txGroup: fixedOutputSwapTxns,
     initiatorSigner: signerWithSecretKey(account)
   });
   const swapExecutionResponse = await Swap.v2.execute({
-    network: "testnet" as SupportedNetwork,
+    quote: fixedOutputSwapQuote!,
     client: algodClient,
     signedTxns,
     txGroup: fixedOutputSwapTxns,
-    pool,
-    assetIn
   });
 
   console.log("✅ Fixed Output Swap executed successfully!");

examples/src/util/account.ts

@@ -1,6 +1,7 @@
 import { Account, generateAccount } from "algosdk";
 import { writeFileSync, readFileSync } from "fs";
 import { getAccountInformation } from "@tinymanorg/tinyman-js-sdk";
+
 import { algodClient } from "./client";
 import { assertAccountHasBalance } from "./other";
 
@@ -15,8 +16,8 @@ export async function getAccount(): Promise<Account> {
   if (!account) {
     account = generateAccount();
 
-    console.log("✅ Account generated: " + account.addr);
-    console.log("✅ Account data saved to: " + ACCOUNT_FILENAME);
+    console.log(`✅ Account generated: ${  account.addr}`);
+    console.log(`✅ Account data saved to: ${  ACCOUNT_FILENAME}`);
 
     writeFileSync(ACCOUNT_FILENAME, JSON.stringify(account));
   }

examples/src/util/client.ts

@@ -5,6 +5,6 @@ console.log(
 );
 export const algodClient = new algosdk.Algodv2(
   "",
-  "https://node.testnet.algoexplorerapi.io/",
+  "https://testnet-api.algonode.cloud",
   ""
 );

examples/src/util/other.ts

@@ -5,6 +5,7 @@ import { algodClient } from "./client";
  */
 export async function assertAccountHasBalance(address: string) {
   const accountInfo = await algodClient.accountInformation(address).do();
+
   if (!accountInfo["amount"]) {
     throw new Error(
       `Go to https://bank.testnet.algorand.network/?account=${address} and fund your account.`