diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 0b4477c..743c77b 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -40,7 +40,7 @@ RUN apt-get update $NO_PROXY_CACHE && \ && rm -rf ~/.gradle \ && mv $JDK_DIR/jre /usr/local \ && rm -rf $JDK_DIR \ - && wget -O $BASE_DIR/config.conf https://raw.githubusercontent.com/tronprotocol/tron-deployment/master/main_net_config.conf \ + && wget -O $BASE_DIR/config.conf https://raw.githubusercontent.com/tronprotocol/java-tron/master/framework/src/main/resources/config.conf \ # Clean apt cache && apt-get clean \ && rm -rf /var/cache/apt/archives/* /var/cache/apt/archives/partial/* \ diff --git a/tools/docker/Dockerfile.arm64 b/tools/docker/Dockerfile.arm64 index 280af0d..1da2e75 100644 --- a/tools/docker/Dockerfile.arm64 +++ b/tools/docker/Dockerfile.arm64 @@ -20,7 +20,7 @@ RUN apt-get update $NO_PROXY_CACHE \ && mv java-tron-1.0.0 $BASE_DIR \ && rm -rf $TMP_DIR \ && rm -rf ~/.gradle \ - && wget -4 -O $BASE_DIR/config.conf https://raw.githubusercontent.com/tronprotocol/tron-deployment/master/main_net_config.conf \ + && wget -4 -O $BASE_DIR/config.conf https://raw.githubusercontent.com/tronprotocol/java-tron/master/framework/src/main/resources/config.conf \ # Clean apt cache && apt-get clean \ && rm -rf /var/cache/apt/archives/* /var/cache/apt/archives/partial/* \ diff --git a/tools/docker/Dockerfile.nile b/tools/docker/Dockerfile.nile index 9768428..70f19ee 100644 --- a/tools/docker/Dockerfile.nile +++ b/tools/docker/Dockerfile.nile @@ -40,7 +40,7 @@ RUN apt-get update $NO_PROXY_CACHE && \ && rm -rf ~/.gradle \ && mv $JDK_DIR/jre /usr/local \ && rm -rf $JDK_DIR \ - && wget -O $BASE_DIR/config.conf https://raw.githubusercontent.com/tronprotocol/tron-deployment/master/test_net_config.conf \ + && wget -O $BASE_DIR/config.conf https://raw.githubusercontent.com/tron-nile-testnet/nile-testnet/master/framework/src/main/resources/config-nile.conf \ # Clean apt cache && apt-get clean \ && rm -rf /var/cache/apt/archives/* /var/cache/apt/archives/partial/* \ diff --git a/tools/docker/Dockerfile.nile.arm64 b/tools/docker/Dockerfile.nile.arm64 index 7940c4d..4e0e2ac 100644 --- a/tools/docker/Dockerfile.nile.arm64 +++ b/tools/docker/Dockerfile.nile.arm64 @@ -20,7 +20,7 @@ RUN apt-get update $NO_PROXY_CACHE \ && mv java-tron-1.0.0 $BASE_DIR \ && rm -rf $TMP_DIR \ && rm -rf ~/.gradle \ - && wget -4 -O $BASE_DIR/config.conf https://raw.githubusercontent.com/tronprotocol/tron-deployment/master/test_net_config.conf \ + && wget -4 -O $BASE_DIR/config.conf https://raw.githubusercontent.com/tron-nile-testnet/nile-testnet/master/framework/src/main/resources/config-nile.conf \ # Clean apt cache && apt-get clean \ && rm -rf /var/cache/apt/archives/* /var/cache/apt/archives/partial/* \ diff --git a/tools/docker/README.md b/tools/docker/README.md index 1f12911..365b4ab 100644 --- a/tools/docker/README.md +++ b/tools/docker/README.md @@ -96,7 +96,7 @@ Building for default linux/amd64 platform #6 [2/5] RUN apt-get update -o Acquire::BrokenProxy=true -o Acquire::http::No-Cache=true -o Acquire::http::Pipeline-Depth=0 && apt-get --quiet --yes install git wget 7zip curl jq && wget -P /usr/local https://github.com/frekele/oracle-java/releases/download/8u202-b08/jdk-8u202-linux-x64.tar.gz && echo "9a5c32411a6a06e22b69c495b7975034409fa1652d03aeb8eb5b6f59fd4594e0 /usr/local/jdk-8u202-linux-x64.tar.gz" | sha256sum -c && tar -zxf /usr/local/jdk-8u202-linux-x64.tar.gz -C /usr/local && rm /usr/local/jdk-8u202-linux-x64.tar.gz && export JAVA_HOME=/usr/local/jdk1.8.0_202 && export CLASSPATH=$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar && export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$JAVA_HOME/bin && echo "git clone" && mkdir -p /tron-build && cd /tron-build && git clone https://github.com/tronprotocol/java-tron.git && cd java-tron && git checkout master && ./gradlew build -x test && cd build/distributions && 7z x -y java-tron-1.0.0.zip && mv java-tron-1.0.0 /java-tron && rm -rf /tron-build && rm -rf ~/.gradle && mv /usr/local/jdk1.8.0_202/jre /usr/local && rm -rf /usr/local/jdk1.8.0_202 apt-get clean && rm -rf /var/cache/apt/archives/* /var/cache/apt/archives/partial/* && rm -rf /var/lib/apt/lists/* #6 CACHED -#7 [3/5] RUN wget -P /java-tron/config https://raw.githubusercontent.com/tronprotocol/tron-deployment/master/main_net_config.conf +#7 [3/5] RUN wget -P /java-tron/config https://raw.githubusercontent.com/tronprotocol/java-tron/master/framework/src/main/resources/config.conf #7 CACHED #8 [4/5] COPY docker-entrypoint.sh /java-tron/bin diff --git a/tools/toolkit/DBFork.md b/tools/toolkit/DBFork.md index 3fe3f06..bdab692 100644 --- a/tools/toolkit/DBFork.md +++ b/tools/toolkit/DBFork.md @@ -29,7 +29,7 @@ To use the DBFork tool, we need to obtain the state data of the public chain fir - Launch the FullNode and sync directly. -If we want the state data of specified block height, we can modify the `node.shutdown.BlockHeight` option in the [config](https://github.com/tronprotocol/tron-deployment/blob/master/main_net_config.conf) to make the FullNode sync to the target height after downloading the snapshot. +If we want the state data of specified block height, we can modify the `node.shutdown.BlockHeight` option in the [config](https://github.com/tronprotocol/java-tron/blob/master/framework/src/main/resources/config.conf) to make the FullNode sync to the target height after downloading the snapshot. ```conf node.shutdown = { # BlockTime = "54 59 08 * * ?" # if block header time in persistent db matched. @@ -161,7 +161,7 @@ java -jar Toolkit.jar db fork -c /path/to/fork.conf -d /path/to/output-directory ``` ### Launch the FullNode -Launch the FullNode against the modified state. To launch the node smoothly, we may need to change some parameters in the [config](https://github.com/tronprotocol/tron-deployment/blob/master/main_net_config.conf): +Launch the FullNode against the modified state. To launch the node smoothly, we may need to change some parameters in the [config](https://github.com/tronprotocol/java-tron/blob/master/framework/src/main/resources/config.conf): ```config needSyncCheck = false minParticipationRate = 0