Update version

Former-commit-id: 10f2fbaa37
Merge pull request #172 from cerc-io/dboreham/revert-foundry-image
2023-01-30 22:28:33 +01:00 · 2023-01-30 22:06:26 +01:00 · 2023-01-30 14:05:48 -07:00 · 2023-01-30 19:12:06 +01:00 · 2023-01-30 16:53:57 +01:00 · 2023-01-28 11:35:44 -07:00
13 changed files with 43 additions and 126 deletions
@@ -1,67 +0,0 @@
-version: '3.7'
-
-services:
-  datanet-eth-bootnode-geth:
-    hostname: datanet-eth-bootnode-geth
-    env_file:
-      - ../config/datanet-eth/datanet-eth.env
-    environment:
-      RUN_BOOTNODE: "true"
-    image: cerc/datanet-eth-geth:local
-    ports:
-      - "9898"
-      - "30303"
-
-  datanet-eth-geth-1:
-    hostname: datanet-eth-geth-1
-    cap_add:
-      - SYS_PTRACE
-    environment:
-      CERC_REMOTE_DEBUG: "false"
-      CERC_RUN_STATEDIFF: "false"
-      CERC_STATEDIFF_DB_NODE_ID: 1
-    env_file:
-      - ../config/datanet-eth/datanet-eth.env
-    image: cerc/datanet-eth-geth:local
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "8545"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    depends_on:
-      - datanet-eth-bootnode-geth
-    ports:
-      - "8545"
-      - "40000"
-      - "6060"
-
-  datanet-eth-geth-2:
-    hostname: datanet-eth-geth-2
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "8545"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    env_file:
-      - ../config/datanet-eth/datanet-eth.env
-    image: cerc/datanet-eth-geth:local
-    depends_on:
-      - datanet-eth-bootnode-geth
-
-  datanet-tx-spammer:
-    restart: always
-    image: cerc/tx-spammer:local
-    environment:
-      ACCOUNTS_CSV_URL: http://datanet-eth-bootnode-geth:9898/accounts.csv
-      ETH_HTTP_PATH: http://datanet-eth-geth-1:8545
-      LOG_LEVEL: info
-      SPAMMER_COMMAND: autoSend
-      ETH_CALL_FREQ: 0
-      ETH_SEND_FREQ: 0
-    depends_on:
-      datanet-eth-bootnode-geth:
-        condition: service_started
-      datanet-eth-geth-1:
-        condition: service_healthy
@@ -13,6 +13,8 @@ services:
  grafana:
    restart: always
    image: grafana/grafana
+    environment:
+      - GF_SECURITY_ADMIN_PASSWORD=changeme6325
    volumes:
      - ../config/fixturenet-eth-metrics/grafana/etc/provisioning/dashboards:/etc/grafana/provisioning/dashboards
      - ../config/fixturenet-eth-metrics/grafana/etc/provisioning/datasources:/etc/grafana/provisioning/datasources
@@ -1,9 +0,0 @@
-# The password used to access test accounts (eg, via personal_unlockAccount).  The password is the same for all accounts.
-ACCOUNT_PASSWORD=secret1212
-
-# ENODE of the geth bootnode.
-BOOTNODE_KEY="b0ac22adcad37213c7c565810a50f1772291e7b0ce53fb73e7ec2a3c75bc13b5"
-ENODE="enode://af22c29c316ad069cf48a09a4ad5cf04a251b411e45098888d114c6dd7f489a13786620d5953738762afa13711d4ffb3b19aa5de772d8af72f851f7e9c5b164a@datanet-eth-bootnode-geth:30303"
-
-# JWT is required by the startup script, but won't be used without lighthouse.
-JWT="0x6cdcac3501046a08e186730dd8bd136cfaf0fdc1fc955f6e15ad3068c0ff2af0"
@@ -16,6 +16,12 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && export DEBCONF_NO
 RUN mkdir /scripts
 COPY install-dependencies.sh /scripts

