Skip to content

Commit

Permalink
v16.5.1: fix OKX wallet detection
Browse files Browse the repository at this point in the history
  • Loading branch information
@0xNe0x1
0xNe0x1 committed Mar 8, 2024
1 parent 6e5014b commit ae51550
Show file tree
Hide file tree
Showing 11 changed files with 97 additions and 77 deletions.
30 changes: 16 additions & 14 deletions dist/esm/index.evm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,33 +280,35 @@ class WindowEthereum {

static __initStatic2() {this.isAvailable = async()=>{
return (
_optionalChain$l([window, 'optionalAccess', _33 => _33.ethereum]) &&
_optionalChain$l([window, 'optionalAccess', _34 => _34.ethereum]) &&
// not MetaMask
!(_optionalChain$l([window, 'optionalAccess', _34 => _34.ethereum, 'optionalAccess', _35 => _35.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) &&
!(_optionalChain$l([window, 'optionalAccess', _35 => _35.ethereum, 'optionalAccess', _36 => _36.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) &&
// not Coin98
!_optionalChain$l([window, 'optionalAccess', _36 => _36.coin98]) &&
!_optionalChain$l([window, 'optionalAccess', _37 => _37.coin98]) &&
// not Trust Wallet
!(_optionalChain$l([window, 'optionalAccess', _37 => _37.ethereum, 'optionalAccess', _38 => _38.isTrust]) || _optionalChain$l([window, 'optionalAccess', _39 => _39.ethereum, 'optionalAccess', _40 => _40.isTrustWallet])) &&
!(_optionalChain$l([window, 'optionalAccess', _38 => _38.ethereum, 'optionalAccess', _39 => _39.isTrust]) || _optionalChain$l([window, 'optionalAccess', _40 => _40.ethereum, 'optionalAccess', _41 => _41.isTrustWallet])) &&
// not crypto.com
!_optionalChain$l([window, 'optionalAccess', _41 => _41.ethereum, 'optionalAccess', _42 => _42.isDeficonnectProvider]) &&
!_optionalChain$l([window, 'optionalAccess', _42 => _42.ethereum, 'optionalAccess', _43 => _43.isDeficonnectProvider]) &&
// not HyperPay
!_optionalChain$l([window, 'optionalAccess', _43 => _43.ethereum, 'optionalAccess', _44 => _44.isHyperPay]) &&
!_optionalChain$l([window, 'optionalAccess', _44 => _44.ethereum, 'optionalAccess', _45 => _45.isHyperPay]) &&
// not Phantom
!(window.phantom && !window.glow && !_optionalChain$l([window, 'optionalAccess', _45 => _45.solana, 'optionalAccess', _46 => _46.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) &&
!(window.phantom && !window.glow && !_optionalChain$l([window, 'optionalAccess', _46 => _46.solana, 'optionalAccess', _47 => _47.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) &&
// not Rabby
!_optionalChain$l([window, 'optionalAccess', _47 => _47.ethereum, 'optionalAccess', _48 => _48.isRabby]) &&
!_optionalChain$l([window, 'optionalAccess', _48 => _48.ethereum, 'optionalAccess', _49 => _49.isRabby]) &&
// not Backpack
!_optionalChain$l([window, 'optionalAccess', _49 => _49.backpack, 'optionalAccess', _50 => _50.isBackpack]) &&
!_optionalChain$l([window, 'optionalAccess', _50 => _50.backpack, 'optionalAccess', _51 => _51.isBackpack]) &&
// not TokenPocket
!_optionalChain$l([window, 'optionalAccess', _51 => _51.ethereum, 'optionalAccess', _52 => _52.isTokenPocket]) &&
!_optionalChain$l([window, 'optionalAccess', _52 => _52.ethereum, 'optionalAccess', _53 => _53.isTokenPocket]) &&
// not BitKeep
!_optionalChain$l([window, 'optionalAccess', _53 => _53.ethereum, 'optionalAccess', _54 => _54.isBitKeep]) &&
!_optionalChain$l([window, 'optionalAccess', _54 => _54.ethereum, 'optionalAccess', _55 => _55.isBitKeep]) &&
// not Coinbase
!(_optionalChain$l([window, 'optionalAccess', _55 => _55.ethereum, 'optionalAccess', _56 => _56.isCoinbaseWallet]) || _optionalChain$l([window, 'optionalAccess', _57 => _57.ethereum, 'optionalAccess', _58 => _58.isWalletLink])) &&
!(_optionalChain$l([window, 'optionalAccess', _56 => _56.ethereum, 'optionalAccess', _57 => _57.isCoinbaseWallet]) || _optionalChain$l([window, 'optionalAccess', _58 => _58.ethereum, 'optionalAccess', _59 => _59.isWalletLink])) &&
// MetaMask through ProviderMap
!_optionalChain$l([window, 'optionalAccess', _59 => _59.ethereum, 'optionalAccess', _60 => _60.providerMap, 'optionalAccess', _61 => _61.has, 'call', _62 => _62('MetaMask')]) &&
!_optionalChain$l([window, 'optionalAccess', _60 => _60.ethereum, 'optionalAccess', _61 => _61.providerMap, 'optionalAccess', _62 => _62.has, 'call', _63 => _63('MetaMask')]) &&
// Brave Wallet
!_optionalChain$l([window, 'optionalAccess', _63 => _63.ethereum, 'optionalAccess', _64 => _64.isBraveWallet])
!_optionalChain$l([window, 'optionalAccess', _64 => _64.ethereum, 'optionalAccess', _65 => _65.isBraveWallet]) &&
// OKX Wallet
!_optionalChain$l([window, 'optionalAccess', _66 => _66.okxwallet])
)
};}

Expand Down
40 changes: 22 additions & 18 deletions dist/esm/index.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions dist/esm/index.solana.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 16 additions & 14 deletions dist/umd/index.evm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,33 +283,35 @@

static __initStatic2() {this.isAvailable = async()=>{
return (
_optionalChain$l([window, 'optionalAccess', _33 => _33.ethereum]) &&
_optionalChain$l([window, 'optionalAccess', _34 => _34.ethereum]) &&
// not MetaMask
!(_optionalChain$l([window, 'optionalAccess', _34 => _34.ethereum, 'optionalAccess', _35 => _35.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) &&
!(_optionalChain$l([window, 'optionalAccess', _35 => _35.ethereum, 'optionalAccess', _36 => _36.isMetaMask]) && Object.keys(window.ethereum).filter((key)=>key.match(/^is(?!Connected)(?!PocketUniverse)(?!RevokeCash)/)).length == 1) &&
// not Coin98
!_optionalChain$l([window, 'optionalAccess', _36 => _36.coin98]) &&
!_optionalChain$l([window, 'optionalAccess', _37 => _37.coin98]) &&
// not Trust Wallet
!(_optionalChain$l([window, 'optionalAccess', _37 => _37.ethereum, 'optionalAccess', _38 => _38.isTrust]) || _optionalChain$l([window, 'optionalAccess', _39 => _39.ethereum, 'optionalAccess', _40 => _40.isTrustWallet])) &&
!(_optionalChain$l([window, 'optionalAccess', _38 => _38.ethereum, 'optionalAccess', _39 => _39.isTrust]) || _optionalChain$l([window, 'optionalAccess', _40 => _40.ethereum, 'optionalAccess', _41 => _41.isTrustWallet])) &&
// not crypto.com
!_optionalChain$l([window, 'optionalAccess', _41 => _41.ethereum, 'optionalAccess', _42 => _42.isDeficonnectProvider]) &&
!_optionalChain$l([window, 'optionalAccess', _42 => _42.ethereum, 'optionalAccess', _43 => _43.isDeficonnectProvider]) &&
// not HyperPay
!_optionalChain$l([window, 'optionalAccess', _43 => _43.ethereum, 'optionalAccess', _44 => _44.isHyperPay]) &&
!_optionalChain$l([window, 'optionalAccess', _44 => _44.ethereum, 'optionalAccess', _45 => _45.isHyperPay]) &&
// not Phantom
!(window.phantom && !window.glow && !_optionalChain$l([window, 'optionalAccess', _45 => _45.solana, 'optionalAccess', _46 => _46.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) &&
!(window.phantom && !window.glow && !_optionalChain$l([window, 'optionalAccess', _46 => _46.solana, 'optionalAccess', _47 => _47.isGlow]) && !['isBitKeep'].some((identifier)=>window.solana && window.solana[identifier])) &&
// not Rabby
!_optionalChain$l([window, 'optionalAccess', _47 => _47.ethereum, 'optionalAccess', _48 => _48.isRabby]) &&
!_optionalChain$l([window, 'optionalAccess', _48 => _48.ethereum, 'optionalAccess', _49 => _49.isRabby]) &&
// not Backpack
!_optionalChain$l([window, 'optionalAccess', _49 => _49.backpack, 'optionalAccess', _50 => _50.isBackpack]) &&
!_optionalChain$l([window, 'optionalAccess', _50 => _50.backpack, 'optionalAccess', _51 => _51.isBackpack]) &&
// not TokenPocket
!_optionalChain$l([window, 'optionalAccess', _51 => _51.ethereum, 'optionalAccess', _52 => _52.isTokenPocket]) &&
!_optionalChain$l([window, 'optionalAccess', _52 => _52.ethereum, 'optionalAccess', _53 => _53.isTokenPocket]) &&
// not BitKeep
!_optionalChain$l([window, 'optionalAccess', _53 => _53.ethereum, 'optionalAccess', _54 => _54.isBitKeep]) &&
!_optionalChain$l([window, 'optionalAccess', _54 => _54.ethereum, 'optionalAccess', _55 => _55.isBitKeep]) &&
// not Coinbase
!(_optionalChain$l([window, 'optionalAccess', _55 => _55.ethereum, 'optionalAccess', _56 => _56.isCoinbaseWallet]) || _optionalChain$l([window, 'optionalAccess', _57 => _57.ethereum, 'optionalAccess', _58 => _58.isWalletLink])) &&
!(_optionalChain$l([window, 'optionalAccess', _56 => _56.ethereum, 'optionalAccess', _57 => _57.isCoinbaseWallet]) || _optionalChain$l([window, 'optionalAccess', _58 => _58.ethereum, 'optionalAccess', _59 => _59.isWalletLink])) &&
// MetaMask through ProviderMap
!_optionalChain$l([window, 'optionalAccess', _59 => _59.ethereum, 'optionalAccess', _60 => _60.providerMap, 'optionalAccess', _61 => _61.has, 'call', _62 => _62('MetaMask')]) &&
!_optionalChain$l([window, 'optionalAccess', _60 => _60.ethereum, 'optionalAccess', _61 => _61.providerMap, 'optionalAccess', _62 => _62.has, 'call', _63 => _63('MetaMask')]) &&
// Brave Wallet
!_optionalChain$l([window, 'optionalAccess', _63 => _63.ethereum, 'optionalAccess', _64 => _64.isBraveWallet])
!_optionalChain$l([window, 'optionalAccess', _64 => _64.ethereum, 'optionalAccess', _65 => _65.isBraveWallet]) &&
// OKX Wallet
!_optionalChain$l([window, 'optionalAccess', _66 => _66.okxwallet])
)
};}

Expand Down
Loading

0 comments on commit ae51550

Please sign in to comment.