@alpha-arcade/sdk 0.2.11 → 0.3.0

package/README.md

@@ -49,7 +49,7 @@ const client = new AlphaClient({
   algodClient,
   indexerClient,
   signer,
-  activeAddress: account.addr,
+  activeAddress: account.addr.toString(),
   matcherAppId: 3078581851,
   usdcAssetId: 31566704,
 });
@@ -380,7 +380,7 @@ const setup = () => {
     algodClient,
     indexerClient,
     signer: algosdk.makeBasicAccountTransactionSigner(account),
-    activeAddress: account.addr,
+    activeAddress: account.addr.toString(),
     matcherAppId: 3078581851,
     usdcAssetId: 31566704,
   });

package/dist/index.cjs

@@ -4,8 +4,6 @@ var algosdk2 = require('algosdk');
 var algokit4 = require('@algorandfoundation/algokit-utils');
 var decimal_js = require('decimal.js');
 
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   var n = Object.create(null);
@@ -24,7 +22,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var algosdk2__default = /*#__PURE__*/_interopDefault(algosdk2);
+var algosdk2__namespace = /*#__PURE__*/_interopNamespace(algosdk2);
 var algokit4__namespace = /*#__PURE__*/_interopNamespace(algokit4);
 
 // src/modules/trading.ts
