@onekeyfe/onekey-near-provider 0.0.4 → 0.0.5

package/dist/OneKeyNearProvider.d.ts

@@ -1,18 +1,20 @@
 /// <reference types="node" />
 import { ProviderNearBase } from './ProviderNearBase';
 import { IJsonRpcRequest } from '@onekeyfe/cross-inpage-provider-types';
-import { Account } from 'near-api-js';
-import type { Action as NearTransactionAction } from 'near-api-js/lib/transaction';
+import { Account, Connection, transactions } from 'near-api-js';
+import type { Action as NearTransactionAction, Transaction as NearTransaction } from 'near-api-js/lib/transaction';
+import type { AccessKeyInfoView, FinalExecutionOutcome } from 'near-api-js/lib/providers/provider';
 import { IInpageProviderConfig } from '@onekeyfe/cross-inpage-provider-core';
 export declare type NearAccountInfo = {
     accountId: string;
     publicKey: string;
     allKeys?: string[];
 };
-export declare type NearNetworkChangedPayload = {
+export declare type NearNetworkInfo = {
     networkId: string;
     nodeUrls?: string[];
 };
+export declare type NearNetworkChangedPayload = NearNetworkInfo;
 export declare type NearProviderState = {
     accounts: Array<NearAccountInfo>;
     network: NearNetworkChangedPayload;
@@ -23,20 +25,7 @@ export declare type NearAccountsChangedPayload = {
 export declare type NearUnlockChangedPayload = {
     isUnlocked: boolean;
 };
-export declare type NearBlockInfoHeader = {
-    hash: string;
-};
-export declare type NearBlockInfo = {
-    header: NearBlockInfoHeader;
-};
-export declare type NearConnectionProvider = {
-    sendJsonRpc: (method: string, params: object) => Promise<any>;
-    block: (params: object) => Promise<NearBlockInfo>;
-    query: (...args: any) => Promise<any>;
-};
-export declare type NearConnection = {
-    provider: NearConnectionProvider;
-};
+export declare type NearConnection = Connection;
 export declare type TransactionCreatorParams = {
     accountId: string;
     publicKey: string;
@@ -47,8 +36,8 @@ export declare type TransactionCreatorParams = {
 };
 export declare type TransactionCreator = (params: TransactionCreatorParams) => any;
 export declare type OneKeyNearWalletProps = {
-    connection: NearConnection | any;
-    networkId: string;
+    connection?: NearConnection | any;
+    networkId?: string;
     connectEagerly?: boolean;
     enablePageReload?: boolean;
     timeout?: number;
@@ -60,31 +49,29 @@ export declare type OneKeyWalletAccountProps = {
     connection: unknown;
     accountId: string;
 };
+export declare type CommonOptionsMeta = unknown | string | object;
 export declare type SignInOptions = {
     contractId?: string;
     methodNames?: string[];
     successUrl?: string;
     failureUrl?: string;
 };
-export declare type NearTransaction = {
-    encode: () => Uint8Array;
-};
-export declare type NearAccountAccessKey = {
-    nonce: number;
-};
-export declare type NearAccountAccessKeyInfo = {
-    public_key: string;
-    access_key: NearAccountAccessKey;
-};
+export declare type SignInResult = NearAccountsChangedPayload;
 export declare type SignTransactionsOptions = {
     transactions: NearTransaction[];
     callbackUrl?: string;
-    meta?: unknown | string;
+    meta?: CommonOptionsMeta;
     send?: boolean;
 };
+export declare type SignTransactionsResult = {
+    transactionHashes: string[];
+};
 export declare type SignMessagesOptions = {
     messages: string[];
-    meta?: unknown | string | object;
+    meta?: CommonOptionsMeta;
+};
+export declare type SignMessagesResult = {
+    signatures: string[];
 };
 export declare type CreateTransactionOptions = {
     receiverId: string;
@@ -94,7 +81,7 @@ export declare type CreateTransactionOptions = {
 export declare type SignAndSendTransactionOptions = {
     receiverId: string;
     actions: NearTransactionAction[];
-    meta?: object;
+    meta?: CommonOptionsMeta;
     callbackUrl?: string;
 };
 declare function serializeTransaction({ transaction }: {
@@ -166,15 +153,14 @@ declare class OneKeyNearProvider extends ProviderNearBase {
     getAccountId(): string;
     getPublicKey(): string;
     getAccountInfo(): NearAccountInfo;
-    getNetworkId(): string;
-    getSelectedNetwork(): NearNetworkChangedPayload;
+    getNetworkInfo(): NearNetworkInfo;
     _saveAuthData(data: NearAccountInfo): void;
-    requestSignIn(signInOptions?: SignInOptions): Promise<NearAccountsChangedPayload>;
-    requestSignTransactions(signTransactionsOptions: SignTransactionsOptions): Promise<unknown>;
-    requestSignMessages({ messages, meta }: SignMessagesOptions): Promise<unknown>;
+    requestSignIn(signInOptions?: SignInOptions): Promise<SignInResult>;
+    requestSignTransactions(signTransactionsOptions: SignTransactionsOptions): Promise<SignTransactionsResult>;
+    requestSignMessages({ messages, meta, }: SignMessagesOptions): Promise<SignMessagesResult>;
     request({ method, params }?: IJsonRpcRequest): Promise<unknown>;
-    sendJsonRpc(method: string, params: object): Promise<any>;
-    createTransaction({ receiverId, actions, nonceOffset }: CreateTransactionOptions): Promise<NearTransaction>;
+    sendJsonRpc(method: string, params: object): Promise<unknown>;
+    createTransaction({ receiverId, actions, nonceOffset }: CreateTransactionOptions): Promise<transactions.Transaction>;
     _clearAuthData(): void;
     signOut(): void;
     account(): OneKeyWalletAccount;
@@ -182,7 +168,8 @@ declare class OneKeyNearProvider extends ProviderNearBase {
 declare class OneKeyWalletAccount extends Account {
     _wallet: OneKeyNearProvider;
     constructor({ wallet, connection, accountId }: OneKeyWalletAccountProps);
-    signAndSendTransaction(signAndSendTransactionOptions: SignAndSendTransactionOptions): Promise<unknown>;
+    signAndSendTransaction(signAndSendTransactionOptions: SignAndSendTransactionOptions): Promise<FinalExecutionOutcome>;
+    getAccessKeys(): Promise<AccessKeyInfoView[]>;
     _fetchAccountAccessKey({ publicKey, accountId }: {
         publicKey: string;
         accountId: string;
@@ -191,6 +178,6 @@ declare class OneKeyWalletAccount extends Account {
         publicKey: string;
         accountId: string;
     }>;
-    createTransaction({ receiverId, actions, nonceOffset }: CreateTransactionOptions): Promise<NearTransaction>;
+    createTransaction({ receiverId, actions, nonceOffset, }: CreateTransactionOptions): Promise<NearTransaction>;
 }
 export { OneKeyNearProvider, OneKeyWalletAccount, serializeTransaction };

package/dist/OneKeyNearProvider.js

@@ -11,7 +11,7 @@ import depd from 'depd';
 import { ProviderNearBase } from './ProviderNearBase';
 import entries from 'lodash/entries';
 import isString from 'lodash/isString';
-import { baseDecode } from 'borsh';
+import { baseEncode, baseDecode } from 'borsh';
 import { Account, utils, transactions } from 'near-api-js';
 import { getOrCreateExtInjectedJsBridge } from '@onekeyfe/extension-bridge-injected';
 import { web3Errors } from '@onekeyfe/cross-inpage-provider-errors';
@@ -33,14 +33,16 @@ const DEFAULT_NETWORK_INFO = {
 };
 const PROVIDER_METHODS = {
     near_accounts: 'near_accounts',
+    near_network: 'near_network',
     near_networkInfo: 'near_networkInfo',
+    near_requestAccounts: 'near_requestAccounts',
     near_requestSignIn: 'near_requestSignIn',
     near_signOut: 'near_signOut',
     near_requestSignTransactions: 'near_requestSignTransactions',
     near_sendTransactions: 'near_sendTransactions',
     near_signTransactions: 'near_signTransactions',
-    near_requestSignMessages: 'near_requestSignMessages',
     near_signMessages: 'near_signMessages',
+    near_requestSignMessages: 'near_requestSignMessages',
 };
 const PROVIDER_EVENTS = {
     accountsChanged: 'accountsChanged',
@@ -84,13 +86,13 @@ class OneKeyNearProvider extends ProviderNearBase {
         this._isUnlocked = false;
         this._initializedEmitted = false;
         if (!networkId) {
-            throw new Error('OneKeyNearWallet init error: networkId required.');
+            // throw new Error('OneKeyNearWallet init error: networkId required.');
         }
         this._authDataKey = keyPrefix + this._authDataKey;
         this._enablePageReload = enablePageReload;
         this._connectEagerly = connectEagerly;
         this._connection = connection;
-        this._networkId = networkId;
+        this._networkId = networkId || '';
         this._transactionCreator = transactionCreator || defaultTransactionCreator;
         this._initAuthDataFromStorage();
         this._registerEvents();
@@ -276,8 +278,8 @@ class OneKeyNearProvider extends ProviderNearBase {
         return this.bridgeRequest(Object.assign(Object.assign({}, payload), { requestInfo: {
                 accountId: this.getAccountId(),
                 publicKey: this.getPublicKey(),
-                networkId: this.getNetworkId(),
-                selectedNetworkId: ((_a = this.getSelectedNetwork()) === null || _a === void 0 ? void 0 : _a.networkId) || '',
+                networkId: this._networkId,
+                selectedNetworkId: ((_a = this.getNetworkInfo()) === null || _a === void 0 ? void 0 : _a.networkId) || '',
             } }));
     }
     isInstalled() {
@@ -300,10 +302,7 @@ class OneKeyNearProvider extends ProviderNearBase {
     getAccountInfo() {
         return this._authData || DEFAULT_AUTH_DATA;
     }
-    getNetworkId() {
-        return this._networkId || '';
-    }
-    getSelectedNetwork() {
+    getNetworkInfo() {
         return this._selectedNetwork;
     }
     _saveAuthData(data) {
@@ -394,7 +393,7 @@ class OneKeyNearProvider extends ProviderNearBase {
             return res;
         });
     }
-    requestSignMessages({ messages = [], meta = {} }) {
+    requestSignMessages({ messages = [], meta = {}, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield this._callBridgeRequest({
                 method: PROVIDER_METHODS.near_requestSignMessages,
@@ -408,7 +407,11 @@ class OneKeyNearProvider extends ProviderNearBase {
         return __awaiter(this, void 0, void 0, function* () {
             const paramsArr = [].concat(params);
             const paramObj = paramsArr[0];
-            if (method === PROVIDER_METHODS.near_requestSignIn) {
+            if (method === PROVIDER_METHODS.near_network) {
+                method = PROVIDER_METHODS.near_networkInfo;
+            }
+            if (method === PROVIDER_METHODS.near_requestAccounts ||
+                method === PROVIDER_METHODS.near_requestSignIn) {
                 return this.requestSignIn(paramObj);
             }
             if (method === PROVIDER_METHODS.near_sendTransactions ||
@@ -424,6 +427,9 @@ class OneKeyNearProvider extends ProviderNearBase {
                 method === PROVIDER_METHODS.near_requestSignMessages) {
                 return this.requestSignMessages(paramObj);
             }
+            if (method === PROVIDER_METHODS.near_signOut) {
+                return this.signOut();
+            }
             return yield this._callBridgeRequest({
                 method,
                 params,
@@ -435,7 +441,6 @@ class OneKeyNearProvider extends ProviderNearBase {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return
         return provider.sendJsonRpc(method, params);
     }
-    // SpecialWallet required
     createTransaction({ receiverId, actions, nonceOffset = 1 }) {
         return this.account().createTransaction({
             receiverId,
@@ -477,6 +482,7 @@ class OneKeyWalletAccount extends Account {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     signAndSendTransaction(signAndSendTransactionOptions) {
+        var _a;
         return __awaiter(this, arguments, void 0, function* () {
             let options = signAndSendTransactionOptions;
             // eslint-disable-next-line prefer-rest-params
@@ -494,12 +500,44 @@ class OneKeyWalletAccount extends Account {
             });
             const txHashList = yield this._wallet.requestSignTransactions({
                 transactions: [transaction],
-                meta: Object.assign({}, meta),
+                meta,
                 callbackUrl,
             });
-            // TODO return typeof this.connection.provider.sendTransaction
-            // same type to pending tx polling result
-            return txHashList;
+            const txHash = (_a = txHashList === null || txHashList === void 0 ? void 0 : txHashList.transactionHashes) === null || _a === void 0 ? void 0 : _a[0];
+            if (txHash) {
+                // near-api-js/lib/providers/json-rpc-provider.js
+                //    async txStatus(txHash, accountId)
+                const txHashStr = typeof txHash === 'string' ? txHash : baseEncode(txHash);
+                const res = (yield this._wallet.request({
+                    method: 'tx',
+                    params: [txHashStr, this.accountId],
+                }));
+                return res;
+            }
+            throw web3Errors.rpc.internal({
+                message: 'Transaction sign and send failed: transactionHash not found',
+            });
+        });
+    }
+    getAccessKeys() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // near-api-js/lib/account.js
+            //    async getAccessKeys() { ... }
+            const response = yield this._wallet.request({
+                method: 'query',
+                params: {
+                    request_type: 'view_access_key_list',
+                    account_id: this.accountId,
+                    finality: 'optimistic',
+                },
+            });
+            // A breaking API change introduced extra information into the
+            // response, so it now returns an object with a `keys` field instead
+            // of an array: https://github.com/nearprotocol/nearcore/pull/1789
+            if (Array.isArray(response)) {
+                return response;
+            }
+            return response.keys;
         });
     }
     _fetchAccountAccessKey({ publicKey, accountId }) {
@@ -517,7 +555,7 @@ class OneKeyWalletAccount extends Account {
             throw new Error(`near account access key not found for: ${accountId}`);
         });
     }
-    createTransaction({ receiverId, actions, nonceOffset = 1 }) {
+    createTransaction({ receiverId, actions, nonceOffset = 1, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const _authData = this._wallet._authData;
             const publicKey = _authData.publicKey;
@@ -531,7 +569,12 @@ class OneKeyWalletAccount extends Account {
                 publicKey,
             });
             const nonce = accessKeyInfo.accessKey.nonce + nonceOffset;
-            const block = yield this.connection.provider.block({ finality: 'final' });
+            // near-api-js/lib/providers/json-rpc-provider.js
+            //    async block(blockQuery) {...}
+            const block = (yield this._wallet.request({
+                method: 'block',
+                params: { block_id: undefined, finality: 'final' },
+            }));
             const blockHash = baseDecode(block.header.hash);
             const transaction = this._wallet._transactionCreator({
                 accountId,

package/dist/cjs/OneKeyNearProvider.js

@@ -40,14 +40,16 @@ const DEFAULT_NETWORK_INFO = {
 };
 const PROVIDER_METHODS = {
     near_accounts: 'near_accounts',
+    near_network: 'near_network',
     near_networkInfo: 'near_networkInfo',
+    near_requestAccounts: 'near_requestAccounts',
     near_requestSignIn: 'near_requestSignIn',
     near_signOut: 'near_signOut',
     near_requestSignTransactions: 'near_requestSignTransactions',
     near_sendTransactions: 'near_sendTransactions',
     near_signTransactions: 'near_signTransactions',
-    near_requestSignMessages: 'near_requestSignMessages',
     near_signMessages: 'near_signMessages',
+    near_requestSignMessages: 'near_requestSignMessages',
 };
 const PROVIDER_EVENTS = {
     accountsChanged: 'accountsChanged',
@@ -91,13 +93,13 @@ class OneKeyNearProvider extends ProviderNearBase_1.ProviderNearBase {
         this._isUnlocked = false;
         this._initializedEmitted = false;
         if (!networkId) {
-            throw new Error('OneKeyNearWallet init error: networkId required.');
+            // throw new Error('OneKeyNearWallet init error: networkId required.');
         }
         this._authDataKey = keyPrefix + this._authDataKey;
         this._enablePageReload = enablePageReload;
         this._connectEagerly = connectEagerly;
         this._connection = connection;
-        this._networkId = networkId;
+        this._networkId = networkId || '';
         this._transactionCreator = transactionCreator || defaultTransactionCreator;
         this._initAuthDataFromStorage();
         this._registerEvents();
@@ -283,8 +285,8 @@ class OneKeyNearProvider extends ProviderNearBase_1.ProviderNearBase {
         return this.bridgeRequest(Object.assign(Object.assign({}, payload), { requestInfo: {
                 accountId: this.getAccountId(),
                 publicKey: this.getPublicKey(),
-                networkId: this.getNetworkId(),
-                selectedNetworkId: ((_a = this.getSelectedNetwork()) === null || _a === void 0 ? void 0 : _a.networkId) || '',
+                networkId: this._networkId,
+                selectedNetworkId: ((_a = this.getNetworkInfo()) === null || _a === void 0 ? void 0 : _a.networkId) || '',
             } }));
     }
     isInstalled() {
@@ -307,10 +309,7 @@ class OneKeyNearProvider extends ProviderNearBase_1.ProviderNearBase {
     getAccountInfo() {
         return this._authData || DEFAULT_AUTH_DATA;
     }
-    getNetworkId() {
-        return this._networkId || '';
-    }
-    getSelectedNetwork() {
+    getNetworkInfo() {
         return this._selectedNetwork;
     }
     _saveAuthData(data) {
@@ -401,7 +400,7 @@ class OneKeyNearProvider extends ProviderNearBase_1.ProviderNearBase {
             return res;
         });
     }
-    requestSignMessages({ messages = [], meta = {} }) {
+    requestSignMessages({ messages = [], meta = {}, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield this._callBridgeRequest({
                 method: PROVIDER_METHODS.near_requestSignMessages,
@@ -415,7 +414,11 @@ class OneKeyNearProvider extends ProviderNearBase_1.ProviderNearBase {
         return __awaiter(this, void 0, void 0, function* () {
             const paramsArr = [].concat(params);
             const paramObj = paramsArr[0];
-            if (method === PROVIDER_METHODS.near_requestSignIn) {
+            if (method === PROVIDER_METHODS.near_network) {
+                method = PROVIDER_METHODS.near_networkInfo;
+            }
+            if (method === PROVIDER_METHODS.near_requestAccounts ||
+                method === PROVIDER_METHODS.near_requestSignIn) {
                 return this.requestSignIn(paramObj);
             }
             if (method === PROVIDER_METHODS.near_sendTransactions ||
@@ -431,6 +434,9 @@ class OneKeyNearProvider extends ProviderNearBase_1.ProviderNearBase {
                 method === PROVIDER_METHODS.near_requestSignMessages) {
                 return this.requestSignMessages(paramObj);
             }
+            if (method === PROVIDER_METHODS.near_signOut) {
+                return this.signOut();
+            }
             return yield this._callBridgeRequest({
                 method,
                 params,
@@ -442,7 +448,6 @@ class OneKeyNearProvider extends ProviderNearBase_1.ProviderNearBase {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return
         return provider.sendJsonRpc(method, params);
     }
-    // SpecialWallet required
     createTransaction({ receiverId, actions, nonceOffset = 1 }) {
         return this.account().createTransaction({
             receiverId,
@@ -485,6 +490,7 @@ class OneKeyWalletAccount extends near_api_js_1.Account {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     signAndSendTransaction(signAndSendTransactionOptions) {
+        var _a;
         return __awaiter(this, arguments, void 0, function* () {
             let options = signAndSendTransactionOptions;
             // eslint-disable-next-line prefer-rest-params
@@ -502,12 +508,44 @@ class OneKeyWalletAccount extends near_api_js_1.Account {
             });
             const txHashList = yield this._wallet.requestSignTransactions({
                 transactions: [transaction],
-                meta: Object.assign({}, meta),
+                meta,
                 callbackUrl,
             });
-            // TODO return typeof this.connection.provider.sendTransaction
-            // same type to pending tx polling result
-            return txHashList;
+            const txHash = (_a = txHashList === null || txHashList === void 0 ? void 0 : txHashList.transactionHashes) === null || _a === void 0 ? void 0 : _a[0];
+            if (txHash) {
+                // near-api-js/lib/providers/json-rpc-provider.js
+                //    async txStatus(txHash, accountId)
+                const txHashStr = typeof txHash === 'string' ? txHash : (0, borsh_1.baseEncode)(txHash);
+                const res = (yield this._wallet.request({
+                    method: 'tx',
+                    params: [txHashStr, this.accountId],
+                }));
+                return res;
+            }
+            throw cross_inpage_provider_errors_1.web3Errors.rpc.internal({
+                message: 'Transaction sign and send failed: transactionHash not found',
+            });
+        });
+    }
+    getAccessKeys() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // near-api-js/lib/account.js
+            //    async getAccessKeys() { ... }
+            const response = yield this._wallet.request({
+                method: 'query',
+                params: {
+                    request_type: 'view_access_key_list',
+                    account_id: this.accountId,
+                    finality: 'optimistic',
+                },
+            });
+            // A breaking API change introduced extra information into the
+            // response, so it now returns an object with a `keys` field instead
+            // of an array: https://github.com/nearprotocol/nearcore/pull/1789
+            if (Array.isArray(response)) {
+                return response;
+            }
+            return response.keys;
         });
     }
     _fetchAccountAccessKey({ publicKey, accountId }) {
@@ -525,7 +563,7 @@ class OneKeyWalletAccount extends near_api_js_1.Account {
             throw new Error(`near account access key not found for: ${accountId}`);
         });
     }
-    createTransaction({ receiverId, actions, nonceOffset = 1 }) {
+    createTransaction({ receiverId, actions, nonceOffset = 1, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const _authData = this._wallet._authData;
             const publicKey = _authData.publicKey;
@@ -539,7 +577,12 @@ class OneKeyWalletAccount extends near_api_js_1.Account {
                 publicKey,
             });
             const nonce = accessKeyInfo.accessKey.nonce + nonceOffset;
-            const block = yield this.connection.provider.block({ finality: 'final' });
+            // near-api-js/lib/providers/json-rpc-provider.js
+            //    async block(blockQuery) {...}
+            const block = (yield this._wallet.request({
+                method: 'block',
+                params: { block_id: undefined, finality: 'final' },
+            }));
             const blockHash = (0, borsh_1.baseDecode)(block.header.hash);
             const transaction = this._wallet._transactionCreator({
                 accountId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-near-provider",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -35,13 +35,13 @@
     "near-api-js": "^0.44.2"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "^0.0.4",
-    "@onekeyfe/cross-inpage-provider-errors": "^0.0.4",
-    "@onekeyfe/cross-inpage-provider-types": "^0.0.4",
-    "@onekeyfe/extension-bridge-injected": "^0.0.4",
+    "@onekeyfe/cross-inpage-provider-core": "^0.0.5",
+    "@onekeyfe/cross-inpage-provider-errors": "^0.0.5",
+    "@onekeyfe/cross-inpage-provider-types": "^0.0.5",
+    "@onekeyfe/extension-bridge-injected": "^0.0.5",
     "borsh": "^0.6.0",
     "depd": "^2.0.0",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "d47447804157874b2607aea82f92ff3a132c5e67"
+  "gitHead": "fc053fe3c2920fca734addae381339a29a09b716"
 }