Feature/fet 1977 alternative migrate tests to foundry

.github/workflows/main.yml

@@ -10,13 +10,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Use Bun 1.2.3
         uses: oven-sh/setup-bun@v2
         with:
           bun-version: 1.2.3
 
-      - run: bun install --frozen-lockfile
+      - run: bun install
 
       - name: Run wikiCheck
         run: bun run wikiCheck
@@ -25,13 +27,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Use Bun 1.2.0
         uses: oven-sh/setup-bun@v2
         with:
           bun-version: 1.2.0
 
-      - run: bun install --frozen-lockfile
+      - run: bun install
 
       - name: Run tests
         run: bun run build
@@ -40,6 +44,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive # Required for forge-std submodule
 
       - name: Use Bun 1.2.3
         uses: oven-sh/setup-bun@v2
@@ -49,22 +55,30 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
 
-      - run: bun install --frozen-lockfile
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
 
-      - name: Run tests
-        run: bun run test:parallel
+      - run: bun install
+
+      - name: Run Foundry tests
+        run: bun run test:fast
+
+      - name: Run gas report
+        run: bun run test:gas
 
   deploy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive # Required for forge-std submodule
 
       - name: Use Bun 1.2.3
         uses: oven-sh/setup-bun@v2
         with:
           bun-version: 1.2.3
 
-      - run: bun install --frozen-lockfile
+      - run: bun install
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1

.gitignore

@@ -2,10 +2,12 @@ node_modules
 artifacts
 cache
 gasreport-*
+generated
 .env*
 *.DS_Store
-node_modules
 build
 forge-cache
 out
-deployments/**/.pendingSafeTransactions
+test/foundry-*
+deployments/**/.pendingSafeTransactions
+deployments/localhost

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std

.vscode/settings.json

@@ -1,3 +1,25 @@
 {
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "solidity.remappings": [
+    "@ensdomains/buffer/=node_modules/@ensdomains/buffer/",
+    "@ensdomains/solsha1/=node_modules/@ensdomains/solsha1/",
+    "@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/",
+    "@openzeppelin/contracts-v5/=node_modules/@openzeppelin/contracts-v5/",
+    "forge-std/=lib/forge-std/src/",
+    "test/=test/"
+  ],
+  "solidity.packageDefaultDependenciesContractsDirectory": "contracts",
+  "solidity.packageDefaultDependenciesDirectory": "lib",
+  "search.exclude": {
+    "**/test/foundry-artifacts": true,
+    "**/test/foundry-cache": true,
+    "**/node_modules": true,
+    "**/cache": true,
+    "**/artifacts": true,
+    "**/build": true
+  },
+  "files.exclude": {
+    "**/test/foundry-artifacts": true,
+    "**/test/foundry-cache": true
+  }
 }

contracts/reverseResolver/ChainReverseResolver.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.17;
 
 import {AbstractReverseResolver} from "./AbstractReverseResolver.sol";
 import {Ownable} from "@openzeppelin/contracts-v5/access/Ownable.sol";
-import {GatewayFetchTarget, IGatewayVerifier} from "@unruggable/gateways/contracts/GatewayFetchTarget.sol";
-import {GatewayFetcher, GatewayRequest} from "@unruggable/gateways/contracts/GatewayFetcher.sol";
+import {GatewayFetchTarget, IGatewayVerifier} from "../../node_modules/@unruggable/gateways/contracts/GatewayFetchTarget.sol";
+import {GatewayFetcher, GatewayRequest} from "../../node_modules/@unruggable/gateways/contracts/GatewayFetcher.sol";
 import {IStandaloneReverseRegistrar} from "../reverseRegistrar/IStandaloneReverseRegistrar.sol";
 import {INameReverser} from "./INameReverser.sol";
 

contracts/utils/TestStringUtils.sol

