@msafe/sui3-sdk 0.0.6-pre-fdcc3ff.0 → 0.0.6

package/src/backend/PseudoBackend.ts

@@ -15,6 +15,7 @@ import {
   MultisigAccountManager,
   OwnerWithWeightPK,
   UserWithOwnedMSafe,
+  HistoryTransaction as HistoryTx,
 } from '@msafe/sui3-utils';
 import { SuiClient } from '@mysten/sui.js/client';
 import { PublicKey, SerializedSignature } from '@mysten/sui.js/cryptography';
@@ -23,11 +24,11 @@ import { MoreThanOrEqual } from 'typeorm';
 
 import { CoreDB } from '@/backend/CoreDatabase';
 import { IBackend } from '@/backend/interface';
-import { JWTToken } from '@/backend/types';
+import { JWTToken, PaginationOption, PaginationResponse } from '@/backend/types';
 import { MessageHelper } from '@/core/MessageHelper';
 import { DBConfig } from '@/globals/const';
 import { IntentionHelper, TxIntention } from '@/transactions/intention';
-import { FutureIntention, HistorySendTx, PendingTx } from '@/types/msafe';
+import { FutureIntention, PendingTx } from '@/types/msafe';
 import { Uint8ArrayToHex, HexToUint8Array } from '@/utils/buffer';
 import { PublicKeySerde, SignatureVerifier } from '@/utils/crypto';
 import { Formatter } from '@/utils/format';
