Merge branch 'master' into merkle-perf

OffchainLabs · May 3, 2024 · f63141c · f63141c
2 parents 2ce703f + 6af948f
commit f63141c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml
@@ -39,7 +39,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          token: ${{ secrets.PRIVATE_CHECKOUT }}
           submodules: recursive
 
       - name: Install Ubuntu dependencies

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          token: ${{ secrets.PRIVATE_CHECKOUT }}
           submodules: true
 
       - name: Install dependencies

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -45,9 +45,11 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        token: ${{ secrets.PRIVATE_CHECKOUT }}
         submodules: true
 
+    - name: Install dependencies
+      run: sudo apt update && sudo apt install -y wabt
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -25,7 +25,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          token: ${{ secrets.PRIVATE_CHECKOUT }}
           submodules: recursive
 
       - name: Set up Docker Buildx

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "go-ethereum"]
 	path = go-ethereum
-	url = https://github.com/OffchainLabs/polygeth.git
+	url = https://github.com/OffchainLabs/go-ethereum.git
 [submodule "fastcache"]
 	path = fastcache
 	url = https://github.com/OffchainLabs/fastcache.git
@@ -12,7 +12,7 @@
 	url = https://github.com/google/brotli.git
 [submodule "contracts"]
 	path = contracts
-	url = https://github.com/OffchainLabs/stylus-contracts.git
+	url = https://github.com/OffchainLabs/nitro-contracts.git
 	branch = develop
 [submodule "arbitrator/wasm-testsuite/testsuite"]
 	path = arbitrator/wasm-testsuite/testsuite