Skip to content

Commit

Permalink
Merge pull request #1847 from ergoplatform/v4.0.101
Browse files Browse the repository at this point in the history
Candidate for version 4.0.101: auto-voting for EIP-37
  • Loading branch information
kushti authored Sep 27, 2022
2 parents 3e5b5c0 + 569954c commit 601cd17
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN sbt assembly
RUN mv `find target/scala-*/stripped/ -name ergo-*.jar` ergo.jar

FROM openjdk:11-jre-slim
RUN apt-get update && apt-get install -y curl jq && rm -rf /var/lib/apt/lists/*
RUN adduser --disabled-password --home /home/ergo --uid 9052 --gecos "ErgoPlatform" ergo && \
install -m 0750 -o ergo -g ergo -d /home/ergo/.ergo
USER ergo
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/api/openapi.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: "3.0.2"

info:
version: "4.0.100"
version: "4.0.101"
title: Ergo Node API
description: API docs for Ergo Node. Models are shared between all Ergo products
contact:
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ scorex {
nodeName = "ergo-node"

# Network protocol version to be sent in handshakes
appVersion = 4.0.100
appVersion = 4.0.101

# Network agent name. May contain information about client code
# stack, starting from core code-base up to the end graphical interface.
Expand Down
7 changes: 6 additions & 1 deletion src/main/resources/mainnet.conf
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ ergo {
injectionBoxBytesEncoded = "80a8d6b9071003040005808098f4e9b5ca6a0402d1ed91c1b2a4730000730193c5a7c5b2a47302008f9e2d0220fa2bf23962cdf51b07722d6237c0c7b8a44f78856c0f7ec308dc1ef1a92a5101d9a2cc8a09abfaed87afacfbb7daee79a6b26f10c6613fc13d3f3953e5521d1a808088fccdbcc32300fca71b8b95f6ad14ce600a126c8842334d40d35f8754176c4cda2c95219f19f700"
}
}

node {
mining = false

Expand All @@ -64,13 +65,17 @@ ergo {
# maximum cost of transaction for it to be propagated
maxTransactionCost = 4900000
}

voting {
6 = 2400 #vote for EIP-37
}
}

scorex {
network {
magicBytes = [1, 0, 2, 4]
bindAddress = "0.0.0.0:9030"
nodeName = "ergo-mainnet-4.0.100"
nodeName = "ergo-mainnet-4.0.101"
nodeName = ${?NODENAME}
knownPeers = [
"213.239.193.208:9030",
Expand Down

0 comments on commit 601cd17

Please sign in to comment.