mirror of
https://seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git
synced 2026-11-21 22:30:41 +08:00
Use Alchemy as fallback provider
This commit is contained in:
+22
-8
@@ -10,6 +10,8 @@
|
||||
import Orgs from '@app/base/orgs/Routes.svelte';
|
||||
import Resolver from '@app/base/resolver/Routes.svelte';
|
||||
import Header from '@app/Header.svelte';
|
||||
import Loading from '@app/Loading.svelte';
|
||||
import Modal from '@app/Modal.svelte';
|
||||
|
||||
function handleKeydown(event: KeyboardEvent) {
|
||||
if (event.key === 'Enter') {
|
||||
@@ -30,10 +32,11 @@
|
||||
</style>
|
||||
|
||||
<svelte:window on:keydown={handleKeydown} />
|
||||
{#await getConfig()}
|
||||
<!-- Loading wallet -->
|
||||
{:then config}
|
||||
<div class="app">
|
||||
<div class="app">
|
||||
{#await getConfig()}
|
||||
<!-- Loading wallet -->
|
||||
<Loading center />
|
||||
{:then config}
|
||||
<Header session={$session} {config} />
|
||||
<div class="wrapper">
|
||||
<Router>
|
||||
@@ -48,7 +51,18 @@
|
||||
<Resolver {config} />
|
||||
</Router>
|
||||
</div>
|
||||
</div>
|
||||
{:catch}
|
||||
<!-- Show error -->
|
||||
{/await}
|
||||
{:catch err}
|
||||
<div class="wrapper">
|
||||
<Modal error subtle>
|
||||
<span slot="title">
|
||||
<h3>👻</h3>
|
||||
<div>Error connecting to network</div>
|
||||
</span>
|
||||
|
||||
<span slot="body">
|
||||
{err}
|
||||
</span>
|
||||
</Modal>
|
||||
</div>
|
||||
{/await}
|
||||
</div>
|
||||
|
||||
+2
-1
@@ -10,11 +10,12 @@
|
||||
export let subtitle: string = "";
|
||||
export let message: string = "";
|
||||
export let floating = false;
|
||||
export let subtle = false;
|
||||
|
||||
let body = message || (error && error.message) || "";
|
||||
</script>
|
||||
|
||||
<Modal on:close error {floating}>
|
||||
<Modal on:close error {floating} {subtle}>
|
||||
<span slot="title">
|
||||
{title}
|
||||
</span>
|
||||
|
||||
+18
-5
@@ -13,7 +13,9 @@
|
||||
import type { Config } from '@app/config';
|
||||
|
||||
export let session: Session | null;
|
||||
export let config: Config;
|
||||
export let config: Config | null;
|
||||
|
||||
console.log(config);
|
||||
|
||||
let sessionButton: HTMLElement | null = null;
|
||||
let sessionButtonHover = false;
|
||||
@@ -78,6 +80,13 @@
|
||||
margin: 0 2rem;
|
||||
border-radius: var(--border-radius);
|
||||
}
|
||||
.network.unavailable {
|
||||
color: #888;
|
||||
background-color: #ffffff11;
|
||||
}
|
||||
.network:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
</style>
|
||||
|
||||
{#if $error}
|
||||
@@ -98,17 +107,21 @@
|
||||
<div class="nav">
|
||||
<a use:link href="/registrations">Register</a>
|
||||
<a use:link href="/vesting/">Vesting</a>
|
||||
{#if config.network.name === 'ropsten'}
|
||||
{#if config && config.network.name === 'ropsten'}
|
||||
<a use:link href="/orgs/">Orgs</a>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
{#if config.network.name == 'ropsten'}
|
||||
{#if config && config.network.name == 'ropsten'}
|
||||
<span class="network">Ropsten</span>
|
||||
{:else if config.network.name == 'rinkeby'}
|
||||
{:else if config && config.network.name == 'rinkeby'}
|
||||
<span class="network">Rinkeby</span>
|
||||
{:else if config && config.network.name == 'homestead'}
|
||||
<!-- Don't show anything -->
|
||||
{:else}
|
||||
<span class="network unavailable">No Network</span>
|
||||
{/if}
|
||||
|
||||
{#if address}
|
||||
@@ -127,7 +140,7 @@
|
||||
{formatAddress(address)}
|
||||
{/if}
|
||||
</button>
|
||||
{:else}
|
||||
{:else if config}
|
||||
<Connect className="small" {config} />
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -40,6 +40,12 @@
|
||||
transparent 70%
|
||||
);
|
||||
}
|
||||
.modal.modal-subtle.error {
|
||||
background: radial-gradient(
|
||||
var(--color-glow-error) 0%,
|
||||
transparent 70%
|
||||
);
|
||||
}
|
||||
.modal-title {
|
||||
font-size: 1.25rem;
|
||||
font-weight: bold;
|
||||
|
||||
+49
-26
@@ -7,17 +7,45 @@ declare global {
|
||||
ethereum: any;
|
||||
registrarState: any;
|
||||
}
|
||||
|
||||
interface ImportMeta {
|
||||
env: {
|
||||
RADICLE_ALCHEMY_API_KEY: string | null,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export type Config = {
|
||||
network: { name: string, chainId: number },
|
||||
registrar: { address: string, domain: string },
|
||||
radToken: { address: string },
|
||||
orgFactory: { address: string },
|
||||
gasLimits: { createOrg: number },
|
||||
provider: ethers.providers.JsonRpcProvider,
|
||||
signer: ethers.Signer & TypedDataSigner,
|
||||
};
|
||||
export class Config {
|
||||
network: { name: string, chainId: number };
|
||||
registrar: { address: string, domain: string };
|
||||
radToken: { address: string };
|
||||
orgFactory: { address: string };
|
||||
gasLimits: { createOrg: number };
|
||||
provider: ethers.providers.JsonRpcProvider;
|
||||
signer: ethers.Signer & TypedDataSigner | null;
|
||||
|
||||
constructor(
|
||||
network: { name: string, chainId: number },
|
||||
provider: ethers.providers.JsonRpcProvider
|
||||
) {
|
||||
let cfg = (<Record<string, any>> config)[network.name];
|
||||
let signer = null;
|
||||
|
||||
try {
|
||||
signer = provider.getSigner();
|
||||
} catch (e) {
|
||||
console.log(e.message);
|
||||
}
|
||||
|
||||
this.network = network;
|
||||
this.registrar = cfg.registrar;
|
||||
this.radToken = cfg.radToken;
|
||||
this.orgFactory = cfg.orgFactory;
|
||||
this.provider = provider;
|
||||
this.signer = signer;
|
||||
this.gasLimits = gasLimits;
|
||||
}
|
||||
}
|
||||
|
||||
/// Gas limits for various transactions.
|
||||
const gasLimits = {
|
||||
@@ -30,26 +58,21 @@ function isMetamaskInstalled(): boolean {
|
||||
}
|
||||
|
||||
export async function getConfig(): Promise<Config> {
|
||||
let config: Config;
|
||||
|
||||
if (isMetamaskInstalled()) {
|
||||
const provider = new ethers.providers.Web3Provider(window.ethereum);
|
||||
const network = await provider.ready;
|
||||
|
||||
let network = await provider.ready;
|
||||
let cfg = (<Record<string, any>> config)[network.name];
|
||||
|
||||
if (cfg) {
|
||||
return {
|
||||
network,
|
||||
registrar: cfg.registrar,
|
||||
radToken: cfg.radToken,
|
||||
orgFactory: cfg.orgFactory,
|
||||
provider: provider,
|
||||
signer: provider.getSigner(),
|
||||
gasLimits: gasLimits,
|
||||
};
|
||||
} else {
|
||||
throw `Wrong network: ${network.name}`;
|
||||
}
|
||||
config = new Config(network, provider);
|
||||
} else {
|
||||
throw "No provider available";
|
||||
const network = { name: "homestead", chainId: 1 };
|
||||
const apiKey = import.meta.env.RADICLE_ALCHEMY_API_KEY;
|
||||
const provider = new ethers.providers.AlchemyProvider(network.name, apiKey);
|
||||
|
||||
config = new Config(network, provider);
|
||||
}
|
||||
console.log(config);
|
||||
|
||||
return config;
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
<Modal floating>
|
||||
<div slot="title">
|
||||
{#if mismatchError}
|
||||
🦉
|
||||
👻
|
||||
{:else}
|
||||
🖊️
|
||||
{/if}
|
||||
|
||||
Reference in New Issue
Block a user