From f74f45bc884216d9b4a524e814518363ca7e5604 Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Wed, 5 May 2021 14:30:19 +0200 Subject: [PATCH] Implement registration view --- public/index.css | 27 +++++++++-- src/Header.svelte | 1 + src/Link.svelte | 17 +++++++ src/Modal.svelte | 8 ---- src/base/register/Register.svelte | 6 +-- src/base/register/Registration.svelte | 68 +++++++++++++++++++++++++++ src/base/register/Routes.svelte | 6 ++- src/base/register/registrar.ts | 38 +++++++++++++++ src/base/register/steps/Begin.svelte | 4 +- 9 files changed, 158 insertions(+), 17 deletions(-) create mode 100644 src/Link.svelte create mode 100644 src/base/register/Registration.svelte diff --git a/public/index.css b/public/index.css index 304a23310..412b81432 100644 --- a/public/index.css +++ b/public/index.css @@ -146,13 +146,25 @@ button.small { padding-bottom: 0.5rem; min-width: 6rem; } +button.tiny { + min-width: 0; + padding: 0.125rem 0.75rem; +} a { color: var(--color-secondary); text-decoration: none; } a:hover { - text-decoration: none; + color: var(--color-secondary-faded); + border-bottom-color: var(--color-secondary-faded); +} +a.primary { + color: var(--color-primary); +} +a.primary:hover { + color: var(--color-primary-faded); + border-bottom-color: var(--color-primary-faded); } input[type="text"], button { @@ -240,6 +252,12 @@ input.wide { color: var(--color-subtle); font-style: italic; } +.label { + color: var(--color-secondary); +} +.bold { + font-weight: bold; +} button.error:hover { background-color: var(--color-negative); @@ -254,9 +272,6 @@ td { text-align: left; text-overflow: ellipsis; } -td.label { - color: var(--color-secondary); -} td strong { font-weight: 600; } @@ -270,3 +285,7 @@ h1 { text-overflow: ellipsis; overflow-x: hidden; } + +p { + margin: 0.5rem 0; +} diff --git a/src/Header.svelte b/src/Header.svelte index 621696ee2..8c787733c 100644 --- a/src/Header.svelte +++ b/src/Header.svelte @@ -41,6 +41,7 @@ margin-right: 1.5rem; font-weight: 500; color: var(--color-foreground-6); + border: none; } header .nav a:hover { color: var(--color-foreground); diff --git a/src/Link.svelte b/src/Link.svelte new file mode 100644 index 000000000..8e6818ffa --- /dev/null +++ b/src/Link.svelte @@ -0,0 +1,17 @@ + + + + + diff --git a/src/Modal.svelte b/src/Modal.svelte index 82f04bdce..1b4c2d2bd 100644 --- a/src/Modal.svelte +++ b/src/Modal.svelte @@ -1,15 +1,7 @@ + +{#await getRegistration(subdomain, config)} + +{:then registration} + {#if registration} +
+

{subdomain}.{config.registrar.domain}

+
+ +
Address
+
+ {#if registration.address} + {registration.address} + {:else} + Not set + {/if} +
+
+ {#if !registration.address} + + {/if} +
+ +
Owner
+
{registration.owner}
+
+
+
+ {:else} + + + {subdomain}.{config.registrar.domain} + + + +

The name {subdomain} is not registered.

+
+ + + Register → + +
+ {/if} +{/await} diff --git a/src/base/register/Routes.svelte b/src/base/register/Routes.svelte index c904a6cd6..4673d22d2 100644 --- a/src/base/register/Routes.svelte +++ b/src/base/register/Routes.svelte @@ -3,10 +3,10 @@ import Register from '@app/base/register/Register.svelte'; import Begin from '@app/base/register/steps/Begin.svelte'; import Submit from '@app/base/register/steps/Submit.svelte'; + import Registration from '@app/base/register/Registration.svelte'; import Error from '@app/Error.svelte'; import type { Config } from '@app/config'; import type { Session } from '@app/session'; - import { Failure } from '@app/error'; export let session: Session | null; export let config: Config; @@ -31,3 +31,7 @@ /> {/if} + + + + diff --git a/src/base/register/registrar.ts b/src/base/register/registrar.ts index 805fa8a2e..4b8b5faa7 100644 --- a/src/base/register/registrar.ts +++ b/src/base/register/registrar.ts @@ -22,6 +22,28 @@ const registrarAbi = [ {"inputs":[{"internalType":"string","name":"name","type":"string"}],"name":"valid","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"} ]; +interface Registration { + name: string + owner: string + address: string | null +} + +export async function getRegistration(label: string, config: Config): Promise { + if (await registrar(config).available(label)) { + // If the name is available, ie. not registered, we don't return anything. + return null; + } + const name =`${label}.${config.registrar.domain}`; + const address = await config.provider.resolveName(name); + const owner = await getOwner(name, config); + + return { + name, + owner, + address + }; +} + export function registrar(config: Config) { return new ethers.Contract(config.registrar.address, registrarAbi, config.provider); } @@ -112,3 +134,19 @@ function makeCommitment(name: string, owner: string, salt: Uint8Array): string { ]); return ethers.utils.keccak256(bytes); } + +async function getOwner(name: string, config: Config): Promise { + const ensAbi = [ + "function owner(bytes32 node) view returns (address)" + ]; + + let ensAddr = config.provider.network.ensAddress; + if (! ensAddr) { + throw new Error("ENS address is not defined"); + } + + let registry = new ethers.Contract(ensAddr, ensAbi, config.provider); + let owner = await registry.owner(ethers.utils.namehash(name)); + + return owner; +} diff --git a/src/base/register/steps/Begin.svelte b/src/base/register/steps/Begin.svelte index cd4bfc4d1..4a50e0a76 100644 --- a/src/base/register/steps/Begin.svelte +++ b/src/base/register/steps/Begin.svelte @@ -1,4 +1,6 @@