Fix parachain build in proxy-contracts branch (#889)

* Upgrade ssz_rs crate. (#880) * Upgrade ssz_rs crate. * Upgrade ssz_rs crate. --------- Co-authored-by: claravanstaden <Cats 4 life!> * Bump nixpkgs to use its geth package (#885) * Bump nixpkgs to use its geth package * Use source config in PolkadotListener * Match field order in struct def * Move info log to relay creation * Remove unused channel * Whitespace * Add context to errors * Add logs * Bump node & pnpm in workflow * Rename locals * Remove unused variable * Add Troubleshooting README section * Fix up .envrc-example files * Add note about pure shells * Update cumulus submodule (#886) * Inbound queue benchmarks (#876) * Start with inbound channel benchmarks. * Add method to set execution header storage for benchmark test. * Working on benchmarks * Basic working version * Cleanup * Removes cleanup. * Adds some comments for Alistair. * Adds branch name. * Makes note * Test transactions * Cleaning up beacon client deps. * Clean up comments. * Tests cleanup. * Fixes non-benchmark test runs. * Cleanup. * Update fixtures and generates benchmarks. * Revert relayer logs. * Cleanup BenchmarkHelper impl and inbound queue dependencies. * fmt * Cleanup imports. * Cleanup imports. * Touch * Adds weights in inbound queue pallet. * Fix tests. * Update cumulus. --------- Co-authored-by: claravanstaden <Cats 4 life!> * Fix parachain build * Move BalanceOf outside of pallet * remove benchmark for non existing method * downgrade cargo.lock to match cumulus * fix benchmarks --------- Co-authored-by: Clara van Staden <claravanstaden64@gmail.com> Co-authored-by: Alistair Singh <alistair.singh7@gmail.com>
Snowfork · Jul 19, 2023 · 669d414 · 669d414
1 parent 6d44b0d
commit 669d414
Show file tree

Hide file tree

Showing 34 changed files with 395 additions and 201 deletions.
diff --git a/.envrc.example → .envrc-example b/.envrc.example → .envrc-example
diff --git a/.github/workflows/ethereum.yml b/.github/workflows/ethereum.yml
@@ -22,11 +22,11 @@ jobs:
           fetch-depth: 2
       - uses: pnpm/action-setup@v2.0.1
         with:
-          version: 8.4.0
+          version: 8.6.6
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: v18.16.0
+          node-version: v18.16.1
           cache: "pnpm"
           cache-dependency-path: core/pnpm-lock.yaml
       - name: Install Foundry

diff --git a/README.md b/README.md
@@ -66,11 +66,37 @@ direnv allow
 
 ## Upgrade
 
-Sometimes we would like to upgrade rust toolchain. First update `parachain/rust-toolchain.toml` as required and then update `flake.lock` running 
+Sometimes we would like to upgrade rust toolchain. First update `parachain/rust-toolchain.toml` as required and then update `flake.lock` running
 ```sh
 nix flake lock --update-input rust-overlay
 ```
 
 ## Security
 
 The security policy and procedures can be found in SECURITY.md.
+
+## Troubleshooting
+
+Check the contents of all `.envrc` files.
+
+Remove untracked files:
+```sh
+git clean -idx
+```
+
+Ensure submodules are up-to-date:
+```sh
+git submodule update
+```
+
+Check untracked files & directories:
+```sh
+git clean -ndx | awk '{print $3}'
+```
+
+Check Nix config in `~/.config/nix/nix.conf`.
+
+Run a pure developer shell (note that this removes access to your local tools):
+```sh
+nix develop -i --pure-eval
+```
diff --git a/core/package.json b/core/package.json
@@ -2,8 +2,8 @@
   "name": "@snowbridge/core",
   "private": true,
   "engines": {
-    "node": "v18.16.0",
-    "pnpm": "8.4.0"
+    "node": "v18.16.1",
+    "pnpm": "8.6.6"
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",

diff --git a/core/packages/test/.envrc-example b/core/packages/test/.envrc-example
@@ -32,4 +32,3 @@ source_up_if_exists
 # export CUMULUS_VER=snowbridge       # For dev setup change to some feature branch
 # export SKIP_RELAYER=false           # For local setup only, set as true to skip starting relayer so to manually debug later
 # export ETH_FAST_MODE=false          # For local setup only, set as true will hack beacon client for fast slot time
-
diff --git a/core/packages/test/scripts/build-binary.sh b/core/packages/test/scripts/build-binary.sh
@@ -59,19 +59,9 @@ build_relayer()
     cp $relay_bin "$output_bin_dir"
 }
 
-build_geth() {
-    if [ ! -f "$geth_dir/geth" ]; then
-        echo "Building geth binary"
-        mkdir -p $geth_dir
-        GOBIN=$geth_dir go install -v -x github.com/ethereum/go-ethereum/cmd/geth@$geth_version
-    fi
-    cp "$geth_dir/geth" "$output_bin_dir"
-}
-
 install_binary() {
     echo "Building and installing binaries."
     mkdir -p $output_bin_dir
-    build_geth
     build_cumulus_from_source
     build_relaychain
     build_relayer

diff --git a/cumulus b/cumulus
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -40,7 +40,7 @@
 
                     # ethereum
                     foundry-bin
-                    # go-ethereum
+                    go-ethereum
                     # gnupg for forge install
                     gnupg