@msafe/sui-app-store 0.0.15 → 0.0.17

package/dist/index.mjs

@@ -355,7 +355,7 @@ var Globals = class _Globals {
 };
 
 // src/apps/mpay/stream/client.ts
-import { normalizeStructTag as normalizeStructTag6, normalizeSuiAddress as normalizeSuiAddress3 } from "@mysten/sui.js/utils";
+import { SUI_TYPE_ARG as SUI_TYPE_ARG3, normalizeStructTag as normalizeStructTag6, normalizeSuiAddress as normalizeSuiAddress3 } from "@mysten/sui.js/utils";
 
 // src/apps/mpay/stream/helper.ts
 import { normalizeStructTag as normalizeStructTag3, SUI_TYPE_ARG as SUI_TYPE_ARG2 } from "@mysten/sui.js/utils";
@@ -538,8 +538,9 @@ function isSameTarget(target1, target2) {
 var GAS_OBJECT_SPEC = "txn.gas";
 
 // src/apps/mpay/utils/random.ts
+import { nanoid } from "nanoid";
 function generateGroupId() {
-  return "nanoid()";
+  return nanoid();
 }
 
 // src/apps/mpay/builder/CreateStreamHelper.ts
@@ -2032,6 +2033,76 @@ function normalizeAddressFilter(address) {
   return address.length !== 0 ? address.map((addr) => normalizeSuiAddress2(addr)) : void 0;
 }
 
+// src/apps/mpay/error/NotEnoughBalanceError.ts
+var NotEnoughBalanceError = class extends MPayError {
+  constructor(coinType, requestAmount, gotAmount) {
+    super(4 /* NotEnoughBalance */, `Not enough balance: ${coinType}`, {
+      context: {
+        coinType,
+        requestAmount,
+        gotAmount
+      }
+    });
+    this.coinType = coinType;
+    this.requestAmount = requestAmount;
+    this.gotAmount = gotAmount;
+  }
+};
+
+// src/apps/mpay/sui/iterator/coin.ts
+var DEF_REQ_PAGE_SIZE = 25;
+async function getCoinsWithAmount(suiClient, owner, requestAmount, coinType = "0x2::sui::SUI", pageSize = DEF_REQ_PAGE_SIZE) {
+  const it = new OwnedCoinIterator(suiClient, owner, coinType, pageSize);
+  let totalAmount = BigInt(0);
+  const res = [];
+  while (await it.hasNext() && totalAmount < requestAmount) {
+    const val = await it.next();
+    if (!val) {
+      continue;
+    }
+    res.push(val);
+    totalAmount += BigInt(val.balance);
+  }
+  if (totalAmount < requestAmount) {
+    throw new NotEnoughBalanceError(coinType, requestAmount, totalAmount);
+  }
+  return res;
+}
+var OwnedCoinIterator = class extends EntryIterator {
+  constructor(suiClient, owner, coinType, reqPageSize) {
+    super(new OwnedCoinRequester(suiClient, owner, coinType, reqPageSize));
+    this.suiClient = suiClient;
+    this.owner = owner;
+    this.coinType = coinType;
+    this.reqPageSize = reqPageSize;
+  }
+};
+var OwnedCoinRequester = class {
+  constructor(suiClient, owner, coinType, reqPageSize) {
+    this.suiClient = suiClient;
+    this.owner = owner;
+    this.coinType = coinType;
+    this.reqPageSize = reqPageSize;
+    if (reqPageSize <= 0) {
+      throw new SanityError("Invalid reqPageSize");
+    }
+  }
+  nextCursor;
+  async doNextRequest() {
+    const res = await this.suiClient.getCoins({
+      owner: this.owner,
+      coinType: this.coinType,
+      cursor: this.nextCursor,
+      limit: this.reqPageSize
+    });
+    this.nextCursor = res.nextCursor;
+    return {
+      data: res.data,
+      hasNext: res.hasNextPage
+    };
+  }
+};
+
 // src/apps/mpay/stream/client.ts
 var MSafeAccountAdapter = class {
   constructor(msafe) {
@@ -2047,6 +2118,47 @@ var MSafeAccountAdapter = class {
     return this.msafe.requestCoins(reqs);
   }
 };
+var MSafeSingleWallet = class {
+  constructor(account) {
+    this.account = account;
+  }
+  async address() {
+    return this.account.address;
+  }
+};
+var SingleWalletAdapter = class {
+  constructor(singleWallet, suiClient) {
+    this.singleWallet = singleWallet;
+    this.suiClient = suiClient;
+  }
+  get type() {
+    return "single" /* single */;
+  }
+  async address() {
+    return this.singleWallet.address();
+  }
+  async requestCoins(reqs) {
+    return Promise.all(reqs.map((req) => this.requestCoin(req)));
+  }
+  async requestCoin(req) {
+    if (isSameCoinType(req.coinType, SUI_TYPE_ARG3)) {
+      return {
+        primaryCoin: GAS_OBJECT_SPEC
+      };
+    }
+    if (req.amount <= 0) {
+      throw new InvalidInputError("Invalid coin request", "coinAmount", req.amount);
+    }
+    const coins = await getCoinsWithAmount(this.suiClient, await this.address(), req.amount, req.coinType);
+    if (coins.length === 0) {
+      throw new SanityError("no coins available");
+    }
+    return {
+      primaryCoin: coins[0].coinObjectId,
+      mergedCoins: coins.slice(1).map((coin) => coin.coinObjectId)
+    };
+  }
+};
 var MPayClient = class {
   globals;
   helper;
@@ -2054,6 +2166,10 @@ var MPayClient = class {
     this.globals = Globals.new(env, options);
     this.helper = new MPayHelper(this.globals);
   }
+  connectSingleWallet(wallet) {
+    const adapter = new SingleWalletAdapter(wallet, this.globals.suiClient);
+    this.globals.connectWallet(adapter);
+  }
   connectMSafeAccount(msafe) {
     const adapter = new MSafeAccountAdapter(msafe);
     this.globals.connectWallet(adapter);
@@ -2110,8 +2226,9 @@ var CreateStreamIntention = class _CreateStreamIntention extends CoreBaseIntenti
   txType;
   txSubType;
   async build(input) {
-    const { network } = input;
+    const { network, account } = input;
     const mpayClient = new MPayClient(network === "sui:mainnet" ? "prod" /* prod */ : "dev" /* dev */);
+    mpayClient.connectSingleWallet(new MSafeSingleWallet(account));
     const txb = await mpayClient.createStream(this.data);
     return txb;
   }
@@ -2121,7 +2238,7 @@ var CreateStreamIntention = class _CreateStreamIntention extends CoreBaseIntenti
 };
 
 // src/apps/mpay/decoder/create.ts
-import { normalizeStructTag as normalizeStructTag8, SUI_TYPE_ARG as SUI_TYPE_ARG3 } from "@mysten/sui.js/utils";
+import { normalizeStructTag as normalizeStructTag8, SUI_TYPE_ARG as SUI_TYPE_ARG4 } from "@mysten/sui.js/utils";
 
 // src/apps/mpay/decoder/moveCall.ts
 import { bcs as bcs2 } from "@mysten/sui.js/bcs";
@@ -2314,11 +2431,11 @@ var CreateStreamDecodeHelper = class {
     const coinType = moveCall.typeArg(0);
     const paymentCoin = moveCall.txArg(2);
     const paymentCoinMerge = this.getCoinMergeFromNestedResult(paymentCoin, coinType, moveCall);
-    if (coinType === normalizeStructTag8(SUI_TYPE_ARG3)) {
+    if (coinType === normalizeStructTag8(SUI_TYPE_ARG4)) {
       return [paymentCoinMerge];
     }
     const flatFeeCoin = moveCall.txArg(3);
-    const flatCoinMerge = this.getCoinMergeFromNestedResult(flatFeeCoin, normalizeStructTag8(SUI_TYPE_ARG3), moveCall);
+    const flatCoinMerge = this.getCoinMergeFromNestedResult(flatFeeCoin, normalizeStructTag8(SUI_TYPE_ARG4), moveCall);
     return [paymentCoinMerge, flatCoinMerge];
   }
   getCoinMergeFromNestedResult(coinArg, coinType, moveCall) {