@msafe/sui3-sdk 0.0.44 → 0.0.45-pre-14ca25c.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@msafe/sui3-sdk",
-  "version": "0.0.44",
+  "version": "0.0.45-pre-14ca25c.0",
   "description": "SDK for MSafe SUI V3",
   "type": "module",
   "module": "./dist/index.js",
@@ -22,12 +22,15 @@
   "license": "MIT",
   "dependencies": {
     "@msafe/sui-wallet": "^0.0.41-pre-e5d4812.0",
+    "@msafe/sui3-utils": "^3.1.55-pre-1d77150.0",
     "axios": "^1.6.6",
-    "buffer": "^6.0.3"
+    "buffer": "^6.0.3",
+    "json-bigint": "^1.0.0"
   },
   "devDependencies": {
     "@mysten/sui.js": "^0.50.1",
     "@types/jest": "^29.5.8",
+    "@types/json-bigint": "^1.0.4",
     "@types/node": "^20.9.2",
     "@typescript-eslint/eslint-plugin": "^6.5.0",
     "@typescript-eslint/parser": "^6.5.0",

package/src/backend/BackendImpl.ts

@@ -39,7 +39,8 @@ import {
   IGetDashboardResp,
 } from '@msafe/sui3-utils';
 import { SerializedSignature, PublicKey } from '@mysten/sui.js/cryptography';
-import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
+import axios, { AxiosError, AxiosRequestConfig, AxiosRequestTransformer, AxiosResponse } from 'axios';
+import * as JSONBig from 'json-bigint';
 
 import { IBackend } from '@/backend/interface';
 import { addPrefix } from '@/utils';
@@ -292,33 +293,49 @@ export class BackendImpl implements IBackend {
     };
   }
 
