@alpha-arcade/sdk 0.2.11 → 0.3.1

package/dist/index.js

@@ -1,4 +1,5 @@
-import algosdk2, { AtomicTransactionComposer, getApplicationAddress, modelsv2 } from 'algosdk';
+import * as algosdk2 from 'algosdk';
+import { AtomicTransactionComposer, getApplicationAddress, modelsv2 } from 'algosdk';
 import * as algokit4 from '@algorandfoundation/algokit-utils';
 import { Decimal } from 'decimal.js';
 
@@ -1973,47 +1974,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.encodeAddress(addressBytes);
+            state[key] = algosdk2.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;
   }
@@ -2107,8 +2119,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;
     }
@@ -2122,7 +2135,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);
@@ -2141,7 +2154,7 @@ var transformOrders = (orders) => orders.filter((o) => o.appId > 0).map((o) => (
   owner: o.globalState.owner ?? ""
 }));
 var getOrderbook = async (config, marketAppId) => {
-  const appAddress = algosdk2.getApplicationAddress(marketAppId);
+  const appAddress = algosdk2.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;
@@ -2170,7 +2183,7 @@ var getOrderbook = async (config, marketAppId) => {
 };
 var getOpenOrders = async (config, marketAppId, walletAddress) => {
   const owner = walletAddress ?? config.activeAddress;
-  const appAddress = algosdk2.getApplicationAddress(marketAppId);
+  const appAddress = algosdk2.getApplicationAddress(marketAppId).toString();
   const applications = await getAllCreatedApplications(config.indexerClient, appAddress);
   const appsWithState = await fetchApplicationsGlobalState(config.indexerClient, applications);
   return appsWithState.filter(
@@ -2235,8 +2248,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 {
   }
@@ -2245,8 +2260,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 {
     }
@@ -2314,7 +2332,7 @@ var createOrder = async (config, params) => {
   if (isBuying) {
     fee = calculateFee(quantity, price + slippage, feeBase);
   }
-  const marketAddress = getApplicationAddress(marketAppId);
+  const marketAddress = getApplicationAddress(marketAppId).toString();
   const atc = new AtomicTransactionComposer();
   let createEscrowTxnIndex = 0;
   if (!isBuying) {
@@ -2363,7 +2381,7 @@ var createOrder = async (config, params) => {
     const payCounterPartyTxn = await algokit4.transferAlgos(
       {
         from: signerAccount,
-        to: getApplicationAddress(matchingOrder.escrowAppId),
+        to: getApplicationAddress(matchingOrder.escrowAppId).toString(),
         amount: algokit4.microAlgos(1e3 * (isBuying ? 1 : 2)),
         skipSending: true
       },
@@ -2395,7 +2413,7 @@ var createOrder = async (config, params) => {
   return {
     escrowAppId,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    confirmedRound: Number(result.confirmedRound)
   };
 };
 var cancelOrder = async (config, params) => {
@@ -2424,7 +2442,7 @@ var cancelOrder = async (config, params) => {
   return {
     success: true,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    confirmedRound: Number(result.confirmedRound)
   };
 };
 var proposeMatch = async (config, params) => {
@@ -2443,7 +2461,7 @@ var proposeMatch = async (config, params) => {
   const payMakerTxn = await algokit4.transferAlgos(
     {
       from: signerAccount,
-      to: getApplicationAddress(makerEscrowAppId),
+      to: getApplicationAddress(makerEscrowAppId).toString(),
       amount: algokit4.microAlgos(2e3),
       skipSending: true
     },
@@ -2471,7 +2489,90 @@ var proposeMatch = async (config, params) => {
   return {
     success: true,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    confirmedRound: Number(result.confirmedRound)
+  };
+};
+var processMatch = async (config, params) => {
+  const { algodClient, signer, activeAddress, usdcAssetId } = config;
+  const { marketAppId, makerEscrowAppId, takerEscrowAppId } = params;
+  const [marketState, makerAppInfo, takerAppInfo] = await Promise.all([
+    getMarketGlobalState(algodClient, marketAppId),
+    algodClient.getApplicationByID(makerEscrowAppId).do(),
+    algodClient.getApplicationByID(takerEscrowAppId).do()
+  ]);
+  const marketFeeAddress = marketState.fee_address;
+  const yesAssetId = marketState.yes_asset_id;
+  const noAssetId = marketState.no_asset_id;
+  const makerState = decodeGlobalState(
+    makerAppInfo.params?.globalState ?? makerAppInfo.params?.["global-state"] ?? []
+  );
+  const takerState = decodeGlobalState(
+    takerAppInfo.params?.globalState ?? takerAppInfo.params?.["global-state"] ?? []
+  );
+  const makerOwner = makerState.owner ?? "";
+  const takerOwner = takerState.owner ?? "";
+  const makerRemaining = (makerState.quantity ?? 0) - (makerState.quantity_filled ?? 0);
+  const takerRemaining = (takerState.quantity ?? 0) - (takerState.quantity_filled ?? 0);
+  const matchedQuantity = Math.min(makerRemaining, takerRemaining);
+  if (matchedQuantity <= 0) {
+    throw new Error("processMatch: no quantity left to match on maker or taker escrow.");
+  }
+  const signerAccount = { signer, addr: activeAddress };
+  const makerEscrowClient = new EscrowAppClient(
+    { resolveBy: "id", id: makerEscrowAppId, sender: signerAccount },
+    algodClient
+  );
+  const takerEscrowClient = new EscrowAppClient(
+    { resolveBy: "id", id: takerEscrowAppId, sender: signerAccount },
+    algodClient
+  );
+  const marketClient = new MarketAppClient(
+    { resolveBy: "id", id: marketAppId, sender: signerAccount },
+    algodClient
+  );
+  const atc = new AtomicTransactionComposer();
+  const assets = [usdcAssetId, yesAssetId, noAssetId];
+  const sendParamsWithFee = { skipSending: true, fee: algokit4.microAlgos(3e3) };
+  const sendParamsNoop = { skipSending: true, fee: algokit4.microAlgos(1e3) };
+  const matchMakerTxn = await makerEscrowClient.matchMaker(
+    { taker: takerEscrowAppId, matchQuantity: matchedQuantity },
+    {
+      assets,
+      apps: [marketAppId],
+      accounts: [takerOwner, marketFeeAddress],
+      sendParams: sendParamsWithFee
+    }
+  );
+  atc.addTransaction({ txn: matchMakerTxn.transaction, signer });
+  const matchTakerTxn = await takerEscrowClient.matchTaker(
+    { maker: makerEscrowAppId },
+    {
+      assets,
+      apps: [marketAppId],
+      accounts: [makerOwner, marketFeeAddress],
+      sendParams: sendParamsWithFee
+    }
+  );
+  atc.addTransaction({ txn: matchTakerTxn.transaction, signer });
+  const processMatchTxn = await marketClient.processPotentialMatch(
+    { maker: makerEscrowAppId, taker: takerEscrowAppId },
+    {
+      assets,
+      accounts: [makerOwner, takerOwner, marketFeeAddress],
+      sendParams: sendParamsNoop
+    }
+  );
+  atc.addTransaction({ txn: processMatchTxn.transaction, signer });
+  const doNoopTxn = await marketClient.doNoop(
+    { callNumber: 1 },
+    { sendParams: sendParamsNoop }
+  );
+  atc.addTransaction({ txn: doNoopTxn.transaction, signer });
+  const result = await atc.execute(algodClient, 4);
+  return {
+    success: true,
+    txIds: result.txIDs,
+    confirmedRound: Number(result.confirmedRound)
   };
 };
 var amendOrder = async (config, params) => {
@@ -2479,7 +2580,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.");
@@ -2530,10 +2631,47 @@ var amendOrder = async (config, params) => {
   );
   atc.addTransaction({ txn: amendCall.transaction, signer });
   const result = await atc.execute(algodClient, 4);
+  const allTxIds = [...result.txIDs];
+  let lastConfirmedRound = Number(result.confirmedRound);
+  const orderbook = await getOrderbook(config, marketAppId);
+  let matchingOrders = calculateMatchingOrders(orderbook, isBuy, position === 1, quantity, price, slippage);
+  matchingOrders = matchingOrders.filter((m) => m.escrowAppId !== escrowAppId);
+  if (matchingOrders.length > 0) {
+    let quantityLeft = quantity;
+    const matchedQuantities = [];
+    const matchedPrices = [];
+    for (const m of matchingOrders) {
+      if (quantityLeft <= 0) break;
+      try {
+        const matchResult = await processMatch(config, {
+          marketAppId,
+          makerEscrowAppId: m.escrowAppId,
+          takerEscrowAppId: escrowAppId
+        });
+        allTxIds.push(...matchResult.txIds);
+        lastConfirmedRound = matchResult.confirmedRound;
+        const q = Math.min(m.quantity, quantityLeft);
+        matchedQuantities.push(q);
+        matchedPrices.push((m.price ?? price) * q);
+        quantityLeft -= q;
+      } catch (err) {
+        console.log(`Error matching order: ${JSON.stringify(err)}`);
+        break;
+      }
+    }
+    const totalMatchedQuantity = matchedQuantities.reduce((a, b) => a + b, 0);
+    const matchedPrice = totalMatchedQuantity > 0 ? Math.round(matchedPrices.reduce((a, b) => a + b, 0) / totalMatchedQuantity) : void 0;
+    return {
+      success: true,
+      txIds: allTxIds,
+      confirmedRound: lastConfirmedRound,
+      ...totalMatchedQuantity > 0 && { matchedQuantity: totalMatchedQuantity, matchedPrice }
+    };
+  }
   return {
     success: true,
-    txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    txIds: allTxIds,
+    confirmedRound: lastConfirmedRound
   };
 };
 var splitShares = async (config, params) => {
@@ -2547,7 +2685,7 @@ var splitShares = async (config, params) => {
     { resolveBy: "id", id: marketAppId, sender: signerAccount },
     algodClient
   );
-  const marketAddress = getApplicationAddress(marketAppId);
+  const marketAddress = getApplicationAddress(marketAppId).toString();
   const atc = new AtomicTransactionComposer();
   let optInCosts = 0;
   const hasYesOptIn = await checkAssetOptIn(algodClient, activeAddress, yesAssetId);
@@ -2587,7 +2725,7 @@ var splitShares = async (config, params) => {
   return {
     success: true,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    confirmedRound: Number(result.confirmedRound)
   };
 };
 var mergeShares = async (config, params) => {
@@ -2601,7 +2739,7 @@ var mergeShares = async (config, params) => {
     { resolveBy: "id", id: marketAppId, sender: signerAccount },
     algodClient
   );
-  const marketAddress = getApplicationAddress(marketAppId);
+  const marketAddress = getApplicationAddress(marketAppId).toString();
   const atc = new AtomicTransactionComposer();
   let optInCosts = 0;
   const hasUsdcOptIn = await checkAssetOptIn(algodClient, activeAddress, usdcAssetId);
@@ -2637,7 +2775,7 @@ var mergeShares = async (config, params) => {
   return {
     success: true,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound
+    confirmedRound: Number(result.confirmedRound)
   };
 };
 var claim = async (config, params) => {
@@ -2648,12 +2786,12 @@ var claim = async (config, params) => {
     { resolveBy: "id", id: marketAppId, sender: signerAccount },
     algodClient
   );
-  const marketAddress = getApplicationAddress(marketAppId);
+  const marketAddress = 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) {
@@ -2675,8 +2813,8 @@ var claim = async (config, params) => {
   atc.addTransaction({ txn: claimTxn.transaction, signer });
   const sp = await algodClient.getTransactionParams().do();
   const closeOutTxn = algosdk2.makeAssetTransferTxnWithSuggestedParamsFromObject({
-    from: activeAddress,
-    to: marketAddress,
+    sender: activeAddress,
+    receiver: marketAddress,
     amount: 0,
     assetIndex: assetId,
     closeRemainderTo: marketAddress,
@@ -2687,7 +2825,7 @@ var claim = async (config, params) => {
   return {
     success: true,
     txIds: result.txIDs,
-    confirmedRound: result.confirmedRound,
+    confirmedRound: Number(result.confirmedRound),
     amountClaimed: tokenBalance
   };
 };
@@ -2695,17 +2833,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;
@@ -2721,16 +2859,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, {
@@ -2811,8 +2957,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;
     }
@@ -2820,7 +2967,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;
@@ -2846,7 +2993,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),
@@ -3007,6 +3154,19 @@ var AlphaClient = class {
   async proposeMatch(params) {
     return proposeMatch(this.config, params);
   }
+  /**
+   * Matches two existing limit orders (no create-escrow in the group).
+   *
+   * Calls the market app's process_potential_match(maker, taker). Use this
+   * after amending an order: the amended order is the taker (pays the fee),
+   * the counterparty is the maker.
+   *
+   * @param params - Process match params (marketAppId, makerEscrowAppId, takerEscrowAppId)
+   * @returns Whether the match succeeded
+   */
+  async processMatch(params) {
+    return processMatch(this.config, params);
+  }
   /**
    * Amends (edits) an existing unfilled order in-place.
    *