Merge pull request #111 from tinymanorg/fix/tiny-2006-fix-apply-rate-change

Liquid Restake - Fix applyRateChange txn params

Author: gulcinuras

dist/index.js

@@ -1,8 +1,6 @@
-import { joinByteArrays } from "../util/util";
 declare function createPaddedByteArray(elements: number[], length?: number, paddingValue?: number, byteSize?: number): Uint8Array;
-declare function computeSHA512(fileArrayBuffer: Uint8Array): Promise<string>;
 declare function getCompiledPrograms(): Promise<{
     approvalProgram: Uint8Array;
     clearProgram: Uint8Array;
 }>;
-export { computeSHA512, createPaddedByteArray, getCompiledPrograms, joinByteArrays };
+export { createPaddedByteArray, getCompiledPrograms };

dist/order/utils.d.ts

@@ -1,6 +1,6 @@
 {
   "name": "@tinymanorg/tinyman-js-sdk",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "Tinyman JS SDK",
   "author": "Tinyman Core Team",
   "license": "MIT",

package-lock.json

@@ -33,7 +33,7 @@ class TinymanSTAlgoClient extends TinymanBaseClient<number, algosdk.Address> {
     const userStateBoxName = this.getUserStateBoxName(userAddress);
 
     const txns = [
-      ...(await this.getApplyRateChangeTxnIfNeeded()),
+      ...(await this.getApplyRateChangeTxnIfNeeded(userAddress)),
       ...(await this.getUserBoxPaymentTxnIfNeeded(userAddress, suggestedParams)),
       ...(await this.getOptinTxnIfNeeded(userAddress, STALGO_ASSET_ID[this.network])),
       algosdk.makeAssetTransferTxnWithSuggestedParamsFromObject({
@@ -70,7 +70,7 @@ class TinymanSTAlgoClient extends TinymanBaseClient<number, algosdk.Address> {
     const userStateBoxName = this.getUserStateBoxName(userAddress);
 
     const txns = [
-      ...(await this.getApplyRateChangeTxnIfNeeded()),
+      ...(await this.getApplyRateChangeTxnIfNeeded(userAddress)),
       ...(await this.getOptinTxnIfNeeded(userAddress, TALGO_ASSET_ID[this.network])),
       algosdk.makeApplicationNoOpTxnFromObject({
         sender: userAddress,
@@ -90,7 +90,7 @@ class TinymanSTAlgoClient extends TinymanBaseClient<number, algosdk.Address> {
     const userStateBoxName = this.getUserStateBoxName(userAddress);
 
     const txns = [
-      ...(await this.getApplyRateChangeTxnIfNeeded()),
+      ...(await this.getApplyRateChangeTxnIfNeeded(userAddress)),
       ...(await this.getOptinTxnIfNeeded(userAddress, TINY_ASSET_ID[this.network])),
       algosdk.makeApplicationNoOpTxnFromObject({
         sender: userAddress,
@@ -145,9 +145,9 @@ class TinymanSTAlgoClient extends TinymanBaseClient<number, algosdk.Address> {
     return algosdk.decodeAddress(userAddress).publicKey;
   }
 
-  private async getApplyRateChangeTxnIfNeeded() {
+  private async getApplyRateChangeTxnIfNeeded(userAddress: string) {
     if (await this.shouldApplyRateChange()) {
-      return this.getApplyRateChangeTxn();
+      return this.getApplyRateChangeTxn(userAddress);
     }
 
     return [];
@@ -195,17 +195,15 @@ class TinymanSTAlgoClient extends TinymanBaseClient<number, algosdk.Address> {
     return currentRateEndTimestamp <= now;
   }
 
-  private async getApplyRateChangeTxn() {
-    const txns = [
+  private async getApplyRateChangeTxn(userAddress: string) {
+    return [
       algosdk.makeApplicationNoOpTxnFromObject({
-        sender: this.applicationAddress,
+        sender: userAddress,
         appIndex: this.appId,
         appArgs: [encodeString("apply_rate_change")],
         suggestedParams: await this.getSuggestedParams()
       })
     ];
-
-    return this.setupTxnFeeAndAssignGroupId({txns});
   }
 }
 

package.json

@@ -17,7 +17,7 @@ import {
   MINIMUM_BALANCE_REQUIRED_PER_BYTE_SCHEMA,
   MINIMUM_BALANCE_REQUIRED_PER_INT_SCHEMA_VALUE
 } from "../util/constant";
-import {encodeString, intToBytes} from "../util/util";
+import {encodeString, intToBytes, joinByteArrays} from "../util/util";
 import {
   APP_LATEST_VERSION_KEY,
   APP_VERSION_KEY,
@@ -39,7 +39,7 @@ import {
   PutRecurringOrderParams,
   PutTriggerOrderParams
 } from "./types";
-import {createPaddedByteArray, getCompiledPrograms, joinByteArrays} from "./utils";
+import {createPaddedByteArray, getCompiledPrograms} from "./utils";
 
 const ENTRY_STRUCT = new Struct(OrderStruct.Entry, ORDER_STRUCTS);
 const TRIGGER_STRUCT = new Struct(OrderStruct.Trigger, ORDER_STRUCTS);
@@ -156,7 +156,6 @@ class OrderingClient extends TinymanBaseClient<number | null, algosdk.Address |
    * Prepares transactions to update the ordering app using the latest contracts.
    * @returns A promise that resolves the transaction array.
    */
-  // TODO: Once the contracts are public, use getCompiledPrograms for approval and clear programs
   async prepareUpdateOrderingAppTransactions(): Promise<Transaction[]> {
     if (!this.appId) {
       throw new Error("Application ID not provided");

src/liquid-stake/stAlgoClient.ts

@@ -13,21 +13,6 @@ function createPaddedByteArray(
   return joinByteArrays(...array.map((num) => intToBytes(num, byteSize)));
 }
 
-async function computeSHA512(fileArrayBuffer: Uint8Array) {
-  const hashBuffer = await crypto.subtle.digest("SHA-512", fileArrayBuffer);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-
-  // Extract the first 32 bytes (256 bits)
-  const sha512_256HashArray = hashArray.slice(0, 32);
-
-  // Convert the byte array to a hexadecimal string
-  const hashHex = Array.from(sha512_256HashArray)
-    .map((byte) => byte.toString(16).padStart(2, "0"))
-    .join("");
-
-  return hashHex;
-}
-
 // Fetch and compile the approval and clear programs
 async function getCompiledPrograms() {
   const approvalSourceResponse = await fetch(
@@ -46,4 +31,4 @@ async function getCompiledPrograms() {
   return {approvalProgram, clearProgram};
 }
 
-export {computeSHA512, createPaddedByteArray, getCompiledPrograms, joinByteArrays};
+export {createPaddedByteArray, getCompiledPrograms};