@@ -177,24 +178,28 @@ export class PseudoBackend implements IBackend {
       throw new Error('MSafe already exist in database');
     }
     input.ownersWithWeightPKEncoded.forEach((ownerInfo) => {
-      if (!Formatter.isSuiAddressEqual(ownerInfo.address, ownerInfo.publicKey.toSuiAddress())) {
+      if (
+        !Formatter.isSuiAddressEqual(
+          ownerInfo.address,
+          PublicKeySerde.de({ publicKey: ownerInfo.publicKeyEncoded, scheme: ownerInfo.schema }).toSuiAddress(),
+        )
+      ) {
         throw new Error('Sui address public key not match');
       }
     });
 
     // For each manager, add user info if not exist. Add userMSafe entry.
-    for (let i = 0; i !== input.ownerWithWeight.length; i++) {
-      const ownerInfo = input.ownerWithWeight[i];
+    for (let i = 0; i !== input.ownersWithWeightPKEncoded.length; i++) {
+      const ownerInfo = input.ownersWithWeightPKEncoded[i];
       // Creator has been verified and already exist in database
       if (i !== 0) {
         const coManager = await this.getUser(ownerInfo.address);
-        const serPK = PublicKeySerde.ser(ownerInfo.publicKey);
         // Add user with public key if not exist
         if (coManager === null) {
           const user: User = {
             address: ownerInfo.address,
-            publicKey: serPK.publicKey,
-            schema: serPK.scheme,
+            publicKey: ownerInfo.publicKeyEncoded,
+            schema: ownerInfo.schema,
             nonce: 0,
             lastLogin: new Date(),
           };
@@ -343,7 +348,10 @@ export class PseudoBackend implements IBackend {
     return maxSNIntention === null ? 0 : maxSNIntention.sequenceNumber + 1;
   }
 
-  async getHistoryTransactions(msafeAddress: string): Promise<HistorySendTx[]> {
+  async getHistoryTransactions(
+    msafeAddress: string,
+    paginationOption?: PaginationOption,
+  ): Promise<PaginationResponse<HistoryTx>> {
     // TODO: Add pagination options. Filter by sequence number based
     //  on pagination options.
     //  Notice there can be multiple transactions with the same sequence
@@ -363,23 +371,35 @@ export class PseudoBackend implements IBackend {
         }),
       ),
     );
-    return transactions.map((tx, i) => ({
-      digest: tx.digest,
-      payload: tx.payload,
-      msafeAddress: tx.msafeAddress,
-      isRejectTx: tx.isRejectTx,
-      status: tx.status,
-      creator: tx.creator,
-      createdAt: tx.createdAt as Date,
-      sequenceNumber: tx.sequenceNumber,
-      votes: votes[i].map((vote) => ({
-        userAddress: vote.userAddress,
-        timestamp: vote.updatedAt as Date,
+    return {
+      items: transactions.map((tx, i) => ({
+        digest: tx.digest,
+        payload: tx.payload,
+        msafeAddress: tx.msafeAddress,
+        isRejectTx: tx.isRejectTx,
+        status: tx.status,
+        creator: tx.creator,
+        createdAt: tx.createdAt as Date,
+        sequenceNumber: tx.sequenceNumber,
+        votes: votes[i].map((vote) => ({
+          userAddress: vote.userAddress,
+          timestamp: vote.updatedAt as Date,
+        })),
       })),
-    }));
+      meta: {
+        totalItems: 0,
+        itemCount: 0,
+        itemsPerPage: 0,
+        totalPages: 0,
+        currentPage: 0,
+      },
+    };
   }
 
-  async getFutureIntentions(msafeAddress: string): Promise<FutureIntention[]> {
+  async getFutureIntentions(
+    msafeAddress: string,
+    paginationOption?: PaginationOption,
+  ): Promise<PaginationResponse<FutureIntention>> {
     // TODO: Add pagination options, add user permission validation
     const currentSequenceNumber = await this.getCurrentSequenceNumber(msafeAddress);
     const hasPending = (await this.model.pendingTransaction.findOneBy({ msafeAddress })) !== null;
@@ -389,19 +409,28 @@ export class PseudoBackend implements IBackend {
       where: { msafeAddress, sequenceNumber: MoreThanOrEqual(futureSNStart) },
       order: { sequenceNumber: 'asc' },
     });
-    return futureTxs.map((tx) => ({
-      intention: IntentionHelper.de(tx.data),
-      msafeAddress: tx.msafeAddress,
-      sequenceNumber: tx.sequenceNumber,
-      rawData: tx.data,
-      txType: tx.txType,
-      txSubType: tx.txSubType,
-      processed: tx.processed,
-      status: tx.status,
-      statusRemark: tx.statusRemark,
-      creator: tx.creator,
-      createdAt: tx.createdAt as Date,
-    }));
+    return {
+      items: futureTxs.map((tx) => ({
+        intention: IntentionHelper.de(tx.data),
+        msafeAddress: tx.msafeAddress,
+        sequenceNumber: tx.sequenceNumber,
+        rawData: tx.data,
+        txType: tx.txType,
+        txSubType: tx.txSubType,
+        processed: tx.processed,
+        status: tx.status,
+        statusRemark: tx.statusRemark,
+        creator: tx.creator,
+        createdAt: tx.createdAt as Date,
+      })),
+      meta: {
+        totalItems: 0,
+        itemCount: 0,
+        itemsPerPage: 0,
+        totalPages: 0,
+        currentPage: 0,
+      },
+    };
   }
 
   async proposeIntention(input: {
@@ -648,6 +677,7 @@ export class PseudoBackend implements IBackend {
 
     // Verify the signature
     const payload = HexToUint8Array(pendingTx.payload);
+
     const verified = await SignatureVerifier.verifyTransactionSignature({
       payload,
       targetAddress: input.userAddress,

package/src/backend/interface.ts

@@ -1,12 +1,12 @@
 import {
   AuthLoginRequest,
-  CreateMSafeAccountInfoRequest,
+  CreateMSafeAccountInfoRequest, HistoryTransaction,
   MSafeAccountInfo,
-  UserWithOwnedMSafe,
-} from '@msafe/sui3-utils';
+  UserWithOwnedMSafe
+} from "@msafe/sui3-utils";
 import { PublicKey, SerializedSignature } from '@mysten/sui.js/cryptography';
 
-import { JWTToken } from '@/backend/types';
+import { JWTToken, PaginationOption, PaginationResponse } from '@/backend/types';
 import { TxIntention } from '@/transactions/intention';
 import { FutureIntention, HistorySendTx, PendingTx } from '@/types/msafe';
 
@@ -19,8 +19,14 @@ export interface IBackend {
   getMSafeAccountInfo(msafeAddress: string): Promise<MSafeAccountInfo>;
   getUserInfo(userAddress: string): Promise<UserWithOwnedMSafe>;
   getPendingTransactions(msafeAddress: string): Promise<PendingTx[]>;
-  getHistoryTransactions(msafeAddress: string): Promise<HistorySendTx[]>;
-  getFutureIntentions(msafeAddress: string): Promise<FutureIntention[]>;
+  getHistoryTransactions(
+    msafeAddress: string,
+    paginationOption?: PaginationOption,
+  ): Promise<PaginationResponse<HistoryTransaction>>;
+  getFutureIntentions(
+    msafeAddress: string,
+    paginationOption?: PaginationOption,
+  ): Promise<PaginationResponse<FutureIntention>>;
   getCurrentSequenceNumber(msafeAddress: string): Promise<number>;
   getNextSequenceNumber(msafeAddress: string): Promise<number>;
 

package/src/backend/types.ts

@@ -1 +1,19 @@
 export type JWTToken = string;
+
+export interface PaginationOption {
+  page?: number;
+  pageSize: number;
+}
+
+export interface PaginationResponse<T> {
+  items: T[];
+  meta: PaginationMeta;
+}
+
+export interface PaginationMeta {
+  totalItems: number;
+  itemCount: number;
+  itemsPerPage: number;
+  totalPages: number;
+  currentPage: number;
+}

package/src/core/MSafeAccount.ts

@@ -1,4 +1,4 @@
-import { MSafeAccountInfo, MultisigAccountManager } from "@msafe/sui3-utils";
+import { MSafeAccountInfo, MultisigAccountManager, verifyTransactionSignature } from "@msafe/sui3-utils";
 import { SerializedSignature } from '@mysten/sui.js/cryptography';
 
 import { MessageHelper } from '@/core/MessageHelper';
@@ -6,6 +6,8 @@ import { MSafeGlobals } from '@/globals/MSafeGlobals';
 import { IntentionHelper, TxIntention } from '@/transactions/intention';
 import { PendingTx } from '@/types/msafe';
 import { HexToUint8Array } from '@/utils/buffer';
+import { PaginationOption } from "@/backend/types";
+import { SignatureVerifier } from "@/utils";
 
 export class MSafeAccount {
   public multisigManager: MultisigAccountManager;
@@ -30,12 +32,14 @@ export class MSafeAccount {
     return this.backend.getPendingTransactions(this.address);
   }
 
-  async historyTransaction() {
-    return this.backend.getHistoryTransactions(this.address);
+  async historyTransaction(paginationOption?: PaginationOption) {
+    const paginatedHistoryTransactions = await this.backend.getHistoryTransactions(this.address, paginationOption);
+    return paginatedHistoryTransactions.items;
   }
 
-  async futureIntentions() {
-    return this.backend.getFutureIntentions(this.address);
+  async futureIntentions(paginationOption?: PaginationOption) {
+    const paginatedIntentions = await this.backend.getFutureIntentions(this.address, paginationOption);
+    return paginatedIntentions.items;
   }
 
   async currentSequenceNumber() {

package/src/globals/const.ts

@@ -14,6 +14,7 @@ export interface MSafeConfig {
   };
   backend: DBConfig;
   apiURL: string;
+  syncingURL: string;
 }
 
 export interface MSafeConfigOptions {
@@ -56,6 +57,8 @@ export const TESTNET_RPC_URL = 'https://sui-testnet.blockvision.org/v1/2Sgk89ivT
 export const MAINNET_RPC_URL = 'https://sui-mainnet.blockvision.org/v1/2Sgk7NPvqkd7mESYkxF01yX15l7';
 
 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 = 'http://13.56.226.148';
 
 export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
@@ -67,6 +70,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
       },
       backend: LOCAL_DATABASE_CONFIG,
       apiURL: LOCAL_API_URL,
+      syncingURL: LOCAL_SYNCING_URL,
     },
   ],
   [
@@ -77,6 +81,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
       },
       backend: LOCAL_DATABASE_CONFIG,
       apiURL: LOCAL_API_URL,
+      syncingURL: LOCAL_SYNCING_URL,
     },
   ],
   [
@@ -87,6 +92,7 @@ export const ENV_CONFIGS = new Map<MSafeEnv, MSafeConfig>([
       },
       backend: DEV_DATABASE_CONFIG,
       apiURL: DEV_API_URL,
+      syncingURL: LOCAL_SYNCING_URL,
     },
   ],
 ]);