@msafe/sui3-sdk 0.0.90 → 1.0.6

package/dist/index.js

@@ -133,46 +133,86 @@ import {
   buildRejectTxb,
   isSameAddress as isSameAddress2
 } from "@msafe/sui3-utils";
-import { TransactionBlock as TransactionBlock2 } from "@mysten/sui.js/transactions";
-import { fromHEX, normalizeStructTag as normalizeStructTag3, toHEX } from "@mysten/sui.js/utils";
+import { Transaction as Transaction3 } from "@mysten/sui/transactions";
+import { fromHex, normalizeStructTag as normalizeStructTag3, toHex } from "@mysten/sui/utils";
 import { SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN } from "@mysten/wallet-standard";
 
 // src/simulate/simulator.ts
-import { TransactionBlock } from "@mysten/sui.js/transactions";
+import { Transaction } from "@mysten/sui/transactions";
 var GAS_SAFE_OVERHEAD = 1000n;
+function formatExecutionError(error) {
+  return error.message;
+}
+function gasObjectToReference(gas) {
+  if (!gas?.objectId) {
+    throw new Error("Gas object missing from simulation effects");
+  }
+  const version = gas.outputVersion ?? gas.inputVersion ?? "0";
+  const digest = gas.outputDigest ?? gas.inputDigest ?? "";
+  return { objectId: gas.objectId, version, digest };
+}
 var Simulator = class {
   constructor(globals) {
     this.globals = globals;
   }
   async simulate(input) {
-    const tx = this.copyTransactionBlock(input.txb);
+    const tx = this.copyTransaction(input.txb);
     const { suiClient } = this.globals;
     const gasPrice = await this.getGasPrice();
     tx.setGasPrice(gasPrice);
-    const inspectResult = await suiClient.dryRunTransactionBlock({
-      transactionBlock: await tx.build({ client: suiClient })
-    });
-    const success = inspectResult.effects.status.status === "success";
+    let built;
+    try {
+      built = await tx.build({ client: suiClient });
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      return {
+        success: false,
+        gasPrice,
+        simulationError: message
+      };
+    }
+    let inspectResult;
+    try {
+      inspectResult = await suiClient.simulateTransaction({
+        transaction: built,
+        include: { effects: true }
+      });
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      return {
+        success: false,
+        gasPrice,
+        simulationError: message
+      };
+    }
+    const txRow = inspectResult.Transaction ?? inspectResult.FailedTransaction;
+    const { effects } = txRow;
+    if (!effects) {
+      throw new Error("simulateTransaction did not return effects");
+    }
+    const success = effects.status.success === true;
     if (!success) {
+      const err = effects.status.success === false ? effects.status.error : null;
       return {
         success,
         gasPrice,
         response: inspectResult,
-        simulationError: inspectResult.effects.status.error
+        simulationError: err ? formatExecutionError(err) : "Simulation failed"
       };
     }
-    const gasBudget = this.toGasBudget(inspectResult.effects.gasUsed, gasPrice);
+    const gasBudget = this.toGasBudget(effects.gasUsed, gasPrice);
     return {
       success,
       gasPrice,
-      gasObject: inspectResult.effects.gasObject.reference,
-      gasUsed: inspectResult.effects.gasUsed,
+      gasObject: gasObjectToReference(effects.gasObject),
+      gasUsed: effects.gasUsed,
       gasBudget,
       response: inspectResult
     };
   }
   async getGasPrice() {
-    return this.globals.suiClient.getReferenceGasPrice();
+    const { referenceGasPrice } = await this.globals.suiClient.getReferenceGasPrice();
+    return BigInt(referenceGasPrice);
   }
   toGasBudget(gasUsed, gasPrice) {
     const { computationCost, storageCost, storageRebate } = gasUsed;
@@ -181,8 +221,8 @@ var Simulator = class {
     const gasBudget = baseComputationCostWithOverhead + BigInt(storageCost) - BigInt(storageRebate);
     return gasBudget > baseComputationCostWithOverhead ? gasBudget : baseComputationCostWithOverhead;
   }
-  copyTransactionBlock(tx) {
-    return TransactionBlock.from(tx.serialize());
+  copyTransaction(tx) {
+    return Transaction.from(tx.serialize());
   }
 };
 
@@ -199,13 +239,13 @@ function HexToUint8Array(hex) {
 }
 
 // src/utils/crypto.ts
-import { verifyPersonalMessage, verifyTransactionBlock } from "@mysten/sui.js/verify";
+import { verifyPersonalMessageSignature, verifyTransactionSignature } from "@mysten/sui/verify";
 
 // src/utils/format.ts
-import { normalizeSuiAddress, normalizeStructTag as normalizeStructTag2 } from "@mysten/sui.js/utils";
+import { normalizeSuiAddress, normalizeStructTag as normalizeStructTag2 } from "@mysten/sui/utils";
 
 // src/utils/coin.ts
-import { normalizeStructTag } from "@mysten/sui.js/utils";
+import { normalizeStructTag } from "@mysten/sui/utils";
 var CoinHelper = class {
   _client;
   _coinMetaReg;
@@ -226,7 +266,7 @@ var CoinHelper = class {
   }
   async queryCoinMeta(coinType) {
     const res = await this._client.getCoinMetadata({ coinType });
-    return res || void 0;
+    return res.coinMetadata ?? void 0;
   }
 };
 var COIN_TYPE_ARG_REGEX = /^0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<(.+)>$/;
@@ -245,6 +285,13 @@ var Coin = class _Coin {
     if (!_Coin.isCoin(data.type)) {
       return void 0;
     }
+    if (data.json && typeof data.json === "object" && "balance" in data.json) {
+      const { balance: balance2 } = data.json;
+      if (balance2 === void 0) {
+        return void 0;
+      }
+      return BigInt(balance2);
+    }
     if (data.content?.dataType !== "moveObject") {
       return void 0;
     }
@@ -285,9 +332,9 @@ function addPrefix(s, prefix) {
 var SignatureVerifier = class _SignatureVerifier {
   static async getPublicKeyFromSignature(input) {
     if (input.messageType === "TransactionBlock") {
-      return verifyTransactionBlock(input.message, input.signature);
+      return verifyTransactionSignature(input.message, input.signature);
     }
-    return verifyPersonalMessage(input.message, input.signature);
+    return verifyPersonalMessageSignature(input.message, input.signature);
   }
   static async getPublicKeyFromPersonalSignature(input) {
     const message = stringToBuffer(input.messageStr);
@@ -322,26 +369,69 @@ var SignatureVerifier = class _SignatureVerifier {
 
 // src/utils/sui.ts
 import { PublicKeySerde as PublicKeySerde2 } from "@msafe/sui3-utils";
-import { parseSerializedSignature } from "@mysten/sui.js/cryptography";
-import { MultiSigPublicKey } from "@mysten/sui.js/multisig";
+import { parseSerializedSignature } from "@mysten/sui/cryptography";
+import { SuiGraphQLClient } from "@mysten/sui/graphql";
+import { MultiSigPublicKey } from "@mysten/sui/multisig";
 var SUI_COIN = "0x2::sui::SUI";
+var GRAPHQL_URL_BY_NETWORK = {
+  mainnet: "https://sui-mainnet.mystenlabs.com/graphql",
+  testnet: "https://sui-testnet.mystenlabs.com/graphql",
+  devnet: "https://sui-devnet.mystenlabs.com/graphql"
+};
+function graphqlClientForGrpc(suiClient) {
+  const url = GRAPHQL_URL_BY_NETWORK[suiClient.network] ?? GRAPHQL_URL_BY_NETWORK.testnet;
+  return new SuiGraphQLClient({ url, network: suiClient.network });
+}
+function collectSignatureStrings(value) {
+  if (typeof value === "string") {
+    return [value];
+  }
+  if (!value || typeof value !== "object") {
+    return [];
+  }
+  if ("base64" in value && typeof value.base64 === "string") {
+    return [value.base64];
+  }
+  if ("scheme" in value && "base64" in value) {
+    const b64 = value.base64;
+    return typeof b64 === "string" ? [b64] : [];
+  }
+  return [];
+}
+var TX_SIG_QUERY = `
+  query PublicKeyTxSigs($sender: SuiAddress!, $first: Int!) {
+    transactions(first: $first, filter: { sentAddress: $sender }) {
+      nodes {
+        signatures
+      }
+    }
+  }
+`;
 async function getPublicKeyFromChain(suiClient, address) {
+  const graphql = graphqlClientForGrpc(suiClient);
   let txs;
   try {
-    txs = await suiClient.queryTransactionBlocks({
-      // Disable naming rule since the variable is defined by Mysten
-      filter: { FromAddress: address },
-      options: { showInput: true },
-      limit: 2
+    const res = await graphql.query({
+      query: TX_SIG_QUERY,
+      variables: { sender: address, first: 2 }
     });
+    if (res.errors?.length) {
+      return void 0;
+    }
+    txs = res.data ?? {};
   } catch (e) {
     return void 0;
   }
-  if (txs.data.length === 0 || !txs.data[0].transaction?.txSignatures) {
+  const nodes = txs.transactions?.nodes ?? [];
+  if (nodes.length === 0) {
+    return void 0;
+  }
+  const first = nodes[0];
+  const rawSigs = first.signatures;
+  const signatures = Array.isArray(rawSigs) ? rawSigs.flatMap((item) => collectSignatureStrings(item)) : [];
+  if (signatures.length === 0) {
     return void 0;
   }
-  const tx = txs.data[0];
-  const signatures = tx.transaction?.txSignatures;
   for (let i = 0; i !== signatures.length; i++) {
     const serializedSig = signatures[i];
     const pk = getAddressFromSignatures(serializedSig, address);
@@ -381,18 +471,28 @@ async function getAllCoins(input) {
   let cursor;
   const res = [];
   while (hasNext) {
-    const currentPage = await input.suiClient.getCoins({
+    const currentPage = await input.suiClient.listCoins({
       owner: input.owner,
       coinType: input.coinType,
       cursor
     });
-    res.push(...currentPage.data);
+    res.push(...currentPage.objects);
     hasNext = currentPage.hasNextPage;
-    cursor = currentPage.nextCursor;
+    cursor = currentPage.cursor;
   }
   return res;
 }
 
+// src/utils/transaction.ts
+import { Transaction as Transaction2, isTransaction } from "@mysten/sui/transactions";
+function toSuiTransaction(txb) {
+  if (isTransaction(txb)) {
+    return txb;
+  }
+  const legacy = txb;
+  return Transaction2.from(legacy.serialize());
+}
+
 // src/utils/iter/iterator.ts
 var REQUEST_PAGE_SIZE = 25;
 async function getAllFromIterator(it) {
@@ -469,6 +569,10 @@ var EntryIterator = class {
 };
 
 // src/utils/iter/object.ts
+var defaultObjectInclude = { json: true };
+function mergeInclude(options) {
+  return { ...defaultObjectInclude, ...options?.objectInclude };
+}
 async function getAllOwnedObjects(provider, owner, options) {
   const iter = new OwnedObjectIterator(provider, owner, options);
   return await getAllFromIterator(iter);
@@ -489,32 +593,29 @@ var OwnedObjectRequester = class {
     this.nextCursor = null;
     this.filter = options?.filter;
     this.pageSize = options?.pageSize || REQUEST_PAGE_SIZE;
-    this.objectOptions = options?.objectOptions || {
-      showType: true,
-      showContent: true
-    };
+    this.objectInclude = mergeInclude(options);
   }
   nextCursor;
   filter;
   pageSize;
-  objectOptions;
+  objectInclude;
   async doNextRequest() {
-    const res = await this.provider.getOwnedObjects({
+    const res = await this.provider.listOwnedObjects({
       owner: this.owner,
-      options: this.objectOptions,
+      include: this.objectInclude,
       cursor: this.nextCursor,
       limit: this.pageSize
     });
-    this.nextCursor = res.nextCursor;
+    this.nextCursor = res.cursor;
     let filtered;
     if (this.filter) {
       const { filter } = this;
-      filtered = res.data.filter((obj) => filter?.(obj));
+      filtered = res.objects.filter((obj) => filter(obj));
     } else {
-      filtered = res.data;
+      filtered = res.objects;
     }
     return {
-      data: filtered.map((r) => r.data).filter((data) => data),
+      data: filtered,
       hasNext: res.hasNextPage
     };
   }
@@ -544,14 +645,21 @@ var MSafeAccount = class _MSafeAccount {
     }
   }
   async ownedCoins() {
-    const balances = await this.suiClient.getAllBalances({ owner: this.address });
+    const balances = [];
+    let cursor = null;
+    let hasNext = true;
+    while (hasNext) {
+      const page = await this.suiClient.listBalances({ owner: this.address, cursor, limit: 50 });
+      balances.push(...page.balances);
+      hasNext = page.hasNextPage;
+      cursor = page.cursor;
+    }
     return Promise.all(
       balances.map(async (balance) => {
         const meta = await this.coinHelper.getCoinMeta(balance.coinType);
-        const unlockedBalance = balance.lockedBalance.number ? BigInt(balance.totalBalance) - BigInt(balance.lockedBalance.number) : BigInt(balance.totalBalance);
         return {
           type: normalizeStructTag3(balance.coinType),
-          balance: BigInt(unlockedBalance),
+          balance: BigInt(balance.addressBalance),
           metadata: meta
         };
       })
@@ -559,7 +667,7 @@ var MSafeAccount = class _MSafeAccount {
   }
   async ownedObjects(options) {
     const filterCoinObjectOptions = {
-      filter: (objRes) => !objRes?.data?.type?.startsWith("0x2::coin::Coin"),
+      filter: (obj) => !obj?.type?.startsWith("0x2::coin::Coin"),
       ...options
     };
     return getAllOwnedObjects(this.suiClient, this.address, filterCoinObjectOptions);
@@ -614,19 +722,21 @@ var MSafeAccount = class _MSafeAccount {
       if (!appHelper) {
         throw new Error(`Can't find app helper for application ${request.application}`);
       }
-      txb = await appHelper.build({
-        network: this.globals.config.network,
-        intentionData: request.intention,
-        txType: request.txType,
-        txSubType: request.txSubType,
-        clientUrl: this.globals.config.suiClient.url,
-        account: {
-          address: this.address,
-          publicKey: fromHEX(this.address),
-          chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
-          features: []
-        }
-      });
+      txb = toSuiTransaction(
+        await appHelper.build({
+          network: this.globals.config.network,
+          intentionData: request.intention,
+          txType: request.txType,
+          txSubType: request.txSubType,
+          clientUrl: this.globals.config.suiClient.url,
+          account: {
+            address: this.address,
+            publicKey: fromHex(this.address),
+            chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
+            features: []
+          }
+        })
+      );
     }
     txb.setSender(this.address);
     return this.simulator.simulate({ txb, sender: this.address });
@@ -655,19 +765,21 @@ var MSafeAccount = class _MSafeAccount {
       if (!appHelper) {
         throw new Error(`Can't find app helper for application ${input.application}`);
       }
-      txb = await appHelper.build({
-        network: this.globals.config.network,
-        intentionData: input.intention,
-        txType: input.txType,
-        txSubType: input.txSubType,
-        clientUrl: this.globals.config.suiClient.url,
-        account: {
-          address: this.address,
-          publicKey: fromHEX(this.address),
-          chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
-          features: []
-        }
-      });
+      txb = toSuiTransaction(
+        await appHelper.build({
+          network: this.globals.config.network,
+          intentionData: input.intention,
+          txType: input.txType,
+          txSubType: input.txSubType,
+          clientUrl: this.globals.config.suiClient.url,
+          account: {
+            address: this.address,
+            publicKey: fromHex(this.address),
+            chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
+            features: []
+          }
+        })
+      );
     }
     txb.setGasPrice(input.gasPrice);
     txb.setGasBudget(input.gasBudget);
@@ -677,7 +789,7 @@ var MSafeAccount = class _MSafeAccount {
     const signature = await this.wallet.signTransactionBlock({ transactionBlock: payload });
     return this.backend.proposeIntentionAndBuildVote({
       ...input,
-      payload: toHEX(payload),
+      payload: toHex(payload),
       digest,
       msafeAddress: this.address,
       signature: signature.signature
@@ -735,8 +847,9 @@ var MSafeAccount = class _MSafeAccount {
   }
   async proposePlainPayloadIntention(intention) {
     const sn = await this.nextSequenceNumber();
-    const tb = TransactionBlock2.from(intention.payload);
-    if (!tb.blockData.sender || !isSameAddress2(tb.blockData.sender, this.address)) {
+    const tb = Transaction3.from(intention.payload);
+    const data = tb.getData();
+    if (!data.sender || !isSameAddress2(data.sender, this.address)) {
       throw new Error("Transaction sender is not same as the multisig address");
     }
     return this.proposeIntention({
@@ -761,7 +874,7 @@ var MSafeAccount = class _MSafeAccount {
     if (!pendingTx || pendingTx.rejectDigest !== "") {
       throw new Error("Already rejected");
     }
-    const txb = buildRejectTxb(this.address);
+    const txb = toSuiTransaction(buildRejectTxb(this.address));
     txb.setSender(this.address);
     return this.simulator.simulate({ txb, sender: this.address });
   }
@@ -770,7 +883,7 @@ var MSafeAccount = class _MSafeAccount {
     if (!pendingTx || pendingTx.rejectDigest !== "") {
       throw new Error("Already rejected");
     }
-    const rejectTxb = buildRejectTxb(this.address);
+    const rejectTxb = toSuiTransaction(buildRejectTxb(this.address));
     const digest = await rejectTxb.getDigest({ client: this.suiClient });
     const payload = await rejectTxb.build({ client: this.suiClient });
     const signature = await this.wallet.signTransactionBlock({ transactionBlock: payload });
@@ -787,19 +900,21 @@ var MSafeAccount = class _MSafeAccount {
     if (!appHelper) {
       throw new Error(`Can't find app helper for application ${intention.application}`);
     }
-    const txb = await appHelper.build({
-      network: this.globals.config.network,
-      intentionData: intention.intention,
-      txType: intention.txType,
-      txSubType: intention.txSubType,
-      clientUrl: this.globals.config.suiClient.url,
-      account: {
-        address: this.address,
-        publicKey: fromHEX(this.address),
-        chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
-        features: []
-      }
-    });
+    const txb = toSuiTransaction(
+      await appHelper.build({
+        network: this.globals.config.network,
+        intentionData: intention.intention,
+        txType: intention.txType,
+        txSubType: intention.txSubType,
+        clientUrl: this.globals.config.suiClient.url,
+        account: {
+          address: this.address,
+          publicKey: fromHex(this.address),
+          chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
+          features: []
+        }
+      })
+    );
     txb.setSender(this.address);
     return this.simulator.simulate({ txb, sender: this.address });
   }
@@ -833,10 +948,10 @@ var MSafeAccount = class _MSafeAccount {
       }
     }
     const multiSignature = this.multiSig.combinePartialSignatures(sortedSigs);
-    return this.suiClient.executeTransactionBlock({
-      transactionBlock: HexToUint8Array(payload),
-      signature: multiSignature,
-      options: { showEffects: true, showEvents: true }
+    return this.suiClient.executeTransaction({
+      transaction: HexToUint8Array(payload),
+      signatures: [multiSignature],
+      include: { effects: true, events: true }
     });
   }
   async dashboard() {
@@ -876,7 +991,7 @@ var MSafeAccount = class _MSafeAccount {
 
 // src/core/PublicKeyHelper.ts
 import { isSameAddress as isSameAddress3 } from "@msafe/sui3-utils";
-import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui.js/utils";
+import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui/utils";
 var PublicKeyHelper = class {
   constructor(globals) {
     this.globals = globals;
@@ -962,7 +1077,7 @@ var ReportSDK = class {
 };
 
 // src/globals/MSafeGlobals.ts
-import { SuiClient } from "@mysten/sui.js/client";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
 
 // src/backend/BackendImpl.ts
 import {
@@ -1274,6 +1389,9 @@ var BackendError = class _BackendError extends Error {
 };
 
 // src/globals/const.ts
+function msafeChainToSuiNetwork(chain) {
+  return chain === "sui:mainnet" ? "mainnet" : "testnet";
+}
 var MSafeEnv = /* @__PURE__ */ ((MSafeEnv3) => {
   MSafeEnv3["local"] = "local";
   MSafeEnv3["unit"] = "unit";
@@ -1282,6 +1400,16 @@ var MSafeEnv = /* @__PURE__ */ ((MSafeEnv3) => {
   MSafeEnv3["prod"] = "prod";
   return MSafeEnv3;
 })(MSafeEnv || {});
+function httpUrlToGrpcBaseUrl(url) {
+  const parsed = new URL(url);
+  if (parsed.protocol === "https:" && parsed.port === "") {
+    return `https://${parsed.hostname}:443${parsed.pathname}${parsed.search}`;
+  }
+  if (parsed.protocol === "http:" && parsed.port === "") {
+    return `http://${parsed.hostname}:80${parsed.pathname}${parsed.search}`;
+  }
+  return `${parsed.origin}${parsed.pathname}${parsed.search}`;
+}
 var TESTNET_RPC_URL = "https://fullnode.testnet.sui.io";
 var MAINNET_RPC_URL = "https://fullnode.mainnet.sui.io";
 var LOCAL_API_URL = "http://127.0.0.1:3000";
@@ -1298,9 +1426,9 @@ var ENV_CONFIGS = /* @__PURE__ */ new Map([
         url: TESTNET_RPC_URL
       },
       backend: {
-        url: LOCAL_API_URL
+        url: DEV_API_URL
       },
-      syncingURL: LOCAL_SYNCING_URL,
+      syncingURL: DEV_SYNCING_URL,
       network: "sui:testnet"
     }
   ],
@@ -1387,9 +1515,13 @@ var MSafeGlobals = class _MSafeGlobals {
   }
   static async New(env, options) {
     const config = getMSafeConfig(env, options);
-    const suiClient = new SuiClient(
-      config.suiClient.transport ? { transport: config.suiClient.transport } : { url: config.suiClient.url }
-    );
+    const suiClient = config.suiClient.transport ? new SuiGrpcClient({
+      transport: config.suiClient.transport,
+      network: msafeChainToSuiNetwork(config.network)
+    }) : new SuiGrpcClient({
+      baseUrl: httpUrlToGrpcBaseUrl(config.suiClient.url),
+      network: msafeChainToSuiNetwork(config.network)
+    });
     const backend = new BackendImpl(config.backend.url, options?.mockAddress);
     return new _MSafeGlobals({
       backend,
@@ -1558,6 +1690,9 @@ export {
   getAllCoins,
   getMSafeConfig,
   getPublicKeyFromChain,
-  stringToBuffer
+  httpUrlToGrpcBaseUrl,
+  msafeChainToSuiNetwork,
+  stringToBuffer,
+  toSuiTransaction
 };
 //# sourceMappingURL=index.js.map