@orderly.network/core 0.0.5 → 0.0.6

package/dist/index.d.mts

@@ -1,4 +1,5 @@
 import { BehaviorSubject } from 'rxjs';
+import { AccountStatusEnum } from '@orderly.network/types';
 
 interface OrderlyKeyPair {
     getPublicKey(): Promise<string>;
@@ -12,26 +13,54 @@ declare class BaseOrderlyKeyPair implements OrderlyKeyPair {
     getPublicKey(): Promise<string>;
 }
 
-interface KeyStore {
+interface OrderlyKeyStore {
     getOrderlyKey: () => OrderlyKeyPair;
+    getAccountId: () => string | undefined;
+    setAccountId: (accountId: string) => void;
+    getAddress: () => string | undefined;
+    setAddress: (address: string) => void;
     generateKey: () => OrderlyKeyPair;
+    cleanKey: (key: string) => void;
+    cleanAllKey: () => void;
     setKey: (orderlyKey: string, secretKey: string) => void;
 }
-declare class LocalStorageStore implements KeyStore {
+declare abstract class BaseKeyStore implements OrderlyKeyStore {
     private readonly networkId;
-    private readonly accountId;
-    constructor(networkId: string, accountId: string);
+    constructor(networkId: string);
+    abstract getOrderlyKey(): OrderlyKeyPair;
+    abstract getAccountId(): string | undefined;
+    abstract setAccountId(accountId: string): void;
+    abstract getAddress(): string | undefined;
+    abstract setAddress(address: string): void;
+    abstract generateKey(): OrderlyKeyPair;
+    abstract setKey(orderlyKey: string, secretKey: string): void;
+    abstract cleanAllKey(): void;
+    abstract cleanKey(key: string): void;
+    protected get keyPrefix(): string;
+}
+declare class LocalStorageStore extends BaseKeyStore {
     getOrderlyKey(): OrderlyKeyPair;
+    getAccountId(): string;
+    setAccountId(accountId: string): void;
+    getAddress(): string;
+    setAddress(address: string): void;
     generateKey(): BaseOrderlyKeyPair;
     setKey(orderlyKey: string, secretKey: string): void;
-    private get _keyPrefix();
+    cleanAllKey(): void;
+    cleanKey(key: string): void;
 }
-declare class MockKeyStore implements KeyStore {
+declare class MockKeyStore implements OrderlyKeyStore {
     private readonly secretKey;
     constructor(secretKey: string);
     generateKey(): BaseOrderlyKeyPair;
     getOrderlyKey(): BaseOrderlyKeyPair;
+    getAccountId(): string;
+    setAccountId(accountId: string): void;
+    getAddress(): string;
+    setAddress(address: string): void;
     setKey(orderlyKey: string, secretKey: string): void;
+    cleanAllKey(): void;
+    cleanKey(key: string): void;
 }
 
 type MessageFactor = {
@@ -61,10 +90,14 @@ type SignedMessagePayload = {
  */
 interface Signer {
     sign: (data: MessageFactor) => Promise<SignedMessagePayload>;
+    signText: (text: string) => Promise<{
+        signature: string;
+        publicKey: string;
+    }>;
 }
 declare class BaseSigner implements Signer {
     private readonly keyStore;
-    constructor(keyStore: KeyStore);
+    constructor(keyStore: OrderlyKeyStore);
     sign(message: MessageFactor): Promise<SignedMessagePayload>;
     signText(text: string): Promise<{
         signature: string;
@@ -101,49 +134,13 @@ declare class SimpleDI {
     private constructor();
 }
 
-interface WalletClient {
-    get address(): string;
-    getBalance: () => Promise<any>;
-    deposit: () => Promise<any>;
-    connect: () => Promise<any>;
-}
-declare abstract class BaseWalletClient implements WalletClient {
-    private readonly _address;
-    constructor(_address: string);
-    abstract getBalance(): Promise<any>;
-    abstract deposit(): Promise<any>;
-    abstract connect(): Promise<any>;
-    get address(): string;
-}
-declare class SimpleWallet extends BaseWalletClient {
-    getBalance(): Promise<any>;
-    deposit(): Promise<any>;
-    connect(): Promise<any>;
-}
-
-type wallet_BaseWalletClient = BaseWalletClient;
-declare const wallet_BaseWalletClient: typeof BaseWalletClient;
-type wallet_SimpleWallet = SimpleWallet;
-declare const wallet_SimpleWallet: typeof SimpleWallet;
-type wallet_WalletClient = WalletClient;
-declare namespace wallet {
-  export {
-    wallet_BaseWalletClient as BaseWalletClient,
-    wallet_SimpleWallet as SimpleWallet,
-    wallet_WalletClient as WalletClient,
-  };
+interface WalletAdapter {
+    getBalance: (address: string) => Promise<any>;
+    deposit: (from: string, to: string, amount: string) => Promise<any>;
 }
 
-type AccountStatus = "NotConnected" | "Connected" | "NotSignedIn" | "SignedIn";
-declare enum AccountStatusEnum {
-    NotConnected = 0,
-    Connected = 1,
-    NotSignedIn = 2,
-    SignedIn = 3,
-    EnableTrading = 4
-}
 interface AccountState {
-    status: AccountStatus;
+    status: AccountStatusEnum;
     accountId?: string;
     userId?: string;
     address?: string;
@@ -162,9 +159,11 @@ interface AccountState {
  */
 declare class Account {
     private readonly configStore;
-    private walletClient?;
+    private readonly keyStore;
+    private readonly walletClient;
+    private _singer?;
     private _state$;
-    constructor(configStore: ConfigStore, walletClient?: WalletClient | undefined);
+    constructor(configStore: ConfigStore, keyStore: OrderlyKeyStore, walletClient: WalletAdapter);
     /**
      * 登录
      * @param address 钱包地址
@@ -177,9 +176,10 @@ declare class Account {
     /**
      * 为账户设置钱包
      */
-    set wallet(wallet: WalletClient | string);
+    set address(address: string);
     get state$(): BehaviorSubject<AccountState>;
     get stateValue(): AccountState;
+    get accountId(): string | undefined;
     /**
      * set user positions count
      */
@@ -187,6 +187,7 @@ declare class Account {
     set orders(orders: string[]);
     private _checkAccount;
     private _checkAccountExist;
+    get signer(): Signer;
     private getAccountInfo;
     private getBalance;
     private _fetch;
@@ -320,4 +321,11 @@ declare namespace WSMessage {
     }
 }
 
-export { API, Account, AccountState, AccountStatusEnum, BaseSigner, ConfigStore, KeyStore, LocalStorageStore, MemoryConfigStore, MessageFactor, MockKeyStore, SignedMessagePayload, Signer, SimpleDI, WSMessage, getDefaultSigner, getMockSigner, wallet };
+declare class Web3WalletAdapter implements Web3WalletAdapter {
+    private readonly web3;
+    constructor(web3: any);
+    getBalance(address: string): Promise<any>;
+    deposit(from: string, to: string, amount: string): Promise<any>;
+}
+
+export { API, Account, AccountState, BaseKeyStore, BaseSigner, ConfigStore, LocalStorageStore, MemoryConfigStore, MessageFactor, MockKeyStore, OrderlyKeyPair, OrderlyKeyStore, SignedMessagePayload, Signer, SimpleDI, WSMessage, WalletAdapter, Web3WalletAdapter, getDefaultSigner, getMockSigner };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { BehaviorSubject } from 'rxjs';
+import { AccountStatusEnum } from '@orderly.network/types';
 
 interface OrderlyKeyPair {
     getPublicKey(): Promise<string>;
@@ -12,26 +13,54 @@ declare class BaseOrderlyKeyPair implements OrderlyKeyPair {
     getPublicKey(): Promise<string>;
 }
 
-interface KeyStore {
+interface OrderlyKeyStore {
     getOrderlyKey: () => OrderlyKeyPair;
+    getAccountId: () => string | undefined;
+    setAccountId: (accountId: string) => void;
+    getAddress: () => string | undefined;
+    setAddress: (address: string) => void;
     generateKey: () => OrderlyKeyPair;
+    cleanKey: (key: string) => void;
+    cleanAllKey: () => void;
     setKey: (orderlyKey: string, secretKey: string) => void;
 }
-declare class LocalStorageStore implements KeyStore {
+declare abstract class BaseKeyStore implements OrderlyKeyStore {
     private readonly networkId;
-    private readonly accountId;
-    constructor(networkId: string, accountId: string);
+    constructor(networkId: string);
+    abstract getOrderlyKey(): OrderlyKeyPair;
+    abstract getAccountId(): string | undefined;
+    abstract setAccountId(accountId: string): void;
+    abstract getAddress(): string | undefined;
+    abstract setAddress(address: string): void;
+    abstract generateKey(): OrderlyKeyPair;
+    abstract setKey(orderlyKey: string, secretKey: string): void;
+    abstract cleanAllKey(): void;
+    abstract cleanKey(key: string): void;
+    protected get keyPrefix(): string;
+}
+declare class LocalStorageStore extends BaseKeyStore {
     getOrderlyKey(): OrderlyKeyPair;
+    getAccountId(): string;
+    setAccountId(accountId: string): void;
+    getAddress(): string;
+    setAddress(address: string): void;
     generateKey(): BaseOrderlyKeyPair;
     setKey(orderlyKey: string, secretKey: string): void;
-    private get _keyPrefix();
+    cleanAllKey(): void;
+    cleanKey(key: string): void;
 }
-declare class MockKeyStore implements KeyStore {
+declare class MockKeyStore implements OrderlyKeyStore {
     private readonly secretKey;
     constructor(secretKey: string);
     generateKey(): BaseOrderlyKeyPair;
     getOrderlyKey(): BaseOrderlyKeyPair;
+    getAccountId(): string;
+    setAccountId(accountId: string): void;
+    getAddress(): string;
+    setAddress(address: string): void;
     setKey(orderlyKey: string, secretKey: string): void;
+    cleanAllKey(): void;
+    cleanKey(key: string): void;
 }
 
 type MessageFactor = {
@@ -61,10 +90,14 @@ type SignedMessagePayload = {
  */
 interface Signer {
     sign: (data: MessageFactor) => Promise<SignedMessagePayload>;
+    signText: (text: string) => Promise<{
+        signature: string;
+        publicKey: string;
+    }>;
 }
 declare class BaseSigner implements Signer {
     private readonly keyStore;
-    constructor(keyStore: KeyStore);
+    constructor(keyStore: OrderlyKeyStore);
     sign(message: MessageFactor): Promise<SignedMessagePayload>;
     signText(text: string): Promise<{
         signature: string;
@@ -101,49 +134,13 @@ declare class SimpleDI {
     private constructor();
 }
 
-interface WalletClient {
-    get address(): string;
-    getBalance: () => Promise<any>;
-    deposit: () => Promise<any>;
-    connect: () => Promise<any>;
-}
-declare abstract class BaseWalletClient implements WalletClient {
-    private readonly _address;
-    constructor(_address: string);
-    abstract getBalance(): Promise<any>;
-    abstract deposit(): Promise<any>;
-    abstract connect(): Promise<any>;
-    get address(): string;
-}
-declare class SimpleWallet extends BaseWalletClient {
-    getBalance(): Promise<any>;
-    deposit(): Promise<any>;
-    connect(): Promise<any>;
-}
-
-type wallet_BaseWalletClient = BaseWalletClient;
-declare const wallet_BaseWalletClient: typeof BaseWalletClient;
-type wallet_SimpleWallet = SimpleWallet;
-declare const wallet_SimpleWallet: typeof SimpleWallet;
-type wallet_WalletClient = WalletClient;
-declare namespace wallet {
-  export {
-    wallet_BaseWalletClient as BaseWalletClient,
-    wallet_SimpleWallet as SimpleWallet,
-    wallet_WalletClient as WalletClient,
-  };
+interface WalletAdapter {
+    getBalance: (address: string) => Promise<any>;
+    deposit: (from: string, to: string, amount: string) => Promise<any>;
 }
 
-type AccountStatus = "NotConnected" | "Connected" | "NotSignedIn" | "SignedIn";
-declare enum AccountStatusEnum {
-    NotConnected = 0,
-    Connected = 1,
-    NotSignedIn = 2,
-    SignedIn = 3,
-    EnableTrading = 4
-}
 interface AccountState {
-    status: AccountStatus;
+    status: AccountStatusEnum;
     accountId?: string;
     userId?: string;
     address?: string;
@@ -162,9 +159,11 @@ interface AccountState {
  */
 declare class Account {
     private readonly configStore;
-    private walletClient?;
+    private readonly keyStore;
+    private readonly walletClient;
+    private _singer?;
     private _state$;
-    constructor(configStore: ConfigStore, walletClient?: WalletClient | undefined);
+    constructor(configStore: ConfigStore, keyStore: OrderlyKeyStore, walletClient: WalletAdapter);
     /**
      * 登录
      * @param address 钱包地址
@@ -177,9 +176,10 @@ declare class Account {
     /**
      * 为账户设置钱包
      */
-    set wallet(wallet: WalletClient | string);
+    set address(address: string);
     get state$(): BehaviorSubject<AccountState>;
     get stateValue(): AccountState;
+    get accountId(): string | undefined;
     /**
      * set user positions count
      */
@@ -187,6 +187,7 @@ declare class Account {
     set orders(orders: string[]);
     private _checkAccount;
     private _checkAccountExist;
+    get signer(): Signer;
     private getAccountInfo;
     private getBalance;
     private _fetch;
@@ -320,4 +321,11 @@ declare namespace WSMessage {
     }
 }
 
-export { API, Account, AccountState, AccountStatusEnum, BaseSigner, ConfigStore, KeyStore, LocalStorageStore, MemoryConfigStore, MessageFactor, MockKeyStore, SignedMessagePayload, Signer, SimpleDI, WSMessage, getDefaultSigner, getMockSigner, wallet };
+declare class Web3WalletAdapter implements Web3WalletAdapter {
+    private readonly web3;
+    constructor(web3: any);
+    getBalance(address: string): Promise<any>;
+    deposit(from: string, to: string, amount: string): Promise<any>;
+}
+
+export { API, Account, AccountState, BaseKeyStore, BaseSigner, ConfigStore, LocalStorageStore, MemoryConfigStore, MessageFactor, MockKeyStore, OrderlyKeyPair, OrderlyKeyStore, SignedMessagePayload, Signer, SimpleDI, WSMessage, WalletAdapter, Web3WalletAdapter, getDefaultSigner, getMockSigner };