@rango-dev/provider-brave 0.5.0 → 0.5.1-next.1
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 +2 -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 +10 -6
- package/src/helpers.ts +3 -3
- package/src/index.ts +9 -9
- package/src/signer.ts +3 -3
package/dist/index.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Networks, WalletTypes, CanSwitchNetwork, Connect, Subscribe, SwitchNetwork, WalletInfo } from '@rango-dev/wallets-shared';
|
|
2
2
|
import { brave as brave_instances } from './helpers';
|
|
3
3
|
import { SignerFactory, BlockchainMeta } from 'rango-types';
|
|
4
4
|
export declare const config: {
|
|
5
5
|
type: WalletTypes;
|
|
6
|
-
defaultNetwork:
|
|
6
|
+
defaultNetwork: Networks;
|
|
7
7
|
};
|
|
8
8
|
export declare const getInstance: typeof brave_instances;
|
|
9
9
|
export declare const connect: Connect;
|
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,EACL,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,WAAW,EAKX,gBAAgB,EAChB,OAAO,EAEP,SAAS,EACT,aAAa,EACb,UAAU,EAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,IAAI,eAAe,EAAE,MAAM,WAAW,CAAC;AAErD,OAAO,EACL,aAAa,EAGb,cAAc,EAGf,MAAM,aAAa,CAAC;AAIrB,eAAO,MAAM,MAAM;;;CAGlB,CAAC;AAEF,eAAO,MAAM,WAAW,wBAAkB,CAAC;AAE3C,eAAO,MAAM,OAAO,EAAE,OAyCrB,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,SAgCvB,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,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 s=(e,o)=>v(e,"name",{value:o,configurable:!0});import{
|
|
1
|
+
var v=Object.defineProperty;var s=(e,o)=>v(e,"name",{value:o,configurable:!0});import{Networks as a,WalletTypes as A,canSwitchNetworkToEvm as b,chooseInstance as m,getEvmAccounts as d,switchNetworkForEvm as T,getSolanaAccounts as x}from"@rango-dev/wallets-shared";import{Networks as p}from"@rango-dev/wallets-shared";function h(){let{ethereum:e,braveSolana:o}=window,t=new Map;return e?.isBraveWallet&&t.set(p.ETHEREUM,e),o&&t.set(p.SOLANA,o),t.size===0?null:t}s(h,"brave");import{DefaultEvmSigner as k}from"@rango-dev/signer-evm";import{DefaultSolanaSigner as y}from"@rango-dev/signer-solana";import{Networks as u,getNetworkInstance as E}from"@rango-dev/wallets-shared";import{DefaultSignerFactory as N,TransactionType as S}from"rango-types";function g(e){let o=E(e,u.ETHEREUM),t=E(e,u.SOLANA),r=new N;return r.registerSigner(S.EVM,new k(o)),r.registerSigner(S.SOLANA,new y(t)),r}s(g,"getSigners");import{isEvmBlockchain as M,isSolanaBlockchain as C,evmBlockchains as R,solanaBlockchain as L}from"rango-types";var B=A.BRAVE,oe={type:B,defaultNetwork:a.ETHEREUM},ne=h,re=s(async({instance:e,meta:o})=>{let t=m(e,o,a.ETHEREUM),r=m(e,o,a.SOLANA),i=[],l=-32603,w="Please create or import a wallet",c=0;if(t)try{let n=await d(t);i.push(n)}catch(n){if(n.code===l)c+=1;else throw n}if(r)try{let n=await x({instance:r,meta:o});i.push(n)}catch(n){if(n.code===l)c+=1;else throw n}if(c===e.size)throw new Error(w);return i},"connect"),ce=s(({instance:e,updateAccounts:o,meta:t,state:r,updateChainId:i})=>{let l=m(e,t,a.ETHEREUM),w=m(e,t,a.SOLANA);l?.on("accountsChanged",c=>{let n=t.filter(M).find(f=>f.name===a.ETHEREUM)?.chainId;r.connected&&(r.network!=a.ETHEREUM&&n&&i(n),o(c))}),l?.on("chainChanged",c=>{i(c)}),w?.on("accountChanged",async()=>{r.network!=a.SOLANA&&i(t.filter(C)[0].chainId);let n=(await w.connect()).publicKey.toString();o([n])})},"subscribe"),se=T,ae=b,ie=g,le=s(e=>{let o=R(e),t=L(e);return{name:"Brave",img:"https://raw.githubusercontent.com/rango-exchange/rango-types/main/assets/icons/wallets/brave.png",installLink:{DEFAULT:"https://brave.com/wallet/"},color:"#ef342f",supportedChains:[...o,...t]}},"getWalletInfo");export{ae as canSwitchNetworkTo,oe as config,re as connect,ne as getInstance,ie as getSigners,le as getWalletInfo,ce as subscribe,se 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": "+EAAA,OACE,
|
|
6
|
-
"names": ["
|
|
4
|
+
"sourcesContent": ["import {\n Networks,\n WalletTypes,\n canSwitchNetworkToEvm,\n chooseInstance,\n getEvmAccounts,\n switchNetworkForEvm,\n CanSwitchNetwork,\n Connect,\n ProviderConnectResult,\n Subscribe,\n SwitchNetwork,\n WalletInfo,\n getSolanaAccounts,\n} from '@rango-dev/wallets-shared';\nimport { brave as brave_instances } from './helpers';\nimport signer from './signer';\nimport {\n SignerFactory,\n isEvmBlockchain,\n isSolanaBlockchain,\n BlockchainMeta,\n evmBlockchains,\n solanaBlockchain,\n} from 'rango-types';\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 throw error;\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 throw error;\n }\n }\n\n if (numberOfEmptyWallets === instance.size)\n throw new Error(emptyWalletCustomErrorMessage);\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 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 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 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-types/main/assets/icons/wallets/brave.png',\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": ["Networks", "WalletTypes", "canSwitchNetworkToEvm", "chooseInstance", "getEvmAccounts", "switchNetworkForEvm", "getSolanaAccounts", "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", "isEvmBlockchain", "isSolanaBlockchain", "evmBlockchains", "solanaBlockchain", "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", "getWalletInfo", "allBlockChains", "evms", "evmBlockchains", "solana", "solanaBlockchain"]
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rango-dev/provider-brave",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.1-next.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
|
-
"module": "dist/index.js",
|
|
6
|
+
"module": "./dist/index.js",
|
|
7
|
+
"main": "./dist/index.js",
|
|
8
|
+
"exports": {
|
|
9
|
+
".": "./dist/index.js"
|
|
10
|
+
},
|
|
7
11
|
"typings": "dist/index.d.ts",
|
|
8
12
|
"files": [
|
|
9
13
|
"dist",
|
|
@@ -16,10 +20,10 @@
|
|
|
16
20
|
"lint": "eslint \"**/*.{ts,tsx}\" --ignore-path ../../.eslintignore"
|
|
17
21
|
},
|
|
18
22
|
"dependencies": {
|
|
19
|
-
"@rango-dev/signer-evm": "^0.5.0",
|
|
20
|
-
"@rango-dev/signer-solana": "^0.5.0",
|
|
21
|
-
"@rango-dev/wallets-shared": "^0.5.0",
|
|
22
|
-
"rango-types": "^0.1.
|
|
23
|
+
"@rango-dev/signer-evm": "^0.5.1-next.0",
|
|
24
|
+
"@rango-dev/signer-solana": "^0.5.1-next.0",
|
|
25
|
+
"@rango-dev/wallets-shared": "^0.5.1-next.0",
|
|
26
|
+
"rango-types": "^0.1.39"
|
|
23
27
|
},
|
|
24
28
|
"publishConfig": {
|
|
25
29
|
"access": "public"
|
package/src/helpers.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Networks } from '@rango-dev/wallets-shared';
|
|
2
2
|
|
|
3
3
|
export function brave() {
|
|
4
4
|
const { ethereum, braveSolana } = window;
|
|
5
5
|
|
|
6
6
|
const instances = new Map();
|
|
7
7
|
|
|
8
|
-
if (ethereum?.isBraveWallet) instances.set(
|
|
9
|
-
if (
|
|
8
|
+
if (ethereum?.isBraveWallet) instances.set(Networks.ETHEREUM, ethereum);
|
|
9
|
+
if (braveSolana) instances.set(Networks.SOLANA, braveSolana);
|
|
10
10
|
|
|
11
11
|
if (instances.size === 0) return null;
|
|
12
12
|
|
package/src/index.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
2
|
+
Networks,
|
|
3
3
|
WalletTypes,
|
|
4
4
|
canSwitchNetworkToEvm,
|
|
5
5
|
chooseInstance,
|
|
@@ -28,14 +28,14 @@ const WALLET = WalletTypes.BRAVE;
|
|
|
28
28
|
|
|
29
29
|
export const config = {
|
|
30
30
|
type: WALLET,
|
|
31
|
-
defaultNetwork:
|
|
31
|
+
defaultNetwork: Networks.ETHEREUM,
|
|
32
32
|
};
|
|
33
33
|
|
|
34
34
|
export const getInstance = brave_instances;
|
|
35
35
|
|
|
36
36
|
export const connect: Connect = async ({ instance, meta }) => {
|
|
37
|
-
const evm_instance = chooseInstance(instance, meta,
|
|
38
|
-
const sol_instance = chooseInstance(instance, meta,
|
|
37
|
+
const evm_instance = chooseInstance(instance, meta, Networks.ETHEREUM);
|
|
38
|
+
const sol_instance = chooseInstance(instance, meta, Networks.SOLANA);
|
|
39
39
|
const results: ProviderConnectResult[] = [];
|
|
40
40
|
const emptyWalletErrorCode = -32603;
|
|
41
41
|
const emptyWalletCustomErrorMessage = 'Please create or import a wallet';
|
|
@@ -83,15 +83,15 @@ export const subscribe: Subscribe = ({
|
|
|
83
83
|
state,
|
|
84
84
|
updateChainId,
|
|
85
85
|
}) => {
|
|
86
|
-
const evm_instance = chooseInstance(instance, meta,
|
|
87
|
-
const sol_instance = chooseInstance(instance, meta,
|
|
86
|
+
const evm_instance = chooseInstance(instance, meta, Networks.ETHEREUM);
|
|
87
|
+
const sol_instance = chooseInstance(instance, meta, Networks.SOLANA);
|
|
88
88
|
|
|
89
89
|
evm_instance?.on('accountsChanged', (addresses: string[]) => {
|
|
90
90
|
const eth_chainId = meta
|
|
91
91
|
.filter(isEvmBlockchain)
|
|
92
|
-
.find((blockchain) => blockchain.name ===
|
|
92
|
+
.find((blockchain) => blockchain.name === Networks.ETHEREUM)?.chainId;
|
|
93
93
|
if (state.connected) {
|
|
94
|
-
if (state.network !=
|
|
94
|
+
if (state.network != Networks.ETHEREUM && eth_chainId)
|
|
95
95
|
updateChainId(eth_chainId);
|
|
96
96
|
updateAccounts(addresses);
|
|
97
97
|
}
|
|
@@ -102,7 +102,7 @@ export const subscribe: Subscribe = ({
|
|
|
102
102
|
});
|
|
103
103
|
|
|
104
104
|
sol_instance?.on('accountChanged', async () => {
|
|
105
|
-
if (state.network !=
|
|
105
|
+
if (state.network != Networks.SOLANA)
|
|
106
106
|
updateChainId(meta.filter(isSolanaBlockchain)[0].chainId);
|
|
107
107
|
const response = await sol_instance.connect();
|
|
108
108
|
const account: string = response.publicKey.toString();
|
package/src/signer.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DefaultEvmSigner } from '@rango-dev/signer-evm';
|
|
2
2
|
import { DefaultSolanaSigner } from '@rango-dev/signer-solana';
|
|
3
|
-
import {
|
|
3
|
+
import { Networks, getNetworkInstance } from '@rango-dev/wallets-shared';
|
|
4
4
|
import {
|
|
5
5
|
DefaultSignerFactory,
|
|
6
6
|
SignerFactory,
|
|
@@ -8,8 +8,8 @@ import {
|
|
|
8
8
|
} from 'rango-types';
|
|
9
9
|
|
|
10
10
|
export default function getSigners(provider: any): SignerFactory {
|
|
11
|
-
const ethProvider = getNetworkInstance(provider,
|
|
12
|
-
const solProvider = getNetworkInstance(provider,
|
|
11
|
+
const ethProvider = getNetworkInstance(provider, Networks.ETHEREUM);
|
|
12
|
+
const solProvider = getNetworkInstance(provider, Networks.SOLANA);
|
|
13
13
|
const signers = new DefaultSignerFactory();
|
|
14
14
|
signers.registerSigner(TxType.EVM, new DefaultEvmSigner(ethProvider));
|
|
15
15
|
signers.registerSigner(TxType.SOLANA, new DefaultSolanaSigner(solProvider));
|