From a45964610cc3fba509e3cdbb9886b112a04c86b9 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 17 May 2024 17:57:19 +0300 Subject: [PATCH 1/2] fix builds --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d318fcb04..75ea828ad 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ endif ifeq ($(WITH_CLEVELDB),yes) build_tags += gcc endif -build_tags += $(BUILD_TAGS),muslc +build_tags += $(BUILD_TAGS) build_tags := $(strip $(build_tags)) build_tags_test_binary = $(build_tags) @@ -111,7 +111,8 @@ build-static-linux-amd64: go.sum $(BUILDDIR)/ --build-arg GO_VERSION=$(GO_VERSION) \ --build-arg GIT_VERSION=$(VERSION) \ --build-arg GIT_COMMIT=$(COMMIT) \ - --build-arg BUILD_TAGS=$(build_tags_comma_sep) \ + --build-arg BUILD_TAGS=$(build_tags_comma_sep),muslc \ + --platform linux/amd64 \ -t neutron-amd64 \ --load \ -f Dockerfile.builder . From 77154d21c70eb4c9b637b058c06ceeb08450e777 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Fri, 17 May 2024 20:05:56 +0300 Subject: [PATCH 2/2] fix oracle config init --- network/init.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/network/init.sh b/network/init.sh index d042f9512..3a7d513a5 100755 --- a/network/init.sh +++ b/network/init.sh @@ -83,16 +83,11 @@ sed -i -e 's#"tcp://localhost:1317"#"tcp://0.0.0.0:'"$RESTPORT"'"#g' "$CHAIN_DIR sed -i -e 's#"tcp://0.0.0.0:1317"#"tcp://0.0.0.0:'"$RESTPORT"'"#g' "$CHAIN_DIR/config/app.toml" sed -i -e 's#":8080"#":'"$ROSETTA_1"'"#g' "$CHAIN_DIR/config/app.toml" -# NOTE: we provide prometheus_server_address but it does not matter, since we don't use it, just need non-empty value -cat <> "$CHAIN_DIR/config/app.toml" - -[oracle] -enabled = true -oracle_address = "$ORACLE_ADDRESS" -client_timeout = "$ORACLE_CLIENT_TIMEOUT" -metrics_enabled = $ORACLE_METRICS_ENABLED -prometheus_server_address = "localhost:12912" -EOF + +sed -i -e 's/oracle_address = "localhost:8080"/oracle_address = '\""$ORACLE_ADDRESS"\"'/g' "$CHAIN_DIR/config/app.toml" +sed -i -e 's/client_timeout = "2s"/client_timeout = '\""$ORACLE_CLIENT_TIMEOUT"\"'/g' "$CHAIN_DIR/config/app.toml" +sed -i -e 's/metrics_enabled = true/metrics_enabled = '\""$ORACLE_METRICS_ENABLED"\"'/g' "$CHAIN_DIR/config/app.toml" + GENESIS_FILE="$CHAIN_DIR/config/genesis.json"