@onekeyfe/onekey-cosmos-provider 2.0.0-alpha.8 → 2.0.0

package/dist/OnekeyCosmosProvider.d.ts

@@ -10,13 +10,13 @@ declare const PROVIDER_EVENTS: {
     readonly accountChanged: "accountChanged";
     readonly message_low_level: "message_low_level";
 };
-declare type CosmosProviderEventsMap = {
+type CosmosProviderEventsMap = {
     [PROVIDER_EVENTS.connect]: (account: Key) => void;
     [PROVIDER_EVENTS.disconnect]: () => void;
     [PROVIDER_EVENTS.keplr_keystorechange]: () => void;
     [PROVIDER_EVENTS.message_low_level]: (payload: IJsonRpcRequest) => void;
 };
-export declare type CosmosRequest = {
+export type CosmosRequest = {
     'enable': (chainIds: string[]) => Promise<void>;
     'disconnect': (chainIds: string[]) => Promise<void>;
     'experimentalSuggestChain': (chain: any) => Promise<void>;
@@ -37,7 +37,7 @@ export declare type CosmosRequest = {
     'verifyArbitrary': (chainId: string, signer: string, data: string | Uint8Array, signature: StdSignature) => Promise<boolean>;
     'signEthereum': (chainId: string, signer: string, data: string | Uint8Array, type: EthSignType) => Promise<string>;
 };
-export declare type PROVIDER_EVENTS_STRINGS = keyof typeof PROVIDER_EVENTS;
+export type PROVIDER_EVENTS_STRINGS = keyof typeof PROVIDER_EVENTS;
 export interface IProviderCosmos {
     readonly mode: KeplrMode;
     defaultOptions: KeplrIntereactionOptions;
@@ -63,7 +63,7 @@ export interface IProviderCosmos {
     getOfflineSignerOnlyAmino(chainId: string): OfflineAminoSigner;
     getOfflineSignerAuto(chainId: string): Promise<OfflineAminoSigner | OfflineDirectSigner>;
 }
-export declare type OneKeySuiProviderProps = IInpageProviderConfig & {
+export type OneKeySuiProviderProps = IInpageProviderConfig & {
     timeout?: number;
 };
 declare class ProviderCosmos extends ProviderCosmosBase implements IProviderCosmos {
@@ -75,7 +75,7 @@ declare class ProviderCosmos extends ProviderCosmosBase implements IProviderCosm
     private _callBridge;
     private _handleConnected;
     private _handleDisconnected;
-    isAccountsChanged(account: Key | undefined): boolean;
+    isAccountsChanged(account: KeyHex | undefined): boolean;
     private _handleAccountChange;
     private _network;
     isNetworkChanged(network: string): boolean;
@@ -85,6 +85,7 @@ declare class ProviderCosmos extends ProviderCosmosBase implements IProviderCosm
     enable(chainIds: string | string[]): Promise<void>;
     disconnect(): Promise<void>;
     getKey(chainId: string): Promise<Key>;
+    ping(): Promise<void>;
     experimentalSuggestChain(chain: any): Promise<void>;
     signAmino(chainId: string, signer: string, signDoc: StdSignDoc, signOptions?: KeplrSignOptions | undefined): Promise<AminoSignResponse>;
     signDirect(chainId: string, signer: string, signDoc: {

package/dist/OnekeyCosmosProvider.js

@@ -15,6 +15,7 @@ import { ProviderCosmosBase } from './ProviderCosmosBase';
 import Long from 'long';
 import { CosmJSOfflineSigner, CosmJSOfflineSignerOnlyAmino } from './cosmjs';
 import { isArray } from 'lodash';
+import { JSONUint8Array } from './utils/uint8-array';
 const PROVIDER_EVENTS = {
     'connect': 'connect',
     'disconnect': 'disconnect',
@@ -25,6 +26,7 @@ const PROVIDER_EVENTS = {
 function isWalletEventMethodMatch({ method, name }) {
     return method === `wallet_events_${name}`;
 }
+const USING_MESSAGE_SITES = ['https://wallet.keplr.app', 'https://testnet.keplr.app'];
 class ProviderCosmos extends ProviderCosmosBase {
     constructor(props) {
         super(Object.assign(Object.assign({}, props), { bridge: props.bridge || getOrCreateExtInjectedJsBridge({ timeout: props.timeout }) }));
@@ -45,6 +47,47 @@ class ProviderCosmos extends ProviderCosmosBase {
                 this._handleAccountChange(params);
             }
         });
+        this.on(PROVIDER_EVENTS.keplr_keystorechange, () => {
+            window.dispatchEvent(new Event(PROVIDER_EVENTS.keplr_keystorechange));
+        });
+        const isUsingMessage = USING_MESSAGE_SITES.includes(window.location.origin);
+        if (isUsingMessage) {
+            window.addEventListener('message', (e) => {
+                const data = e.data;
+                if (data && data.type === 'proxy-request' && data.method) {
+                    const method = data.method;
+                    if (this[method]) {
+                        const unwrapedArgs = JSONUint8Array.unwrap(data.args);
+                        this[method](...unwrapedArgs).then((res) => {
+                            window.postMessage({
+                                type: 'proxy-request-response',
+                                id: data.id,
+                                result: JSONUint8Array.wrap({
+                                    return: res,
+                                }),
+                            });
+                        }).catch((err) => {
+                            window.postMessage({
+                                type: 'proxy-request-response',
+                                id: data.id,
+                                result: {
+                                    error: err.message,
+                                },
+                            });
+                        });
+                    }
+                    else {
+                        window.postMessage({
+                            type: 'proxy-request-response',
+                            id: data.id,
+                            result: {
+                                error: true,
+                            },
+                        });
+                    }
+                }
+            });
+        }
     }
     _callBridge(params) {
         return this.bridgeRequest(params);
@@ -71,13 +114,13 @@ class ProviderCosmos extends ProviderCosmosBase {
             return false;
         if (!this._account)
             return true;
-        return bytesToHex(account.pubKey) !== bytesToHex(this._account.pubKey);
+        return account.pubKey !== this._account.pubKey;
     }
     // trigger by bridge account change event
     _handleAccountChange(payload) {
         const account = payload;
         if (this.isAccountsChanged(account)) {
-            this.emit('keplr_keystorechange');
+            this.emit(PROVIDER_EVENTS.keplr_keystorechange);
         }
         if (!account) {
             this._handleDisconnected();
@@ -123,6 +166,9 @@ class ProviderCosmos extends ProviderCosmosBase {
                 address: hexToBytes(key.address) });
         });
     }
+    ping() {
+        return Promise.resolve();
+    }
     experimentalSuggestChain(chain) {
         return this._callBridge({
             method: 'experimentalSuggestChain',

package/dist/cjs/OnekeyCosmosProvider.js

@@ -21,6 +21,7 @@ const ProviderCosmosBase_1 = require("./ProviderCosmosBase");
 const long_1 = __importDefault(require("long"));
 const cosmjs_1 = require("./cosmjs");
 const lodash_1 = require("lodash");
+const uint8_array_1 = require("./utils/uint8-array");
 const PROVIDER_EVENTS = {
     'connect': 'connect',
     'disconnect': 'disconnect',
@@ -31,6 +32,7 @@ const PROVIDER_EVENTS = {
 function isWalletEventMethodMatch({ method, name }) {
     return method === `wallet_events_${name}`;
 }
+const USING_MESSAGE_SITES = ['https://wallet.keplr.app', 'https://testnet.keplr.app'];
 class ProviderCosmos extends ProviderCosmosBase_1.ProviderCosmosBase {
     constructor(props) {
         super(Object.assign(Object.assign({}, props), { bridge: props.bridge || (0, extension_bridge_injected_1.getOrCreateExtInjectedJsBridge)({ timeout: props.timeout }) }));
@@ -51,6 +53,47 @@ class ProviderCosmos extends ProviderCosmosBase_1.ProviderCosmosBase {
                 this._handleAccountChange(params);
             }
         });
+        this.on(PROVIDER_EVENTS.keplr_keystorechange, () => {
+            window.dispatchEvent(new Event(PROVIDER_EVENTS.keplr_keystorechange));
+        });
+        const isUsingMessage = USING_MESSAGE_SITES.includes(window.location.origin);
+        if (isUsingMessage) {
+            window.addEventListener('message', (e) => {
+                const data = e.data;
+                if (data && data.type === 'proxy-request' && data.method) {
+                    const method = data.method;
+                    if (this[method]) {
+                        const unwrapedArgs = uint8_array_1.JSONUint8Array.unwrap(data.args);
+                        this[method](...unwrapedArgs).then((res) => {
+                            window.postMessage({
+                                type: 'proxy-request-response',
+                                id: data.id,
+                                result: uint8_array_1.JSONUint8Array.wrap({
+                                    return: res,
+                                }),
+                            });
+                        }).catch((err) => {
+                            window.postMessage({
+                                type: 'proxy-request-response',
+                                id: data.id,
+                                result: {
+                                    error: err.message,
+                                },
+                            });
+                        });
+                    }
+                    else {
+                        window.postMessage({
+                            type: 'proxy-request-response',
+                            id: data.id,
+                            result: {
+                                error: true,
+                            },
+                        });
+                    }
+                }
+            });
+        }
     }
     _callBridge(params) {
         return this.bridgeRequest(params);
@@ -77,13 +120,13 @@ class ProviderCosmos extends ProviderCosmosBase_1.ProviderCosmosBase {
             return false;
         if (!this._account)
             return true;
-        return (0, utils_1.bytesToHex)(account.pubKey) !== (0, utils_1.bytesToHex)(this._account.pubKey);
+        return account.pubKey !== this._account.pubKey;
     }
     // trigger by bridge account change event
     _handleAccountChange(payload) {
         const account = payload;
         if (this.isAccountsChanged(account)) {
-            this.emit('keplr_keystorechange');
+            this.emit(PROVIDER_EVENTS.keplr_keystorechange);
         }
         if (!account) {
             this._handleDisconnected();
@@ -129,6 +172,9 @@ class ProviderCosmos extends ProviderCosmosBase_1.ProviderCosmosBase {
                 address: (0, utils_1.hexToBytes)(key.address) });
         });
     }
+    ping() {
+        return Promise.resolve();
+    }
     experimentalSuggestChain(chain) {
         return this._callBridge({
             method: 'experimentalSuggestChain',

package/dist/cjs/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/cjs/types/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/cjs/utils/hex.js

@@ -0,0 +1,30 @@
+"use strict";
+/*
+  Belows are from @cosmjs/encoding library.
+  To reduce the bundle size of provider, put them directly here.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromHex = exports.toHex = void 0;
+function toHex(data) {
+    let out = "";
+    for (const byte of data) {
+        out += (`0${byte.toString(16)}`).slice(-2);
+    }
+    return out;
+}
+exports.toHex = toHex;
+function fromHex(hexstring) {
+    if (hexstring.length % 2 !== 0) {
+        throw new Error("hex string length must be a multiple of 2");
+    }
+    const listOfInts = [];
+    for (let i = 0; i < hexstring.length; i += 2) {
+        const hexByteAsString = hexstring.substr(i, 2);
+        if (!hexByteAsString.match(/[0-9a-f]{2}/i)) {
+            throw new Error("hex string contains invalid characters");
+        }
+        listOfInts.push(parseInt(hexByteAsString, 16));
+    }
+    return new Uint8Array(listOfInts);
+}
+exports.fromHex = fromHex;

package/dist/cjs/utils/uint8-array.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JSONUint8Array = void 0;
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+// The JSON encoder that supports the `Uint8Array`.
+const hex_1 = require("./hex");
+class JSONUint8Array {
+    static parse(text) {
+        return JSON.parse(text, (key, value) => {
+            // Prevent potential prototype poisoning.
+            if (key === "__proto__") {
+                throw new Error("__proto__ is disallowed");
+            }
+            if (value &&
+                typeof value === "string" &&
+                value.startsWith("__uint8array__")) {
+                return (0, hex_1.fromHex)(value.replace("__uint8array__", ""));
+            }
+            return value;
+        });
+    }
+    static stringify(obj) {
+        return JSON.stringify(obj, (key, value) => {
+            // Prevent potential prototype poisoning.
+            if (key === "__proto__") {
+                throw new Error("__proto__ is disallowed");
+            }
+            if (value &&
+                (value instanceof Uint8Array ||
+                    (typeof value === "object" &&
+                        "type" in value &&
+                        "data" in value &&
+                        value.type === "Buffer" &&
+                        Array.isArray(value.data)))) {
+                const array = value instanceof Uint8Array ? value : new Uint8Array(value.data);
+                return `__uint8array__${(0, hex_1.toHex)(array)}`;
+            }
+            return value;
+        });
+    }
+    static wrap(obj) {
+        if (obj === undefined)
+            return undefined;
+        return JSON.parse(JSONUint8Array.stringify(obj));
+    }
+    static unwrap(obj) {
+        if (obj === undefined)
+            return undefined;
+        return JSONUint8Array.parse(JSON.stringify(obj));
+    }
+}
+exports.JSONUint8Array = JSONUint8Array;

package/dist/type-utils.d.ts

@@ -1,4 +1,4 @@
-export declare type WireStringified<T> = T extends Array<infer P> ? Array<WireStringified<P>> : T extends object ? {
+export type WireStringified<T> = T extends Array<infer P> ? Array<WireStringified<P>> : T extends object ? {
     [K in keyof T]: WireStringified<T[K]>;
 } : T;
-export declare type ResolvePromise<T> = T extends Promise<infer P> ? P : T;
+export type ResolvePromise<T> = T extends Promise<infer P> ? P : T;

package/dist/types/cosmjs.d.ts

@@ -68,7 +68,7 @@ export interface SignDoc {
     /** account_number is the account number of the account in state */
     accountNumber: string;
 }
-export declare type SignDocHex = {
+export type SignDocHex = {
     bodyBytes: string;
     authInfoBytes: string;
     accountNumber: string;
@@ -95,7 +95,7 @@ export interface DirectSignResponse {
     readonly signed: SignDoc;
     readonly signature: StdSignature;
 }
-export declare type DirectSignResponseHex = DirectSignResponse & {
+export type DirectSignResponseHex = DirectSignResponse & {
     readonly signed: SignDocHex;
 };
 export interface OfflineDirectSigner {

package/dist/types/currency.d.ts

@@ -46,14 +46,14 @@ export interface IBCCurrency extends Currency {
 /**
  * Any type of currency that Kepler applications can support.
  */
-export declare type AppCurrency = Currency | CW20Currency | Secret20Currency | IBCCurrency;
+export type AppCurrency = Currency | CW20Currency | Secret20Currency | IBCCurrency;
 export interface FiatCurrency {
     readonly currency: string;
     readonly symbol: string;
     readonly maxDecimals: number;
     readonly locale: string;
 }
-export declare type WithGasPriceStep<T> = T & {
+export type WithGasPriceStep<T> = T & {
     /**
      * This is used to set the fee of the transaction.
      * If this field is empty, it just use the default gas price step (low: 0.01, average: 0.025, high: 0.04).
@@ -64,4 +64,4 @@ export declare type WithGasPriceStep<T> = T & {
         readonly high: number;
     };
 };
-export declare type FeeCurrency = WithGasPriceStep<AppCurrency>;
+export type FeeCurrency = WithGasPriceStep<AppCurrency>;

package/dist/types/type.d.ts

@@ -6,11 +6,11 @@ export interface Key {
     readonly bech32Address: string;
     readonly isNanoLedger: boolean;
 }
-export declare type KeyHex = Key & {
+export type KeyHex = Key & {
     pubKey: string;
     address: string;
 };
-export declare type KeplrMode = 'extension' | 'mobile-web' | 'walletconnect';
+export type KeplrMode = 'extension' | 'mobile-web' | 'walletconnect';
 export interface KeplrIntereactionOptions {
     readonly sign?: KeplrSignOptions;
 }

package/dist/utils/hex.d.ts

@@ -0,0 +1,2 @@
+export declare function toHex(data: Uint8Array): string;
+export declare function fromHex(hexstring: string): Uint8Array;

package/dist/utils/hex.js

@@ -0,0 +1,25 @@
+/*
+  Belows are from @cosmjs/encoding library.
+  To reduce the bundle size of provider, put them directly here.
+ */
+export function toHex(data) {
+    let out = "";
+    for (const byte of data) {
+        out += (`0${byte.toString(16)}`).slice(-2);
+    }
+    return out;
+}
+export function fromHex(hexstring) {
+    if (hexstring.length % 2 !== 0) {
+        throw new Error("hex string length must be a multiple of 2");
+    }
+    const listOfInts = [];
+    for (let i = 0; i < hexstring.length; i += 2) {
+        const hexByteAsString = hexstring.substr(i, 2);
+        if (!hexByteAsString.match(/[0-9a-f]{2}/i)) {
+            throw new Error("hex string contains invalid characters");
+        }
+        listOfInts.push(parseInt(hexByteAsString, 16));
+    }
+    return new Uint8Array(listOfInts);
+}

package/dist/utils/uint8-array.d.ts

@@ -0,0 +1,6 @@
+export declare class JSONUint8Array {
+    static parse(text: string): any;
+    static stringify(obj: unknown): string;
+    static wrap(obj: unknown): unknown;
+    static unwrap(obj: unknown): unknown;
+}

package/dist/utils/uint8-array.js

@@ -0,0 +1,49 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+// The JSON encoder that supports the `Uint8Array`.
+import { fromHex, toHex } from "./hex";
+export class JSONUint8Array {
+    static parse(text) {
+        return JSON.parse(text, (key, value) => {
+            // Prevent potential prototype poisoning.
+            if (key === "__proto__") {
+                throw new Error("__proto__ is disallowed");
+            }
+            if (value &&
+                typeof value === "string" &&
+                value.startsWith("__uint8array__")) {
+                return fromHex(value.replace("__uint8array__", ""));
+            }
+            return value;
+        });
+    }
+    static stringify(obj) {
+        return JSON.stringify(obj, (key, value) => {
+            // Prevent potential prototype poisoning.
+            if (key === "__proto__") {
+                throw new Error("__proto__ is disallowed");
+            }
+            if (value &&
+                (value instanceof Uint8Array ||
+                    (typeof value === "object" &&
+                        "type" in value &&
+                        "data" in value &&
+                        value.type === "Buffer" &&
+                        Array.isArray(value.data)))) {
+                const array = value instanceof Uint8Array ? value : new Uint8Array(value.data);
+                return `__uint8array__${toHex(array)}`;
+            }
+            return value;
+        });
+    }
+    static wrap(obj) {
+        if (obj === undefined)
+            return undefined;
+        return JSON.parse(JSONUint8Array.stringify(obj));
+    }
+    static unwrap(obj) {
+        if (obj === undefined)
+            return undefined;
+        return JSONUint8Array.parse(JSON.stringify(obj));
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-cosmos-provider",
-  "version": "2.0.0-alpha.8",
+  "version": "2.0.0",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.3.0",
-    "@onekeyfe/cross-inpage-provider-core": "2.0.0-alpha.8",
-    "@onekeyfe/cross-inpage-provider-errors": "2.0.0-alpha.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.0.0-alpha.8",
-    "@onekeyfe/extension-bridge-injected": "2.0.0-alpha.8",
+    "@onekeyfe/cross-inpage-provider-core": "2.0.0",
+    "@onekeyfe/cross-inpage-provider-errors": "2.0.0",
+    "@onekeyfe/cross-inpage-provider-types": "2.0.0",
+    "@onekeyfe/extension-bridge-injected": "2.0.0",
     "eth-rpc-errors": "^4.0.3",
     "long": "^5.2.1",
     "mitt": "^3.0.0"
   },
-  "gitHead": "a72404c2d39b3910aa62c137be02e4643c3b59f0"
+  "gitHead": "4e9109e35064cc7dafe3a4f86a33f497ad9567ec"
 }