@tomo-inc/chains-service 0.0.7 → 0.0.8

package/src/solana/service.ts

@@ -5,7 +5,7 @@ import { BaseService } from "../base/service";
 import { BaseConfig, MSG_PREFIX } from "./config";
 import { createLegacyTx, createTokenLegacyTransaction2, txToHex } from "./utils";
 
-import { IaccountInfo, QueryGasParams, QueryGasResponse, TomoAppInfo, TransactionParams } from "../types";
+import { IAccountInfo, QueryGasParams, QueryGasResponse, TomoAppInfo, TransactionParams } from "../types";
 import { QueryRentParams, SolanaRentInfo } from "./types";
 
 import { getAssociatedTokenAddress } from "@solana/spl-token";
@@ -20,7 +20,7 @@ export class SolanaService extends BaseService {
   public rpcUrl: string;
   private connection: Connection;
 
-  public constructor(chainType: ChainTypes, accountInfo: IaccountInfo, tomoAppInfo: TomoAppInfo) {
+  public constructor(chainType: ChainTypes, accountInfo: IAccountInfo, tomoAppInfo: TomoAppInfo) {
     super(tomoAppInfo, accountInfo);
     this.chainType = chainType;
     const config: any = {
@@ -38,7 +38,7 @@ export class SolanaService extends BaseService {
     this.connection = new Connection(rpcUrl, config);
   }
 
-  public static getInstance(chainType: ChainTypes, accountInfo: any, tomoAppInfo: TomoAppInfo) {
+  public static getInstance(chainType: ChainTypes, accountInfo: IAccountInfo, tomoAppInfo: TomoAppInfo) {
     if (!SolanaService.instance) {
       SolanaService.instance = new SolanaService(chainType, accountInfo, tomoAppInfo);
     }
@@ -50,12 +50,12 @@ export class SolanaService extends BaseService {
   }
 
   public async getAccount(): Promise<{ publicKey: string; address: string }> {
-    const { currentAddress, publicKey }: any = await this.accountInfo.getIds();
+    const { address: currentAddress, publicKey }: any = await this.accountInfo.getCurrent();
     return { publicKey: publicKey || currentAddress, address: currentAddress };
   }
 
   public async signMessage(params: any): Promise<{ message: string; signature: string; publicKey: string }> {
-    const { currentAddress, publicKey }: any = await this.accountInfo.getIds();
+    const { address: currentAddress, publicKey }: any = await this.accountInfo.getCurrent();
 
     const { message } = params;
     const signature = await this.accountInfo.signMessage(message);
@@ -70,7 +70,7 @@ export class SolanaService extends BaseService {
   public async signIn(
     params: any,
   ): Promise<{ address: string; publicKey: string; signature: string; signedMessage: string }> {
-    const { currentAddress, publicKey }: any = await this.accountInfo.getIds();
+    const { address: currentAddress, publicKey }: any = await this.accountInfo.getCurrent();
 
     const { signature = "" } = await this.signMessage(params);
 

package/src/types/account.ts

@@ -31,9 +31,9 @@ export interface ChainAddress {
 export interface IAccount {
   readonly id: string;
   readonly userId?: string | number;
-  readonly name: string;
+  readonly name?: string;
   readonly type: AccountType;
-  readonly lastUsedTime: number;
+  readonly lastUsedTime?: number;
   readonly sortIndex?: number;
   readonly addresses: Record<ChainTypes, ChainAddress[]>;
 
@@ -50,9 +50,10 @@ export interface IAccount {
   readonly totalAssets?: string;
 }
 
-export interface IaccountInfo {
+export interface IAccountInfo {
   getCurrent: () => Promise<any[]>;
   signMessage: (message: string) => Promise<string>;
   signTypedData: (message: any) => Promise<string>;
   signTransaction: (transaction: any) => Promise<string>;
+  decryptedMessage?: (message: string) => Promise<any>;
 }

package/src/types/index.ts

@@ -10,9 +10,9 @@ export * from "./wallet";
 export interface TomoAppInfo {
   tomoStage: TomoStage;
   tomoClientId: string;
-  apiKey: string;
-  apiSecret: string;
-  salt: string;
+  apiKey?: string;
+  apiSecret?: string;
+  salt?: string;
   jwtToken?: string;
 }
 

package/src/utils/index.ts

@@ -0,0 +1,7 @@
+export async function waitOnly(ms: number) {
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      resolve(ms);
+    }, ms);
+  });
+}