-  private async get<T = any, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<AxiosResponse<T, D>> {
+  private async get<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R> {
     const fullUrl = this.getFullUrl(url);
-    const response = await axios.get<T, AxiosResponse<T, D>, D>(fullUrl, config);
-    if (axios.isAxiosError(response)) {
-      const error = BackendError.fromError(response);
-      throw error ?? new Error(response.statusText);
+    try {
+      return await axios.get<T, R, D>(fullUrl, config);
+    } catch (e) {
+      throw BackendError.fromError(e) ?? e;
     }
-    return response;
   }
 
-  private async post<T = any, D = any>(
+  private async post<T = any, R = AxiosResponse<T>, D = any>(
     url: string,
     data?: D,
     config?: AxiosRequestConfig<D>,
-  ): Promise<AxiosResponse<T, D>> {
+  ): Promise<R> {
     const fullUrl = this.getFullUrl(url);
-    const response = await axios.post<T, AxiosResponse<T, D>, D>(fullUrl, data, config);
-    if (axios.isAxiosError(response)) {
-      const error = BackendError.fromError(response);
-      throw error ?? new Error(response.statusText);
+    try {
+      return await axios.post<T, R, D>(fullUrl, data, {
+        ...config,
+        transformRequest: this.getTransformRequest(),
+      });
+    } catch (e) {
+      throw BackendError.fromError(e) ?? e;
     }
-    return response;
   }
 
   private getFullUrl(url: string) {
     return url.startsWith(this.apiURL) ? url : `${this.apiURL}${addPrefix(url, '/')}`;
   }
+
+  private getTransformRequest() {
+    let transformRequests: AxiosRequestTransformer[] = [];
+    const { transformRequest } = axios.defaults;
+
+    if (!transformRequest) {
+      transformRequests = [];
+    } else if (transformRequest instanceof Array) {
+      transformRequests = transformRequest;
+    } else {
+      transformRequests = [transformRequest];
+    }
+
+    return [(d: any) => JSONBig.parse(JSONBig.stringify(d)), ...transformRequests];
+  }
 }
 
 export class BackendError extends Error {

package/src/core/MSafeAccount.ts

@@ -19,7 +19,7 @@ import {
 import { SuiObjectData, SuiObjectResponse } from '@mysten/sui.js/client';
 import { SerializedSignature } from '@mysten/sui.js/cryptography';
 import { TransactionBlock } from '@mysten/sui.js/transactions';
-import { normalizeStructTag } from '@mysten/sui.js/utils';
+import { normalizeStructTag, toHEX } from '@mysten/sui.js/utils';
 
 import { MSafeGlobals } from '@/globals/MSafeGlobals';
 import { Simulator } from '@/simulate/simulator';
@@ -133,11 +133,12 @@ export class MSafeAccount {
 
   async simulateIntention(request: Omit<IProposeIntentionRequest, 'msafeAddress' | 'signature'>) {
     const appHelper = appHelpers.getAppHelper(request.application);
+    console.log('🚀 ~ MSafeAccount ~ simulateIntention ~ appHelper:', appHelper);
     if (!appHelper) {
       throw new Error(`Can't find app helper for application ${request.application}`);
     }
     const txb = await appHelper.build({
-      network: 'sui:testnet',
+      network: this.globals.config.network,
       intentionData: request.intention,
       txType: request.txType,
       txSubType: request.txSubType,
@@ -167,19 +168,35 @@ export class MSafeAccount {
   }
 
   async proposeIntentionAndBuildVote(
-    input: Omit<IProposeIntentionAndBuildAndVoteRequest, 'signature' | 'msafeAddress'>,
+    input: Omit<IProposeIntentionAndBuildAndVoteRequest, 'signature' | 'msafeAddress' | 'payload' | 'digest'>,
   ): Promise<void> {
-    const message = SigningMessageHelper.proposeIntentionMessage({
-      msafeAddress: this.address,
-      intention: input.intention,
-      sn: input.sequenceNumber,
-    });
-    const signature = await this.wallet.signPersonalMessage({
-      messageStr: message,
+    const appHelper = appHelpers.getAppHelper(input.application);
+    if (!appHelper) {
+      throw new Error(`Can't find app helper for application ${input.application}`);
+    }
+
+    const txb = await appHelper.build({
+      network: this.globals.config.network,
+      intentionData: input.intention,
+      txType: input.txType,
+      txSubType: input.txSubType,
+      suiClient: this.globals.suiClient,
+      account: {
+        address: this.address,
+      },
     });
+    txb.setGasPrice(input.gasPrice);
+    txb.setGasBudget(input.gasBudget);
+    txb.setSender(this.address);
+    const payload = await txb.build({ client: this.globals.suiClient });
+    const digest = await txb.getDigest({ client: this.globals.suiClient });
+
+    const signature = await this.wallet.signTransactionBlock({ transactionBlock: payload });
 
     return this.backend.proposeIntentionAndBuildVote({
       ...input,
+      payload: toHEX(payload),
+      digest,
       msafeAddress: this.address,
       signature: signature.signature,
     });
@@ -318,13 +335,12 @@ export class MSafeAccount {
 
   async simulateBuildTransaction(): Promise<SimulationResult> {
     const intention = await this.backend.getNextIntention({ msafeAddress: this.address });
-    console.log('🚀 ~ MSafeAccount ~ simulateBuildTransaction ~ appHelper:', appHelpers.apps);
     const appHelper = appHelpers.getAppHelper(intention.application);
     if (!appHelper) {
       throw new Error(`Can't find app helper for application ${intention.application}`);
     }
     const txb = await appHelper.build({
-      network: 'sui:testnet',
+      network: this.globals.config.network,
       intentionData: intention.intention,
       txType: intention.txType as TransactionType,
       txSubType: intention.txSubType,

package/src/globals/const.ts

@@ -14,6 +14,7 @@ export interface MSafeConfig {
     url: string;
   };
   syncingURL: string;
+  network: 'sui:mainnet' | 'sui:testnet';
 }
 
 export interface MSafeConfigOptions {
@@ -25,8 +26,9 @@ export interface MSafeConfigOptions {
   };
 }
 
-export const TESTNET_RPC_URL = 'https://sui-testnet.blockvision.org/v1/2Sgk89ivT64MnKdcGzjmyjY2ndD';
-export const MAINNET_RPC_URL = 'https://sui-mainnet.blockvision.org/v1/2Sgk7NPvqkd7mESYkxF01yX15l7';
+// export const TESTNET_RPC_URL = 'https://sui-testnet.blockvision.org/v1/2Sgk89ivT64MnKdcGzjmyjY2ndD';
+export const TESTNET_RPC_URL = 'https://fullnode.testnet.sui.io';
+export const MAINNET_RPC_URL = 'https://fullnode.mainnet.sui.io';
 
 export const LOCAL_API_URL = 'http://127.0.0.1:3000';
 export const LOCAL_SYNCING_URL = 'http://127.0.0.1:3001';
@@ -49,6 +51,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
         url: LOCAL_API_URL,
       },
       syncingURL: LOCAL_SYNCING_URL,
+      network: 'sui:testnet',
     },
   ],
   [
@@ -61,6 +64,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
         url: LOCAL_API_URL,
       },
       syncingURL: LOCAL_SYNCING_URL,
+      network: 'sui:testnet',
     },
   ],
   [
@@ -73,6 +77,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
         url: DEV_API_URL,
       },
       syncingURL: DEV_SYNCING_URL,
+      network: 'sui:testnet',
     },
   ],
   [
@@ -85,6 +90,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
         url: PREV_API_URL,
       },
       syncingURL: '',
+      network: 'sui:mainnet',
     },
   ],
   [
@@ -97,6 +103,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
         url: PROD_API_URL,
       },
       syncingURL: '',
+      network: 'sui:mainnet',
     },
   ],
 ]);