Merge (#1)

* Patch L2 Reverse Name Link (ensdomains#355) * Misc. fixes and improvements to "Resolvers" section (ensdomains#357) * Typo corrections (ensdomains#345) * Add clarity about resolution starting from L1 (ensdomains#360) * fix: incorrect resolver address on EthRegistryDemo (ensdomains#368) Co-authored-by: Greg <[email protected]> * fix: min_commitment_age language (ensdomains#367) * Bump cross-spawn from 7.0.3 to 7.0.6 in /app (ensdomains#366) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update connect modal (ensdomains#340) * Create EP 5.27 (ensdomains#373) * Fix DAO stewards' avatars (ensdomains#363) * Add EP 5.22 (ensdomains#343) Co-authored-by: Greg Skriloff <[email protected]> * Bump nanoid from 3.3.7 to 3.3.8 in /app (ensdomains#374) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump secp256k1 from 5.0.0 to 5.0.1 in /app (ensdomains#335) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add EP 5.25 (ensdomains#358) Co-authored-by: Greg Skriloff <[email protected]> * Add EP 5.26 (ensdomains#359) Co-authored-by: Greg Skriloff <[email protected]> * Add EP 5.23 (ensdomains#376) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Luc van Kampen <[email protected]> Co-authored-by: r4bbit <[email protected]> Co-authored-by: Dmitry <[email protected]> Co-authored-by: Greg <[email protected]> Co-authored-by: CHANCE <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nick Johnson <[email protected]> Co-authored-by: Agora Governance Bot <[email protected]>
5ajaki · Dec 15, 2024 · 8851b45 · 8851b45
1 parent d5b7736
commit 8851b45
Show file tree

Hide file tree

Showing 30 changed files with 766 additions and 218 deletions.
diff --git a/app/.prettierrc b/app/.prettierrc
@@ -1,5 +1,6 @@
 {
     "tabWidth": 4,
     "useTabs": false,
-    "singleQuote": true
+    "singleQuote": true,
+    "trailingComma": "es5"
 }
diff --git a/app/app/theme.tsx b/app/app/theme.tsx
@@ -4,7 +4,13 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { ThemeProvider } from 'next-themes';
 import { useEffect } from 'react';
 import { holesky, mainnet, sepolia } from 'viem/chains';
-import { createConfig, http, WagmiProvider } from 'wagmi';
+import {
+    createConfig,
+    http,
+    useAccount,
+    useConfig,
+    WagmiProvider,
+} from 'wagmi';
 import { injected, walletConnect } from 'wagmi/connectors';
 
 const config = createConfig({
@@ -30,6 +36,8 @@ const config = createConfig({
 });
 
 declare module 'wagmi' {
+    // @ts-ignore
+    // eslint-disable-next-line unused-imports/no-unused-vars
     interface Register {
         config: typeof config;
     }
@@ -38,19 +46,29 @@ declare module 'wagmi' {
 const queryClient = new QueryClient();
 
 export const Theme = ({ children }) => {
-    useEffect(() => {
-        (async () => {
-            const { setupConfig } = await import('@ens-tools/thorin-core');
-
-            setupConfig(() => config as any);
-        })();
-    }, []);
-
     return (
         <ThemeProvider attribute="class">
             <QueryClientProvider client={queryClient}>
-                <WagmiProvider config={config}>{children}</WagmiProvider>
+                <WagmiProvider config={config}>
+                    {children}
+                    <WagmiChild />
+                </WagmiProvider>
             </QueryClientProvider>
         </ThemeProvider>
     );
 };
+
+export const WagmiChild = () => {
+    const state = useConfig();
+    const { address, connector } = useAccount();
+
+    useEffect(() => {
+        (async () => {
+            const { setupConfig } = await import('@ens-tools/thorin-core');
+
+            setupConfig(() => state || config);
+        })();
+    }, [state, address, connector]);
+
+    return <></>;
+};
diff --git a/app/local/config/navigation/protocol.ts b/app/local/config/navigation/protocol.ts
@@ -405,10 +405,31 @@ export const navigation: SectionData[] = [
             {
                 title: 'Proposals Term 5',
                 links: [
+                    {
+                        title: '5.27 - [Executable] Revoke the DAO’s ability to upgrade the name wrapper',
+                        href: '/dao/proposals/5.27',
+                    },
+                    {
+                        title: '5.26 - [Executable] Implementation of [EP 5.19]’s ENS Governance Distribution Pilot Program',
+                        href: '/dao/proposals/5.26',
+                    },
+                    {
+                        title: '5.25 - [Executable] Collective Working Group Funding Request (Oct 2024) - Resubmission',
+                        href: '/dao/proposals/5.25',
+                    },
                     {
                         title: '5.24 - [Executable] Term 5 Q4, Collective Working Group Funding Proposal',
                         href: '/dao/proposals/5.24',
                     },
+                    {
+                        // eslint-disable-next-line quotes
+                        title: "5.23 - [Executable] blockful's governance security bounty",
+                        href: '/dao/proposals/5.23',
+                    },
+                    {
+                        title: '5.22 - [Executable] ENSv2 Development Funding',
+                        href: '/dao/proposals/5.22',
+                    },
                     {
                         title: '5.21 - [Social] Governance Security Bounty',
                         href: '/dao/proposals/5.21',

diff --git a/app/local/content/demos/ethregistry/ETHRegistryDemo.tsx b/app/local/content/demos/ethregistry/ETHRegistryDemo.tsx
@@ -30,7 +30,7 @@ const Demo = () => {
         '0x225f137127d9067788314bc7fcc1f36746a3c3B5'
     );
     const [resolver, setResolver] = useState(
-        '0x225f137127d9067788314bc7fcc1f36746a3c3B5'
+        '0x231b0Ee14048e9dCcD1d247744d114a4EB5E8E63'
     );
     const [duration, setDuration] = useState(60 * 60 * 24 * 365);
     const [secret, setSecret] = useState(

diff --git a/app/local/data/resolver.tsx b/app/local/data/resolver.tsx
@@ -2,24 +2,6 @@
 import { CodeGroup } from '../content/prose/code/group/CodeGroup';
 import { ContractMethod } from './interfaces';
 
-export const PUBLIC_RESOLVER_SUPPORTS = [
-    //     'addr',
-    //     'addr.reverse',
-    //     'contenthash',
-    //     'contenthash.set',
-    //     'multicoin',
-    //     'multicoin.set',
-    //     'text',
-    //     'text.set',
-    //     'ABI',
-    //     'ABI.set',
-    //     'pubkey',
-    //     'pubkey.set',
-    //     'name',
-    //     'name.set',
-    //     'multicall',
-];
-
 export const resolver_methods: ContractMethod[] = [
     {
         name: 'supportsInterface(bytes4 interfaceID) external pure returns (bool)',
@@ -162,7 +144,7 @@ export const resolver_methods: ContractMethod[] = [
         name: 'pubkey(bytes32 node) view returns (bytes32 x, bytes32 y)',
         interface: '0xc8690233',
         usage: 'Read Public Key',
-        seeMore: 'ENSIP- / EIP-619',
+        seeMore: '',
         input: [
             {
                 name: 'node',
@@ -197,6 +179,21 @@ export const resolver_methods: ContractMethod[] = [
             },
         ],
     },
+    {
+        name: 'resolve(bytes memory name, bytes memory data) view returns (bytes memory)',
+        interface: '0x9061b923',
+        usage: 'Wildcard Resolution',
+        seeMore: 'ENSIP-10',
+        input: [
+            { name: 'name', type: 'bytes', description: 'DNS-encoded name' },
+            {
+                name: 'data',
+                type: 'bytes',
+                description:
+                    'Encoded function data for other resolver calls like addr(), text(), etc.',
+            },
+        ],
+    },
     {
         name: 'setAddr(bytes32 node, address a)',
         interface: '0xd5fa2b00',

diff --git a/app/package.json b/app/package.json
@@ -12,7 +12,7 @@
     "browserslist": "defaults, not ie <= 11",
     "dependencies": {
         "@ens-tools/format": "^0.0.2",
-        "@ens-tools/thorin-core": "0.0.5",
+        "@ens-tools/thorin-core": "0.1.4-1",
         "@ensdomains/thorin": "1.0.0-beta.9",
         "@headlessui/react": "^1.7.18",
         "@mdx-js/loader": "^3.0.0",