Merge pull request #104 from tinymanorg/fix/swap-router-app-call-note

gulcinuras · web-flow · commit 08ccb10b09c1 · 2025-03-18T10:52:36.000+01:00
Swap - Add origin info to app call note
diff --git a/dist/index.js b/dist/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tinymanorg/tinyman-js-sdk",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "description": "Tinyman JS SDK",
   "author": "Tinyman Core Team",
   "license": "MIT",
diff --git a/src/liquid-stake/tAlgoClient.test.ts b/src/liquid-stake/tAlgoClient.test.ts
@@ -91,7 +91,7 @@ describe("TinymanTAlgoClient", () => {
   it("should calculate the mint transaction fee correctly", async () => {
     const result = await client.mint(mintAmount, TEST_ACCOUNT.addr);
 
-    expect(result[0].fee).toBe((result.length + 4) * ALGORAND_MIN_TX_FEE);
+    expect(result[0].fee).toBe((result.length + 1) * ALGORAND_MIN_TX_FEE);
   });
 
   it("should receive correct amount of tALGOs after mint transaction", async () => {
diff --git a/src/liquid-stake/tAlgoClient.ts b/src/liquid-stake/tAlgoClient.ts
@@ -59,7 +59,7 @@ class TinymanTAlgoClient extends TinymanBaseClient {
       })
     ];
 
-    return this.setupTxnFeeAndAssignGroupId({txns, additionalFeeCount: 4});
+    return this.setupTxnFeeAndAssignGroupId({txns, additionalFeeCount: 1});
   }
 
   async burn(amount: number, userAddress: string) {
diff --git a/src/swap/v2/router/swap-router.ts b/src/swap/v2/router/swap-router.ts
@@ -11,6 +11,8 @@ import {
   SwapRouterResponse,
   SwapRouterTransactionRecipe
 } from "../../types";
+import {tinymanJSSDKConfig} from "../../../config";
+import {CONTRACT_VERSION} from "../../../contract/constants";
 
 export async function generateSwapRouterTxns({
   initiatorAddr,
@@ -89,6 +91,15 @@ export function generateSwapRouterTxnFromRecipe(
       });
       txn.fee = 0;
 
+      if (
+        recipe.args &&
+        Buffer.from(recipe.args[0], "base64").toString("utf8") === "swap"
+      ) {
+        txn.note = tinymanJSSDKConfig.getAppCallTxnNoteWithClientName(
+          CONTRACT_VERSION.V2
+        );
+      }
+
       return txn;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@tinymanorg/tinyman-js-sdk",`
`3`		`- "version": "4.1.4",`
	`3`	`+ "version": "4.1.5",`
`4`	`4`	`"description": "Tinyman JS SDK",`
`5`	`5`	`"author": "Tinyman Core Team",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class TinymanTAlgoClient extends TinymanBaseClient {`
`59`	`59`	`})`
`60`	`60`	`];`
`61`	`61`
`62`		`- return this.setupTxnFeeAndAssignGroupId({txns, additionalFeeCount: 4});`
	`62`	`+ return this.setupTxnFeeAndAssignGroupId({txns, additionalFeeCount: 1});`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`async burn(amount: number, userAddress: string) {`