@@ -1998,47 +1996,58 @@ var calculateFeeFromTotal = (totalAmount, price, feeBase) => {
 var decodeGlobalState = (rawState) => {
   const state = {};
   for (const item of rawState) {
-    const key = Buffer.from(item.key, "base64").toString();
-    if (item.value.type === 1) {
+    const rawKey = item.key;
+    const key = typeof rawKey === "string" ? Buffer.from(rawKey, "base64").toString() : rawKey instanceof Uint8Array ? Buffer.from(rawKey).toString() : String(rawKey);
+    const val = item.value;
+    const type = val.type;
+    if (type === 1) {
       if (key === "owner" || key === "oracle_address" || key === "fee_address" || key === "market_friend_addr" || key === "escrow_cancel_address") {
         try {
-          const addressBytes = Buffer.from(item.value.bytes, "base64");
+          const rawBytes = val.bytes;
+          const addressBytes = typeof rawBytes === "string" ? Buffer.from(rawBytes, "base64") : rawBytes instanceof Uint8Array ? rawBytes : Buffer.from(String(rawBytes), "base64");
           if (addressBytes.length === 32) {
-            state[key] = algosdk2__default.default.encodeAddress(addressBytes);
+            state[key] = algosdk2__namespace.encodeAddress(new Uint8Array(addressBytes));
           } else {
-            state[key] = item.value.bytes;
+            state[key] = val.bytes;
           }
         } catch {
-          state[key] = item.value.bytes;
+          state[key] = val.bytes;
         }
       } else {
         try {
-          state[key] = Buffer.from(item.value.bytes, "base64").toString();
+          const rawBytes = val.bytes;
+          if (typeof rawBytes === "string") {
+            state[key] = Buffer.from(rawBytes, "base64").toString();
+          } else if (rawBytes instanceof Uint8Array) {
+            state[key] = Buffer.from(rawBytes).toString();
+          } else {
+            state[key] = rawBytes;
+          }
         } catch {
-          state[key] = item.value.bytes;
+          state[key] = val.bytes;
         }
       }
     } else {
-      state[key] = Number(item.value.uint);
+      state[key] = Number(val.uint);
     }
   }
   return state;
 };
 var getMarketGlobalState = async (algodClient, marketAppId) => {
   const appInfo = await algodClient.getApplicationByID(marketAppId).do();
-  const rawState = appInfo.params?.["global-state"] ?? appInfo["params"]?.["global-state"] ?? [];
+  const rawState = appInfo.params?.globalState ?? appInfo.params?.["global-state"] ?? [];
   return decodeGlobalState(rawState);
 };
 var getEscrowGlobalState = async (indexerClient, escrowAppId) => {
   const appInfo = await indexerClient.lookupApplications(escrowAppId).do();
-  const rawState = appInfo.application?.params?.["global-state"] ?? [];
+  const rawState = appInfo.application?.params?.globalState ?? appInfo.application?.params?.["global-state"] ?? [];
   return decodeGlobalState(rawState);
 };
 var checkAssetOptIn = async (algodClient, address, assetId) => {
   try {
     const accountInfo = await algodClient.accountInformation(address).do();
-    const assets = accountInfo.assets || accountInfo["assets"] || [];
-    return assets.some((a) => (a["asset-id"] ?? a.assetId) === assetId);
+    const assets = accountInfo.assets || [];
+    return assets.some((a) => Number(a.assetId ?? a["asset-id"]) === assetId);
   } catch {
     return false;
   }
@@ -2132,8 +2141,9 @@ var getAllCreatedApplications = async (indexerClient, address, limit = 100) => {
     if (response.applications?.length) {
       applications = [...applications, ...response.applications];
     }
-    if (response["next-token"]) {
-      nextToken = response["next-token"];
+    const token = response.nextToken ?? response["next-token"];
+    if (token) {
+      nextToken = token;
     } else {
       hasMore = false;
     }
@@ -2147,7 +2157,7 @@ var fetchApplicationsGlobalState = async (indexerClient, applications) => {
       try {
         const appInfo = await indexerClient.lookupApplications(appId).do();
         const globalState = {};
-        const rawGlobalState = appInfo.application?.params?.["global-state"];
+        const rawGlobalState = appInfo.application?.params?.globalState ?? appInfo.application?.params?.["global-state"];
         if (rawGlobalState) {
           const decoded = decodeGlobalState(rawGlobalState);
           Object.assign(globalState, decoded);
@@ -2166,7 +2176,7 @@ var transformOrders = (orders) => orders.filter((o) => o.appId > 0).map((o) => (
   owner: o.globalState.owner ?? ""
 }));
 var getOrderbook = async (config, marketAppId) => {
-  const appAddress = algosdk2__default.default.getApplicationAddress(marketAppId);
+  const appAddress = algosdk2__namespace.getApplicationAddress(marketAppId).toString();
   const applications = await getAllCreatedApplications(config.indexerClient, appAddress);
   const appsWithState = await fetchApplicationsGlobalState(config.indexerClient, applications);
   const isOpenLimitOrder = (o) => (o.globalState.quantity ?? 0) > (o.globalState.quantity_filled ?? 0) && o.globalState.slippage === 0;
@@ -2195,7 +2205,7 @@ var getOrderbook = async (config, marketAppId) => {
 };
 var getOpenOrders = async (config, marketAppId, walletAddress) => {
   const owner = walletAddress ?? config.activeAddress;
-  const appAddress = algosdk2__default.default.getApplicationAddress(marketAppId);
+  const appAddress = algosdk2__namespace.getApplicationAddress(marketAppId).toString();
   const applications = await getAllCreatedApplications(config.indexerClient, appAddress);
   const appsWithState = await fetchApplicationsGlobalState(config.indexerClient, applications);
   return appsWithState.filter(
@@ -2260,8 +2270,10 @@ var getWalletOrdersFromApi = async (config, walletAddress) => {
 var extractEscrowAppId = async (algodClient, indexerClient, targetTxId) => {
   try {
     const pendingInfo = await algodClient.pendingTransactionInformation(targetTxId).do();
-    if (pendingInfo?.["inner-txns"]?.[0]?.["created-application-index"]) {
-      return pendingInfo["inner-txns"][0]["created-application-index"];
+    const innerTxns = pendingInfo.innerTxns ?? pendingInfo["inner-txns"];
+    const createdAppId = innerTxns?.[0]?.applicationIndex ?? innerTxns?.[0]?.["created-application-index"];
+    if (createdAppId) {
+      return Number(createdAppId);
     }
   } catch {
   }
@@ -2270,8 +2282,11 @@ var extractEscrowAppId = async (algodClient, indexerClient, targetTxId) => {
     try {
       await new Promise((resolve) => setTimeout(resolve, delayMs));
       const txnLookup = await indexerClient.lookupTransactionByID(targetTxId).do();
-      if (txnLookup?.transaction?.["inner-txns"]?.[0]?.["created-application-index"]) {
-        return txnLookup.transaction["inner-txns"][0]["created-application-index"];
+      const txn = txnLookup.transaction;
+      const innerTxns = txn?.innerTxns ?? txn?.["inner-txns"];
+      const createdAppId = innerTxns?.[0]?.createdApplicationIndex ?? innerTxns?.[0]?.["created-application-index"];
+      if (createdAppId) {
+        return Number(createdAppId);
       }
     } catch {
     }
@@ -2339,7 +2354,7 @@ var createOrder = async (config, params) => {
   if (isBuying) {
     fee = calculateFee(quantity, price + slippage, feeBase);
   }
-  const marketAddress = algosdk2.getApplicationAddress(marketAppId);
+  const marketAddress = algosdk2.getApplicationAddress(marketAppId).toString();
   const atc = new algosdk2.AtomicTransactionComposer();
   let createEscrowTxnIndex = 0;
   if (!isBuying) {
@@ -2388,7 +2403,7 @@ var createOrder = async (config, params) => {
     const payCounterPartyTxn = await algokit4__namespace.transferAlgos(
       {
         from: signerAccount,
-        to: algosdk2.getApplicationAddress(matchingOrder.escrowAppId),
+        to: algosdk2.getApplicationAddress(matchingOrder.escrowAppId).toString(),
         amount: algokit4__namespace.microAlgos(1e3 * (isBuying ? 1 : 2)),
         skipSending: true
       },
@@ -2420,7 +2435,7 @@ var createOrder = async (config, params) => {
   return {
     escrowAppId,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    confirmedRound: Number(result.confirmedRound)
   };
 };
 var cancelOrder = async (config, params) => {
@@ -2449,7 +2464,7 @@ var cancelOrder = async (config, params) => {
   return {
     success: true,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    confirmedRound: Number(result.confirmedRound)
   };
 };
 var proposeMatch = async (config, params) => {
@@ -2468,7 +2483,7 @@ var proposeMatch = async (config, params) => {
   const payMakerTxn = await algokit4__namespace.transferAlgos(
     {
       from: signerAccount,
-      to: algosdk2.getApplicationAddress(makerEscrowAppId),
+      to: algosdk2.getApplicationAddress(makerEscrowAppId).toString(),
       amount: algokit4__namespace.microAlgos(2e3),
       skipSending: true
     },
@@ -2496,7 +2511,7 @@ var proposeMatch = async (config, params) => {
   return {
     success: true,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    confirmedRound: Number(result.confirmedRound)
   };
 };
 var amendOrder = async (config, params) => {
@@ -2504,7 +2519,7 @@ var amendOrder = async (config, params) => {
   const { marketAppId, escrowAppId, price, quantity, slippage = 0 } = params;
   const escrowAppInfo = await algodClient.getApplicationByID(escrowAppId).do();
   const escrowState = decodeGlobalState(
-    escrowAppInfo.params?.["global-state"] ?? escrowAppInfo["params"]?.["global-state"] ?? []
+    escrowAppInfo.params?.globalState ?? escrowAppInfo.params?.["global-state"] ?? []
   );
   if ((escrowState.quantity_filled ?? 0) > 0) {
     throw new Error("Cannot amend an order that has been partially or fully filled.");
@@ -2558,7 +2573,7 @@ var amendOrder = async (config, params) => {
   return {
     success: true,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    confirmedRound: Number(result.confirmedRound)
   };
 };
 var splitShares = async (config, params) => {
@@ -2572,7 +2587,7 @@ var splitShares = async (config, params) => {
     { resolveBy: "id", id: marketAppId, sender: signerAccount },
     algodClient
   );
-  const marketAddress = algosdk2.getApplicationAddress(marketAppId);
+  const marketAddress = algosdk2.getApplicationAddress(marketAppId).toString();
   const atc = new algosdk2.AtomicTransactionComposer();
   let optInCosts = 0;
   const hasYesOptIn = await checkAssetOptIn(algodClient, activeAddress, yesAssetId);
@@ -2612,7 +2627,7 @@ var splitShares = async (config, params) => {
   return {
     success: true,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    confirmedRound: Number(result.confirmedRound)
   };
 };
 var mergeShares = async (config, params) => {
@@ -2626,7 +2641,7 @@ var mergeShares = async (config, params) => {
     { resolveBy: "id", id: marketAppId, sender: signerAccount },
     algodClient
   );
-  const marketAddress = algosdk2.getApplicationAddress(marketAppId);
+  const marketAddress = algosdk2.getApplicationAddress(marketAppId).toString();
   const atc = new algosdk2.AtomicTransactionComposer();
   let optInCosts = 0;
   const hasUsdcOptIn = await checkAssetOptIn(algodClient, activeAddress, usdcAssetId);
@@ -2662,7 +2677,7 @@ var mergeShares = async (config, params) => {
   return {
     success: true,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    confirmedRound: Number(result.confirmedRound)
   };
 };
 var claim = async (config, params) => {
@@ -2673,12 +2688,12 @@ var claim = async (config, params) => {
     { resolveBy: "id", id: marketAppId, sender: signerAccount },
     algodClient
   );
-  const marketAddress = algosdk2.getApplicationAddress(marketAppId);
+  const marketAddress = algosdk2.getApplicationAddress(marketAppId).toString();
   let tokenBalance = params.amount;
   if (!tokenBalance) {
     const accountInfo = await algodClient.accountInformation(activeAddress).do();
-    const assets = accountInfo.assets || accountInfo["assets"] || [];
-    const asset = assets.find((a) => (a["asset-id"] ?? a.assetId) === assetId);
+    const assets = accountInfo.assets || [];
+    const asset = assets.find((a) => Number(a.assetId ?? a["asset-id"]) === assetId);
     tokenBalance = asset ? Number(asset.amount) : 0;
   }
   if (tokenBalance <= 0) {
@@ -2699,9 +2714,9 @@ var claim = async (config, params) => {
   );
   atc.addTransaction({ txn: claimTxn.transaction, signer });
   const sp = await algodClient.getTransactionParams().do();
-  const closeOutTxn = algosdk2__default.default.makeAssetTransferTxnWithSuggestedParamsFromObject({
-    from: activeAddress,
-    to: marketAddress,
+  const closeOutTxn = algosdk2__namespace.makeAssetTransferTxnWithSuggestedParamsFromObject({
+    sender: activeAddress,
+    receiver: marketAddress,
     amount: 0,
     assetIndex: assetId,
     closeRemainderTo: marketAddress,
@@ -2712,7 +2727,7 @@ var claim = async (config, params) => {
   return {
     success: true,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound,
+    confirmedRound: Number(result.confirmedRound),
     amountClaimed: tokenBalance
   };
 };
@@ -2720,17 +2735,17 @@ var getPositions = async (config, walletAddress) => {
   const { algodClient, indexerClient } = config;
   const address = walletAddress ?? config.activeAddress;
   const accountInfo = await algodClient.accountInformation(address).do();
-  const assets = accountInfo.assets || accountInfo["assets"] || [];
+  const assets = accountInfo.assets || [];
   const nonZeroAssets = assets.filter((a) => Number(a.amount) > 0);
   if (nonZeroAssets.length === 0) return [];
   const positions = /* @__PURE__ */ new Map();
   for (const asset of nonZeroAssets) {
-    const assetId = asset["asset-id"] ?? asset.assetId;
+    const assetId = Number(asset.assetId ?? asset["asset-id"]);
     const amount = Number(asset.amount);
     try {
       const assetInfo = await indexerClient.lookupAssetByID(assetId).do();
       const assetName = assetInfo.asset?.params?.name ?? "";
-      const unitName = assetInfo.asset?.params?.["unit-name"] ?? "";
+      const unitName = assetInfo.asset?.params?.unitName ?? assetInfo.asset?.params?.["unit-name"] ?? "";
       if (!unitName.startsWith("ALPHA-")) continue;
       const match = assetName.match(/^Alpha Market (\d+) (Yes|No)$/);
       if (!match) continue;
@@ -2746,16 +2761,24 @@ var getPositions = async (config, walletAddress) => {
       } else {
         try {
           const appInfo = await indexerClient.lookupApplications(marketAppId).do();
-          const rawState = appInfo.application?.params?.["global-state"];
+          const rawState = appInfo.application?.params?.globalState ?? appInfo.application?.params?.["global-state"];
           if (!rawState) continue;
           let yesAssetIdOnChain = 0;
           let noAssetIdOnChain = 0;
           let marketTitle = "";
           for (const item of rawState) {
-            const key = Buffer.from(item.key, "base64").toString();
+            const rawKey = item.key;
+            const key = typeof rawKey === "string" ? Buffer.from(rawKey, "base64").toString() : rawKey instanceof Uint8Array ? Buffer.from(rawKey).toString() : String(rawKey);
             if (key === "yes_asset_id") yesAssetIdOnChain = Number(item.value.uint);
             if (key === "no_asset_id") noAssetIdOnChain = Number(item.value.uint);
-            if (key === "title") marketTitle = Buffer.from(item.value.bytes, "base64").toString();
+            if (key === "title") {
+              const rawBytes = item.value.bytes;
+              if (typeof rawBytes === "string") {
+                marketTitle = Buffer.from(rawBytes, "base64").toString();
+              } else if (rawBytes instanceof Uint8Array) {
+                marketTitle = Buffer.from(rawBytes).toString();
+              }
+            }
           }
           if (yesAssetIdOnChain === 0 && noAssetIdOnChain === 0) continue;
           positions.set(marketAppId, {
@@ -2836,8 +2859,9 @@ var getMarketsOnChain = async (config, options) => {
     if (response.applications?.length) {
       allApps.push(...response.applications);
     }
-    if (response["next-token"]) {
-      nextToken = response["next-token"];
+    const token = response.nextToken ?? response["next-token"];
+    if (token) {
+      nextToken = token;
     } else {
       hasMore = false;
     }
@@ -2845,7 +2869,7 @@ var getMarketsOnChain = async (config, options) => {
   const flatMarkets = [];
   for (const app of allApps) {
     if (app.deleted) continue;
-    const rawState = app.params?.["global-state"];
+    const rawState = app.params?.globalState ?? app.params?.["global-state"];
     if (!rawState) continue;
     const state = decodeGlobalState(rawState);
     if (activeOnly && !state.is_activated) continue;
@@ -2871,7 +2895,7 @@ var getMarketOnChain = async (config, marketAppId) => {
   try {
     const appId = typeof marketAppId === "string" ? Number(marketAppId) : marketAppId;
     const appInfo = await config.algodClient.getApplicationByID(appId).do();
-    const rawState = appInfo.params?.["global-state"] ?? appInfo["params"]?.["global-state"] ?? [];
+    const rawState = appInfo.params?.globalState ?? appInfo.params?.["global-state"] ?? [];
     const state = decodeGlobalState(rawState);
     return {
       id: String(appId),