(BIDS-2346) Merge remote-tracking branch 'origin/master' into BIDS-23…

…46/dencun

.github/workflows/build.yml

@@ -14,14 +14,17 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.18
-        uses: actions/setup-go@v3
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Set up Go 1.20
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version-file: './go.mod'
         id: go
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+      - name: Output go version
+        run: go version
 
       - name: Check gofmt
         run: |

.github/workflows/staticcheck.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        go: ["1.18.x"]
+        go: ["1.20.x"]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v1
@@ -31,6 +31,6 @@ jobs:
     - run: "go vet ./..."
     - uses: dominikh/[email protected]
       with:
-        version: "2022.1.1"
+        version: "2023.1.5"
         install-go: false
         cache-key: ${{ matrix.go }}

.gitignore

@@ -29,3 +29,4 @@ lastAttestationCache
 cmd/forkwatch
 **/.DS_Store
 _gitignore/
+local-deployment/config.yml

Makefile

@@ -5,7 +5,7 @@ BUILDDATE=`date -u +"%Y-%m-%dT%H:%M:%S%:z"`
 PACKAGE=eth2-exporter
 LDFLAGS="-X ${PACKAGE}/version.Version=${VERSION} -X ${PACKAGE}/version.BuildDate=${BUILDDATE} -X ${PACKAGE}/version.GitCommit=${GITCOMMIT} -X ${PACKAGE}/version.GitDate=${GITDATE} -s -w"
 
-all: explorer stats frontend-data-updater eth1indexer blobindexer ethstore-exporter rewards-exporter node-jobs-processor signatures notification-sender notification-collector
+all: explorer stats frontend-data-updater eth1indexer blobindexer ethstore-exporter rewards-exporter node-jobs-processor signatures notification-sender notification-collector misc
 
 lint:
 	golint ./...

README.md

@@ -2,7 +2,7 @@
 
 The explorer provides a comprehensive and easy to use interface for the upcoming Ethereum beacon chain. It makes it easy to view proposed blocks, follow attestations and monitor your staking activity.
 
