@orderly.network/core 0.0.59 → 0.0.61

package/dist/index.d.mts

@@ -1,5 +1,6 @@
 import EventEmitter from 'eventemitter3';
 export { default as EventEmitter } from 'eventemitter3';
+import { TransactionResponse, ethers } from 'ethers';
 import { AccountStatusEnum } from '@orderly.network/types';
 
 interface OrderlyKeyPair {
@@ -90,7 +91,7 @@ type SignedMessagePayload = {
  *   method: "GET",
  *   data: {
  *     address: "0x1234567890",
- *     brokerId: "woofi_dex",
+ *     brokerId: "woofi_pro",
  *    },
  *  });
  *  ```
@@ -115,6 +116,7 @@ declare class BaseSigner implements Signer {
 type ConfigKey = "apiBaseUrl" | "klineDataUrl";
 interface ConfigStore {
     get<T>(key: string): T;
+    getOr<T>(key: string, defaultValue: T): T;
     set<T>(key: string, value: T): void;
     clear(): void;
 }
@@ -123,6 +125,7 @@ declare class MemoryConfigStore implements ConfigStore {
     constructor();
     protected _restore(): void;
     get<T>(key: string): T;
+    getOr<T>(key: string, defaultValue: T): T;
     set<T>(key: string, value: T): void;
     clear(): void;
 }
@@ -348,12 +351,20 @@ declare class SimpleDI {
     private constructor();
 }
 
-interface WalletAdapter {
+interface IWalletAdapter {
     get chainId(): number;
     get addresses(): string;
     parseUnits: (amount: string) => string;
     formatUnits: (amount: string) => string;
     send: (method: string, params: Array<any> | Record<string, any>) => Promise<any>;
+    sendTransaction(contractAddress: string, method: string, payload: {
+        from: string;
+        to?: string;
+        data: any[];
+        value?: bigint;
+    }, options: {
+        abi: any;
+    }): Promise<TransactionResponse>;
     signTypedData: (address: string, data: any) => Promise<string>;
     getBalance: (userAddress: string) => Promise<any>;
     call(address: string, method: string, params: any, options: {
@@ -369,7 +380,7 @@ type WalletAdapterOptions = {
         id: string;
     };
 };
-type getWalletAdapterFunc = (options: WalletAdapterOptions) => WalletAdapter;
+type getWalletAdapterFunc = (options: WalletAdapterOptions) => IWalletAdapter;
 
 declare class Assets {
     private readonly configStore;
@@ -388,14 +399,14 @@ declare class Assets {
     }): Promise<string>;
     getBalance(address?: string): Promise<string>;
     getBalanceByAddress(address: string): Promise<string>;
-    getAllowance(address?: string): Promise<string>;
-    approve(address?: string, amount?: string): Promise<any>;
+    getAllowance(address?: string, vaultAddress?: string): Promise<string>;
+    approve(address?: string, amount?: string, vaultAddress?: string): Promise<any>;
     approveByAddress(inputs: {
         amount?: string;
         address: string;
     }): Promise<any>;
     private _approve;
-    deposit(amount: string): Promise<any>;
+    deposit(amount: string): Promise<ethers.TransactionResponse>;
     private _simpleFetch;
     get usdcAddress(): string;
 }
@@ -413,7 +424,7 @@ interface AccountState {
     leverage: number;
 }
 /**
- * 账户
+ * Account
  * @example
  * ```ts
  * const account = new Account();