+# Override the definition of GERBIL_PATH in the base image, but
+# is safe because (at present) no gerbil packages are installed in the base image
+# We do this in order to allow a set of pre-installed packages from the container
+# to be used with an arbitrary, potentially different set of projects bind mounted
+# at /src
+ENV GERBIL_PATH=/.gerbil
 RUN bash /scripts/install-dependencies.sh

 # Needed to prevent git from raging about /src
@@ -10,6 +10,7 @@ DEPS=(github.com/fare/gerbil-utils
      github.com/vyzo/gerbil-libp2p
      ) ;
 for i in ${DEPS[@]} ; do
+  echo "Installing gerbil package: $i"
  gxpkg install $i &&
  gxpkg build $i
 done
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-#
-#Build cerc/datanet-eth-geth
-
-set -e
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-# Make sure the "build" directory is empty.
-rm -rf $SCRIPT_DIR/build
-
-# Copy the fixture-net scripts and config.
-cp -rp $SCRIPT_DIR/../cerc-fixturenet-eth-geth $SCRIPT_DIR/build
-
-# Then remove terminal_total_difficulty and replace it with capped_maximum_difficulty.
-# This has two effects:
-#   (1) Disables the Merge (so all we need is geth, not lighthouse).
-#   (2) Maintains a fast block rate, since the difficulty will never exceed the capped value.
-sed -i '' 's/^terminal_total_difficulty:.*$/capped_maximum_difficulty: 1/' $SCRIPT_DIR/build/genesis/el/el-config.yaml
-
-# Build the image.
-docker build -t cerc/datanet-eth-geth:local ${SCRIPT_DIR}/build
-
-# Clean up the "build" directory.
-rm -rf $SCRIPT_DIR/build
@@ -21,11 +21,9 @@ istanbul_block=`cat $tmp_dir/genesis-config.yaml | grep istanbul_block | awk '{
 berlin_block=`cat $tmp_dir/genesis-config.yaml | grep berlin_block | awk '{ print $2 }'`
 london_block=`cat $tmp_dir/genesis-config.yaml | grep london_block | awk '{ print $2 }'`
 merge_fork_block=`cat $tmp_dir/genesis-config.yaml | grep merge_fork_block | awk '{ print $2 }'`
-capped_maximum_difficulty=`cat $tmp_dir/genesis-config.yaml | grep capped_maximum_difficulty | awk '{ print $2 }'`
-
-python3 ../accounts/mnemonic_to_csv.py $tmp_dir/genesis-config.yaml > ../build/el/accounts.csv

 python3 /apps/el-gen/genesis_geth.py $tmp_dir/genesis-config.yaml | \
+  jq ".config.terminalTotalDifficulty=$ttd" | \
  jq ".config.homesteadBlock=$homestead_block" | \
  jq ".config.eip150Block=$eip150_block" | \
  jq ".config.eip155Block=$eip155_block" | \
@@ -37,19 +35,4 @@ python3 /apps/el-gen/genesis_geth.py $tmp_dir/genesis-config.yaml | \
  jq ".config.berlinBlock=$berlin_block" | \
  jq ".config.londonBlock=$london_block" | \
  jq ".config.mergeForkBlock=$merge_fork_block" > ../build/el/geth.json
-
-if [ -n "$ttd" ]; then
-  cat ../build/el/geth.json | jq ".config.terminalTotalDifficulty=$ttd" > ../build/el/geth.json.jq
-  mv ../build/el/geth.json.jq ../build/el/geth.json
-else
-  cat ../build/el/geth.json | jq "del(.config.terminalTotalDifficulty)" > ../build/el/geth.json.jq
-  mv ../build/el/geth.json.jq ../build/el/geth.json
-fi
-
-if [ -n "$capped_maximum_difficulty" ]; then
-  cat ../build/el/geth.json | jq ".config.cappedMaximumDifficulty=$capped_maximum_difficulty" > ../build/el/geth.json.jq
-  mv ../build/el/geth.json.jq ../build/el/geth.json
-else
-  cat ../build/el/geth.json | jq "del(.config.cappedMaximumDifficulty)" > ../build/el/geth.json.jq
-  mv ../build/el/geth.json.jq ../build/el/geth.json
-fi
+python3 ../accounts/mnemonic_to_csv.py $tmp_dir/genesis-config.yaml > ../build/el/accounts.csv
@@ -1,6 +1,4 @@
-# Use locally build foundry base image to work around there being
-# no aarm64 image published.
-FROM foundry-rs/foundry:local
+FROM ghcr.io/foundry-rs/foundry

 RUN apk update ; apk add --no-cache --allow-untrusted ca-certificates curl bash git jq
 RUN apk add --no-cache --upgrade grep
@@ -11,7 +11,6 @@ cerc/ipld-eth-beacon-indexer
 cerc/ipld-eth-server
 cerc/laconicd
 cerc/laconic-registry-cli
-cerc/datanet-eth-geth
 cerc/fixturenet-eth-geth
 cerc/fixturenet-eth-lighthouse
 cerc/watcher-mobymask
@@ -8,7 +8,6 @@ ipld-eth-server
 lighthouse
 laconicd
 fixturenet-laconicd
-datanet-eth
 fixturenet-eth
 fixturenet-eth-metrics
 watcher-mobymask
@@ -0,0 +1,6 @@
+# fixturenet-eth
+
+A "loaded" version of fixturenet-eth, with all the bells and whistles enabled.
+
+TODO: write me
+
@@ -0,0 +1,24 @@
+version: "1.0"
+name: fixturenet-eth-loaded
+decription: "Loaded Ethereum Fixturenet"
+repos:
+  - cerc-io/go-ethereum
+  - cerc-io/tx-spammer
+  - cerc-io/ipld-eth-server
+  - cerc-io/ipld-eth-db
+  - cerc/go-ethereum
+containers:
+  - cerc/lighthouse
+  - cerc/fixturenet-eth-geth
+  - cerc/fixturenet-eth-lighthouse
+  - cerc/ipld-eth-server
+  - cerc/ipld-eth-db
+  - cerc/keycloak
+  - cerc/tx-spammer
+pods:
+  - fixturenet-eth
+  - tx-spammer
+  - fixturenet-eth-metrics
+  - keycloak
+  - ipld-eth-server
+  - ipld-eth-db
@@ -1,2 +1,2 @@
 # This file should be re-generated running: scripts/update-version-file.sh script
-v1.0.16-ecf943b
+v1.0.18-3bd0c74
Author	SHA1	Message	Date
dboreham	9a750f0d9e	Update version Former-commit-id: `10f2fbaa37`	2023-01-30 22:28:33 +01:00
dboreham	8a6ba6d01b	Merge pull request #172 from cerc-io/dboreham/revert-foundry-image Revert local foundry build Former-commit-id: `3bd0c74e1f`	2023-01-30 22:06:26 +01:00
dboreham	b4ddef7ff0	Revert local foundry build Former-commit-id: `e850923e1a`	2023-01-30 14:05:48 -07:00
dboreham	a38ac5470d	Merge pull request #171 from cerc-io/dboreham/fixturenet-loaded Initial commit Former-commit-id: `82c2bb78f2`	2023-01-30 19:12:06 +01:00
dboreham	77380aec94	Initial commit Former-commit-id: `f01bc27660`	2023-01-30 16:53:57 +01:00
dboreham	ce7e5f2d82	Merge pull request #169 from cerc-io/dboreham/fix-gerbil-package-install Install gerbil packages globally not locally in the project directory Former-commit-id: `db5775621d`	2023-01-28 11:35:44 -07:00
dboreham	4dda8e2a87	Install gerbil packages globally not locally in the project directory Former-commit-id: `5928e40721`	2023-01-28 18:56:43 +01:00