@msafe/sui3-sdk 0.0.40 → 0.0.42-pre-bbd6acd.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@msafe/sui3-sdk",
-  "version": "0.0.40",
+  "version": "0.0.42-pre-bbd6acd.0",
   "description": "SDK for MSafe SUI V3",
   "type": "module",
   "module": "./dist/index.js",
@@ -21,13 +21,13 @@
   "author": "MSafe <admin@m-safe.io>",
   "license": "MIT",
   "dependencies": {
-    "@msafe/sui-app-store": "^0.0.10",
-    "@msafe/sui3-utils": "^3.1.44",
+    "@msafe/sui-wallet": "^0.0.22",
+    "@msafe/sui3-utils": "^3.1.51",
     "axios": "^1.6.6",
     "buffer": "^6.0.3"
   },
   "devDependencies": {
-    "@mysten/sui.js": "^0.46.1",
+    "@mysten/sui.js": "^0.50.1",
     "@types/jest": "^29.5.8",
     "@types/node": "^20.9.2",
     "@typescript-eslint/eslint-plugin": "^6.5.0",
@@ -59,6 +59,7 @@
     "lint": "eslint . --ext .ts,.tsx",
     "build": "yarn clean && yarn _build:node",
     "_build:node": "tsup --format cjs,esm --dts",
+    "build-yalc": "yarn build && yalc publish --private",
     "prerelease": "yarn build && chmod +x ./scripts/prerelease.sh && ./scripts/prerelease.sh"
   },
   "peerDependencies": {

package/src/backend/BackendImpl.ts

@@ -35,9 +35,10 @@ import {
   ISetAddressBookModeReq,
   IRejectTransactionRequest,
   IProposeIntentionAndBuildAndVoteRequest,
+  IGetDashboardReq,
+  IGetDashboardResp,
 } from '@msafe/sui3-utils';
-import { SerializedSignature } from '@mysten/sui.js/cryptography';
-import { PublicKey } from '@mysten/sui.js/src/cryptography';
+import { SerializedSignature, PublicKey } from '@mysten/sui.js/cryptography';
 import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
 
 import { IBackend } from '@/backend/interface';
@@ -265,6 +266,14 @@ export class BackendImpl implements IBackend {
     await this.post('/report', report);
   }
 
+  async getDashboard(input: IGetDashboardReq): Promise<IGetDashboardResp> {
+    const res = await this.get<IGetDashboardResp>('/dashboard', {
+      params: input,
+      headers: this.headers(),
+    });
+    return res.data;
+  }
+
   private headers(token?: string) {
     return { Authorization: `Bearer ${token || this._token}` };
   }

package/src/backend/interface.ts

@@ -27,6 +27,8 @@ import {
   ISetAddressBookModeReq,
   IRejectTransactionRequest,
   IProposeIntentionAndBuildAndVoteRequest,
+  IGetDashboardResp,
+  IGetDashboardReq,
 } from '@msafe/sui3-utils';
 import { PublicKey, SerializedSignature } from '@mysten/sui.js/cryptography';
 
@@ -73,4 +75,6 @@ export interface IBackend {
   setAddressBookMode(input: ISetAddressBookModeReq): Promise<void>;
 
   submitReport(report: Report): Promise<void>;
+
+  getDashboard(input: IGetDashboardReq): Promise<IGetDashboardResp>;
 }

package/src/core/MSafeAccount.ts

@@ -16,9 +16,8 @@ import {
   buildRejectTxb,
   isSameAddress,
 } from '@msafe/sui3-utils';
-import { SuiObjectData } from '@mysten/sui.js/client';
+import { SuiObjectData, SuiObjectResponse } from '@mysten/sui.js/client';
 import { SerializedSignature } from '@mysten/sui.js/cryptography';
-import { SuiObjectResponse } from '@mysten/sui.js/src/client';
 import { TransactionBlock } from '@mysten/sui.js/transactions';
 import { normalizeStructTag } from '@mysten/sui.js/utils';
 
@@ -94,11 +93,9 @@ export class MSafeAccount {
     const rejectPending = res.reject;
 
     return {
-      txType: TransactionType.Assets,
-      txSubType:
-        'coinType' in pendingTx.intention
-          ? TransactionSubTypes.assets.coin.send
-          : TransactionSubTypes.assets.object.send,
+      application: pendingTx.application,
+      txType: pendingTx.txType,
+      txSubType: pendingTx.txSubType,
       createdAt: pendingTx.createdAt as Date,
       creator: pendingTx.creator,
       digest: pendingTx.digest,
@@ -140,6 +137,7 @@ export class MSafeAccount {
       throw new Error(`Can't find app helper for application ${request.application}`);
     }
     const txb = await appHelper.build({
+      network: 'sui:testnet',
       intentionData: request.intention,
       txType: request.txType,
       txSubType: request.txSubType,
@@ -320,12 +318,13 @@ 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',
       intentionData: intention.intention,
       txType: intention.txType as TransactionType,
       txSubType: intention.txSubType,
@@ -375,6 +374,13 @@ export class MSafeAccount {
     });
   }
 
+  async dashboard(timezone?: string) {
+    return this.backend.getDashboard({
+      msafeAddress: this.address,
+      // timezone,
+    });
+  }
+
   private calculateWeightFromVotes(votes: { userAddress: string }[]) {
     return this.calculateWeight(votes.map((vote) => vote.userAddress));
   }

package/src/core/PublicKeyHelper.ts

@@ -1,5 +1,5 @@
 import { isSameAddress } from '@msafe/sui3-utils';
-import { PublicKey } from '@mysten/sui.js/src/cryptography';
+import { PublicKey } from '@mysten/sui.js/cryptography';
 import { normalizeSuiAddress } from '@mysten/sui.js/utils';
 
 import { MSafeGlobals } from '@/globals/MSafeGlobals';

package/src/globals/const.ts

@@ -32,7 +32,7 @@ export const LOCAL_API_URL = 'http://127.0.0.1:3000';
 export const LOCAL_SYNCING_URL = 'http://127.0.0.1:3001';
 
 export const DEV_API_URL = 'https://sui-dev.m-safe.link';
-export const DEV_SYNCING_URL = 'http://52.53.228.20';
+export const DEV_SYNCING_URL = 'http://13.56.226.148:81';
 
 export const PREV_API_URL = 'https://sui-preview.m-safe.link';
 

package/src/types/msafe.ts

@@ -3,6 +3,7 @@ import { GasCostSummary, SuiObjectRef } from '@mysten/sui.js/client';
 import { SerializedSignature } from '@mysten/sui.js/cryptography';
 
 export interface PendingTx {
+  application: string;
   txType: TransactionType;
   txSubType: string;
   digest: string;

package/src/types/wallet.ts

@@ -3,7 +3,7 @@ import {
   SuiTransactionBlockResponseOptions,
   SuiTransactionBlockResponse,
 } from '@mysten/sui.js/client';
-import { SignatureWithBytes } from '@mysten/sui.js/src/cryptography/keypair';
+import { SignatureWithBytes } from '@mysten/sui.js/cryptography';
 import { TransactionBlock } from '@mysten/sui.js/transactions';
 
 export interface IWallet {