From c2ddc1a8894df8b83503f6730fd22b4027bdf1b7 Mon Sep 17 00:00:00 2001 From: julink-eth Date: Thu, 18 Apr 2024 14:01:43 +0200 Subject: [PATCH 1/8] chore: test github action frontend build --- .github/workflows/docker.yml | 57 ------------------- .github/workflows/frontend.yml | 4 +- .../poh-verifier-build-and-publish.yml | 16 ++++++ .github/workflows/slither.yml | 30 ---------- .github/workflows/test.yml | 32 ----------- Dockerfile => packages/ens-app-v3/Dockerfile | 0 6 files changed, 18 insertions(+), 121 deletions(-) delete mode 100644 .github/workflows/docker.yml create mode 100644 .github/workflows/poh-verifier-build-and-publish.yml delete mode 100644 .github/workflows/slither.yml delete mode 100644 .github/workflows/test.yml rename Dockerfile => packages/ens-app-v3/Dockerfile (100%) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index 9e236c212..000000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: Docker Image - -on: - push: - branches: - - develop - # pull_request: - release: - types: - - released - -jobs: - publish: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Set Docker Tag - id: docker-tag - if: ${{ github.event_name != 'release' }} - run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)" | tee $GITHUB_ENV - - - name: Set Docker Tag - Release - id: docker-tag-release - if: ${{ github.event_name == 'release' }} - run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-${GITHUB_REF#refs/tags/}" | tee $GITHUB_ENV - - - name: Login to Docker Repository - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_REPO_USER }} - password: ${{ secrets.DOCKER_REPO_TOKEN }} - - - - # Setting up Docker Buildx with docker-container driver is required - # at the moment to be able to use a subdirectory with Git context - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Docker Image Build - id: docker-build - if: ${{ github.event_name == 'pull_request' }} - uses: docker/build-push-action@v4 - with: - context: "{{defaultContext}}:packages/gateway" - push: false - tags: consensys/linea-resolver:${{ env.DOCKER_TAG }} - - - name: Docker Image Build and Publish - id: docker-build-publish - if: ${{ github.ref == 'refs/heads/develop' || startsWith(github.ref,'refs/tags/') }} - uses: docker/build-push-action@v4 - with: - context: "{{defaultContext}}:packages/gateway" - push: true - tags: consensys/linea-resolver:${{ env.DOCKER_TAG }} \ No newline at end of file diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index e563e52af..c7227f299 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -12,7 +12,7 @@ on: - released jobs: - publish: + ens-app-publish: runs-on: ubuntu-latest steps: - name: Checkout @@ -47,7 +47,7 @@ jobs: uses: docker/build-push-action@v4 with: context: ./ - file: ./Dockerfile + file: ./packages/ens-app-v3/Dockerfile push: true tags: consensys/linea-resolver:${{ env.DOCKER_TAG }} build-args: BUILD_COMMAND="pnpm build" diff --git a/.github/workflows/poh-verifier-build-and-publish.yml b/.github/workflows/poh-verifier-build-and-publish.yml new file mode 100644 index 000000000..2697f2e07 --- /dev/null +++ b/.github/workflows/poh-verifier-build-and-publish.yml @@ -0,0 +1,16 @@ +name: Build and Publish PoH Verifier API + +on: + pull_request: + branches: + - main + paths: + - "packages/poh-verifier/**" + +jobs: + l2-contracts-tests: + runs-on: ubuntu-latest + + defaults: + run: + working-directory: ./packages/poh-verifier diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml deleted file mode 100644 index d8634bb14..000000000 --- a/.github/workflows/slither.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Slither Analysis -on: - pull_request: - branches: - - develop - push: - branches: - - develop -jobs: - analyze: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Run Slither - uses: crytic/slither-action@v0.3.0 - id: slither - env: - L2_PROVIDER_URL: ${{ secrets.L2_PROVIDER_URL }} - L1_PROVIDER_URL: ${{ secrets.L1_PROVIDER_URL }} - with: - node-version: 16 - target: "packages/contracts" - sarif: results.sarif - fail-on: none - - - name: Upload SARIF file - uses: github/codeql-action/upload-sarif@v2 - with: - sarif_file: ${{ steps.slither.outputs.sarif }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index f0fc461f9..000000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: "Execute lint and test" - -on: - pull_request: - branches: - - develop - push: - branches: - - develop -jobs: - test-smart-contracts-and-build-gateway: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Install dependencies - working-directory: ./packages/contracts - run: yarn install - - name: Lint the code - working-directory: ./packages/contracts - run: yarn lint - - name: Run tests - working-directory: ./packages/contracts - env: - L2_PROVIDER_URL: ${{ secrets.L2_PROVIDER_URL }} - L1_PROVIDER_URL: ${{ secrets.L1_PROVIDER_URL }} - run: yarn test - - name: Build Gateway - working-directory: ./packages/gateway - run: | - yarn install - yarn build diff --git a/Dockerfile b/packages/ens-app-v3/Dockerfile similarity index 100% rename from Dockerfile rename to packages/ens-app-v3/Dockerfile From e4f7688a67229d28da388355a655a056ad78dc9e Mon Sep 17 00:00:00 2001 From: julink-eth Date: Thu, 18 Apr 2024 14:05:11 +0200 Subject: [PATCH 2/8] chore: test --- .github/workflows/frontend.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index c7227f299..b1aff5d23 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -43,7 +43,6 @@ jobs: env: NEXT_PUBLIC_BASE_DOMAIN: ${{ secrets.NEXT_PUBLIC_BASE_DOMAIN }} NEXT_PUBLIC_ALCHEMY_KEY: ${{ secrets.NEXT_PUBLIC_ALCHEMY_KEY }} - if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') }} uses: docker/build-push-action@v4 with: context: ./ From 7a1eddb31692d30173b6bd2bd36db83f6b8b1019 Mon Sep 17 00:00:00 2001 From: julink-eth Date: Thu, 18 Apr 2024 15:50:41 +0200 Subject: [PATCH 3/8] feat: cleanup github actions to be more standard + add action for poh-verifier --- ...frontend.yml => ens-app-build-publish.yml} | 5 +- .../poh-verifier-build-and-publish.yml | 16 ------ .../workflows/poh-verifier-build-publish.yml | 56 +++++++++++++++++++ packages/poh-verifier/.env.production | 11 ++++ packages/poh-verifier/Dockerfile | 16 ++++++ 5 files changed, 86 insertions(+), 18 deletions(-) rename .github/workflows/{frontend.yml => ens-app-build-publish.yml} (88%) delete mode 100644 .github/workflows/poh-verifier-build-and-publish.yml create mode 100644 .github/workflows/poh-verifier-build-publish.yml create mode 100644 packages/poh-verifier/.env.production create mode 100644 packages/poh-verifier/Dockerfile diff --git a/.github/workflows/frontend.yml b/.github/workflows/ens-app-build-publish.yml similarity index 88% rename from .github/workflows/frontend.yml rename to .github/workflows/ens-app-build-publish.yml index b1aff5d23..e992b4dde 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/ens-app-build-publish.yml @@ -12,7 +12,7 @@ on: - released jobs: - ens-app-publish: + ens-app-build-publish: runs-on: ubuntu-latest steps: - name: Checkout @@ -43,10 +43,11 @@ jobs: env: NEXT_PUBLIC_BASE_DOMAIN: ${{ secrets.NEXT_PUBLIC_BASE_DOMAIN }} NEXT_PUBLIC_ALCHEMY_KEY: ${{ secrets.NEXT_PUBLIC_ALCHEMY_KEY }} + if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') }} uses: docker/build-push-action@v4 with: context: ./ file: ./packages/ens-app-v3/Dockerfile push: true - tags: consensys/linea-resolver:${{ env.DOCKER_TAG }} + tags: consensys/ens-app:${{ env.DOCKER_TAG }} build-args: BUILD_COMMAND="pnpm build" diff --git a/.github/workflows/poh-verifier-build-and-publish.yml b/.github/workflows/poh-verifier-build-and-publish.yml deleted file mode 100644 index 2697f2e07..000000000 --- a/.github/workflows/poh-verifier-build-and-publish.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Build and Publish PoH Verifier API - -on: - pull_request: - branches: - - main - paths: - - "packages/poh-verifier/**" - -jobs: - l2-contracts-tests: - runs-on: ubuntu-latest - - defaults: - run: - working-directory: ./packages/poh-verifier diff --git a/.github/workflows/poh-verifier-build-publish.yml b/.github/workflows/poh-verifier-build-publish.yml new file mode 100644 index 000000000..33116b9a7 --- /dev/null +++ b/.github/workflows/poh-verifier-build-publish.yml @@ -0,0 +1,56 @@ +name: "Build and Publish PoH Verifier API" + +on: + push: + branches: + - main + paths: + - "packages/poh-verifier/**" + pull_request: + branches: + - main + paths: + - "packages/poh-verifier/**" + release: + types: + - released + +jobs: + poh-verifier-build-publish: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set Docker Tag + id: docker-tag + if: ${{ github.event_name != 'release' }} + run: | + echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)" >> $GITHUB_ENV + + - name: Set Docker Tag - Release + id: docker-tag-release + if: ${{ github.event_name == 'release' }} + run: | + echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + + - name: Login to Docker Repository + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_REPO_USER }} + password: ${{ secrets.DOCKER_REPO_TOKEN }} + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Docker Image Build and Publish + env: + SIGNER_PRIVATE_KEY: ${{ secrets.POH_VERIFIER_PRIVATE_KEY }} + uses: docker/build-push-action@v4 + with: + build-args: | + ENV_FILE=.env.production + context: ./packages/poh-verifier + file: ./packages/poh-verifier/Dockerfile + push: true + tags: consensys/poh-verifier:${{ env.DOCKER_TAG }} diff --git a/packages/poh-verifier/.env.production b/packages/poh-verifier/.env.production new file mode 100644 index 000000000..45afe3bcd --- /dev/null +++ b/packages/poh-verifier/.env.production @@ -0,0 +1,11 @@ +# Env +NODE_ENV=development +PORT=3000 + +# Signer +VERIFIER_CONTRACT_ADDRESS=0xa904d832aBEBb150acde3Aa520cAC39B0970AF1b + +# Poh API +POH_API_URL=https://linea-xp-poh-api.linea.build + +CHAIN_ID=11155111 \ No newline at end of file diff --git a/packages/poh-verifier/Dockerfile b/packages/poh-verifier/Dockerfile new file mode 100644 index 000000000..7c4dfe7dc --- /dev/null +++ b/packages/poh-verifier/Dockerfile @@ -0,0 +1,16 @@ +FROM node:18 + +WORKDIR /app + +ARG ENV_FILE + +COPY . . + +COPY $ENV_FILE .env + +RUN npm install +RUN npm run build + +EXPOSE 3000 + +CMD ["npm", "start"] \ No newline at end of file From 56045c5bd6604a1a017676d38640da7f7fa71e43 Mon Sep 17 00:00:00 2001 From: julink-eth Date: Thu, 18 Apr 2024 16:20:03 +0200 Subject: [PATCH 4/8] feat: use linea-resolver repo --- .github/workflows/ens-app-build-publish.yml | 8 +++----- .github/workflows/poh-verifier-build-publish.yml | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ens-app-build-publish.yml b/.github/workflows/ens-app-build-publish.yml index e992b4dde..fcdd4b736 100644 --- a/.github/workflows/ens-app-build-publish.yml +++ b/.github/workflows/ens-app-build-publish.yml @@ -21,14 +21,12 @@ jobs: - name: Set Docker Tag id: docker-tag if: ${{ github.event_name != 'release' }} - run: | - echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)" >> $GITHUB_ENV + run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier" >> $GITHUB_ENV - name: Set Docker Tag - Release id: docker-tag-release if: ${{ github.event_name == 'release' }} - run: | - echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier-${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV - name: Login to Docker Repository uses: docker/login-action@v2 @@ -49,5 +47,5 @@ jobs: context: ./ file: ./packages/ens-app-v3/Dockerfile push: true - tags: consensys/ens-app:${{ env.DOCKER_TAG }} + tags: consensys/linea-resolver:${{ env.DOCKER_TAG }} build-args: BUILD_COMMAND="pnpm build" diff --git a/.github/workflows/poh-verifier-build-publish.yml b/.github/workflows/poh-verifier-build-publish.yml index 33116b9a7..eaad9bea1 100644 --- a/.github/workflows/poh-verifier-build-publish.yml +++ b/.github/workflows/poh-verifier-build-publish.yml @@ -25,14 +25,12 @@ jobs: - name: Set Docker Tag id: docker-tag if: ${{ github.event_name != 'release' }} - run: | - echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)" >> $GITHUB_ENV + run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier" >> $GITHUB_ENV - name: Set Docker Tag - Release id: docker-tag-release if: ${{ github.event_name == 'release' }} - run: | - echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier-${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV - name: Login to Docker Repository uses: docker/login-action@v2 @@ -53,4 +51,4 @@ jobs: context: ./packages/poh-verifier file: ./packages/poh-verifier/Dockerfile push: true - tags: consensys/poh-verifier:${{ env.DOCKER_TAG }} + tags: consensys/linea-resolver:${{ env.DOCKER_TAG }} From 818cd2756f0f56bf1598a88f0397517533c113ea Mon Sep 17 00:00:00 2001 From: julink-eth Date: Thu, 18 Apr 2024 16:32:25 +0200 Subject: [PATCH 5/8] chore: test echo tag --- .github/workflows/ens-app-build-publish.yml | 4 ++-- .github/workflows/poh-verifier-build-publish.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ens-app-build-publish.yml b/.github/workflows/ens-app-build-publish.yml index fcdd4b736..13cf7f5c2 100644 --- a/.github/workflows/ens-app-build-publish.yml +++ b/.github/workflows/ens-app-build-publish.yml @@ -21,12 +21,12 @@ jobs: - name: Set Docker Tag id: docker-tag if: ${{ github.event_name != 'release' }} - run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier" >> $GITHUB_ENV + run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier" | tee $GITHUB_ENV - name: Set Docker Tag - Release id: docker-tag-release if: ${{ github.event_name == 'release' }} - run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier-${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier-${GITHUB_REF#refs/tags/}" | tee $GITHUB_ENV - name: Login to Docker Repository uses: docker/login-action@v2 diff --git a/.github/workflows/poh-verifier-build-publish.yml b/.github/workflows/poh-verifier-build-publish.yml index eaad9bea1..e87011e14 100644 --- a/.github/workflows/poh-verifier-build-publish.yml +++ b/.github/workflows/poh-verifier-build-publish.yml @@ -25,12 +25,12 @@ jobs: - name: Set Docker Tag id: docker-tag if: ${{ github.event_name != 'release' }} - run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier" >> $GITHUB_ENV + run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier" | tee $GITHUB_ENV - name: Set Docker Tag - Release id: docker-tag-release if: ${{ github.event_name == 'release' }} - run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier-${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier-${GITHUB_REF#refs/tags/}" | tee $GITHUB_ENV - name: Login to Docker Repository uses: docker/login-action@v2 From 490803605119024fe9b6466fe4f2ef75a5f3b5f2 Mon Sep 17 00:00:00 2001 From: julink-eth Date: Thu, 18 Apr 2024 16:34:50 +0200 Subject: [PATCH 6/8] feat replace poh-verifier by ens-app in github action for the ens-app build and publish --- .github/workflows/ens-app-build-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ens-app-build-publish.yml b/.github/workflows/ens-app-build-publish.yml index 13cf7f5c2..0e4afd6ed 100644 --- a/.github/workflows/ens-app-build-publish.yml +++ b/.github/workflows/ens-app-build-publish.yml @@ -21,12 +21,12 @@ jobs: - name: Set Docker Tag id: docker-tag if: ${{ github.event_name != 'release' }} - run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier" | tee $GITHUB_ENV + run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-ens-app" | tee $GITHUB_ENV - name: Set Docker Tag - Release id: docker-tag-release if: ${{ github.event_name == 'release' }} - run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-poh-verifier-${GITHUB_REF#refs/tags/}" | tee $GITHUB_ENV + run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-ens-app-${GITHUB_REF#refs/tags/}" | tee $GITHUB_ENV - name: Login to Docker Repository uses: docker/login-action@v2 From efb9e9637d5bc1d84e8b914efeb3d65b422e9c58 Mon Sep 17 00:00:00 2001 From: julink-eth Date: Thu, 18 Apr 2024 17:56:04 +0200 Subject: [PATCH 7/8] fix: docker build arguments --- .github/workflows/ens-app-build-publish.yml | 4 ++++ .github/workflows/poh-verifier-build-publish.yml | 3 +-- packages/poh-verifier/Dockerfile | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ens-app-build-publish.yml b/.github/workflows/ens-app-build-publish.yml index 0e4afd6ed..758003d37 100644 --- a/.github/workflows/ens-app-build-publish.yml +++ b/.github/workflows/ens-app-build-publish.yml @@ -4,9 +4,13 @@ on: push: branches: - main + paths: + - "packages/ens-app-v3/**" pull_request: branches: - main + paths: + - "packages/ens-app-v3/**" release: types: - released diff --git a/.github/workflows/poh-verifier-build-publish.yml b/.github/workflows/poh-verifier-build-publish.yml index e87011e14..9068f882f 100644 --- a/.github/workflows/poh-verifier-build-publish.yml +++ b/.github/workflows/poh-verifier-build-publish.yml @@ -42,12 +42,11 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Docker Image Build and Publish - env: - SIGNER_PRIVATE_KEY: ${{ secrets.POH_VERIFIER_PRIVATE_KEY }} uses: docker/build-push-action@v4 with: build-args: | ENV_FILE=.env.production + SIGNER_PRIVATE_KEY=${{ secrets.POH_VERIFIER_PRIVATE_KEY }} context: ./packages/poh-verifier file: ./packages/poh-verifier/Dockerfile push: true diff --git a/packages/poh-verifier/Dockerfile b/packages/poh-verifier/Dockerfile index 7c4dfe7dc..b810bcd13 100644 --- a/packages/poh-verifier/Dockerfile +++ b/packages/poh-verifier/Dockerfile @@ -3,6 +3,9 @@ FROM node:18 WORKDIR /app ARG ENV_FILE +ARG SIGNER_PRIVATE_KEY + +ENV SIGNER_PRIVATE_KEY=$SIGNER_PRIVATE_KEY COPY . . From d6926513a4f8f5be5edb8ad0dbd2ff49ecba1c47 Mon Sep 17 00:00:00 2001 From: Julink Date: Fri, 19 Apr 2024 09:53:26 +0200 Subject: [PATCH 8/8] feat: make ens-app deployment for sepolia --- .github/workflows/ens-app-build-publish.yml | 1 + packages/ens-app-v3/.env.example | 6 +++- .../ens-app-v3/src/constants/sepoliaCustom.ts | 26 ++++++++--------- packages/ens-app-v3/src/utils/query/wagmi.ts | 4 +-- packages/ens-subgraph/networks.json | 28 +++++++++---------- packages/ens-subgraph/package.json | 5 ++-- 6 files changed, 36 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ens-app-build-publish.yml b/.github/workflows/ens-app-build-publish.yml index 758003d37..dc8a3de16 100644 --- a/.github/workflows/ens-app-build-publish.yml +++ b/.github/workflows/ens-app-build-publish.yml @@ -45,6 +45,7 @@ jobs: env: NEXT_PUBLIC_BASE_DOMAIN: ${{ secrets.NEXT_PUBLIC_BASE_DOMAIN }} NEXT_PUBLIC_ALCHEMY_KEY: ${{ secrets.NEXT_PUBLIC_ALCHEMY_KEY }} + NEXT_PUBLIC_POH_SIGNATURE_API: "https://poh-verifier.dev.linea.build" if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') }} uses: docker/build-push-action@v4 with: diff --git a/packages/ens-app-v3/.env.example b/packages/ens-app-v3/.env.example index 4672a2604..8e6dea656 100644 --- a/packages/ens-app-v3/.env.example +++ b/packages/ens-app-v3/.env.example @@ -21,4 +21,8 @@ BATCH_GATEWAY_URLS='["https://ccip-v2.ens.xyz/"]' NEXT_PUBLIC_BASE_DOMAIN='linea-test' # To be read by the frontend dapp BASE_DOMAIN='linea-test' # To be read by the deployment scripts in "l2-cntracts" -NEXT_PUBLIC_POH_SIGNATURE_API='http://localhost:4000' \ No newline at end of file +# Local +NEXT_PUBLIC_POH_SIGNATURE_API='http://localhost:4000' + +# Sepolia +# NEXT_PUBLIC_POH_SIGNATURE_API='https://poh-verifier.dev.linea.build' \ No newline at end of file diff --git a/packages/ens-app-v3/src/constants/sepoliaCustom.ts b/packages/ens-app-v3/src/constants/sepoliaCustom.ts index e2c8c3dfc..3dd51c5a0 100644 --- a/packages/ens-app-v3/src/constants/sepoliaCustom.ts +++ b/packages/ens-app-v3/src/constants/sepoliaCustom.ts @@ -21,10 +21,10 @@ export const sepoliaCustom = /* #__PURE__ */ defineChain({ address: '0xca11bde05977b3631167028862be2a173976ca11', blockCreated: 751532, }, - ensRegistry: { address: '0x56c306b6d15287870B9484883335B8a929f97729' }, + ensRegistry: { address: '0xCeF1e850d0207B237Ae91e64037072F93C76aE35' }, ensUniversalResolver: { - address: '0x35B37282d7f7005DE1c3F867A6C663d4a530E229', - blockCreated: 5_647_522, + address: '0x7263bA3b95Ae6177dC39D22f7eF4E277806E8aCF', + blockCreated: 5_710_989, }, }, testnet: true, @@ -32,33 +32,33 @@ export const sepoliaCustom = /* #__PURE__ */ defineChain({ export const sepoliaCustomEnsAddresses = { ensBaseRegistrarImplementation: { - address: '0x3680EbF9a484B1250E46324328582AbcB53B6791', + address: '0x2372154B01F1071b2f2BB02e93Ab97404f1F7a76', }, ensBulkRenewal: { - address: '0x88Cd4C93b97271AaBA45Bf74a3df5178aB2Ef874', + address: '0x05341E05dc959eF86E08a41883F5B478947B790D', }, ensDnsRegistrar: { - address: '0x964429Cee5760eF8E10d52d7061DbD4A70d8B5F4', + address: '0x88eeA2489dCc3BeF6439E65a413b68F1a23F1DCf', }, ensDnssecImpl: { - address: '0x541B273dE31cd631544a164C6F1679FD2995FD34', + address: '0x45FC85e99c62359d2A778d759FA36dF3D53a31D4', }, ensEthRegistrarController: { - address: '0x65560259405ab2c6a14Aa753e47933a04C8c1b43', + address: '0x77D2a098D81580633091529FB93953dE9180c0c0', }, ensNameWrapper: { - address: '0x3b365991034a573d54E6D10e88BfacBF2788A23e', + address: '0xB496f723a0180418b0F15e2b1af7d60BBa8Afeb1', }, ensPublicResolver: { - address: '0xca710b440ad4457eE7a8C02355dcA985B78B7627', + address: '0xA4254Ba887ea0813A3F265A7442fAFa68E21a6bb', }, ensRegistry: { - address: '0x56c306b6d15287870B9484883335B8a929f97729', + address: '0xCeF1e850d0207B237Ae91e64037072F93C76aE35', }, ensReverseRegistrar: { - address: '0x8f71DD4896e0f005dC3dAF7435D75CaB8B0A721b', + address: '0xDf307b640a95E6ed82798Eb41A5f388D0eF75C38', }, ensUniversalResolver: { - address: '0x35B37282d7f7005DE1c3F867A6C663d4a530E229', + address: '0x7263bA3b95Ae6177dC39D22f7eF4E277806E8aCF', }, } diff --git a/packages/ens-app-v3/src/utils/query/wagmi.ts b/packages/ens-app-v3/src/utils/query/wagmi.ts index 8e54020fa..7fb299d82 100644 --- a/packages/ens-app-v3/src/utils/query/wagmi.ts +++ b/packages/ens-app-v3/src/utils/query/wagmi.ts @@ -119,9 +119,7 @@ const wagmiConfig_ = createConfig({ ]) as unknown as FallbackTransport, } as const), ...({ - [sepolia.id]: initialiseTransports('linea-sepolia', [ - infuraUrl, - ]) as unknown as FallbackTransport, + [sepolia.id]: initialiseTransports('sepolia', [infuraUrl]) as unknown as FallbackTransport, } as const), }, }) diff --git a/packages/ens-subgraph/networks.json b/packages/ens-subgraph/networks.json index fa2381f70..e99c0f2ac 100644 --- a/packages/ens-subgraph/networks.json +++ b/packages/ens-subgraph/networks.json @@ -59,32 +59,32 @@ }, "sepolia": { "ENSRegistry": { - "address": "0x9125C4f492Ca725A2EAE5d9Df5643F6f41Fe77BE", - "startBlock": 5570702 + "address": "0xCeF1e850d0207B237Ae91e64037072F93C76aE35", + "startBlock": 5710905 }, "ENSRegistryOld": { - "address": "0x529a47F9d92375Ea637b56e64C7eaec266B4A575", - "startBlock": 5570741 + "address": "0x4672c086d0dED53102b2cd6fC68a49f1574166a6", + "startBlock": 5710900 }, "Resolver": { - "address": "0x7161c2eEf390ef14053E13012D6E761938820127", - "startBlock": 5570761 + "address": "0xA4254Ba887ea0813A3F265A7442fAFa68E21a6bb", + "startBlock": 5710986 }, "BaseRegistrar": { - "address": "0x0d5446e2050DCDc373DbB13A2e6a81D89E85FEb6", - "startBlock": 5570704 + "address": "0x2372154B01F1071b2f2BB02e93Ab97404f1F7a76", + "startBlock": 5710907 }, "EthRegistrarControllerOld": { - "address": "0x34823AD0432e7BDB512556093A369539fd3cCb39", - "startBlock": 5570748 + "address": "0xca23A9C1129A62584A6a656cE03130020f6eaf53", + "startBlock": 5710964 }, "EthRegistrarController": { - "address": "0xE2f076220c4e456A10398A8482d84BE1E8b82516", - "startBlock": 5570752 + "address": "0x77D2a098D81580633091529FB93953dE9180c0c0", + "startBlock": 5710979 }, "NameWrapper": { - "address": "0x0Fb19ba94805a816471C84c90F167285bA888FD3", - "startBlock": 5570741 + "address": "0xB496f723a0180418b0F15e2b1af7d60BBa8Afeb1", + "startBlock": 5710956 } }, "holesky": { diff --git a/packages/ens-subgraph/package.json b/packages/ens-subgraph/package.json index a0e78bbe5..e8c101801 100644 --- a/packages/ens-subgraph/package.json +++ b/packages/ens-subgraph/package.json @@ -16,9 +16,8 @@ "docker:remove-local": "graph remove graphprotocol/ens --node http://ens-app_graph-node_1:8020", "build": "graph build", "deploy": "graph deploy --network mainnet --product hosted-service ensdomains/ens", - "deploy:goerli": "graph deploy --network goerli --product hosted-service ensdomains/ensgoerli", - "deploy:sepolia": "graph deploy --network sepolia --studio enssepolia", - "deploy:holesky": "graph deploy --network holesky --studio ensholesky", + "deploy:sepolia": "graph deploy --network sepolia --studio ens-sepolia", + "deploy:holesky": "graph deploy --network holesky --studio ens-sepolia", "watch-local": "graph deploy graphprotocol/ens --watch --debug --node http://127.0.0.1:8020/ --ipfs http://localhost:5001" }, "devDependencies": {