feat: Various gateway improvements & general refactorings

Author: wottpal

Diff for: README.md

@@ -14,25 +14,29 @@ It specifically targets the [AZERO.ID](https://azero.id) registry, though, it ca
 |                       | **Testnet¹**                                 | **Mainnet²**                                 |
 | --------------------- | -------------------------------------------- | -------------------------------------------- |
 | **Resolver Contract** | `0x5cf63C14b82C6E1B95023d8D23e682d12761F56C` | `0x723f6C968609F62583504DD67307A4Ae4c9Fd886` |
-| **Gateway**           | https://tzero-id-gateway.nameverse.io        | https://azero-id-gateway.nameverse.io        |
-| **ENS Domain**        | `*.tzero-id.eth`, `tzero.eth`                | `*.azero-id.eth`                             |
+| **Gateway**           | https://gateway.tzero.id                     | https://gateway.azero.id                     |
+| **ENS Domains**       | `<name>.tzero.id`³, `<name>.tzero-id.eth`    | `<name>.azero.id`³, `<name>.azero-id.eth`    |
 
 <small style="opacity: 0.5;">
-  <strong>¹ Testnet:</strong> Ethereum Sepolia & Aleph Zero Testnet<br/>
-  <strong>² Mainnet:</strong> Ethereum Mainnet & Aleph Zero Mainnet<br/>
+  <strong>¹</strong> Ethereum Sepolia & Aleph Zero Testnet<br/>
+  <strong>²</strong> Ethereum Mainnet & Aleph Zero Mainnet<br/>
+  <strong>³</strong> Regular ENS Domains imported via DNSSEC<br/>
 </small>
 
 ## Packages
 
-### [Solidity Contracts](packages/contracts)
+### [Solidity Contracts](packages/contracts/README.md)
 
 The smart contract provides a resolver stub that implement CCIP Read (EIP 3668) and ENS wildcard resolution (ENSIP 10). When queried for a name, it directs the client to query the gateway server. When called back with the gateway server response, the resolver verifies the signature was produced by an authorised signer, and returns the response to the client.
 
-### [Gateway Server](packages/gateway)
+### [Gateway & Relayer Server](packages/server/README.md)
 
-The gateway server implements CCIP Read (EIP 3668), and answers requests by looking up the names on the registry Aleph Zero. Once a record is retrieved, it is signed using a user-provided key to assert its validity, and both record and signature are returned to the caller so they can be provided to the contract that initiated the request. It's designed to be deployed as a Cloudflare worker.
+The server serves as both a EVM Registration Proxy (Relayer) and as a CCIP Read Resolver (Gateway) for ENS resolution.
 
-### [Demo Client](packages/client)
+- **Gateway**: Implements CCIP Read (EIP 3668), and answers requests by looking up the names on the registry Aleph Zero. Once a record is retrieved, it is signed using a user-provided key to assert its validity, and both record and signature are returned to the caller so they can be provided to the contract that initiated the request. It's designed to be deployed as a Cloudflare worker.
+- **Relayer**: TODO @Nimish
+
+### [Demo Client](packages/client/README.md)
 
 A simple script that resolves a given domain through the ENS protocol (using the gateway server) and verifies the response with the result from the registry contracts directly on the Aleph Zero network.
 
@@ -44,7 +48,7 @@ A simple script that resolves a given domain through the ENS protocol (using the
 > - Install [Bun](https://bun.sh/)
 > - Clone this repository
 
-1. Run the gateway server ([packages/gateway/README.md](packages/gateway/README.md))
+1. Run the gateway server ([packages/server/README.md](packages/server/README.md))
    1. Use the worker url as environment variable when deploying the contracts
 2. Deploy the contracts ([packages/contracts/README.md](packages/contracts/README.md))
    1. Assign the new resolver to your ENS name

Diff for: bun.lockb

@@ -37,29 +37,32 @@ const transport = process.env.INFURA_API_KEY
 const viemClient = createPublicClient({ chain: evmChain, transport })
 
 const evmChainName = isMainnet ? 'Ethereum Mainnet' : 'Ethereum Sepolia'
-const ensDomain = isMainnet ? `${domain}-id.eth` : `${domain}-id.eth`
+const ensDomain = isMainnet ? `${domain}.id` : `${domain}.id`
+// const ensDomain = isMainnet ? `${domain}-id.eth` : `${domain}-id.eth`
 
 const resolver = await viemClient.getEnsResolver({
   name: normalize(ensDomain),
 })
 spinner.info(`[${evmChainName}] Found Resolver: ${resolver}`).start()
 
-const gatewayUrl = isMainnet
-  ? `https://azero-id-gateway.nameverse.io`
-  : `https://tzero-id-gateway.nameverse.io`
+const gatewayUrl = isMainnet ? `https://gateway.azero.id` : `https://gateway.tzero.id`
 spinner.info(`[${evmChainName}] Gateway URL: ${gatewayUrl}`)
 
 spinner.start(`Fetching ENS Address on EVM via Gateway (${gatewayUrl})…`)
+
+const startTime = performance.now()
 const evmAddress = await viemClient.getEnsAddress({
   name: normalize(ensDomain),
   coinType: 643,
-  // universalResolverAddress: resolver,
+  universalResolverAddress: resolver,
 })
+const endTime = performance.now()
+const duration = endTime - startTime
 
 const evmAddressSs58 = evmAddress ? new AccountId32(evmAddress).address() : null
 if (evmAddress && evmAddressSs58) {
   spinner.success(
-    `[${evmChainName}] Resolved address of ${ensDomain}: ${evmAddressSs58} (${evmAddress})`,
+    `[${evmChainName}] Resolved address of ${ensDomain}: ${evmAddressSs58} (${evmAddress}) in ${duration.toFixed(0)}ms`,
   )
 } else {
   spinner.error(`[${evmChainName}] Couldn't resolve address of ${ensDomain}`)

Diff for: packages/client/index.ts

@@ -1,6 +1,6 @@
 {
-  "name": "@scio-labs/azero-offchain-resolver-client",
-  "version": "0.0.1",
+  "name": "@scio-labs/azero-offchain-client",
+  "version": "0.2.0",
   "repository": "[email protected]:scio-labs/offchain-resolver-ts.git",
   "author": "Scio Labs <[email protected]> (https://scio.xyz)",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "@types/bun": "latest",
     "@wagmi/cli": "^2.1.16",
     "dedot": "^0.6.0",
-    "viem": "^2.21.22",
-    "yocto-spinner": "^0.1.0"
+    "viem": "^2.21.34",
+    "yocto-spinner": "^0.1.1"
   }
 }

Diff for: packages/client/package.json

@@ -12,3 +12,5 @@ REMOTE_GATEWAY=https://tzero-id-gateway.nameverse.io/
 # SIGNER_ADDR=TODO
 # NETWORK=mainnet
 # REMOTE_GATEWAY=https://azero-id-gateway.nameverse.io/
+
+# TODO @Nimish

Diff for: packages/contracts/.env.example

@@ -8,4 +8,10 @@ source .env
 bun run clean
 
 # Deploy & Verify OffchainResolver
-bunx hardhat --network $NETWORK deploy --tags gateway --reset
+bunx hardhat --network $NETWORK deploy --tags gateway --reset
+
+# Deploy & Verify RegistrationProxy
+bunx hardhat --network $NETWORK deploy --tags relayer --reset
+
+# Verify Manually
+# bunx hardhat verify --network sepolia <address> --constructor-args <file>.js

Diff for: packages/contracts/contracts/IExtendedResolver.sol renamed to packages/contracts/contracts/gateway/IExtendedResolver.sol

@@ -0,0 +1,29 @@
+const { ethers, run } = require('hardhat')
+
+module.exports = async ({ getNamedAccounts, deployments, network }) => {
+  const { deploy } = deployments
+  const { deployer, signer } = await getNamedAccounts()
+
+  // TODO @Nimish
+
+  // if (!network.config.gatewayurl) {
+  //   throw "gatewayurl is missing on hardhat.config.js";
+  // }
+
+  // const args = [network.config.gatewayurl, [signer]];
+  // console.log("Constructor arguments:", args);
+
+  // console.log("Deploying OffchainResolver…");
+  // const { address } = await deploy("OffchainResolver", {
+  //   from: deployer,
+  //   args,
+  //   log: true,
+  // });
+
+  console.log('Verifying contract…')
+  await run('verify:verify', {
+    address,
+    constructorArguments: args,
+  })
+}
+module.exports.tags = ['relayer']

Diff for: packages/contracts/contracts/OffchainResolver.sol renamed to packages/contracts/contracts/gateway/OffchainResolver.sol

@@ -1,11 +1,11 @@
 {
-  "name": "@scio-labs/azero-offchain-resolver-contracts",
-  "version": "0.0.1",
+  "name": "@scio-labs/azero-offchain-contracts",
+  "version": "0.2.0",
   "repository": "[email protected]:scio-labs/offchain-resolver-ts.git",
   "author": "Scio Labs <[email protected]> (https://scio.xyz)",
   "license": "MIT",
   "files": [
-    "contracts/*.sol",
+    "contracts/**/*.sol",
     "artifacts/contracts/**/*.json"
   ],
   "scripts": {