update dockerfile for arm compatibility (#90 )

closes https://github.com/cerc-io/ipld-eth-beacon-indexer/issues/89 Co-authored-by: Ian Kay <ian@knowable.vc> Reviewed-on: #90
ginkgo @ 2.1.4 and env for debugging
2023-10-18 17:31:09 +00:00 · 2022-12-06 16:12:48 -05:00 · 2022-12-06 15:55:57 -05:00 · 2022-12-06 12:23:26 -06:00 · 2022-12-06 10:47:37 -05:00 · 2022-12-06 10:28:16 -05:00
12 changed files with 104 additions and 73 deletions
--- a/.github/workflows/generic-testing.yml
+++ b/.github/workflows/generic-testing.yml
@ -50,6 +50,7 @@ jobs:
          echo vulcanize_ipld_eth_beacon_indexer=$GITHUB_WORKSPACE/ipld-eth-beacon-indexer >> ./config.sh
          echo eth_beacon_config_file=$GITHUB_WORKSPACE/ipld-eth-beacon-indexer/config/cicd/boot.ipld-eth-beacon-indexer.json >> ./config.sh
          echo eth_beacon_capture_mode=boot >> ./config.sh
+          echo CAPTURE_MODE=boot >> config.sh
          cat ./config.sh

      - name: Run docker compose
@ -126,7 +127,7 @@ jobs:

      - name: Install packages
        run: |
-          go install github.com/onsi/ginkgo/v2/ginkgo@latest
+          go install github.com/onsi/ginkgo/v2/ginkgo@2.1.4
          which ginkgo

      - name: Run the tests using Make
--- a/.github/workflows/on-pr.yml
+++ b/.github/workflows/on-pr.yml
@ -24,8 +24,8 @@ on:
      - ".github/workflows/on-pr.yml"
      - ".github/workflows/tests.yml"
      - "**"
-  schedule:
-    - cron: '0 13 * * *' # Must be single quotes!!
+  #schedule:
+  #  - cron: '0 13 * * *' # Must be single quotes!!

 jobs:
  trigger-tests:
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@ -29,7 +29,7 @@ env:

 jobs:
  system-testing:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
    steps:
      - name: Create GOPATH
        run: mkdir -p /tmp/go
--- a/.gitignore
+++ b/.gitignore
@ -11,3 +11,4 @@ ipld-eth-beacon-indexer.log
 ipld-eth-beacon-indexer
 config/local.ipld-eth-beacon-indexer-config.json
 config/docker.ipld-eth-beacon-indexer-config.json
+.idea/*
--- a/6
+++ b/6
@ -12,10 +12,10 @@ COPY . .
 RUN GCO_ENABLED=0 GOOS=linux go build -race -ldflags="-s -w" -o ipld-eth-beacon-indexer .
 RUN chmod +x ipld-eth-beacon-indexer

-FROM frolvlad/alpine-bash:latest
-RUN apk --no-cache add ca-certificates libstdc++ busybox-extras
+FROM alpine:latest
+RUN apk --no-cache add ca-certificates libstdc++ busybox-extras gettext libintl bash gawk sed grep bc coreutils
 WORKDIR /root/
 COPY --from=builder /go/src/github.com/vulcanize/ipld-eth-beacon-indexer/ipld-eth-beacon-indexer /root/ipld-eth-beacon-indexer
 ADD entrypoint.sh .
-ADD ipld-eth-beacon-config.json .
+ADD ipld-eth-beacon-config-docker.json .
 ENTRYPOINT ["./entrypoint.sh"]
--- a/entrypoint.sh
+++ b/entrypoint.sh
@ -3,7 +3,10 @@
 sleep 10
 echo "Starting ipld-eth-beacon-indexer"

+cat /root/ipld-eth-beacon-config-docker.json | envsubst > /root/ipld-eth-beacon-config.json
+
 echo /root/ipld-eth-beacon-indexer capture ${CAPTURE_MODE} --config /root/ipld-eth-beacon-config.json > /root/ipld-eth-beacon-indexer.output
+env

 if [ ${CAPTURE_MODE} == "boot" ]; then
    /root/ipld-eth-beacon-indexer capture ${CAPTURE_MODE} --config /root/ipld-eth-beacon-config.json > /root/ipld-eth-beacon-indexer.output
@ -14,6 +17,7 @@ if [ ${CAPTURE_MODE} == "boot" ]; then
    else
      echo "ipld-eth-beacon-indexer boot succeeded"
    fi
+
    echo $rv > /root/HEALTH
    echo $rv
    cat /root/ipld-eth-beacon-indexer.output
--- a/go.mod
+++ b/go.mod
@ -28,8 +28,10 @@ require (
 	github.com/ethereum/go-ethereum v1.10.25 // indirect
 	github.com/go-ole/go-ole v1.2.1 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
@ -77,6 +79,7 @@ require (
 	go.uber.org/zap v1.23.0 // indirect
 	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
 	golang.org/x/net v0.0.0-20220907135653-1e95f45603a7 // indirect
+	golang.org/x/tools v0.1.10 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
--- a/go.sum
+++ b/go.sum
@ -111,6 +111,8 @@ github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dT
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
 github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
@ -176,6 +178,8 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@ -799,6 +803,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
+golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/ipld-eth-beacon-config-docker.json
+++ b/ipld-eth-beacon-config-docker.json
@ -0,0 +1,44 @@
+{
+  "db": {
+    "address": "${POSTGRES_HOST}",
+    "password": "${POSTGRES_PASSWORD}",
+    "port": ${POSTGRES_PORT},
+    "username": "${POSTGRES_USER}",
+    "name": "${POSTGRES_DB}",
+    "driver": "PGX"
+  },
+  "bc": {
+    "address": "${LIGHTHOUSE_HOST}",
+    "port": ${LIGHTHOUSE_PORT},
+    "type": "lighthouse",
+    "bootRetryInterval": 30,
+    "bootMaxRetry": 5,
+    "maxHistoricProcessWorker": ${BC_MAX_HISTORIC_PROCESS_WORKER},
+    "connectionProtocol": "${LIGHTHOUSE_PROTOCOL}",
+    "uniqueNodeIdentifier": ${BC_UNIQUE_NODE_IDENTIFIER},
+    "checkDb": ${BC_CHECK_DB},
+    "performBeaconStateProcessing": ${BC_BEACON_STATE_PROCESSING_ENABLED},
+    "performBeaconBlockProcessing": ${BC_BEACON_BLOCK_PROCESSING_ENABLED},
+    "minimumSlot": ${BC_MINIMUM_SLOT}
+  },
+  "t": {
+    "skipSync": true
+  },
+  "log": {
+    "level": "${LOG_LEVEL}",
+    "output": true,
+    "file": "./ipld-eth-beacon-indexer.log",
+    "format": "json"
+  },
+  "kg": {
+    "increment": ${KG_INCREMENT},
+    "processKnownGaps": ${KG_PROCESS_KNOWN_GAPS_ENABLED},
+    "maxKnownGapsWorker": ${KG_MAX_KNOWN_GAPS_WORKER},
+    "minimumSlot": ${KG_MINIMUM_SLOT}
+  },
+  "pm": {
+    "address": "${PROM_HOST}",
+    "port": ${PROM_PORT},
+    "metrics": ${PROM_METRICS_ENABLED}
+  }
+}
--- a/ipld-eth-beacon-config.json
+++ b/ipld-eth-beacon-config.json
@ -1,44 +0,0 @@
-{
-  "db": {
-    "address": "localhost",
-    "password": "password",
-    "port": 5432,
-    "username": "vdbm",
-    "name": "vulcanize_db",
-    "driver": "PGX"
-  },
-  "bc": {
-    "address": "localhost",
-    "port": 5052,
-    "type": "lighthouse",
-    "bootRetryInterval": 30,
-    "bootMaxRetry": 5,
-    "maxHistoricProcessWorker": 2,
-    "connectionProtocol": "http",
-    "uniqueNodeIdentifier": 100,
-    "checkDb": true,
-    "performBeaconStateProcessing": false,
-    "performBeaconBlockProcessing": true,
-    "minimumSlot": 4700013
-  },
-  "t": {
-    "skipSync": true
-  },
-  "log": {
-    "level": "debug",
-    "output": true,
-    "file": "./ipld-eth-beacon-indexer.log",
-    "format": "json"
-  },
-  "kg": {
-    "increment": 10000,
-    "processKnownGaps": true,
-    "maxKnownGapsWorker": 2,
-    "minimumSlot": 4700013
-  },
-  "pm": {
-    "address": "localhost",
-    "port": 9000,
-    "metrics": true
-  }
-}
--- a/pkg/beaconclient/e2emerge_test.go
+++ b/pkg/beaconclient/e2emerge_test.go
@ -17,12 +17,14 @@ import (
 	"github.com/vulcanize/ipld-eth-beacon-indexer/pkg/beaconclient"
 	"github.com/vulcanize/ipld-eth-beacon-indexer/pkg/database/sql"
 	"math/big"
+	"os"
+	"strconv"
 	"time"
 )

 var _ = Describe("e2emerge", Label("e2e"), func() {
 	e2eConfig := TestConfig
-	e2eConfig.port = 5052
+	e2eConfig.port = getEnvInt("TEST_E2E_LIGHTHOUSE_PORT", 5052)
 	e2eConfig.performBeaconStateProcessing = false
 	e2eConfig.performBeaconBlockProcessing = true

@ -123,10 +125,10 @@ func sendTestTx() (*SentTx, error) {
 	tx, err := sendTransaction(
 		ctx,
 		eth,
-		"0xe6ce22afe802caf5ff7d3845cec8c736ecc8d61f",
-		"0xe22AD83A0dE117bA0d03d5E94Eb4E0d80a69C62a",
-		10,
-		"0x888814df89c4358d7ddb3fa4b0213e7331239a80e1f013eaa7b2deca2a41a218",
+		getEnvStr("TEST_E2E_FROM_ADDR", "0xe6ce22afe802caf5ff7d3845cec8c736ecc8d61f"),
+		getEnvStr("TEST_E2E_TO_ADDR", "0xe22AD83A0dE117bA0d03d5E94Eb4E0d80a69C62a"),
+		int64(getEnvInt("TEST_E2E_AMOUNT", 10)),
+		getEnvStr("TEST_E2E_SIGNING_KEY", "0x888814df89c4358d7ddb3fa4b0213e7331239a80e1f013eaa7b2deca2a41a218"),
 	)
 	Expect(err).ToNot(HaveOccurred())

@ -155,7 +157,7 @@ func sendTestTx() (*SentTx, error) {
 }

 func createClient() (*ethclient.Client, error) {
-	return ethclient.Dial("http://localhost:8545")
+	return ethclient.Dial(getEnvStr("TEST_E2E_GETH_URL", "http://localhost:8545"))
 }

 // sendTransaction sends a transaction with 1 ETH to a specified address.
@ -165,7 +167,7 @@ func sendTransaction(ctx context.Context, eth *ethclient.Client, fromAddr string
 		to       = common.HexToAddress(toAddr)
 		sk       = crypto.ToECDSAUnsafe(common.FromHex(signingKey))
 		value    = big.NewInt(amount)
-		gasLimit = uint64(21000)
+		gasLimit = uint64(getEnvInt("TEST_E2E_GAS_LIMIT", 21000))
 	)
 	// Retrieve the chainid (needed for signer)
 	chainid, err := eth.ChainID(ctx)
@ -180,6 +182,8 @@ func sendTransaction(ctx context.Context, eth *ethclient.Client, fromAddr string
 	// Get suggested gas price
 	tipCap, _ := eth.SuggestGasTipCap(ctx)
 	feeCap, _ := eth.SuggestGasPrice(ctx)
+	log.Info("Tip cap: ", tipCap)
+	log.Info("Fee cap: ", feeCap)
 	// Create a new transaction
 	tx := types.NewTx(
 		&types.DynamicFeeTx{
@ -197,3 +201,25 @@ func sendTransaction(ctx context.Context, eth *ethclient.Client, fromAddr string
 	// Send the transaction to our node
 	return signedTx, eth.SendTransaction(ctx, signedTx)
 }
+
+func getEnvStr(envVar string, def string) string {
+	value, set := os.LookupEnv(envVar)
+	if set {
+		return value
+	} else {
+		return def
+	}
+}
+
+func getEnvInt(envVar string, def int) int {
+	value, set := os.LookupEnv(envVar)
+	if set {
+		number, err := strconv.Atoi(value)
+		if err != nil {
+			return def
+		}
+		return number
+	} else {
+		return def
+	}
+}
--- a/pkg/beaconclient/systemvalidation_test.go
+++ b/pkg/beaconclient/systemvalidation_test.go
@ -3,7 +3,6 @@ package beaconclient_test
 import (
 	log "github.com/sirupsen/logrus"
 	"os"
-	"strconv"
 	"time"

 	. "github.com/onsi/ginkgo/v2"
@ -15,9 +14,9 @@ var (
 	prodConfig = Config{
 		protocol:                     os.Getenv("bc_protocol"),
 		address:                      os.Getenv("bc_address"),
-		port:                         getEnvInt(os.Getenv("bc_port")),
+		port:                         getEnvInt(os.Getenv("bc_port"), 5052),
 		dbHost:                       os.Getenv("db_host"),
-		dbPort:                       getEnvInt(os.Getenv("db_port")),
+		dbPort:                       getEnvInt(os.Getenv("db_port"), 8076),
 		dbName:                       os.Getenv("db_name"),
 		dbUser:                       os.Getenv("db_user"),
 		dbPassword:                   os.Getenv("db_password"),
@ -62,15 +61,6 @@ var _ = Describe("Systemvalidation", Label("system"), func() {
 	})
 })

-// Wrapper function to get int env variables.
-func getEnvInt(envVar string) int {
-	val, err := strconv.Atoi(envVar)
-	if err != nil {
-		return 0
-	}
-	return val
-}
-
 // Start head tracking and wait for the expected results.
 func processProdHeadBlocks(bc *beaconclient.BeaconClient, expectedInserts, expectedReorgs, expectedKnownGaps, expectedKnownGapsReprocessError uint64) {
 	go bc.CaptureHead()
Author	SHA1	Message	Date
Thomas E Lackey	8ded6246dc	update dockerfile for arm compatibility (#90 ) closes https://github.com/cerc-io/ipld-eth-beacon-indexer/issues/89 Co-authored-by: Ian Kay <ian@knowable.vc> Reviewed-on: #90	2023-10-18 17:31:09 +00:00
Michael Shaw	4381c77a9b	ginkgo @ 2.1.4 and env for debugging	2022-12-06 16:12:48 -05:00
Michael Shaw	3c80a207fd	trying env to match expected in entrypoint.sh and gitignore update	2022-12-06 15:55:57 -05:00
Thomas E Lackey	8033a956d4	Update go.mod related ginkgo. (#85 )	2022-12-06 12:23:26 -06:00
Michael Shaw	815a5654b2	try ubuntu-latest to at least move past not starting	2022-12-06 10:47:37 -05:00
Michael	1bd64266bc	Turn off cron scheduled testing	2022-12-06 10:28:16 -05:00
Thomas E Lackey	9e96e4225a	Revert publish changes.	2022-11-22 16:39:08 -06:00
Thomas E Lackey	a1658421a1	Try updating docker publishing.	2022-11-22 16:34:35 -06:00
Thomas E Lackey	4fe07c45f1	Remove docker-compose (now part of stack-orechestrator).	2022-11-03 13:45:39 -05:00
Thomas E Lackey	56ae836b09	Environment improvements for Docker and testing. (#83 ) * Add docker-compose.yml * Typo * Tweak defaults * Get e2e test from env, and also allow defaults. * Remove compose stuff.	2022-11-02 21:31:04 -05:00
Thomas E Lackey	20804bd30c	Add docker-compose.yml (#80 ) * Add docker-compose.yml * Typo * Tweak defaults	2022-10-31 12:36:08 -05:00