-[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.io/beaconchain)
+[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://dsc.gg/beaconchain)
 [![Twitter](https://img.shields.io/badge/Twitter-%231DA1F2.svg?style=for-the-badge&logo=Twitter&logoColor=white)](https://twitter.com/beaconcha_in)
 
 [![Badge](https://github.com/gobitfly/eth2-beaconchain-explorer/workflows/Build/badge.svg)](https://github.com/gobitfly/eth2-beaconchain-explorer/actions?query=workflow%3A%22Build+%26+Publish+Docker+images%22)

bigtable_config.md

@@ -2,52 +2,101 @@
 This document summarized the bigtable configuration options and table definitions required to run the beaconcha.in explorer. All settings can be applied either by using the GCP bigtable web interface or the `cbt` tool.
 
 ----
-Table name: `beaconchain`
+Table name: `beaconchain_validator_history`
+
+```
+cbt -project $PROJECT -instance $INSTANCE createtable beaconchain_validator_history
+```
 
 Column families:
-* Name: `at` | GC Policy: Version based policy with a maximum of 1 versions
+* Name: `vb` | GC Policy: None
+* Name: `ha` | GC Policy: None
+* Name: `at` | GC Policy: None
+* Name: `pr` | GC Policy: None
+* Name: `sc` | GC Policy: None
+* Name: `sp` | GC Policy: None
 * Name: `id` | GC Policy: None
-* Name: `pr` | GC Policy: Version based policy with a maximum of 1 versions
-* Name: `sc` | GC Policy: Version based policy with a maximum of 1 versions
 * Name: `stats` | GC Policy: None
-* Name: `vb` | GC Policy: None
 
+```
+cbt -project $PROJECT -instance $INSTANCE createfamily beaconchain_validator_history vb
+cbt -project $PROJECT -instance $INSTANCE createfamily beaconchain_validator_history ha
+cbt -project $PROJECT -instance $INSTANCE createfamily beaconchain_validator_history at
+cbt -project $PROJECT -instance $INSTANCE createfamily beaconchain_validator_history pr
+cbt -project $PROJECT -instance $INSTANCE createfamily beaconchain_validator_history sc
+cbt -project $PROJECT -instance $INSTANCE createfamily beaconchain_validator_history sp
+cbt -project $PROJECT -instance $INSTANCE createfamily beaconchain_validator_history id
+cbt -project $PROJECT -instance $INSTANCE createfamily beaconchain_validator_history stats
+```
 ----
 Table name: `beaconchain_validators`
 
+```
+cbt -project $PROJECT -instance $INSTANCE createtable beaconchain_validators
+```
+
 Column families:
 * Name: `at` | GC Policy: Version based policy with a maximum of 1 versions
 
+```
+cbt -project $PROJECT -instance $INSTANCE createfamily beaconchain_validators at
+
+cbt -project $PROJECT -instance $INSTANCE setgcpolicy beaconchain_validators at maxversions=1
+```
 ----
 Table name: `blocks`
 
+```
+cbt -project $PROJECT -instance $INSTANCE createtable blocks
+```
+
 Column families:
 * Name: `default` | GC Policy: Version based policy with a maximum of 1 versions
 
-----
-Table name: `cache`
-
-Column families:
-* Name: `10_min` | GC Policy: Version based policy with a maximum of 1 versions and a maximum age of 10 minutes
-* Name: `1_day` | GC Policy: Version based policy with a maximum of 1 versions and a maximum age of 1 day
-* Name: `1_hour` | GC Policy: Version based policy with a maximum of 1 versions and a maximum age of 1 hour
+```
+cbt -project $PROJECT -instance $INSTANCE createfamily blocks default
 
+cbt -project $PROJECT -instance $INSTANCE setgcpolicy blocks default maxversions=1
+```
 ----
 Table name: `data`
 
+```
+cbt -project $PROJECT -instance $INSTANCE createtable data
+```
+
 Column families:
 * Name: `c` | GC Policy: Age based policy with a max age of 1 day
 * Name: `f` | GC Policy: None
 
+```
+cbt -project $PROJECT -instance $INSTANCE createfamily data c
+cbt -project $PROJECT -instance $INSTANCE createfamily data f
+
+cbt -project $PROJECT -instance $INSTANCE setgcpolicy data c maxage=1d
+```
 ----
 Table name: `machine_metrics`
 
+```
+cbt -project $PROJECT -instance $INSTANCE createtable machine_metrics
+```
+
 Column families:
 * Name: `mm` | GC Policy: Age based policy with a max age of 31 days
 
+```
+cbt -project $PROJECT -instance $INSTANCE createfamily machine_metrics mm
+
+cbt -project $PROJECT -instance $INSTANCE setgcpolicy machine_metrics mm maxage=31d
+```
 ----
 Table name: `metadata`
 
+```
+cbt -project $PROJECT -instance $INSTANCE createtable metadata
+```
+
 Column families:
 * Name: `a` | GC Policy: None
 * Name: `c` | GC Policy: None
@@ -56,9 +105,30 @@ Column families:
 * Name: `erc721` | GC Policy: None
 * Name: `series` | GC Policy: Version based policy with a maximum of 1 versions
 
+```
+cbt -project $PROJECT -instance $INSTANCE createfamily metadata a
+cbt -project $PROJECT -instance $INSTANCE createfamily metadata c
+cbt -project $PROJECT -instance $INSTANCE createfamily metadata erc1155
+cbt -project $PROJECT -instance $INSTANCE createfamily metadata erc20
+cbt -project $PROJECT -instance $INSTANCE createfamily metadata erc721
+cbt -project $PROJECT -instance $INSTANCE createfamily metadata series
+
+cbt -project $PROJECT -instance $INSTANCE setgcpolicy metadata series maxversions=1
+```
 ----
 Table name: `metadata_updates`
 
+```
+cbt -project $PROJECT -instance $INSTANCE createtable metadata_updates
+```
+
 Column families:
 * Name: `blocks` | GC Policy: Age based policy with a max age of 1 day
-* Name: `f` | GC Policy: None
+* Name: `f` | GC Policy: None
+
+```
+cbt -project $PROJECT -instance $INSTANCE createfamily metadata_updates blocks
+cbt -project $PROJECT -instance $INSTANCE createfamily metadata_updates f
+
+cbt -project $PROJECT -instance $INSTANCE setgcpolicy metadata_updates blocks maxage=1d
+```