@rango-dev/provider-coinbase 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/helpers.d.ts.map +1 -1
- 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 +4 -4
- package/src/index.ts +9 -9
- package/src/signer.ts +3 -3
package/dist/helpers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAE5E,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,GAAG,GACZ,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAelC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Networks, WalletTypes, CanSwitchNetwork, Connect, Subscribe, SwitchNetwork, getCoinbaseInstance as coinbase_instance, WalletInfo } from '@rango-dev/wallets-shared';
|
|
2
2
|
import { SignerFactory, BlockchainMeta } from 'rango-types';
|
|
3
3
|
export declare const config: {
|
|
4
4
|
type: WalletTypes;
|
|
5
|
-
defaultNetwork:
|
|
5
|
+
defaultNetwork: Networks;
|
|
6
6
|
};
|
|
7
7
|
export declare const getInstance: typeof coinbase_instance;
|
|
8
8
|
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,EACX,gBAAgB,EAChB,OAAO,EAEP,SAAS,EACT,aAAa,EAKb,mBAAmB,IAAI,iBAAiB,EACxC,UAAU,EACX,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,aAAa,EAEb,cAAc,EAIf,MAAM,aAAa,CAAC;AAKrB,eAAO,MAAM,MAAM;;;CAGlB,CAAC;AAEF,eAAO,MAAM,WAAW,0BAAoB,CAAC;AAC7C,eAAO,MAAM,OAAO,EAAE,OAgBrB,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,SAkCvB,CAAC;AACF,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,UAkBjE,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
var k=Object.defineProperty;var c=(t,n)=>k(t,"name",{value:n,configurable:!0});import{
|
|
1
|
+
var k=Object.defineProperty;var c=(t,n)=>k(t,"name",{value:n,configurable:!0});import{Networks as a,WalletTypes as v,canSwitchNetworkToEvm as C,chooseInstance as w,getEvmAccounts as y,switchNetworkForEvm as I,getCoinbaseInstance as T}from"@rango-dev/wallets-shared";import{Networks as u}from"@rango-dev/wallets-shared";async function S(t){let n=await t.get(u.SOLANA),o=[];if(n){await n.connect();let e=n.publicKey.toString();o.push({accounts:e?[e]:[],chainId:u.SOLANA})}return o}c(S,"getSolanaAccounts");import{isEvmBlockchain as x,evmBlockchains as R,solanaBlockchain as L,isSolanaBlockchain as M}from"rango-types";import{DefaultEvmSigner as A}from"@rango-dev/signer-evm";import{DefaultSolanaSigner as N}from"@rango-dev/signer-solana";import{Networks as d,getNetworkInstance as p}from"@rango-dev/wallets-shared";import{DefaultSignerFactory as b,TransactionType as E}from"rango-types";function m(t){let n=p(t,d.ETHEREUM),o=p(t,d.SOLANA),e=new b;return e.registerSigner(E.EVM,new A(n)),e.registerSigner(E.SOLANA,new N(o)),e}c(m,"getSigners");var O=v.COINBASE,ct={type:O,defaultNetwork:a.ETHEREUM},at=T,st=c(async({instance:t,meta:n})=>{let o=w(t,n,a.ETHEREUM),e=[];if(o){let s=await y(o);e.push(s)}let r=await S(t);return e=[...e,...r],e},"connect"),rt=c(t=>{let n=w(t.instance,t.meta,a.ETHEREUM),o=w(t.instance,t.meta,a.SOLANA),{connect:e,updateAccounts:r,state:s,updateChainId:h,meta:f}=t;n?.on("accountsChanged",i=>{let l=f.filter(x).find(g=>g.name===a.ETHEREUM)?.chainId;s.connected&&(s.network!=a.ETHEREUM&&l&&h(l),r(i))}),o?.on("accountChanged",async i=>{s.network!=a.SOLANA&&h(f.filter(M)[0].chainId);let l=a.SOLANA;if(i){let g=i.toString();r([g])}else e(l)})},"subscribe"),it=I,lt=C,gt=m,mt=c(t=>{let n=R(t),o=L(t);return{name:"Coinbase",img:"https://raw.githubusercontent.com/rango-exchange/rango-types/main/assets/icons/wallets/coinbase.svg",installLink:{CHROME:"https://chrome.google.com/webstore/detail/coinbase-wallet-extension/hnfanknocfeofbddgcijnmhnfnkdnaad",BRAVE:"https://chrome.google.com/webstore/detail/coinbase-wallet-extension/hnfanknocfeofbddgcijnmhnfnkdnaad",DEFAULT:"https://www.coinbase.com/wallet"},color:"#2a62f5",supportedChains:[...n,...o]}},"getWalletInfo");export{lt as canSwitchNetworkTo,ct as config,st as connect,at as getInstance,gt as getSigners,mt as getWalletInfo,rt as subscribe,it 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 CanSwitchNetwork,\n Connect,\n ProviderConnectResult,\n Subscribe,\n SwitchNetwork,\n canSwitchNetworkToEvm,\n chooseInstance,\n getEvmAccounts,\n switchNetworkForEvm,\n getCoinbaseInstance as coinbase_instance,\n WalletInfo,\n} from '@rango-dev/wallets-shared';\nimport { getSolanaAccounts } from './helpers';\nimport {\n SignerFactory,\n isEvmBlockchain,\n BlockchainMeta,\n evmBlockchains,\n solanaBlockchain,\n isSolanaBlockchain,\n} from 'rango-types';\nimport signer from './signer';\n\nconst WALLET = WalletTypes.COINBASE;\n\nexport const config = {\n type: WALLET,\n defaultNetwork: Networks.ETHEREUM,\n};\n\nexport const getInstance = coinbase_instance;\nexport const connect: Connect = async ({ instance, meta }) => {\n // Note: We need to get `chainId` here, because for the first time\n // after opening the browser, wallet is locked, and don't give us accounts and chainId\n // on `check` phase, so `network` will be null. For this case we need to get chainId\n // whenever we are requesting accounts.\n const evm_instance = chooseInstance(instance, meta, Networks.ETHEREUM);\n let results: ProviderConnectResult[] = [];\n\n if (evm_instance) {\n const evm = await getEvmAccounts(evm_instance);\n results.push(evm);\n }\n\n const solanaResults = await getSolanaAccounts(instance);\n results = [...results, ...solanaResults];\n return results;\n};\n\nexport const subscribe: Subscribe = (options) => {\n const ethInstance = chooseInstance(\n options.instance,\n options.meta,\n Networks.ETHEREUM\n );\n const solanaInstance = chooseInstance(\n options.instance,\n options.meta,\n Networks.SOLANA\n );\n const { connect, updateAccounts, state, updateChainId, meta } = options;\n ethInstance?.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 solanaInstance?.on('accountChanged', async (publicKey: string) => {\n if (state.network != Networks.SOLANA)\n updateChainId(meta.filter(isSolanaBlockchain)[0].chainId);\n const network = Networks.SOLANA;\n if (publicKey) {\n const account = publicKey.toString();\n updateAccounts([account]);\n } else {\n connect(network);\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: 'Coinbase',\n img: 'https://raw.githubusercontent.com/rango-exchange/rango-types/main/assets/icons/wallets/coinbase.svg',\n installLink: {\n CHROME:\n 'https://chrome.google.com/webstore/detail/coinbase-wallet-extension/hnfanknocfeofbddgcijnmhnfnkdnaad',\n BRAVE:\n 'https://chrome.google.com/webstore/detail/coinbase-wallet-extension/hnfanknocfeofbddgcijnmhnfnkdnaad',\n DEFAULT: 'https://www.coinbase.com/wallet',\n },\n color: '#2a62f5',\n supportedChains: [...evms, ...solana],\n };\n};\n", "import { Networks, ProviderConnectResult } from '@rango-dev/wallets-shared';\n\nexport async function getSolanaAccounts(\n instance: any\n): Promise<ProviderConnectResult[]> {\n const solanaInstance = await instance.get(Networks.SOLANA);\n const results: ProviderConnectResult[] = [];\n\n if (solanaInstance) {\n await solanaInstance.connect();\n const account = solanaInstance.publicKey.toString();\n\n results.push({\n accounts: account ? [account] : [],\n chainId: Networks.SOLANA,\n });\n }\n\n return results;\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": "+EAAA,OACE,YAAAA,EACA,eAAAC,EAMA,yBAAAC,EACA,kBAAAC,EACA,kBAAAC,EACA,uBAAAC,EACA,uBAAuBC,MAElB,4BCdP,OAAS,YAAAC,MAAuC,4BAEhD,eAAsBC,EACpBC,EACkC,CAClC,IAAMC,EAAiB,MAAMD,EAAS,IAAIE,EAAS,MAAM,EACnDC,EAAmC,CAAC,EAE1C,GAAIF,EAAgB,CAClB,MAAMA,EAAe,QAAQ,EAC7B,IAAMG,EAAUH,EAAe,UAAU,SAAS,EAElDE,EAAQ,KAAK,CACX,SAAUC,EAAU,CAACA,CAAO,EAAI,CAAC,EACjC,QAASF,EAAS,MACpB,CAAC,EAGH,OAAOC,CACT,CAjBsBE,EAAAN,EAAA,qBDctB,OAEE,mBAAAO,EAEA,kBAAAC,EACA,oBAAAC,EACA,sBAAAC,MACK,cEvBP,OAAS,oBAAAC,MAAwB,wBACjC,OAAS,uBAAAC,MAA2B,2BACpC,OAAS,YAAAC,EAAU,sBAAAC,MAA0B,4BAC7C,OACE,wBAAAC,EAEA,mBAAmBC,MACd,cAEQ,SAARC,EAA4BC,EAA8B,CAC/D,IAAMC,EAAcC,EAAmBF,EAAUG,EAAS,QAAQ,EAC5DC,EAAcF,EAAmBF,EAAUG,EAAS,MAAM,EAC1DE,EAAU,IAAIC,EACpB,OAAAD,EAAQ,eAAeE,EAAO,IAAK,IAAIC,EAAiBP,CAAW,CAAC,EACpEI,EAAQ,eAAeE,EAAO,OAAQ,IAAIE,EAAoBL,CAAW,CAAC,EACnEC,CACT,CAPwBK,EAAAX,EAAA,cFiBxB,IAAMY,EAASC,EAAY,SAEdC,GAAS,CACpB,KAAMF,EACN,eAAgBG,EAAS,QAC3B,EAEaC,GAAcC,EACdC,GAAmBC,EAAA,MAAO,CAAE,SAAAC,EAAU,KAAAC,CAAK,IAAM,CAK5D,IAAMC,EAAeC,EAAeH,EAAUC,EAAMN,EAAS,QAAQ,EACjES,EAAmC,CAAC,EAExC,GAAIF,EAAc,CAChB,IAAMG,EAAM,MAAMC,EAAeJ,CAAY,EAC7CE,EAAQ,KAAKC,CAAG,EAGlB,IAAME,EAAgB,MAAMC,EAAkBR,CAAQ,EACtD,OAAAI,EAAU,CAAC,GAAGA,EAAS,GAAGG,CAAa,EAChCH,CACT,EAhBgC,WAkBnBK,GAAuBV,EAACW,GAAY,CAC/C,IAAMC,EAAcR,EAClBO,EAAQ,SACRA,EAAQ,KACRf,EAAS,QACX,EACMiB,EAAiBT,EACrBO,EAAQ,SACRA,EAAQ,KACRf,EAAS,MACX,EACM,CAAE,QAAAG,EAAS,eAAAe,EAAgB,MAAAC,EAAO,cAAAC,EAAe,KAAAd,CAAK,EAAIS,EAChEC,GAAa,GAAG,kBAAoBK,GAAwB,CAC1D,IAAMC,EAAchB,EACjB,OAAOiB,CAAe,EACtB,KAAMC,GAAeA,EAAW,OAASxB,EAAS,QAAQ,GAAG,QAC5DmB,EAAM,YACJA,EAAM,SAAWnB,EAAS,UAAYsB,GACxCF,EAAcE,CAAW,EAC3BJ,EAAeG,CAAS,EAE5B,CAAC,EAEDJ,GAAgB,GAAG,iBAAkB,MAAOQ,GAAsB,CAC5DN,EAAM,SAAWnB,EAAS,QAC5BoB,EAAcd,EAAK,OAAOoB,CAAkB,EAAE,CAAC,EAAE,OAAO,EAC1D,IAAMC,EAAU3B,EAAS,OACzB,GAAIyB,EAAW,CACb,IAAMG,EAAUH,EAAU,SAAS,EACnCP,EAAe,CAACU,CAAO,CAAC,OAExBzB,EAAQwB,CAAO,CAEnB,CAAC,CACH,EAlCoC,aAmCvBE,GAA+BC,EAE/BC,GAAuCC,EAEvCC,GAA+CA,EAE/CC,GAAkE9B,EAC7E+B,GACG,CACH,IAAMC,EAAOC,EAAeF,CAAc,EACpCG,EAASC,EAAiBJ,CAAc,EAC9C,MAAO,CACL,KAAM,WACN,IAAK,sGACL,YAAa,CACX,OACE,uGACF,MACE,uGACF,QAAS,iCACX,EACA,MAAO,UACP,gBAAiB,CAAC,GAAGC,EAAM,GAAGE,CAAM,CACtC,CACF,EAlB+E",
|
|
6
|
+
"names": ["Networks", "WalletTypes", "canSwitchNetworkToEvm", "chooseInstance", "getEvmAccounts", "switchNetworkForEvm", "coinbase_instance", "Networks", "getSolanaAccounts", "instance", "solanaInstance", "Networks", "results", "account", "__name", "isEvmBlockchain", "evmBlockchains", "solanaBlockchain", "isSolanaBlockchain", "DefaultEvmSigner", "DefaultSolanaSigner", "Networks", "getNetworkInstance", "DefaultSignerFactory", "TxType", "getSigners", "provider", "ethProvider", "getNetworkInstance", "Networks", "solProvider", "signers", "DefaultSignerFactory", "TxType", "DefaultEvmSigner", "DefaultSolanaSigner", "__name", "WALLET", "WalletTypes", "config", "Networks", "getInstance", "coinbase_instance", "connect", "__name", "instance", "meta", "evm_instance", "chooseInstance", "results", "evm", "getEvmAccounts", "solanaResults", "getSolanaAccounts", "subscribe", "options", "ethInstance", "solanaInstance", "updateAccounts", "state", "updateChainId", "addresses", "eth_chainId", "isEvmBlockchain", "blockchain", "publicKey", "isSolanaBlockchain", "network", "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-coinbase",
|
|
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,18 +1,18 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Networks, ProviderConnectResult } from '@rango-dev/wallets-shared';
|
|
2
2
|
|
|
3
3
|
export async function getSolanaAccounts(
|
|
4
4
|
instance: any
|
|
5
5
|
): Promise<ProviderConnectResult[]> {
|
|
6
|
-
const solanaInstance = await instance.get(
|
|
6
|
+
const solanaInstance = await instance.get(Networks.SOLANA);
|
|
7
7
|
const results: ProviderConnectResult[] = [];
|
|
8
8
|
|
|
9
|
-
if (
|
|
9
|
+
if (solanaInstance) {
|
|
10
10
|
await solanaInstance.connect();
|
|
11
11
|
const account = solanaInstance.publicKey.toString();
|
|
12
12
|
|
|
13
13
|
results.push({
|
|
14
14
|
accounts: account ? [account] : [],
|
|
15
|
-
chainId:
|
|
15
|
+
chainId: Networks.SOLANA,
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
18
|
|
package/src/index.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
2
|
+
Networks,
|
|
3
3
|
WalletTypes,
|
|
4
4
|
CanSwitchNetwork,
|
|
5
5
|
Connect,
|
|
@@ -28,7 +28,7 @@ const WALLET = WalletTypes.COINBASE;
|
|
|
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 = coinbase_instance;
|
|
@@ -37,7 +37,7 @@ export const connect: Connect = async ({ instance, meta }) => {
|
|
|
37
37
|
// after opening the browser, wallet is locked, and don't give us accounts and chainId
|
|
38
38
|
// on `check` phase, so `network` will be null. For this case we need to get chainId
|
|
39
39
|
// whenever we are requesting accounts.
|
|
40
|
-
const evm_instance = chooseInstance(instance, meta,
|
|
40
|
+
const evm_instance = chooseInstance(instance, meta, Networks.ETHEREUM);
|
|
41
41
|
let results: ProviderConnectResult[] = [];
|
|
42
42
|
|
|
43
43
|
if (evm_instance) {
|
|
@@ -54,29 +54,29 @@ export const subscribe: Subscribe = (options) => {
|
|
|
54
54
|
const ethInstance = chooseInstance(
|
|
55
55
|
options.instance,
|
|
56
56
|
options.meta,
|
|
57
|
-
|
|
57
|
+
Networks.ETHEREUM
|
|
58
58
|
);
|
|
59
59
|
const solanaInstance = chooseInstance(
|
|
60
60
|
options.instance,
|
|
61
61
|
options.meta,
|
|
62
|
-
|
|
62
|
+
Networks.SOLANA
|
|
63
63
|
);
|
|
64
64
|
const { connect, updateAccounts, state, updateChainId, meta } = options;
|
|
65
65
|
ethInstance?.on('accountsChanged', (addresses: string[]) => {
|
|
66
66
|
const eth_chainId = meta
|
|
67
67
|
.filter(isEvmBlockchain)
|
|
68
|
-
.find((blockchain) => blockchain.name ===
|
|
68
|
+
.find((blockchain) => blockchain.name === Networks.ETHEREUM)?.chainId;
|
|
69
69
|
if (state.connected) {
|
|
70
|
-
if (state.network !=
|
|
70
|
+
if (state.network != Networks.ETHEREUM && eth_chainId)
|
|
71
71
|
updateChainId(eth_chainId);
|
|
72
72
|
updateAccounts(addresses);
|
|
73
73
|
}
|
|
74
74
|
});
|
|
75
75
|
|
|
76
76
|
solanaInstance?.on('accountChanged', async (publicKey: string) => {
|
|
77
|
-
if (state.network !=
|
|
77
|
+
if (state.network != Networks.SOLANA)
|
|
78
78
|
updateChainId(meta.filter(isSolanaBlockchain)[0].chainId);
|
|
79
|
-
const network =
|
|
79
|
+
const network = Networks.SOLANA;
|
|
80
80
|
if (publicKey) {
|
|
81
81
|
const account = publicKey.toString();
|
|
82
82
|
updateAccounts([account]);
|
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));
|