@onekeyfe/onekey-cardano-provider 2.2.58 → 2.2.59-alpha.1

package/dist/ProviderCardano.d.ts

@@ -39,7 +39,6 @@ type CardanoProviderEventsMap = {
 };
 interface IProviderCardano extends ProviderBase {
     isConnected: boolean;
-    onekey: Cip30Wallet;
     getNetworkId(): Promise<NetworkId>;
 }
 type OneKeyCardanoProviderProps = IInpageProviderConfig & {
@@ -49,9 +48,6 @@ declare class ProviderCardano extends ProviderCardanoBase implements IProviderCa
     private _account;
     get account(): string | null;
     get isConnected(): boolean;
-    onekey: Cip30Wallet;
-    nami: Cip30Wallet;
-    yoroi: Cip30Wallet;
     constructor(props: OneKeyCardanoProviderProps);
     private _registerEvents;
     private _callBridge;

package/dist/ProviderCardano.js

@@ -30,9 +30,6 @@ class ProviderCardano extends ProviderCardanoBase {
         super(Object.assign(Object.assign({}, props), { bridge: props.bridge || getOrCreateExtInjectedJsBridge({ timeout: props.timeout }) }));
         this._account = null;
         this._registerEvents();
-        this.nami = Object.assign(Object.assign({}, this.walletInfo()), { name: 'Nami' });
-        this.onekey = Object.assign({}, this.walletInfo());
-        this.yoroi = Object.assign(Object.assign({}, this.walletInfo()), { name: 'yoroi' });
     }
     _registerEvents() {
         window.addEventListener('onekey_bridge_disconnect', () => {

package/dist/cjs/ProviderCardano.js

@@ -33,9 +33,6 @@ class ProviderCardano extends ProviderCardanoBase_1.ProviderCardanoBase {
         super(Object.assign(Object.assign({}, props), { bridge: props.bridge || (0, extension_bridge_injected_1.getOrCreateExtInjectedJsBridge)({ timeout: props.timeout }) }));
         this._account = null;
         this._registerEvents();
-        this.nami = Object.assign(Object.assign({}, this.walletInfo()), { name: 'Nami' });
-        this.onekey = Object.assign({}, this.walletInfo());
-        this.yoroi = Object.assign(Object.assign({}, this.walletInfo()), { name: 'yoroi' });
     }
     _registerEvents() {
         window.addEventListener('onekey_bridge_disconnect', () => {

package/dist/cjs/inject.js

@@ -4,15 +4,36 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineWindowCardanoProperty = defineWindowCardanoProperty;
-function defineWindowCardanoProperty(property, provider) {
+const PROXY_WALLETS = ['nami', 'yoroi'];
+const proxyWalletConfigs = {
+    nami: { name: 'Nami' },
+    yoroi: { name: 'yoroi' },
+};
+/**
+ * Define window.cardano property
+ * - Always injects OneKey wallet
+ * - Injects proxy wallets (Nami, etc.) only when registerProxyWallets is true
+ */
+function defineWindowCardanoProperty(property, provider, options) {
+    const walletInfo = provider.walletInfo();
+    const protectedKeys = ['onekey'];
+    // Always register OneKey wallet
+    provider.onekey = walletInfo;
+    // Register proxy wallets on the provider instance if needed
+    if (options === null || options === void 0 ? void 0 : options.registerProxyWallets) {
+        PROXY_WALLETS.forEach((walletKey) => {
+            const config = proxyWalletConfigs[walletKey];
+            provider[walletKey] = Object.assign(Object.assign({}, walletInfo), { name: config.name });
+            protectedKeys.push(walletKey);
+        });
+    }
     const proxyProvider = new Proxy(provider, {
-        defineProperty(target, property, attributes) {
-            if (property !== 'nami') {
-                return Reflect.defineProperty(target, property, attributes);
+        defineProperty(target, prop, attributes) {
+            if (protectedKeys.includes(prop)) {
+                // skip define to prevent overwriting
+                return true;
             }
-            // skip define Prevent overwriting
-            console.log('skip define Prevent overwriting');
-            return true;
+            return Reflect.defineProperty(target, prop, attributes);
         },
     });
     Object.keys(provider).forEach((key) => {
@@ -24,7 +45,7 @@ function defineWindowCardanoProperty(property, provider) {
         get() {
             return proxyProvider;
         },
-        set(val) {
+        set() {
             // skip set
         },
     });

package/dist/inject.d.ts

@@ -1 +1,9 @@
-export declare function defineWindowCardanoProperty(property: string, provider: unknown): void;
+import type { ProviderCardano } from './ProviderCardano';
+/**
+ * Define window.cardano property
+ * - Always injects OneKey wallet
+ * - Injects proxy wallets (Nami, etc.) only when registerProxyWallets is true
+ */
+export declare function defineWindowCardanoProperty(property: string, provider: ProviderCardano, options?: {
+    registerProxyWallets?: boolean;
+}): void;

package/dist/inject.js

@@ -1,15 +1,36 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-export function defineWindowCardanoProperty(property, provider) {
+const PROXY_WALLETS = ['nami', 'yoroi'];
+const proxyWalletConfigs = {
+    nami: { name: 'Nami' },
+    yoroi: { name: 'yoroi' },
+};
+/**
+ * Define window.cardano property
+ * - Always injects OneKey wallet
+ * - Injects proxy wallets (Nami, etc.) only when registerProxyWallets is true
+ */
+export function defineWindowCardanoProperty(property, provider, options) {
+    const walletInfo = provider.walletInfo();
+    const protectedKeys = ['onekey'];
+    // Always register OneKey wallet
+    provider.onekey = walletInfo;
+    // Register proxy wallets on the provider instance if needed
+    if (options === null || options === void 0 ? void 0 : options.registerProxyWallets) {
+        PROXY_WALLETS.forEach((walletKey) => {
+            const config = proxyWalletConfigs[walletKey];
+            provider[walletKey] = Object.assign(Object.assign({}, walletInfo), { name: config.name });
+            protectedKeys.push(walletKey);
+        });
+    }
     const proxyProvider = new Proxy(provider, {
-        defineProperty(target, property, attributes) {
-            if (property !== 'nami') {
-                return Reflect.defineProperty(target, property, attributes);
+        defineProperty(target, prop, attributes) {
+            if (protectedKeys.includes(prop)) {
+                // skip define to prevent overwriting
+                return true;
             }
-            // skip define Prevent overwriting
-            console.log('skip define Prevent overwriting');
-            return true;
+            return Reflect.defineProperty(target, prop, attributes);
         },
     });
     Object.keys(provider).forEach((key) => {
@@ -21,7 +42,7 @@ export function defineWindowCardanoProperty(property, provider) {
         get() {
             return proxyProvider;
         },
-        set(val) {
+        set() {
             // skip set
         },
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-cardano-provider",
-  "version": "2.2.58",
+  "version": "2.2.59-alpha.1",
   "keywords": [
     "cross-inpage-provider",
     "cardano"
@@ -28,10 +28,10 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.2.58",
-    "@onekeyfe/cross-inpage-provider-errors": "2.2.58",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.58",
-    "@onekeyfe/extension-bridge-injected": "2.2.58"
+    "@onekeyfe/cross-inpage-provider-core": "2.2.59-alpha.1",
+    "@onekeyfe/cross-inpage-provider-errors": "2.2.59-alpha.1",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.59-alpha.1",
+    "@onekeyfe/extension-bridge-injected": "2.2.59-alpha.1"
   },
-  "gitHead": "f87b818414e7f07fff074ca557420e05ad090f36"
+  "gitHead": "8fcceb1d4bdf50f336f85fcae2c35574f41aeeda"
 }