@@ -430,13 +441,8 @@ declare class Account {
     private _ee;
     assetsManager: Assets;
     private _state;
-    walletClient?: WalletAdapter;
+    walletClient?: IWalletAdapter;
     constructor(configStore: ConfigStore, keyStore: OrderlyKeyStore, contractManger: IContract, getWalletAdapter: getWalletAdapterFunc);
-    /**
-     * 登录
-     * @param address 钱包地址
-     */
-    login(address: string): void;
     logout(): void;
     /**
      * 连接钱包先用第三方的React版本，不用自己实现
@@ -471,7 +477,7 @@ declare class Account {
     disconnect(): Promise<void>;
     private _checkOrderlyKeyState;
     get signer(): Signer;
-    get wallet(): WalletAdapter | undefined;
+    get wallet(): IWalletAdapter | undefined;
     private _getRegisterationNonce;
     private _getSettleNonce;
     private _simpleFetch;
@@ -481,7 +487,7 @@ declare class Account {
     get off(): <T extends string | symbol>(event: T, fn?: ((...args: any[]) => void) | undefined, context?: any, once?: boolean | undefined) => EventEmitter<string | symbol, any>;
 }
 
-declare class EtherAdapter implements WalletAdapter {
+declare class EtherAdapter implements IWalletAdapter {
     private provider?;
     private _chainId;
     private _address;
@@ -496,6 +502,15 @@ declare class EtherAdapter implements WalletAdapter {
     get chainId(): number;
     get addresses(): string;
     send(method: string, params: Array<any> | Record<string, any>): Promise<any>;
+    sendTransaction(contractAddress: string, method: string, payload: {
+        from: string;
+        to?: string;
+        data: any[];
+        value?: bigint;
+    }, options: {
+        abi: any;
+    }): Promise<ethers.TransactionResponse>;
+    private estimateGas;
     signTypedData(address: string, data: any): Promise<any>;
     verify(data: {
         domain: any;
@@ -506,4 +521,4 @@ declare class EtherAdapter implements WalletAdapter {
     off(eventName: any, listener: any): void;
 }
 
-export { Account, AccountState, BaseConfigStore, BaseContract as BaseContractManager, BaseKeyStore, BaseOrderlyKeyPair, BaseSigner, ConfigKey, ConfigStore, EtherAdapter, IContract, LocalStorageStore, MemoryConfigStore, MessageFactor, MockKeyStore, OrderlyKeyPair, OrderlyKeyStore, SignedMessagePayload, Signer, SimpleDI, WalletAdapter, getDefaultSigner, getMockSigner, getWalletAdapterFunc, utils };
+export { Account, AccountState, BaseConfigStore, BaseContract as BaseContractManager, BaseKeyStore, BaseOrderlyKeyPair, BaseSigner, ConfigKey, ConfigStore, EtherAdapter, IContract, LocalStorageStore, MemoryConfigStore, MessageFactor, MockKeyStore, OrderlyKeyPair, OrderlyKeyStore, SignedMessagePayload, Signer, SimpleDI, IWalletAdapter as WalletAdapter, getDefaultSigner, getMockSigner, getWalletAdapterFunc, utils };

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import EventEmitter from 'eventemitter3';
 export { default as EventEmitter } from 'eventemitter3';
+import { TransactionResponse, ethers } from 'ethers';
 import { AccountStatusEnum } from '@orderly.network/types';
 
 interface OrderlyKeyPair {
@@ -90,7 +91,7 @@ type SignedMessagePayload = {
  *   method: "GET",
  *   data: {
  *     address: "0x1234567890",
- *     brokerId: "woofi_dex",
+ *     brokerId: "woofi_pro",
  *    },
  *  });
  *  ```
@@ -115,6 +116,7 @@ declare class BaseSigner implements Signer {
 type ConfigKey = "apiBaseUrl" | "klineDataUrl";
 interface ConfigStore {
     get<T>(key: string): T;
+    getOr<T>(key: string, defaultValue: T): T;
     set<T>(key: string, value: T): void;
     clear(): void;
 }
@@ -123,6 +125,7 @@ declare class MemoryConfigStore implements ConfigStore {
     constructor();
     protected _restore(): void;
     get<T>(key: string): T;
+    getOr<T>(key: string, defaultValue: T): T;
     set<T>(key: string, value: T): void;
     clear(): void;
 }
@@ -348,12 +351,20 @@ declare class SimpleDI {
     private constructor();
 }
 
-interface WalletAdapter {
+interface IWalletAdapter {
     get chainId(): number;
     get addresses(): string;
     parseUnits: (amount: string) => string;
     formatUnits: (amount: string) => string;
     send: (method: string, params: Array<any> | Record<string, any>) => Promise<any>;
+    sendTransaction(contractAddress: string, method: string, payload: {
+        from: string;
+        to?: string;
+        data: any[];
+        value?: bigint;
+    }, options: {
+        abi: any;
+    }): Promise<TransactionResponse>;
     signTypedData: (address: string, data: any) => Promise<string>;
     getBalance: (userAddress: string) => Promise<any>;
     call(address: string, method: string, params: any, options: {
@@ -369,7 +380,7 @@ type WalletAdapterOptions = {
         id: string;
     };
 };
-type getWalletAdapterFunc = (options: WalletAdapterOptions) => WalletAdapter;
+type getWalletAdapterFunc = (options: WalletAdapterOptions) => IWalletAdapter;
 
 declare class Assets {
     private readonly configStore;
@@ -388,14 +399,14 @@ declare class Assets {
     }): Promise<string>;
     getBalance(address?: string): Promise<string>;
     getBalanceByAddress(address: string): Promise<string>;
-    getAllowance(address?: string): Promise<string>;
-    approve(address?: string, amount?: string): Promise<any>;
+    getAllowance(address?: string, vaultAddress?: string): Promise<string>;
+    approve(address?: string, amount?: string, vaultAddress?: string): Promise<any>;
     approveByAddress(inputs: {
         amount?: string;
         address: string;
     }): Promise<any>;
     private _approve;
-    deposit(amount: string): Promise<any>;
+    deposit(amount: string): Promise<ethers.TransactionResponse>;
     private _simpleFetch;
     get usdcAddress(): string;
 }
@@ -413,7 +424,7 @@ interface AccountState {
     leverage: number;
 }
 /**
- * 账户
+ * Account
  * @example
  * ```ts
  * const account = new Account();
@@ -430,13 +441,8 @@ declare class Account {
     private _ee;
     assetsManager: Assets;
     private _state;
-    walletClient?: WalletAdapter;
+    walletClient?: IWalletAdapter;
     constructor(configStore: ConfigStore, keyStore: OrderlyKeyStore, contractManger: IContract, getWalletAdapter: getWalletAdapterFunc);
-    /**
-     * 登录
-     * @param address 钱包地址
-     */
-    login(address: string): void;
     logout(): void;
     /**
      * 连接钱包先用第三方的React版本，不用自己实现
@@ -471,7 +477,7 @@ declare class Account {
     disconnect(): Promise<void>;
     private _checkOrderlyKeyState;
     get signer(): Signer;
-    get wallet(): WalletAdapter | undefined;
+    get wallet(): IWalletAdapter | undefined;
     private _getRegisterationNonce;
     private _getSettleNonce;
     private _simpleFetch;
@@ -481,7 +487,7 @@ declare class Account {
     get off(): <T extends string | symbol>(event: T, fn?: ((...args: any[]) => void) | undefined, context?: any, once?: boolean | undefined) => EventEmitter<string | symbol, any>;
 }
 
-declare class EtherAdapter implements WalletAdapter {
+declare class EtherAdapter implements IWalletAdapter {
     private provider?;
     private _chainId;
     private _address;
@@ -496,6 +502,15 @@ declare class EtherAdapter implements WalletAdapter {
     get chainId(): number;
     get addresses(): string;
     send(method: string, params: Array<any> | Record<string, any>): Promise<any>;
+    sendTransaction(contractAddress: string, method: string, payload: {
+        from: string;
+        to?: string;
+        data: any[];
+        value?: bigint;
+    }, options: {
+        abi: any;
+    }): Promise<ethers.TransactionResponse>;
+    private estimateGas;
     signTypedData(address: string, data: any): Promise<any>;
     verify(data: {
         domain: any;
@@ -506,4 +521,4 @@ declare class EtherAdapter implements WalletAdapter {
     off(eventName: any, listener: any): void;
 }
 
-export { Account, AccountState, BaseConfigStore, BaseContract as BaseContractManager, BaseKeyStore, BaseOrderlyKeyPair, BaseSigner, ConfigKey, ConfigStore, EtherAdapter, IContract, LocalStorageStore, MemoryConfigStore, MessageFactor, MockKeyStore, OrderlyKeyPair, OrderlyKeyStore, SignedMessagePayload, Signer, SimpleDI, WalletAdapter, getDefaultSigner, getMockSigner, getWalletAdapterFunc, utils };
+export { Account, AccountState, BaseConfigStore, BaseContract as BaseContractManager, BaseKeyStore, BaseOrderlyKeyPair, BaseSigner, ConfigKey, ConfigStore, EtherAdapter, IContract, LocalStorageStore, MemoryConfigStore, MessageFactor, MockKeyStore, OrderlyKeyPair, OrderlyKeyStore, SignedMessagePayload, Signer, SimpleDI, IWalletAdapter as WalletAdapter, getDefaultSigner, getMockSigner, getWalletAdapterFunc, utils };