Merge remote-tracking branch 'origin/main' into 161-contenthash-table

blockful-io · Oct 21, 2024 · 9819ad2 · 9819ad2
2 parents 0414f98 + 8901d8c
commit 9819ad2
Show file tree

Hide file tree

Showing 36 changed files with 903 additions and 406 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -19,24 +19,9 @@
     {
       "type": "node",
       "request": "launch",
-      "name": "db write client",
+      "name": "write client",
       "skipFiles": ["<node_internals>/**"],
-      "program": "${workspaceFolder}/packages/client/src/db.write.ts",
-      "runtimeArgs": ["-r", "ts-node/register", "-r", "tsconfig-paths/register"],
-      "env": {
-        "NODE_ENV": "development",
-        "TS_NODE_PROJECT": "${workspaceFolder}/packages/client/tsconfig.json",
-        "ENV_FILE": "${workspaceFolder}/.env"
-      },
-      "console": "integratedTerminal",
-      "outFiles": ["${workspaceFolder}/**/*.js", "!**/node_modules/**"]
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "l2 write client",
-      "skipFiles": ["<node_internals>/**"],
-      "program": "${workspaceFolder}/packages/client/src/l2.write.ts",
+      "program": "${workspaceFolder}/packages/client/src/write.ts",
       "runtimeArgs": ["-r", "ts-node/register", "-r", "tsconfig-paths/register"],
       "env": {
         "NODE_ENV": "development",

diff --git a/Makefile b/Makefile
@@ -3,7 +3,6 @@ script_dir := packages/contracts/script
 deploy_dir := $(script_dir)/deploy
 
 PRIVATE_KEY?=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
-L2_PRIVATE_KEY?=0xb6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659
 ETHERSCAN_API_KEY?=VEJ7GISNRKFUESRPC4W4D3ZEM2P9B4J6C4
 
 .PHONY: deploy-arb
@@ -34,7 +33,7 @@ deploy-arb-resolver:
 		--rpc-url arb_sepolia \
 		--broadcast \
 		-vvv \
-		--private-key $(L2_PRIVATE_KEY) \
+		--private-key $(PRIVATE_KEY) \
 		--verify;
 
 
@@ -47,7 +46,7 @@ deploy-arb-full:
 			--rpc-url arb_sepolia \
 			--broadcast \
 			-vvv \
-			--private-key $(L2_PRIVATE_KEY) \
+			--private-key $(PRIVATE_KEY) \
 			--verify \
 			&& \
 	) true; \

diff --git a/README.md b/README.md
@@ -17,6 +17,29 @@ This project not only makes ENS more efficient and cost-effective but also opens
 - **Increase Usability**: Make ENS more user-friendly and accessible.
 - **Reference implementation**: Create a reference on how to implement off-chain storage and management.
 
+## Deployments
+
+### Mainnet
+
+| Contract         | Network  | Address                                                                                                               |
+| ---------------- | -------- | --------------------------------------------------------------------------------------------------------------------- |
+| DatabaseResolver | Ethereum | [0xBF3F57862717099319285c1E2664Cd583f35E333](https://etherscan.io/address/0xBF3F57862717099319285c1E2664Cd583f35E333) |
+
+### Sepolia
+
+| Contract                    | Network  | Address                                                                                                                       |
+| --------------------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| DatabaseResolver            | Ethereum | [0xc1D4903Eba794035d2D81D210325b57a95C8a007](https://sepolia.etherscan.io/address/0xc1D4903Eba794035d2D81D210325b57a95C8a007) |
+| ArbitrumVerifier            | Ethereum | [0x8fc4a214705e3c40032e99f867d964c012bf8efb](https://sepolia.etherscan.io/address/0x8fc4a214705e3c40032e99f867d964c012bf8efb) |
+| L1Resolver                  | Ethereum | [0xF0c1d78C73B2fCBF17e1c4DbBBD9df30a9556BB8](https://sepolia.etherscan.io/address/0xF0c1d78C73B2fCBF17e1c4DbBBD9df30a9556BB8) |
+| ENSRegistry                 | Arbitrum | [0x8d55e297c37993ebbd2e7a8d7688f7e5b35f1b50](https://sepolia.arbiscan.io/address/0x8d55e297c37993ebbd2e7a8d7688f7e5b35f1b50)  |
+| ReverseRegistrar            | Arbitrum | [0xb3c9ff08671bbadddd0436cc46fbfa005c8da0a7](https://sepolia.arbiscan.io/address/0xb3c9ff08671bbadddd0436cc46fbfa005c8da0a7)  |
+| BaseRegistrarImplementation | Arbitrum | [0x2C6a113C513fa0fd404abcCE3aC8a4BE16ccb651](https://sepolia.arbiscan.io/address/0x2C6a113C513fa0fd404abcCE3aC8a4BE16ccb651)  |
+| NameWrapper                 | Arbitrum | [0xff4f34ac12a84de527cf9e24856fc8d7c42cc379](https://sepolia.arbiscan.io/address/0xff4f34ac12a84de527cf9e24856fc8d7c42cc379)  |
+| ETHRegistrarController      | Arbitrum | [0x263c644d8f5d4bdb44cfab020491ec6fc4ca5271](https://sepolia.arbiscan.io/address/0x263c644d8f5d4bdb44cfab020491ec6fc4ca5271)  |
+| SubdomainController         | Arbitrum | [0x41eede073217084a30f6f3bc2c546bda1f08b5ca](https://sepolia.arbiscan.io/address/0x41eede073217084a30f6f3bc2c546bda1f08b5ca)  |
+| PublicResolver              | Arbitrum | [0x0a33f065c9c8f0F5c56BB84b1593631725F0f3af](https://sepolia.arbiscan.io/address/0x0a33f065c9c8f0F5c56BB84b1593631725F0f3af)  |
+
 ## Components
 
 The External Resolver consists of three main components, each of them is a self-contained project with its own set of files and logic, ensuring seamless integration and collaboration between them. This modular architecture allows for flexibility and customization, making the External Resolver a versatile solution for various use cases.

diff --git a/ensips/ccip-write/ccip-write.md b/ensips/ccip-write/ccip-write.md
@@ -47,7 +47,7 @@ The function has the following signature:
 
 ```solidity
 function registerParams(
-    bytes memory name,
+    bytes calldata name,
     uint256 duration
 )
     external
@@ -89,7 +89,8 @@ Aiming to integrate with the already existing interface of domain registration,
 
 ```solidity
 function register(
-    string calldata name,
+    bytes32 parentNode,
+    string calldata label,
     address owner,
     uint256 duration,
     bytes32 secret,
@@ -103,7 +104,8 @@ function register(
 
 Parameters:
 
-- `name`: DNS-encoded name to be registered
+- `parentNode`: namehash of the parent domain
+- `label`: DNS-encoded name to be registered
 - `owner`: subdomain owner's address
 - `duration`: the duration in miliseconds of the registration
 - `secret`: random seed to be used for commit/reveal
@@ -278,7 +280,8 @@ interface OffchainRegister {
 
     /**
      * Forwards the registering of a domain to the L2 contracts
-     * @param name The DNS-encoded name to resolve.
+     * @param parentNode namehash of the parent domain
+     * @param label The DNS-encoded name to resolve.
      * @param owner Owner of the domain
      * @param duration duration The duration in seconds of the registration.
      * @param resolver The address of the resolver to set for this name.
@@ -287,7 +290,8 @@ interface OffchainRegister {
      * @param extraData any encoded additional data
      */
     function register(
-        string calldata name,
+        bytes32 parentNode,
+        string calldata label,
         address owner,
         uint256 duration,
         bytes32 secret,
@@ -336,10 +340,10 @@ interface OffchainMulticallable {
 
 interface OffchainCommitable {
 
-		/**
-		 * @notice produces the commit hash from the register calldata
-		 * @returns the hash of the commit to be used
-		 */
+    /**
+    * @notice produces the commit hash from the register calldata
+    * @returns the hash of the commit to be used
+    */
     function makeCommitment(
         string calldata name,
         address owner,