@msafe/sui3-sdk 0.0.89 → 1.0.4

package/src/utils/sui.ts

@@ -1,21 +1,64 @@
 import { PublicKeySerde } from '@msafe/sui3-utils';
-import { SuiClient, PaginatedTransactionResponse, PaginatedCoins, CoinStruct } from '@mysten/sui.js/client';
-import { parseSerializedSignature, PublicKey, SerializedSignature } from '@mysten/sui.js/cryptography';
-import { MultiSigPublicKey } from '@mysten/sui.js/multisig';
+import type { SuiClientTypes } from '@mysten/sui/client';
+import { parseSerializedSignature, type PublicKey } from '@mysten/sui/cryptography';
+import { SuiGraphQLClient } from '@mysten/sui/graphql';
+import type { SuiGrpcClient } from '@mysten/sui/grpc';
+import { MultiSigPublicKey } from '@mysten/sui/multisig';
 
 import { Formatter } from '@/utils/format';
 
 export const SUI_COIN = '0x2::sui::SUI';
 
-export async function getPublicKeyFromChain(suiClient: SuiClient, address: string): Promise<PublicKey | undefined> {
-  let txs: PaginatedTransactionResponse;
+const GRAPHQL_URL_BY_NETWORK: Record<string, string> = {
+  mainnet: 'https://sui-mainnet.mystenlabs.com/graphql',
+  testnet: 'https://sui-testnet.mystenlabs.com/graphql',
+  devnet: 'https://sui-devnet.mystenlabs.com/graphql',
+};
+
+function graphqlClientForGrpc(suiClient: SuiGrpcClient) {
+  const url = GRAPHQL_URL_BY_NETWORK[suiClient.network] ?? GRAPHQL_URL_BY_NETWORK.testnet;
+  return new SuiGraphQLClient({ url, network: suiClient.network });
+}
+
+function collectSignatureStrings(value: unknown): string[] {
+  if (typeof value === 'string') {
+    return [value];
+  }
+  if (!value || typeof value !== 'object') {
+    return [];
+  }
+  if ('base64' in value && typeof (value as { base64: unknown }).base64 === 'string') {
+    return [(value as { base64: string }).base64];
+  }
+  if ('scheme' in value && 'base64' in value) {
+    const b64 = (value as { base64?: unknown }).base64;
+    return typeof b64 === 'string' ? [b64] : [];
+  }
+  return [];
+}
+
+const TX_SIG_QUERY = `
+  query PublicKeyTxSigs($sender: SuiAddress!, $first: Int!) {
+    transactions(first: $first, filter: { sentAddress: $sender }) {
+      nodes {
+        signatures
+      }
+    }
+  }
+`;
+
+export async function getPublicKeyFromChain(suiClient: SuiGrpcClient, address: string): Promise<PublicKey | undefined> {
+  const graphql = graphqlClientForGrpc(suiClient);
+  let txs: { transactions?: { nodes?: unknown[] } };
   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 undefined;
+    }
+    txs = (res.data ?? {}) as { transactions?: { nodes?: unknown[] } };
   } catch (e) {
     // Currently when there is no history transaction, will report an error:
     // Error: byte deserialization failed, cause by: Odd number of digits
@@ -23,11 +66,18 @@ export async function getPublicKeyFromChain(suiClient: SuiClient, address: strin
     return undefined;
   }
 
-  if (txs.data.length === 0 || !txs.data[0].transaction?.txSignatures) {
+  const nodes = txs.transactions?.nodes ?? [];
+  if (nodes.length === 0) {
+    return undefined;
+  }
+
+  const first = nodes[0] as { signatures?: unknown };
+  const rawSigs = first.signatures;
+  const signatures: string[] = Array.isArray(rawSigs) ? rawSigs.flatMap((item) => collectSignatureStrings(item)) : [];
+
+  if (signatures.length === 0) {
     return undefined;
   }
-  const tx = txs.data[0];
-  const signatures = tx.transaction?.txSignatures as string[];
 
   for (let i = 0; i !== signatures.length; i++) {
     const serializedSig = signatures[i];
@@ -40,7 +90,7 @@ export async function getPublicKeyFromChain(suiClient: SuiClient, address: strin
   return undefined;
 }
 
-function getAddressFromSignatures(serializedSig: SerializedSignature, targetAddress: string) {
+function getAddressFromSignatures(serializedSig: string, targetAddress: string) {
   const decoded = parseSerializedSignature(serializedSig);
   switch (decoded.signatureScheme) {
     case 'MultiSig': {
@@ -56,7 +106,7 @@ function getAddressFromSignatures(serializedSig: SerializedSignature, targetAddr
     case 'Secp256r1': {
       const pk = PublicKeySerde.de({ publicKeyEncoded: decoded.publicKey, schema: decoded.signatureScheme });
       if (Formatter.isSuiAddressEqual(pk.toSuiAddress(), targetAddress)) {
-        return pk;
+        return pk as unknown as PublicKey;
       }
       return undefined;
     }
@@ -66,19 +116,19 @@ function getAddressFromSignatures(serializedSig: SerializedSignature, targetAddr
   }
 }
 
-export async function getAllCoins(input: { suiClient: SuiClient; owner: string; coinType: string | undefined }) {
+export async function getAllCoins(input: { suiClient: SuiGrpcClient; owner: string; coinType: string | undefined }) {
   let hasNext = true;
-  let cursor: string | undefined | null;
-  const res: CoinStruct[] = [];
+  let cursor: string | null | undefined;
+  const res: SuiClientTypes.Coin[] = [];
   while (hasNext) {
-    const currentPage: PaginatedCoins = 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;
 }

package/src/utils/transaction.ts

@@ -0,0 +1,12 @@
+import { Transaction, isTransaction } from '@mysten/sui/transactions';
+
+/**
+ * Normalize a transaction value to {@link Transaction} (handles plain Transaction or serialized legacy shapes).
+ */
+export function toSuiTransaction(txb: Transaction | unknown): Transaction {
+  if (isTransaction(txb)) {
+    return txb as Transaction;
+  }
+  const legacy = txb as { serialize: () => string };
+  return Transaction.from(legacy.serialize()) as Transaction;
+}

package/tsconfig.json

@@ -6,7 +6,7 @@
     "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
     "module": "ES2022",                                /* Specify what module code is generated. */
     "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "node",                     /* Specify how TypeScript looks up a file from a given module specifier. */
+    "moduleResolution": "bundler",                  /* Resolve @mysten/sui subpath exports (ESM). */
     "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     "paths": { "@/*": ["./src/*"] },                     /* Specify a set of entries that re-map imports to additional lookup locations. */
     "resolveJsonModule": true,                        /* Enable importing .json files. */