@mistcash/sdk 0.1.0-beta.1 → 0.2.0

package/dist/index.d.mts

@@ -24,7 +24,7 @@ interface Asset {
  * @param provider Starknet provider
  * @returns Typed chamber contract
  */
-declare function getChamber(provider?: ProviderInterface | AccountInterface): ChamberTypedContract;
+declare function getChamber(providerOrAccount?: ProviderInterface | AccountInterface): ChamberTypedContract;
 /**
  * Fetch transaction assets from the chamber contract.
  * ⚠️ Will show assets even if transaction is spent
@@ -58,5 +58,7 @@ declare function checkTxExists(contract: ChamberTypedContract, valKey: string, v
  * @returns index of the transaction
  */
 declare function getTxIndexInTree(leaves: bigint[], valKey: string, valTo: string, tokenAddr: string, amount: string): Promise<number>;
+declare function fmtAmount(amount: bigint, decimals: number): string;
+declare function fmtAmtToBigInt(amountStr: string, decimals: number): bigint;
 
-export { type Asset, checkTxExists, devStr, devVal, fetchTxAssets, getChamber, getTxIndexInTree };
+export { type Asset, checkTxExists, devStr, devVal, fetchTxAssets, fmtAmount, fmtAmtToBigInt, getChamber, getTxIndexInTree };

package/dist/index.d.ts

@@ -24,7 +24,7 @@ interface Asset {
  * @param provider Starknet provider
  * @returns Typed chamber contract
  */
-declare function getChamber(provider?: ProviderInterface | AccountInterface): ChamberTypedContract;
+declare function getChamber(providerOrAccount?: ProviderInterface | AccountInterface): ChamberTypedContract;
 /**
  * Fetch transaction assets from the chamber contract.
  * ⚠️ Will show assets even if transaction is spent
@@ -58,5 +58,7 @@ declare function checkTxExists(contract: ChamberTypedContract, valKey: string, v
  * @returns index of the transaction
  */
 declare function getTxIndexInTree(leaves: bigint[], valKey: string, valTo: string, tokenAddr: string, amount: string): Promise<number>;
+declare function fmtAmount(amount: bigint, decimals: number): string;
+declare function fmtAmtToBigInt(amountStr: string, decimals: number): bigint;
 
-export { type Asset, checkTxExists, devStr, devVal, fetchTxAssets, getChamber, getTxIndexInTree };
+export { type Asset, checkTxExists, devStr, devVal, fetchTxAssets, fmtAmount, fmtAmtToBigInt, getChamber, getTxIndexInTree };

package/dist/index.js

@@ -24,6 +24,8 @@ __export(index_exports, {
   devStr: () => devStr,
   devVal: () => devVal,
   fetchTxAssets: () => fetchTxAssets,
+  fmtAmount: () => fmtAmount,
+  fmtAmtToBigInt: () => fmtAmtToBigInt,
   getChamber: () => getChamber,
   getTxIndexInTree: () => getTxIndexInTree
 });
@@ -39,11 +41,13 @@ var devVal = (val, deflt = void 0) => {
 var import_starknet = require("starknet");
 var import_config = require("@mistcash/config");
 var import_crypto = require("@mistcash/crypto");
-function getChamber(provider) {
+function getChamber(providerOrAccount) {
   return new import_starknet.Contract(
-    import_config.CHAMBER_ABI,
-    import_config.CHAMBER_ADDR_MAINNET,
-    provider
+    {
+      abi: import_config.CHAMBER_ABI,
+      address: import_config.CHAMBER_ADDR_MAINNET,
+      providerOrAccount
+    }
   ).typedv2(import_config.CHAMBER_ABI);
 }
 async function fetchTxAssets(contract, valKey, valTo) {
@@ -54,21 +58,45 @@ async function fetchTxAssets(contract, valKey, valTo) {
   } else if (typeof amount != "bigint") {
     amount = BigInt(`${amount.low}`);
   }
-  return { amount, addr: asset.addr };
+  let addr = asset.addr;
+  if (typeof addr === "bigint") {
+    addr = "0x" + addr.toString(16);
+  }
+  return { amount, addr };
 }
 async function checkTxExists(contract, valKey, valTo, tokenAddr, amount) {
+  const allTransactions = await contract.tx_array();
+  const tx = await (0, import_crypto.txHash)(valKey, valTo, tokenAddr, amount);
+  allTransactions.indexOf(tx);
   return await getTxIndexInTree(await contract.tx_array(), valKey, valTo, tokenAddr, amount) !== -1;
 }
 async function getTxIndexInTree(leaves, valKey, valTo, tokenAddr, amount) {
   const tx_hash = await (0, import_crypto.txHash)(valKey, valTo, tokenAddr, amount);
   return leaves.indexOf(tx_hash);
 }
+function fmtAmount(amount, decimals) {
+  const factor = BigInt(10 ** decimals);
+  const integerPart = amount / factor;
+  const fractionalPart = amount % factor;
+  const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+  const trimmedFractional = fractionalStr.replace(/0+$/, "") || "0";
+  return `${integerPart.toString()}.${trimmedFractional}`;
+}
+function fmtAmtToBigInt(amountStr, decimals) {
+  let amt = BigInt(Math.floor(1e6 * +amountStr));
+  if (decimals > 6) {
+    amt = BigInt(10 ** (decimals - 6)) * amt;
+  }
+  return amt;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkTxExists,
   devStr,
   devVal,
   fetchTxAssets,
+  fmtAmount,
+  fmtAmtToBigInt,
   getChamber,
   getTxIndexInTree
 });

package/dist/index.mjs

@@ -8,11 +8,13 @@ var devVal = (val, deflt = void 0) => {
 import { Contract } from "starknet";
 import { CHAMBER_ABI, CHAMBER_ADDR_MAINNET } from "@mistcash/config";
 import { txSecret, txHash } from "@mistcash/crypto";
-function getChamber(provider) {
+function getChamber(providerOrAccount) {
   return new Contract(
-    CHAMBER_ABI,
-    CHAMBER_ADDR_MAINNET,
-    provider
+    {
+      abi: CHAMBER_ABI,
+      address: CHAMBER_ADDR_MAINNET,
+      providerOrAccount
+    }
   ).typedv2(CHAMBER_ABI);
 }
 async function fetchTxAssets(contract, valKey, valTo) {
@@ -23,20 +25,44 @@ async function fetchTxAssets(contract, valKey, valTo) {
   } else if (typeof amount != "bigint") {
     amount = BigInt(`${amount.low}`);
   }
-  return { amount, addr: asset.addr };
+  let addr = asset.addr;
+  if (typeof addr === "bigint") {
+    addr = "0x" + addr.toString(16);
+  }
+  return { amount, addr };
 }
 async function checkTxExists(contract, valKey, valTo, tokenAddr, amount) {
+  const allTransactions = await contract.tx_array();
+  const tx = await txHash(valKey, valTo, tokenAddr, amount);
+  allTransactions.indexOf(tx);
   return await getTxIndexInTree(await contract.tx_array(), valKey, valTo, tokenAddr, amount) !== -1;
 }
 async function getTxIndexInTree(leaves, valKey, valTo, tokenAddr, amount) {
   const tx_hash = await txHash(valKey, valTo, tokenAddr, amount);
   return leaves.indexOf(tx_hash);
 }
+function fmtAmount(amount, decimals) {
+  const factor = BigInt(10 ** decimals);
+  const integerPart = amount / factor;
+  const fractionalPart = amount % factor;
+  const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+  const trimmedFractional = fractionalStr.replace(/0+$/, "") || "0";
+  return `${integerPart.toString()}.${trimmedFractional}`;
+}
+function fmtAmtToBigInt(amountStr, decimals) {
+  let amt = BigInt(Math.floor(1e6 * +amountStr));
+  if (decimals > 6) {
+    amt = BigInt(10 ** (decimals - 6)) * amt;
+  }
+  return amt;
+}
 export {
   checkTxExists,
   devStr,
   devVal,
   fetchTxAssets,
+  fmtAmount,
+  fmtAmtToBigInt,
   getChamber,
   getTxIndexInTree
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mistcash/sdk",
-  "version": "0.1.0-beta.1",
+  "version": "0.2.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,22 +17,22 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "tsup src/index.ts --format cjs,esm --dts",
+    "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "clean": "rm -rf dist"
+  },
   "dependencies": {
-    "starknet": "^7.6.4",
-    "@mistcash/config": "0.1.0-beta.1",
-    "@mistcash/crypto": "0.1.0-beta.1"
+    "@mistcash/config": "workspace:*",
+    "@mistcash/crypto": "workspace:*",
+    "starknet": "^8.0.0"
   },
   "devDependencies": {
     "@types/jest": "^29.5.0",
     "jest": "^29.5.0",
     "tsup": "^8.0.0",
     "typescript": "^5.0.0"
-  },
-  "scripts": {
-    "build": "tsup src/index.ts --format cjs,esm --dts",
-    "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "clean": "rm -rf dist"
   }
 }

package/readme.md

@@ -22,6 +22,21 @@ const contract = getChamber(provider);
 // ⚠️ Will show assets even if transaction is spent
 // ⚠️ Contract has no way of knowing which transaction is spent
 const asset = await fetchTxAssets(contract, valKey, valTo);
+
+
+// Manually checking if tx exists
+
+// fetch existing transactions
+const allTransactions = await contract.tx_array();
+
+// generate full transaction hash
+const tx = await txHash(claimingKey, recipient, tokenAddr, amount)
+
+// check if your transaction is in the list
+allTransactions.indexOf(tx);
+
+
+
 ```
 
 ## Contributing

package/src/utils.ts

@@ -8,11 +8,13 @@ import { Asset } from './types';
  * @param provider Starknet provider
  * @returns Typed chamber contract
  */
-export function getChamber(provider?: ProviderInterface | AccountInterface): ChamberTypedContract {
+export function getChamber(providerOrAccount?: ProviderInterface | AccountInterface): ChamberTypedContract {
 	return new Contract(
-		CHAMBER_ABI,
-		CHAMBER_ADDR_MAINNET,
-		provider
+		{
+			abi: CHAMBER_ABI,
+			address: CHAMBER_ADDR_MAINNET,
+			providerOrAccount
+		}
 	).typedv2(CHAMBER_ABI)
 }
 
@@ -34,7 +36,11 @@ export async function fetchTxAssets(contract: ChamberTypedContract, valKey: stri
 	} else if (typeof amount != 'bigint') {
 		amount = BigInt(`${amount.low}`);
 	}
-	return { amount, addr: asset.addr }
+	let addr = asset.addr as string | bigint;
+	if (typeof addr === 'bigint') {
+		addr = '0x' + addr.toString(16);
+	}
+	return { amount, addr }
 }
 
 /**
@@ -50,6 +56,16 @@ export async function fetchTxAssets(contract: ChamberTypedContract, valKey: stri
  * @returns True if the transaction exists, false otherwise.
  */
 export async function checkTxExists(contract: ChamberTypedContract, valKey: string, valTo: string, tokenAddr: string, amount: string): Promise<boolean> {
+
+	// fetch existing transactions
+	const allTransactions = await contract.tx_array();
+
+	// generate full transaction hash
+	const tx = await txHash(valKey, valTo, tokenAddr, amount)
+
+	// check if your transaction is in the list
+	allTransactions.indexOf(tx);
+
 	return await getTxIndexInTree(await contract.tx_array() as bigint[], valKey, valTo, tokenAddr, amount) !== -1;
 }
 
@@ -66,3 +82,26 @@ export async function getTxIndexInTree(leaves: bigint[], valKey: string, valTo:
 	const tx_hash = await txHash(valKey, valTo, tokenAddr, amount)
 	return leaves.indexOf(tx_hash);
 }
+
+export function fmtAmount(amount: bigint, decimals: number): string {
+	// Convert bigint amount to string with specified decimal places
+	const factor = BigInt(10 ** decimals);
+	const integerPart = amount / factor;
+	const fractionalPart = amount % factor;
+
+	// Pad fractional part with leading zeros to match decimal places
+	const fractionalStr = fractionalPart.toString().padStart(decimals, '0');
+	// Remove trailing zeros
+	const trimmedFractional = fractionalStr.replace(/0+$/, '') || '0';
+
+	return `${integerPart.toString()}.${trimmedFractional}`;
+}
+
+export function fmtAmtToBigInt(amountStr: string, decimals: number): bigint {
+	let amt = BigInt(Math.floor(1_000_000 * +amountStr));
+	if (decimals > 6) {
+		// Mul by 10**12 for decimal points == 18 for all token but usdc
+		amt = BigInt(10 ** (decimals - 6)) * amt;
+	}
+	return amt;
+}