Skip to content
Snippets Groups Projects
Commit eaefbfa7 authored by Constantin P.'s avatar Constantin P. 💬
Browse files

Merge branch 'hotfix-update-subs' into 'master'

Hotfix update subs

See merge request !1743
parents 61c90c06 ca0804d8
No related branches found
No related tags found
5 merge requests!1779Develop port 02 12,!1743Hotfix update subs,!1729Hotfixes 24 10 asan,!1709feature-13362,!1692Bugfix olzhas
...@@ -212,6 +212,8 @@ amd64:linux.tps: ...@@ -212,6 +212,8 @@ amd64:linux.tps:
before_script: before_script:
- /opt/buildtools/prepare_environment.sh amd64-linux - /opt/buildtools/prepare_environment.sh amd64-linux
- *fill_version_mk - *fill_version_mk
when: manual
script: script:
- ./prod_build/build.sh --target linux release -DBUILD_WITH_TPS_TEST=ON - ./prod_build/build.sh --target linux release -DBUILD_WITH_TPS_TEST=ON
- ./prod_build/pack.sh --target linux release - ./prod_build/pack.sh --target linux release
......
Subproject commit 1b348cf98304c35ecc80d2f8268760a1ab17f034 Subproject commit 807aee87a16b623be9c32b6bcd0fffaeefd1a8f4
Subproject commit 3b7661b9fc1ec79841ba69dda50389ea82bd8e80 Subproject commit 628e8fd05782d701bb1be115d3b5ba8268ee8fa6
[ledger]
hard_reject_list = [ 0x10D896EF77E4666EF94BB6563A09EB17DB930FE9CE21B1F85F433BAF2C8A788A ]
\ No newline at end of file
...@@ -161,6 +161,8 @@ network_mask=255.255.255.0 ...@@ -161,6 +161,8 @@ network_mask=255.255.255.0
# Console interface server # Console interface server
[cli-server] [cli-server]
enabled=true enabled=true
# debug_more=false
# debug-cli=false
#unix-only #unix-only
#listen-path=[../var/run/node_cli] #listen-path=[../var/run/node_cli]
#listen-address=[127.0.0.1:12345] #listen-address=[127.0.0.1:12345]
...@@ -180,6 +182,8 @@ ca_folders=[../var/lib/ca,../share/ca] ...@@ -180,6 +182,8 @@ ca_folders=[../var/lib/ca,../share/ca]
#debug_more=true #debug_more=true
path=../var/lib/global_db path=../var/lib/global_db
driver= driver=
#debug_more=true
# mdbx_upper_limit_of_db_size=1024
# Plugins # Plugins
[plugins] [plugins]
......
...@@ -20,7 +20,7 @@ node-role= ...@@ -20,7 +20,7 @@ node-role=
#permanent_nodes_hosts=[] #permanent_nodes_hosts=[]
# This addresses will have priviledged acceess to some GDB groups # This addresses will have priviledged acceess to some GDB groups
authorized_nodes_addrs=[BCA3::B097::DCDC::CB2B, 038E::0C9B::A3E8::C533, CC88::3F68::5313::1577, 72F9::511B::616A::A46F, A2C2::0CD4::38BA::2E8C, A983::7C3F::7FD4::4950, D1E4::F837::F42C::BFEF, B6E5::1B78::847A::F026] authorized_nodes_addrs=[BCA3::B097::DCDC::CB2B, 038E::0C9B::A3E8::C533, CC88::3F68::5313::1577, 72F9::511B::616A::A46F, A2C2::0CD4::38BA::2E8C, A983::7C3F::7FD4::4950, D1E4::F837::F42C::BFEF, B6E5::1B78::847A::F026]
# This hosts wiil be used as bootstrap balancers for first net access # This hosts will be used as bootstrap balancers for first net access
seed_nodes_hosts=[0.root.raiden.cellframe.net:8079, 1.root.raiden.cellframe.net:8079, 2.root.raiden.cellframe.net:8079] seed_nodes_hosts=[0.root.raiden.cellframe.net:8079, 1.root.raiden.cellframe.net:8079, 2.root.raiden.cellframe.net:8079]
#[auth] #[auth]
......
...@@ -21,7 +21,7 @@ node-role= ...@@ -21,7 +21,7 @@ node-role=
# This addresses will have priviledged acceess to some GDB groups # This addresses will have priviledged acceess to some GDB groups
authorized_nodes_addrs=[D420::C2A9::0637::040C,AC33::9A06::AAD8::B288,5DA8::C171::E316::C923,72F9::511B::616A::A46F,A2C2::0CD4::38BA::2E8C,A983::7C3F::7FD4::4950,D1E4::F837::F42C::BFEF] authorized_nodes_addrs=[D420::C2A9::0637::040C,AC33::9A06::AAD8::B288,5DA8::C171::E316::C923,72F9::511B::616A::A46F,A2C2::0CD4::38BA::2E8C,A983::7C3F::7FD4::4950,D1E4::F837::F42C::BFEF]
# This hosts wiil be used as bootstrap balancers for first net access # This hosts will be used as bootstrap balancers for first net access
seed_nodes_hosts=[0.root.riemann.cellframe.net:8079, 1.root.riemann.cellframe.net:8079, 2.root.riemann.cellframe.net:8079] seed_nodes_hosts=[0.root.riemann.cellframe.net:8079, 1.root.riemann.cellframe.net:8079, 2.root.riemann.cellframe.net:8079]
#[auth] #[auth]
......
...@@ -18,7 +18,7 @@ node-role= ...@@ -18,7 +18,7 @@ node-role=
#permanent_nodes_hosts=[] #permanent_nodes_hosts=[]
# This addresses will have priviledged acceess to some GDB groups # This addresses will have priviledged acceess to some GDB groups
authorized_nodes_addrs=[608C::F7B7::D476::2438, 7497::4FB4::CFA1::9823, 5641::292F::13F5::F039] authorized_nodes_addrs=[608C::F7B7::D476::2438, 7497::4FB4::CFA1::9823, 5641::292F::13F5::F039]
# This hosts wiil be used as bootstrap balancers for first net access # This hosts will be used as bootstrap balancers for first net access
seed_nodes_hosts=[0.root.subzero.cellframe.net:8190, 1.root.subzero.cellframe.net:8190, 2.root.subzero.cellframe.net:8190] seed_nodes_hosts=[0.root.subzero.cellframe.net:8190, 1.root.subzero.cellframe.net:8190, 2.root.subzero.cellframe.net:8190]
#[auth] #[auth]
......
...@@ -210,7 +210,10 @@ int main( int argc, const char **argv ) ...@@ -210,7 +210,10 @@ int main( int argc, const char **argv )
{ {
char l_config_dir[MAX_PATH] = {'\0'}; char l_config_dir[MAX_PATH] = {'\0'};
sprintf(l_config_dir, "%s/etc", g_sys_dir_path); sprintf(l_config_dir, "%s/etc", g_sys_dir_path);
dap_config_init(l_config_dir); if (dap_config_init(l_config_dir) != 0) {
log_it( L_CRITICAL,"Can't init general configurations" );
return -1;
}
} }
if ((g_config = dap_config_open(dap_get_appname())) == NULL ) { if ((g_config = dap_config_open(dap_get_appname())) == NULL ) {
...@@ -407,13 +410,13 @@ int main( int argc, const char **argv ) ...@@ -407,13 +410,13 @@ int main( int argc, const char **argv )
} }
#endif #endif
dap_chain_net_load_all();
if ( dap_chain_node_cli_init(g_config) ) { if ( dap_chain_node_cli_init(g_config) ) {
log_it( L_CRITICAL, "Can't init server for console" ); log_it( L_CRITICAL, "Can't init server for console" );
return -11; return -11;
} }
dap_chain_net_load_all();
log_it(L_INFO, "Automatic mempool processing %s", log_it(L_INFO, "Automatic mempool processing %s",
dap_chain_node_mempool_autoproc_init() ? "enabled" : "disabled"); dap_chain_node_mempool_autoproc_init() ? "enabled" : "disabled");
......
VERSION_MAJOR=5 VERSION_MAJOR=5
VERSION_MINOR=3 VERSION_MINOR=3
VERSION_PATCH=176 VERSION_PATCH=178
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment