@msafe/sui3-sdk 1.0.7 → 1.0.8

package/dist/index.js

@@ -153,6 +153,23 @@ import { SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN } from "@mysten/wallet-standard";
 // src/simulate/simulator.ts
 import { Transaction } from "@mysten/sui/transactions";
 var GAS_SAFE_OVERHEAD = 1000n;
+function formatExecutionError(error) {
+  return error.message;
+}
+__name(formatExecutionError, "formatExecutionError");
+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
+  };
+}
+__name(gasObjectToReference, "gasObjectToReference");
 var Simulator = class {
   static {
     __name(this, "Simulator");
@@ -166,32 +183,63 @@ var Simulator = class {
     const { suiClient } = this.globals;
     const gasPrice = await this.getGasPrice();
     tx.setGasPrice(gasPrice);
-    const inspectResult = await suiClient.dryRunTransactionBlock({
-      transactionBlock: await tx.build({
+    let built;
+    try {
+      built = await tx.build({
         client: suiClient
-      })
-    });
-    const success = inspectResult.effects.status.status === "success";
+      });
+    } 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;
@@ -253,7 +301,7 @@ var CoinHelper = class {
     const res = await this._client.getCoinMetadata({
       coinType
     });
-    return res || void 0;
+    return res.coinMetadata ?? void 0;
   }
 };
 var COIN_TYPE_ARG_REGEX = /^0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<(.+)>$/;
@@ -275,6 +323,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;
     }
@@ -360,29 +415,82 @@ var SignatureVerifier = class _SignatureVerifier {
 // src/utils/sui.ts
 import { PublicKeySerde as PublicKeySerde2 } from "@msafe/sui3-utils";
 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
+  });
+}
+__name(graphqlClientForGrpc, "graphqlClientForGrpc");
+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 [];
+}
+__name(collectSignatureStrings, "collectSignatureStrings");
+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);
@@ -427,14 +535,14 @@ 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;
 }
@@ -536,6 +644,16 @@ var EntryIterator = class {
 };
 
 // src/utils/iter/object.ts
+var defaultObjectInclude = {
+  json: true
+};
+function mergeInclude(options) {
+  return {
+    ...defaultObjectInclude,
+    ...options?.objectInclude
+  };
+}
+__name(mergeInclude, "mergeInclude");
 async function getAllOwnedObjects(provider, owner, options) {
   const iter = new OwnedObjectIterator(provider, owner, options);
   return await getAllFromIterator(iter);
@@ -565,7 +683,7 @@ var OwnedObjectRequester = class {
   nextCursor;
   filter;
   pageSize;
-  objectOptions;
+  objectInclude;
   constructor(provider, owner, options) {
     this.provider = provider;
     this.owner = owner;
@@ -573,28 +691,25 @@ 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);
   }
   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
     };
   }
@@ -629,23 +744,31 @@ 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 lockedEntry = balance.lockedBalance && typeof balance.lockedBalance === "object" && "number" in balance.lockedBalance && balance.lockedBalance.number ? BigInt(balance.lockedBalance.number) : 0n;
-      const unlockedBalance = lockedEntry ? BigInt(balance.totalBalance) - lockedEntry : BigInt(balance.totalBalance);
       return {
         type: normalizeStructTag3(balance.coinType),
-        balance: unlockedBalance,
+        balance: BigInt(balance.addressBalance),
         metadata: meta
       };
     }));
   }
   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);
@@ -966,12 +1089,14 @@ 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
       }
     });
   }
@@ -1106,7 +1231,7 @@ var ReportSDK = class {
 };
 
 // src/globals/MSafeGlobals.ts
-import { SuiJsonRpcClient } from "@mysten/sui/jsonRpc";
+import { SuiGrpcClient } from "@mysten/sui/grpc";
 
 // src/backend/BackendImpl.ts
 import { PublicKeySerde as PublicKeySerde3, UserMSafeStatus } from "@msafe/sui3-utils";
@@ -1463,6 +1588,17 @@ var MSafeEnv;
   MSafeEnv2["prev"] = "prev";
   MSafeEnv2["prod"] = "prod";
 })(MSafeEnv || (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}`;
+}
+__name(httpUrlToGrpcBaseUrl, "httpUrlToGrpcBaseUrl");
 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";
@@ -1479,9 +1615,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"
     }
   ],
@@ -1572,12 +1708,11 @@ var MSafeGlobals = class _MSafeGlobals {
   }
   static async New(env, options) {
     const config = getMSafeConfig(env, options);
-    const suiClient = new SuiJsonRpcClient({
-      ...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);
@@ -1767,6 +1902,7 @@ export {
   getAllCoins,
   getMSafeConfig,
   getPublicKeyFromChain,
+  httpUrlToGrpcBaseUrl,
   msafeChainToSuiNetwork,
   stringToBuffer,
   toSuiTransaction