@@ -7,7 +7,7 @@ library TestStringUtils {
     function escape(string memory s) external pure returns (string memory) {
         return StringUtils.escape(s);
     }
-    
+
     function strlen(string memory s) external pure returns (uint256) {
         return StringUtils.strlen(s);
     }

deploy/dnsregistrar/00_deploy_offchain_dns_resolver.ts

@@ -1,22 +1,25 @@
-import type { DeployFunction } from 'hardhat-deploy/types.js'
+import { execute, artifacts } from '@rocketh'
 
-const func: DeployFunction = async function (hre) {
-  const { viem } = hre
+export default execute(
+  async ({ deploy, get, namedAccounts }) => {
+    const { deployer } = namedAccounts
 
-  const registry = await viem.getContract('ENSRegistry')
-  const dnssec = await viem.getContract('DNSSECImpl')
+    const registry = await get('ENSRegistry')
+    const dnssec = await get('DNSSECImpl')
 
-  await viem.deploy('OffchainDNSResolver', [
-    registry.address,
-    dnssec.address,
-    'https://dnssec-oracle.ens.domains/',
-  ])
-
-  return true
-}
-
-func.id = 'OffchainDNSResolver v1.0.0'
-func.tags = ['category:dnsregistrar', 'OffchainDNSResolver']
-func.dependencies = ['ENSRegistry', 'DNSSECImpl']
-
-export default func
+    await deploy('OffchainDNSResolver', {
+      account: deployer,
+      artifact: artifacts.OffchainDNSResolver,
+      args: [
+        registry.address,
+        dnssec.address,
+        'https://dnssec-oracle.ens.domains/',
+      ],
+    })
+  },
+  {
+    id: 'OffchainDNSResolver v1.0.0',
+    tags: ['category:dnsregistrar', 'OffchainDNSResolver'],
+    dependencies: ['ENSRegistry', 'DNSSECImpl'],
+  },
+)

deploy/dnsregistrar/05_deploy_public_suffix_list.ts

@@ -1,66 +1,86 @@
-import type { DeployFunction } from 'hardhat-deploy/types.js'
+import { execute, artifacts } from '@rocketh'
 import type { Hash } from 'viem'
 import { dnsEncodeName } from '../../test/fixtures/dnsEncodeName.js'
 
-const func: DeployFunction = async function (hre) {
-  const { viem } = hre
+export default execute(
+  async ({ deploy, execute, namedAccounts }) => {
+    const { deployer, owner } = namedAccounts
 
-  const { deployer, owner } = await viem.getNamedClients()
+    const psl = await deploy('SimplePublicSuffixList', {
+      account: deployer,
+      artifact: artifacts.SimplePublicSuffixList,
+      args: [],
+    })
 
-  await viem.deploy('SimplePublicSuffixList', [])
+    if (!psl.newlyDeployed) {
+      return
+    }
 
-  const psl = await viem.getContract('SimplePublicSuffixList')
-  const listOwner = await psl.read.owner()
+    console.log('SimplePublicSuffixList deployed successfully')
 
-  if (
-    owner !== undefined &&
-    owner.address !== deployer.address &&
-    listOwner !== owner.address
-  ) {
-    console.log('Transferring ownership to owner account')
-    const hash = await psl.write.transferOwnership([owner.address])
-    console.log(`Transfer ownership (tx: ${hash})...`)
-    await viem.waitForTransactionSuccess(hash)
-  }
+    // Transfer ownership to owner if different from deployer
+    if (owner !== deployer) {
+      await execute(psl, {
+        functionName: 'transferOwnership',
+        args: [owner],
+        account: deployer,
+      })
+      console.log('Transferred ownership to owner account')
+    }
 
-  const suffixList = await (
-    await fetch('https://publicsuffix.org/list/public_suffix_list.dat', {
-      headers: {
-        Connection: 'close',
-      },
-    })
-  ).text()
-  let suffixes = suffixList
-    .split('\n')
-    .filter((suffix) => !suffix.startsWith('//') && suffix.trim() != '')
-  // Right now we're only going to support top-level, non-idna suffixes
-  suffixes = suffixes.filter((suffix) => suffix.match(/^[a-z0-9]+$/))
+    // Fetch and set public suffix list
+    const suffixList = await (
+      await fetch('https://publicsuffix.org/list/public_suffix_list.dat', {
+        headers: {
+          Connection: 'close',
+        },
+      })
+    ).text()
 
-  const transactionHashes: Hash[] = []
-  console.log('Starting suffix transactions')
+    let suffixes = suffixList
+      .split('\n')
+      .filter((suffix) => !suffix.startsWith('//') && suffix.trim() != '')
+    // Right now we're only going to support top-level, non-idna suffixes
+    suffixes = suffixes.filter((suffix) => suffix.match(/^[a-z0-9]+$/))
 
-  for (let i = 0; i < suffixes.length; i += 100) {
-    const batch = suffixes
-      .slice(i, i + 100)
-      .map((suffix) => dnsEncodeName(suffix))
-    const hash = await psl.write.addPublicSuffixes([batch], {
-      account: owner.account,
-    })
-    console.log(`Setting suffixes (tx: ${hash})...`)
-    transactionHashes.push(hash)
-  }
-  console.log(
-    `Waiting on ${transactionHashes.length} suffix-setting transactions to complete...`,
-  )
-  await Promise.all(
-    transactionHashes.map((hash) => viem.waitForTransactionSuccess(hash)),
-  )
+    console.log(`Starting suffix transactions for ${suffixes.length} suffixes`)
+    const totalBatches = Math.ceil(suffixes.length / 100)
+    let successfulBatches = 0
+    let failedBatches = 0
+
+    // Send transactions sequentially to avoid nonce conflicts
+    for (let i = 0; i < suffixes.length; i += 100) {
+      const batch = suffixes
+        .slice(i, i + 100)
+        .map((suffix) => dnsEncodeName(suffix))
 
-  return true
-}
+      const batchIndex = Math.floor(i / 100) + 1
+      console.log(
+        `Sending suffixes batch ${batchIndex}/${totalBatches} (${batch.length} suffixes)`,
+      )
 
-func.id = 'SimplePublicSuffixList v1.0.0'
-func.tags = ['category:dnsregistrar', 'SimplePublicSuffixList']
-func.dependencies = []
+      try {
+        await execute(psl, {
+          functionName: 'addPublicSuffixes',
+          args: [batch],
+          account: owner,
+        })
+        successfulBatches++
+        console.log(`Batch ${batchIndex} completed successfully`)
+      } catch (error) {
+        failedBatches++
+        console.error(`Batch ${batchIndex} failed:`, error.message || error)
+        // Continue with next batch
+      }
+    }
 
-export default func
+    console.log(
+      `Public suffix list configuration completed: ${successfulBatches} successful, ${failedBatches} failed`,
+    )
+  },
+  {
+    id: 'SimplePublicSuffixList v1.0.0',
+    tags: ['category:dnsregistrar', 'SimplePublicSuffixList'],
+    dependencies: [],
+  },
+)