@rango-dev/provider-brave 0.15.1-next.1 → 0.15.1-next.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +3 -3
- package/package.json +1 -1
- package/src/index.ts +33 -22
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { CanEagerConnect, CanSwitchNetwork, Connect, Subscribe, SwitchNetwork, WalletInfo } from '@rango-dev/wallets-shared';
|
|
2
|
+
import type { BlockchainMeta, SignerFactory } from 'rango-types';
|
|
3
|
+
import { Networks, WalletTypes } from '@rango-dev/wallets-shared';
|
|
2
4
|
import { brave as brave_instances } from './helpers';
|
|
3
|
-
import { SignerFactory, BlockchainMeta } from 'rango-types';
|
|
4
5
|
export declare const config: {
|
|
5
6
|
type: WalletTypes;
|
|
6
7
|
defaultNetwork: Networks;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,gBAAgB,EAChB,OAAO,EAEP,SAAS,EACT,aAAa,EACb,UAAU,EACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjE,OAAO,EAML,QAAQ,EAER,WAAW,EACZ,MAAM,2BAA2B,CAAC;AAQnC,OAAO,EAAE,KAAK,IAAI,eAAe,EAAE,MAAM,WAAW,CAAC;AAKrD,eAAO,MAAM,MAAM;;;CAGlB,CAAC;AAEF,eAAO,MAAM,WAAW,wBAAkB,CAAC;AAE3C,eAAO,MAAM,OAAO,EAAE,OA8CrB,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,SAkCvB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,aAAmC,CAAC;AAEhE,eAAO,MAAM,kBAAkB,EAAE,gBAAwC,CAAC;AAE1E,eAAO,MAAM,UAAU,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,aAAsB,CAAC;AAEnE,eAAO,MAAM,eAAe,EAAE,eAM7B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,CAAC,cAAc,EAAE,cAAc,EAAE,KAAK,UAcjE,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
var v=Object.defineProperty;var c=(e,n)=>v(e,"name",{value:n,configurable:!0});import{
|
|
1
|
+
var v=Object.defineProperty;var c=(e,n)=>v(e,"name",{value:n,configurable:!0});import{canEagerlyConnectToEvm as N,canSwitchNetworkToEvm as A,chooseInstance as m,getEvmAccounts as T,getSolanaAccounts as b,Networks as s,switchNetworkForEvm as C,WalletTypes as x}from"@rango-dev/wallets-shared";import{evmBlockchains as M,isEvmBlockchain as R,isSolanaBlockchain as L,solanaBlockchain as B}from"rango-types";import{Networks as w}from"@rango-dev/wallets-shared";function p(){let{ethereum:e,braveSolana:n}=window,t=new Map;return e?.isBraveWallet&&t.set(w.ETHEREUM,e),n&&t.set(w.SOLANA,n),t.size===0?null:t}c(p,"brave");import{DefaultEvmSigner as y}from"@rango-dev/signer-evm";import{DefaultSolanaSigner as k}from"@rango-dev/signer-solana";import{Networks as h,getNetworkInstance as u}from"@rango-dev/wallets-shared";import{DefaultSignerFactory as d,TransactionType as S}from"rango-types";function f(e){let n=u(e,h.ETHEREUM),t=u(e,h.SOLANA),r=new d;return r.registerSigner(S.EVM,new y(n)),r.registerSigner(S.SOLANA,new k(t)),r}c(f,"getSigners");var U=x.BRAVE,Q={type:U,defaultNetwork:s.ETHEREUM},X=p,Y=c(async({instance:e,meta:n})=>{let t=m(e,n,s.ETHEREUM),r=m(e,n,s.SOLANA),i=[],l=-32603,g="Please create or import a wallet",a=0;if(t)try{let o=await T(t);i.push(o)}catch(o){if(o.code===l)a+=1;else throw o}if(r)try{let o=await b({instance:r,meta:n});i.push(o)}catch(o){if(o.code===l)a+=1;else throw o}if(a===e.size)throw new Error(g);return i},"connect"),Z=c(({instance:e,updateAccounts:n,meta:t,state:r,updateChainId:i})=>{let l=m(e,t,s.ETHEREUM),g=m(e,t,s.SOLANA);l?.on("accountsChanged",a=>{let o=t.filter(R).find(E=>E.name===s.ETHEREUM)?.chainId;r.connected&&(r.network!=s.ETHEREUM&&o&&i(o),n(a))}),l?.on("chainChanged",a=>{i(a)}),g?.on("accountChanged",async()=>{r.network!=s.SOLANA&&i(t.filter(L)[0].chainId);let o=(await g.connect()).publicKey.toString();n([o])})},"subscribe"),$=C,ee=A,te=f,ne=c(async({instance:e,meta:n})=>{let t=m(e,n,s.ETHEREUM);return t?N({instance:t,meta:n}):Promise.resolve(!1)},"canEagerConnect"),oe=c(e=>{let n=M(e),t=B(e);return{name:"Brave",img:"https://raw.githubusercontent.com/rango-exchange/rango-assets/main/wallets/brave/icon.svg",installLink:{DEFAULT:"https://brave.com/wallet/"},color:"#ef342f",supportedChains:[...n,...t]}},"getWalletInfo");export{ne as canEagerConnect,ee as canSwitchNetworkTo,Q as config,Y as connect,X as getInstance,te as getSigners,oe as getWalletInfo,Z as subscribe,$ as switchNetwork};
|
|
2
2
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/index.ts", "../src/helpers.ts", "../src/signer.ts"],
|
|
4
|
-
"sourcesContent": ["import {\n
|
|
5
|
-
"mappings": "+
|
|
6
|
-
"names": ["
|
|
4
|
+
"sourcesContent": ["import type {\n CanEagerConnect,\n CanSwitchNetwork,\n Connect,\n ProviderConnectResult,\n Subscribe,\n SwitchNetwork,\n WalletInfo,\n} from '@rango-dev/wallets-shared';\nimport type { BlockchainMeta, SignerFactory } from 'rango-types';\n\nimport {\n canEagerlyConnectToEvm,\n canSwitchNetworkToEvm,\n chooseInstance,\n getEvmAccounts,\n getSolanaAccounts,\n Networks,\n switchNetworkForEvm,\n WalletTypes,\n} from '@rango-dev/wallets-shared';\nimport {\n evmBlockchains,\n isEvmBlockchain,\n isSolanaBlockchain,\n solanaBlockchain,\n} from 'rango-types';\n\nimport { brave as brave_instances } from './helpers';\nimport signer from './signer';\n\nconst WALLET = WalletTypes.BRAVE;\n\nexport const config = {\n type: WALLET,\n defaultNetwork: Networks.ETHEREUM,\n};\n\nexport const getInstance = brave_instances;\n\nexport const connect: Connect = async ({ instance, meta }) => {\n const evm_instance = chooseInstance(instance, meta, Networks.ETHEREUM);\n const sol_instance = chooseInstance(instance, meta, Networks.SOLANA);\n const results: ProviderConnectResult[] = [];\n const emptyWalletErrorCode = -32603;\n const emptyWalletCustomErrorMessage = 'Please create or import a wallet';\n let numberOfEmptyWallets = 0;\n\n if (evm_instance) {\n try {\n const evmAccounts = await getEvmAccounts(evm_instance);\n results.push(evmAccounts);\n } catch (error) {\n // To resolve this error: Catch clause variable type annotation must be any or unknown if specified\n const err = error as { code: number };\n if (err.code === emptyWalletErrorCode) {\n numberOfEmptyWallets += 1;\n } else {\n throw error;\n }\n }\n }\n\n if (sol_instance) {\n try {\n const solanaAccounts = await getSolanaAccounts({\n instance: sol_instance,\n meta,\n });\n results.push(solanaAccounts as ProviderConnectResult);\n } catch (error) {\n // To resolve this error: Catch clause variable type annotation must be any or unknown if specified\n const err = error as { code: number };\n if (err.code === emptyWalletErrorCode) {\n numberOfEmptyWallets += 1;\n } else {\n throw error;\n }\n }\n }\n\n if (numberOfEmptyWallets === instance.size) {\n throw new Error(emptyWalletCustomErrorMessage);\n }\n\n return results;\n};\n\nexport const subscribe: Subscribe = ({\n instance,\n updateAccounts,\n meta,\n state,\n updateChainId,\n}) => {\n const evm_instance = chooseInstance(instance, meta, Networks.ETHEREUM);\n const sol_instance = chooseInstance(instance, meta, Networks.SOLANA);\n\n evm_instance?.on('accountsChanged', (addresses: string[]) => {\n const eth_chainId = meta\n .filter(isEvmBlockchain)\n .find((blockchain) => blockchain.name === Networks.ETHEREUM)?.chainId;\n if (state.connected) {\n if (state.network != Networks.ETHEREUM && eth_chainId) {\n updateChainId(eth_chainId);\n }\n updateAccounts(addresses);\n }\n });\n\n evm_instance?.on('chainChanged', (chainId: string) => {\n updateChainId(chainId);\n });\n\n sol_instance?.on('accountChanged', async () => {\n if (state.network != Networks.SOLANA) {\n updateChainId(meta.filter(isSolanaBlockchain)[0].chainId);\n }\n const response = await sol_instance.connect();\n const account: string = response.publicKey.toString();\n updateAccounts([account]);\n });\n};\n\nexport const switchNetwork: SwitchNetwork = switchNetworkForEvm;\n\nexport const canSwitchNetworkTo: CanSwitchNetwork = canSwitchNetworkToEvm;\n\nexport const getSigners: (provider: any) => SignerFactory = signer;\n\nexport const canEagerConnect: CanEagerConnect = async ({ instance, meta }) => {\n const evm_instance = chooseInstance(instance, meta, Networks.ETHEREUM);\n if (evm_instance) {\n return canEagerlyConnectToEvm({ instance: evm_instance, meta });\n }\n return Promise.resolve(false);\n};\n\nexport const getWalletInfo: (allBlockChains: BlockchainMeta[]) => WalletInfo = (\n allBlockChains\n) => {\n const evms = evmBlockchains(allBlockChains);\n const solana = solanaBlockchain(allBlockChains);\n return {\n name: 'Brave',\n img: 'https://raw.githubusercontent.com/rango-exchange/rango-assets/main/wallets/brave/icon.svg',\n installLink: {\n DEFAULT: 'https://brave.com/wallet/',\n },\n color: '#ef342f',\n supportedChains: [...evms, ...solana],\n };\n};\n", "import { Networks } from '@rango-dev/wallets-shared';\n\nexport function brave() {\n const { ethereum, braveSolana } = window;\n\n const instances = new Map();\n\n if (ethereum?.isBraveWallet) instances.set(Networks.ETHEREUM, ethereum);\n if (braveSolana) instances.set(Networks.SOLANA, braveSolana);\n\n if (instances.size === 0) return null;\n\n return instances;\n}\n", "import { DefaultEvmSigner } from '@rango-dev/signer-evm';\nimport { DefaultSolanaSigner } from '@rango-dev/signer-solana';\nimport { Networks, getNetworkInstance } from '@rango-dev/wallets-shared';\nimport {\n DefaultSignerFactory,\n SignerFactory,\n TransactionType as TxType,\n} from 'rango-types';\n\nexport default function getSigners(provider: any): SignerFactory {\n const ethProvider = getNetworkInstance(provider, Networks.ETHEREUM);\n const solProvider = getNetworkInstance(provider, Networks.SOLANA);\n const signers = new DefaultSignerFactory();\n signers.registerSigner(TxType.EVM, new DefaultEvmSigner(ethProvider));\n signers.registerSigner(TxType.SOLANA, new DefaultSolanaSigner(solProvider));\n return signers;\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["canEagerlyConnectToEvm", "canSwitchNetworkToEvm", "chooseInstance", "getEvmAccounts", "getSolanaAccounts", "Networks", "switchNetworkForEvm", "WalletTypes", "evmBlockchains", "isEvmBlockchain", "isSolanaBlockchain", "solanaBlockchain", "Networks", "brave", "ethereum", "braveSolana", "instances", "Networks", "__name", "DefaultEvmSigner", "DefaultSolanaSigner", "Networks", "getNetworkInstance", "DefaultSignerFactory", "TxType", "getSigners", "provider", "ethProvider", "getNetworkInstance", "Networks", "solProvider", "signers", "DefaultSignerFactory", "TxType", "DefaultEvmSigner", "DefaultSolanaSigner", "__name", "WALLET", "WalletTypes", "config", "Networks", "getInstance", "brave", "connect", "__name", "instance", "meta", "evm_instance", "chooseInstance", "sol_instance", "results", "emptyWalletErrorCode", "emptyWalletCustomErrorMessage", "numberOfEmptyWallets", "evmAccounts", "getEvmAccounts", "error", "solanaAccounts", "getSolanaAccounts", "subscribe", "updateAccounts", "state", "updateChainId", "addresses", "eth_chainId", "isEvmBlockchain", "blockchain", "chainId", "isSolanaBlockchain", "account", "switchNetwork", "switchNetworkForEvm", "canSwitchNetworkTo", "canSwitchNetworkToEvm", "getSigners", "canEagerConnect", "canEagerlyConnectToEvm", "getWalletInfo", "allBlockChains", "evms", "evmBlockchains", "solana", "solanaBlockchain"]
|
|
7
7
|
}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -1,31 +1,34 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
WalletTypes,
|
|
4
|
-
canSwitchNetworkToEvm,
|
|
5
|
-
chooseInstance,
|
|
6
|
-
getEvmAccounts,
|
|
7
|
-
switchNetworkForEvm,
|
|
1
|
+
import type {
|
|
2
|
+
CanEagerConnect,
|
|
8
3
|
CanSwitchNetwork,
|
|
9
4
|
Connect,
|
|
10
5
|
ProviderConnectResult,
|
|
11
6
|
Subscribe,
|
|
12
7
|
SwitchNetwork,
|
|
13
8
|
WalletInfo,
|
|
14
|
-
|
|
15
|
-
|
|
9
|
+
} from '@rango-dev/wallets-shared';
|
|
10
|
+
import type { BlockchainMeta, SignerFactory } from 'rango-types';
|
|
11
|
+
|
|
12
|
+
import {
|
|
16
13
|
canEagerlyConnectToEvm,
|
|
14
|
+
canSwitchNetworkToEvm,
|
|
15
|
+
chooseInstance,
|
|
16
|
+
getEvmAccounts,
|
|
17
|
+
getSolanaAccounts,
|
|
18
|
+
Networks,
|
|
19
|
+
switchNetworkForEvm,
|
|
20
|
+
WalletTypes,
|
|
17
21
|
} from '@rango-dev/wallets-shared';
|
|
18
|
-
import { brave as brave_instances } from './helpers';
|
|
19
|
-
import signer from './signer';
|
|
20
22
|
import {
|
|
21
|
-
|
|
23
|
+
evmBlockchains,
|
|
22
24
|
isEvmBlockchain,
|
|
23
25
|
isSolanaBlockchain,
|
|
24
|
-
BlockchainMeta,
|
|
25
|
-
evmBlockchains,
|
|
26
26
|
solanaBlockchain,
|
|
27
27
|
} from 'rango-types';
|
|
28
28
|
|
|
29
|
+
import { brave as brave_instances } from './helpers';
|
|
30
|
+
import signer from './signer';
|
|
31
|
+
|
|
29
32
|
const WALLET = WalletTypes.BRAVE;
|
|
30
33
|
|
|
31
34
|
export const config = {
|
|
@@ -52,7 +55,9 @@ export const connect: Connect = async ({ instance, meta }) => {
|
|
|
52
55
|
const err = error as { code: number };
|
|
53
56
|
if (err.code === emptyWalletErrorCode) {
|
|
54
57
|
numberOfEmptyWallets += 1;
|
|
55
|
-
} else
|
|
58
|
+
} else {
|
|
59
|
+
throw error;
|
|
60
|
+
}
|
|
56
61
|
}
|
|
57
62
|
}
|
|
58
63
|
|
|
@@ -68,12 +73,15 @@ export const connect: Connect = async ({ instance, meta }) => {
|
|
|
68
73
|
const err = error as { code: number };
|
|
69
74
|
if (err.code === emptyWalletErrorCode) {
|
|
70
75
|
numberOfEmptyWallets += 1;
|
|
71
|
-
} else
|
|
76
|
+
} else {
|
|
77
|
+
throw error;
|
|
78
|
+
}
|
|
72
79
|
}
|
|
73
80
|
}
|
|
74
81
|
|
|
75
|
-
if (numberOfEmptyWallets === instance.size)
|
|
82
|
+
if (numberOfEmptyWallets === instance.size) {
|
|
76
83
|
throw new Error(emptyWalletCustomErrorMessage);
|
|
84
|
+
}
|
|
77
85
|
|
|
78
86
|
return results;
|
|
79
87
|
};
|
|
@@ -93,8 +101,9 @@ export const subscribe: Subscribe = ({
|
|
|
93
101
|
.filter(isEvmBlockchain)
|
|
94
102
|
.find((blockchain) => blockchain.name === Networks.ETHEREUM)?.chainId;
|
|
95
103
|
if (state.connected) {
|
|
96
|
-
if (state.network != Networks.ETHEREUM && eth_chainId)
|
|
104
|
+
if (state.network != Networks.ETHEREUM && eth_chainId) {
|
|
97
105
|
updateChainId(eth_chainId);
|
|
106
|
+
}
|
|
98
107
|
updateAccounts(addresses);
|
|
99
108
|
}
|
|
100
109
|
});
|
|
@@ -104,8 +113,9 @@ export const subscribe: Subscribe = ({
|
|
|
104
113
|
});
|
|
105
114
|
|
|
106
115
|
sol_instance?.on('accountChanged', async () => {
|
|
107
|
-
if (state.network != Networks.SOLANA)
|
|
116
|
+
if (state.network != Networks.SOLANA) {
|
|
108
117
|
updateChainId(meta.filter(isSolanaBlockchain)[0].chainId);
|
|
118
|
+
}
|
|
109
119
|
const response = await sol_instance.connect();
|
|
110
120
|
const account: string = response.publicKey.toString();
|
|
111
121
|
updateAccounts([account]);
|
|
@@ -118,11 +128,12 @@ export const canSwitchNetworkTo: CanSwitchNetwork = canSwitchNetworkToEvm;
|
|
|
118
128
|
|
|
119
129
|
export const getSigners: (provider: any) => SignerFactory = signer;
|
|
120
130
|
|
|
121
|
-
export const canEagerConnect: CanEagerConnect = ({ instance, meta }) => {
|
|
131
|
+
export const canEagerConnect: CanEagerConnect = async ({ instance, meta }) => {
|
|
122
132
|
const evm_instance = chooseInstance(instance, meta, Networks.ETHEREUM);
|
|
123
133
|
if (evm_instance) {
|
|
124
134
|
return canEagerlyConnectToEvm({ instance: evm_instance, meta });
|
|
125
|
-
}
|
|
135
|
+
}
|
|
136
|
+
return Promise.resolve(false);
|
|
126
137
|
};
|
|
127
138
|
|
|
128
139
|
export const getWalletInfo: (allBlockChains: BlockchainMeta[]) => WalletInfo = (
|
|
@@ -132,7 +143,7 @@ export const getWalletInfo: (allBlockChains: BlockchainMeta[]) => WalletInfo = (
|
|
|
132
143
|
const solana = solanaBlockchain(allBlockChains);
|
|
133
144
|
return {
|
|
134
145
|
name: 'Brave',
|
|
135
|
-
img: 'https://raw.githubusercontent.com/rango-exchange/rango-
|
|
146
|
+
img: 'https://raw.githubusercontent.com/rango-exchange/rango-assets/main/wallets/brave/icon.svg',
|
|
136
147
|
installLink: {
|
|
137
148
|
DEFAULT: 'https://brave.com/wallet/',
|
|
138
149
|
},
|