@subwallet/extension-inject 0.4.6-0 → 0.4.8-0

package/bundle.js

@@ -23,7 +23,15 @@ export function injectEvmExtension(evmProvider) {
   // small helper with the typescript types, just cast window
   const windowInject = window; // add our enable function
 
-  windowInject.subWalletEthereum = evmProvider;
-  windowInject.dispatchEvent(new Event('subwallet#initialized')); // Todo: need more discuss to set it global and not conflict with MetaMask
+  windowInject.SubWallet = evmProvider;
+  windowInject.dispatchEvent(new Event('subwallet#initialized')); // Publish to global if window.ethereum is not available
+
+  windowInject.addEventListener('load', () => {
+    if (!windowInject.ethereum) {
+      windowInject.ethereum = evmProvider;
+      windowInject.dispatchEvent(new Event('ethereum#initialized'));
+    }
+  }); // Todo: Need more discuss to make SubWallet as global before window load because it can be conflict with MetaMask
+  // windowInject.ethereum = evmProvider;
   // windowInject.dispatchEvent(new Event('ethereum#initialized'));
 }

package/cjs/bundle.js

@@ -40,7 +40,15 @@ function injectEvmExtension(evmProvider) {
   // small helper with the typescript types, just cast window
   const windowInject = window; // add our enable function
 
-  windowInject.subWalletEthereum = evmProvider;
-  windowInject.dispatchEvent(new Event('subwallet#initialized')); // Todo: need more discuss to set it global and not conflict with MetaMask
+  windowInject.SubWallet = evmProvider;
+  windowInject.dispatchEvent(new Event('subwallet#initialized')); // Publish to global if window.ethereum is not available
+
+  windowInject.addEventListener('load', () => {
+    if (!windowInject.ethereum) {
+      windowInject.ethereum = evmProvider;
+      windowInject.dispatchEvent(new Event('ethereum#initialized'));
+    }
+  }); // Todo: Need more discuss to make SubWallet as global before window load because it can be conflict with MetaMask
+  // windowInject.ethereum = evmProvider;
   // windowInject.dispatchEvent(new Event('ethereum#initialized'));
 }

package/cjs/packageInfo.js

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@subwallet/extension-inject',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '0.4.6-0'
+  version: '0.4.8-0'
 };
 exports.packageInfo = packageInfo;

package/package.json

@@ -14,7 +14,7 @@
   },
   "sideEffects": true,
   "type": "module",
-  "version": "0.4.6-0",
+  "version": "0.4.8-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",

package/packageInfo.js

@@ -5,5 +5,5 @@ export const packageInfo = {
   name: '@subwallet/extension-inject',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '0.4.6-0'
+  version: '0.4.8-0'
 };

package/types.d.ts

@@ -2,7 +2,6 @@ import type { Signer as InjectedSigner } from '@polkadot/api/types';
 import type { ProviderInterface } from '@polkadot/rpc-provider/types';
 import type { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types';
 import type { KeypairType } from '@polkadot/util-crypto/types';
-import { AbstractProvider } from 'web3-core';
 declare type This = typeof globalThis;
 export declare type Unsubcall = () => void;
 export interface InjectedAccount {
@@ -73,7 +72,7 @@ export interface Injected {
     provider?: InjectedProvider;
     signer: InjectedSigner;
 }
-export interface EvmProvider extends AbstractProvider {
+export interface EvmProvider {
     isMetaMask: boolean;
     isSubWallet: boolean;
     version: string;
@@ -85,7 +84,8 @@ export interface InjectedWindowProvider {
 }
 export interface InjectedWindow extends This {
     injectedWeb3: Record<string, InjectedWindowProvider>;
-    subWalletEthereum: EvmProvider;
+    ethereum: EvmProvider;
+    SubWallet: EvmProvider;
 }
 export declare type InjectedExtension = InjectedExtensionInfo & Injected;
 export declare type InjectOptions = InjectedExtensionInfo;