Update version. #none

Author: tonjen

CODEOWNERS

@@ -0,0 +1,5 @@
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+# @global-owner1 and @global-owner2 will be requested for
+# review when someone opens a pull request.
+*       @bvscd @yaroslavser @Sumrachek @iagen @LenyKholodov @shd @sv-91

Cargo.toml

@@ -2,7 +2,7 @@
 build = 'common/build/build.rs'
 edition = '2021'
 name = 'ton_node'
-version = '0.51.14'
+version = '0.51.22'
 
 [workspace]
 members = [ 'storage' ]
@@ -24,7 +24,7 @@ futures-timer = '3.0.1'
 hex = '0.4'
 lazy_static = '1.4.0'
 log = '0.4'
-log4rs = '1'
+log4rs = '1.2'
 log4rs-rolling-file = '0.2.0'
 num-bigint = '0.4'
 openssl = '0.10.35'
@@ -37,26 +37,26 @@ sha2 = '0.10'
 spin = '0.7.1'
 stream-cancel = '0.8.0'
 string-builder = '^0.2.0'
-adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.92' }
+adnl = { features = [ 'client', 'node', 'server' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.118' }
 catchain = { path = 'catchain' }
 ctrlc = { features = [ 'termination' ], version = '3.2.1' }
-dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.90' }
-ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.55' }
+dht = { git = 'https://github.com/tonlabs/ton-labs-dht', tag = '0.5.129' }
+ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.79' }
 lockfree = { git = 'https://github.com/tonlabs/lockfree.git' }
-overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.77' }
-rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.86' }
+overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.112' }
+rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.114' }
 rustracing = { optional = true, version = '0.4.0' }
 rustracing_jaeger = { optional = true, version = '0.4.1' }
 statsd = { optional = true, version = '0.15' }
 storage = { path = 'storage' }
 tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
-ton_abi = { git = 'https://github.com/tonlabs/ton-labs-abi.git', tag = '2.3.23' }
-ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.143' }
-ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.8.16' }
-ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.7.55' }
-ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.113' }
-ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.11.8' }
-ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.58' }
+ton_abi = { git = 'https://github.com/tonlabs/ton-labs-abi.git', optional = true, tag = '2.3.53' }
+ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.166' }
+ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.9.17' }
+ton_block_json = { git = 'https://github.com/tonlabs/ton-labs-block-json.git', tag = '0.7.82' }
+ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.152' }
+ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.12.5' }
+ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.95' }
 validator_session = { path = 'validator-session' }
 
 [features]
@@ -67,7 +67,7 @@ export_key = [ 'catchain/export_key', 'ever-crypto/export_key' ]
 external_db = [ 'rdkafka' ]
 gosh = [ 'ton_block/gosh', 'ton_vm/gosh' ]
 metrics = [ 'statsd' ]
-slashing = [  ]
+slashing = [ 'ton_abi' ]
 telemetry = [ 'adnl/telemetry', 'dht/telemetry', 'rldp/telemetry', 'overlay/telemetry', 'storage/telemetry' ]
 trace_alloc = [  ]
 trace_alloc_detail = [ 'trace_alloc' ]

README.md

@@ -19,14 +19,14 @@ metrics-runtime = '0.13.0'
 rand = '0.8'
 regex = '1.3.1'
 sha2 = '0.10'
-adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.92' }
-ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.55' }
-overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.77' }
-rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.86' }
+adnl = { features = [ 'node' ], git = 'https://github.com/tonlabs/ton-labs-adnl', tag = '0.7.118' }
+ever-crypto = { git = 'https://github.com/tonlabs/ever-labs-crypto', tag = '0.1.79' }
+overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay', tag = '0.6.112' }
+rldp = { git = 'https://github.com/tonlabs/ton-labs-rldp', tag = '0.7.114' }
 storage = { path = '../storage' }
 tokio = { features = [ 'rt-multi-thread' ], version = '1.5' }
-ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.143' }
-ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.11.8' }
+ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.166' }
+ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.12.5' }
 
 [features]
 default = [  ]

catchain/Cargo.toml

@@ -1 +1 @@
-47e74bdea8c2f8fb933f964b511f094c8454c265
+b878eca4ff7fbc6dfe52483430ddedcf69202ed7

commit_hash.txt

@@ -1 +1 @@
-{"adnl":"a9638e86236858ff6fe46ce49b5c4c8210be3247","dht":"d88a499e2e00e42465c1f9f3f7e0c8f5eff5f49c","ever-crypto":"df922b4da9ae4029c872b44db0429984cefab180","overlay":"950385e79e15365ee8b99086e63e85a3be0d6110","rldp":"6f82051763dbffa779f8bd10a740f79db6f47e6e","ton-labs-abi":"12d80a4f4c803a9aa0271218864b1178e6668642","ton-tl":"44a75461704fe30eb1fc8c79785914f15b4f8894","ton-block":"821c95532e4e569dbb1e068f2959d32f47421cbc","ton-block-json":"a7d97122f5c62d4dd49152a58d74a01017a9cf74","ton-executor":"10a340fce77448285f6c9f5cfc9244f4c4d806f2","ton-types":"ce59ecfb5da3611c93c396eb730b8dcee565df7a","ton-vm":"52f13cab4f6773f87f664aa5827f90b91fe5a15f"}
+{"adnl":"1136be9ceb274059359d1dd8f648c4497558391f","dht":"4b493d8eed3389e23c19bb6ee32054e8591d659f","ever-crypto":"268cb21e6840a26ea29803ceec5e64351cdd5901","overlay":"c6393e8b44ceee69c01dfe5f5136e2343ad6e6df","rldp":"5b7daa4e2e752514b68209ed55a8677cc0e79aab","ton-labs-abi":"7e7a6a2b4c727e602e516a688cf3fb0e76238174","ton-tl":"cbcd0bee3c5e62c4eae28c0b3f979982eb23ee74","ton-block":"19132fa6357032497ab88743f580223ebcc599ec","ton-block-json":"fb106cc3ac75c81d1b776f4b3b5ad83b6e083f59","ton-executor":"b6208e6fbb717626d2fd0a15346e355f50daf25f","ton-types":"a81a0281d521d5ef013d77eb28a9ad2ed4b4aac1","ton-vm":"a00d2cd91e6bd1b5fa1f549b3aa5fd7ae9281ff1"}

common

@@ -0,0 +1,2 @@
+This is folder with default configs from the repo.
+Applied configs may be located elsewhere. On the working note, check the `--configs` key

deps_map.json

@@ -0,0 +1,2 @@
+#!/bin/bash
+export DOCKER_BUILDKIT=1 ; docker build --tag rustnode:local --ssh default .

docker/README-configs.md

@@ -0,0 +1,63 @@
+import os
+import urllib3
+import argparse
+import requests
+import subprocess
+
+build_url = "https://builder.tonlabs.io/jenkins/job/ton-node/job/master/lastSuccessfulBuild/buildNumber"
+artifact_url = 'https://builder.tonlabs.io/jenkins/job/ton-node/job/master/{}/artifact/tonlabs.zip'
+
+def main(args):
+    if not os.path.exists(args.credentials):
+        print("[-] Invalid path to credentials")
+        return 
+
+    if args.source == 'git':
+       download_github(args.credentials)
+    else:
+       download_jenkins(args.credentials)
+    
+    
+def download_github(creds):
+    os.mkdir('/tonlabs')
+    os.chdir('/tonlabs')
+    subprocess.run(['ssh-agent', '-s'])
+    subprocess.run(['ssh-add', creds])
+    subprocess.run(['git', 'clone', '[email protected]:tonlabs/ton-node.git'])
+
+
+def download_jenkins(credentials):
+    def get_creds(filepath):
+        with open(filepath, "r") as f:
+            uname_pass = f.readline()
+            if uname_pass.find(':') != -1:
+                return uname_pass.split(':')
+            else:
+                print("[-] Invalid jenkins credentials file")
+                return ("","")
+    
+    username,token = get_creds(credentials)
+
+    build_num_req = requests.get(_url_bn, auth=(username, token))
+    if build_num_req.status_code != 200:
+        print("Request error")
+        return
+
+    build_num = build_num_req.text
+    download_url = artifact_url.format(build_num)
+    zip_req = requests.get(donwload_url, auth=(username, token))
+    if zip_req.status_code != 200:
+        print("Request error")
+        return
+    
+    with open("tonlabs.zip", "wb") as f:
+        f.write(zip_req.content)
+    suprocess.run(['unzip', 'tonlabs.zip', '-d', '/'])
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='download ton-node sources')
+    parser.add_argument('-c', '--cred', type=str, dest='credentials', help='Path to file with credentials (private key for git and login:pass for jenkins)')
+    parser.add_argument('source', type=str, choices=['git', 'jenkins'], help='git repository / jenkins artifacts')
+    args = parser.parse_args()
+    main(args)

docker/build.sh

@@ -0,0 +1,76 @@
+#!/bin/bash -eEx
+
+#
+# Copyright (C) 2019-2021 TON Labs. All Rights Reserved.
+#
+# Licensed under the SOFTWARE EVALUATION License (the "License"); you may not use
+# this file except in compliance with the License.  You may obtain a copy of the
+# License at:
+#
+# https://www.ton.dev/licenses
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific TON DEV software governing permissions and limitations
+# under the License.
+#
+
+GREEN='\033[0;32m'
+NC='\033[0m' # No Color
+
+echo "INFO: R-Node startup..."
+
+echo "INFO: NETWORK_TYPE = ${NETWORK_TYPE}"
+echo "INFO: DEPLOY_TYPE = ${DEPLOY_TYPE}"
+echo "INFO: CONFIGS_PATH = ${CONFIGS_PATH}"
+echo "INFO: \$1 = $1"
+echo "INFO: \$2 = $2"
+
+NODE_EXEC='/ton-node/ton_node_kafka'
+if [ "${TON_NODE_ENABLE_KAFKA}" -ne 1 ]
+then
+    echo "Kafka disabled"
+    NODE_EXEC='/ton-node/ton_node_no_kafka'
+else 
+    echo "Kafka enabled"
+fi
+if [ "${TON_NODE_ENABLE_COMPRESSION}" -eq 1 ]
+then
+    echo "Compression enabled"
+    NODE_EXEC="${NODE_EXEC}_compression"
+else
+    echo "Compression disabled"
+fi
+
+function f_get_ton_global_config_json() {
+    if [ "${NETWORK_TYPE}" = "customnet" ]; then
+        if [ -f "${CONFIGS_PATH}/ton-global.config.json" ]; then
+            echo "WARNING: ${CONFIGS_PATH}/ton-global.config.json will be used"
+        else
+            echo "WARNING: ${CONFIGS_PATH}/ton-global.config.json does not exist"
+            exit 1
+        fi
+    else
+        curl -sS "https://builder.tonlabs.io/nodes/${NETWORK_TYPE}/ton-global.config.json" -o "${CONFIGS_PATH}/ton-global.config.json"
+    fi
+}
+
+function f_iscron() {
+kill -0 "$(cat /var/run/crond.pid 2>/dev/null)" 2>/dev/null || crond
+}
+
+#f_iscron
+
+f_get_ton_global_config_json
+
+
+# main
+
+if [ "${1}" = "bash" ];then
+    tail -f /dev/null
+else
+    cd /ton-node
+    exec $NODE_EXEC --configs "${CONFIGS_PATH}" ${TON_NODE_EXTRA_ARGS} >> /ton-node/logs/output.log 2>&1
+fi
+