mirror of
https://github.com/ton-blockchain/ton
synced 2025-02-13 03:32:22 +00:00
Merge branch 'testnet' into accelerator
This commit is contained in:
commit
3af45ed7f6
7 changed files with 11 additions and 7 deletions
|
@ -27,7 +27,7 @@ RUN apt-get update && \
|
||||||
apt-get install -y wget curl libatomic1 openssl libsecp256k1-dev libsodium-dev libmicrohttpd-dev liblz4-dev libjemalloc-dev htop net-tools netcat iptraf-ng jq tcpdump pv plzip && \
|
apt-get install -y wget curl libatomic1 openssl libsecp256k1-dev libsodium-dev libmicrohttpd-dev liblz4-dev libjemalloc-dev htop net-tools netcat iptraf-ng jq tcpdump pv plzip && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN mkdir -p /var/ton-work/db /var/ton-work/scripts
|
RUN mkdir -p /var/ton-work/db /var/ton-work/scripts /usr/share/ton/smartcont/ /usr/lib/fift/
|
||||||
|
|
||||||
COPY --from=builder /ton/build/storage/storage-daemon/storage-daemon /usr/local/bin/
|
COPY --from=builder /ton/build/storage/storage-daemon/storage-daemon /usr/local/bin/
|
||||||
COPY --from=builder /ton/build/storage/storage-daemon/storage-daemon-cli /usr/local/bin/
|
COPY --from=builder /ton/build/storage/storage-daemon/storage-daemon-cli /usr/local/bin/
|
||||||
|
@ -35,6 +35,10 @@ COPY --from=builder /ton/build/lite-client/lite-client /usr/local/bin/
|
||||||
COPY --from=builder /ton/build/validator-engine/validator-engine /usr/local/bin/
|
COPY --from=builder /ton/build/validator-engine/validator-engine /usr/local/bin/
|
||||||
COPY --from=builder /ton/build/validator-engine-console/validator-engine-console /usr/local/bin/
|
COPY --from=builder /ton/build/validator-engine-console/validator-engine-console /usr/local/bin/
|
||||||
COPY --from=builder /ton/build/utils/generate-random-id /usr/local/bin/
|
COPY --from=builder /ton/build/utils/generate-random-id /usr/local/bin/
|
||||||
|
COPY --from=builder /ton/build/crypto/fift /usr/local/bin/
|
||||||
|
COPY --from=builder /ton/build/crypto/func /usr/local/bin/
|
||||||
|
COPY --from=builder /ton/crypto/smartcont/* /usr/share/ton/smartcont/
|
||||||
|
COPY --from=builder /ton/crypto/fift/lib/* /usr/lib/fift/
|
||||||
|
|
||||||
WORKDIR /var/ton-work/db
|
WORKDIR /var/ton-work/db
|
||||||
COPY ./docker/init.sh ./docker/control.template /var/ton-work/scripts/
|
COPY ./docker/init.sh ./docker/control.template /var/ton-work/scripts/
|
||||||
|
|
|
@ -27,7 +27,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: validator-engine-container
|
- name: validator-engine-container
|
||||||
image: ghcr.io/neodix42/ton:latest
|
image: ghcr.io/ton-blockchain/ton:latest
|
||||||
env:
|
env:
|
||||||
- name: PUBLIC_IP
|
- name: PUBLIC_IP
|
||||||
value: "<PUBLIC_IP>"
|
value: "<PUBLIC_IP>"
|
||||||
|
|
|
@ -27,7 +27,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: validator-engine-container
|
- name: validator-engine-container
|
||||||
image: ghcr.io/neodix42/ton:latest
|
image: ghcr.io/ton-blockchain/ton:latest
|
||||||
env:
|
env:
|
||||||
- name: PUBLIC_IP
|
- name: PUBLIC_IP
|
||||||
value: "<PUBLIC_IP>"
|
value: "<PUBLIC_IP>"
|
||||||
|
|
|
@ -27,7 +27,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: validator-engine-container
|
- name: validator-engine-container
|
||||||
image: ghcr.io/neodix42/ton:latest
|
image: ghcr.io/ton-blockchain/ton:latest
|
||||||
env:
|
env:
|
||||||
- name: PUBLIC_IP
|
- name: PUBLIC_IP
|
||||||
value: "<PUBLIC_IP>"
|
value: "<PUBLIC_IP>"
|
||||||
|
|
|
@ -11,7 +11,7 @@ spec:
|
||||||
claimName: validator-engine-pvc
|
claimName: validator-engine-pvc
|
||||||
containers:
|
containers:
|
||||||
- name: validator-engine-container
|
- name: validator-engine-container
|
||||||
image: ghcr.io/neodix42/ton:latest
|
image: ghcr.io/ton-blockchain/ton:latest
|
||||||
env:
|
env:
|
||||||
- name: PUBLIC_IP
|
- name: PUBLIC_IP
|
||||||
value: "<PUBLIC_IP>"
|
value: "<PUBLIC_IP>"
|
||||||
|
|
|
@ -21,7 +21,7 @@ spec:
|
||||||
claimName: validator-engine-pvc
|
claimName: validator-engine-pvc
|
||||||
containers:
|
containers:
|
||||||
- name: validator-engine-container
|
- name: validator-engine-container
|
||||||
image: ghcr.io/neodix42/ton:latest
|
image: ghcr.io/ton-blockchain/ton:latest
|
||||||
env:
|
env:
|
||||||
- name: PUBLIC_IP
|
- name: PUBLIC_IP
|
||||||
value: "<PUBLIC_IP>"
|
value: "<PUBLIC_IP>"
|
||||||
|
|
|
@ -58,7 +58,6 @@ std::string ErrorCtx::as_string() const {
|
||||||
* Constructs a ValidateQuery object.
|
* Constructs a ValidateQuery object.
|
||||||
*
|
*
|
||||||
* @param shard The shard of the block being validated.
|
* @param shard The shard of the block being validated.
|
||||||
* @param min_ts The minimum allowed UnixTime for the block.
|
|
||||||
* @param min_masterchain_block_id The minimum allowed masterchain block reference for the block.
|
* @param min_masterchain_block_id The minimum allowed masterchain block reference for the block.
|
||||||
* @param prev A vector of BlockIdExt representing the previous blocks.
|
* @param prev A vector of BlockIdExt representing the previous blocks.
|
||||||
* @param candidate The BlockCandidate to be validated.
|
* @param candidate The BlockCandidate to be validated.
|
||||||
|
@ -7056,6 +7055,7 @@ void ValidateQuery::written_candidate() {
|
||||||
void ValidateQuery::record_stats() {
|
void ValidateQuery::record_stats() {
|
||||||
double work_time = work_timer_.elapsed();
|
double work_time = work_timer_.elapsed();
|
||||||
double cpu_work_time = cpu_work_timer_.elapsed();
|
double cpu_work_time = cpu_work_timer_.elapsed();
|
||||||
|
LOG(WARNING) << "validation took " << perf_timer_.elapsed() << "s";
|
||||||
LOG(WARNING) << "Validate query work time = " << work_time << "s, cpu time = " << cpu_work_time << "s";
|
LOG(WARNING) << "Validate query work time = " << work_time << "s, cpu time = " << cpu_work_time << "s";
|
||||||
td::actor::send_closure(manager, &ValidatorManager::record_validate_query_stats, block_candidate.id, work_time,
|
td::actor::send_closure(manager, &ValidatorManager::record_validate_query_stats, block_candidate.id, work_time,
|
||||||
cpu_work_time);
|
cpu_work_time);
|
||||||
|
|
Loading…
Reference in a new issue