diff --git a/CMakeLists.txt b/CMakeLists.txt index e1a4d692b487108a9b2d94b0d7fcdc7820bf410e..25eb8770ccb6edbb03269caa5ce237af93c67ce2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 2) SET( CPACK_PACKAGE_VERSION_MINOR 11) -SET( CPACK_PACKAGE_VERSION_PATCH 8) +SET( CPACK_PACKAGE_VERSION_PATCH 9) SET( CPACK_SYSTEM_TYPE "debian") SET( CPACK_SYSTEM_VERSION "10.0") diff --git a/dist/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl index d593cbe6e5fa4fd2e8f0a3619cadb8fdbdc3fadd..e79bcf2585afffaba5886a035b1c64f59430aa5c 100644 --- a/dist/share/configs/cellframe-node.cfg.tpl +++ b/dist/share/configs/cellframe-node.cfg.tpl @@ -6,8 +6,6 @@ wallets_default=default # seed mode. WARNING. Used true only when you start the new network #seed_mode=false auto_online={AUTO_ONLINE} -# type of node addr [auto, static, dinamic] -node_addr_type=auto # Console diff --git a/dist/share/configs/network/kelvin-testnet.cfg.tpl b/dist/share/configs/network/kelvin-testnet.cfg.tpl index f176a522bb3e6550d64798b78463dcfab1439820..1adc05cb0c7fb0a1b0f6af55a4eadb3fad4b1980 100644 --- a/dist/share/configs/network/kelvin-testnet.cfg.tpl +++ b/dist/share/configs/network/kelvin-testnet.cfg.tpl @@ -12,6 +12,8 @@ gdb_groups_prefix=kelvin-testnet # node addr exired time in hours (168h=1w 720h=1m 8760h=1y), by default 720h(1week) #node-addr=0x10 node-addr-expired=168 +# type of node addr [auto, static, dinamic] +node_addr_type=auto seed_nodes_hostnames=[0.root.testnet.klvn.io,1.root.testnet.klvn.io,2.root.testnet.klvn.io,3.root.testnet.klvn.io,4.root.testnet.klvn.io] seed_nodes_aliases=[kelvin.testnet.root.0,kelvin.testnet.root.1,kelvin.testnet.root.2,kelvin.testnet.root.3,kelvin.testnet.root.4] diff --git a/dist/share/configs/network/private.cfg.tpl b/dist/share/configs/network/private.cfg.tpl index 3ee047e320abd11311cf19fa312c63ea514b6237..5be3f2c598afe863033868f66af5ffcce917a8f9 100644 --- a/dist/share/configs/network/private.cfg.tpl +++ b/dist/share/configs/network/private.cfg.tpl @@ -11,6 +11,8 @@ gdb_groups_prefix=private #node-addr=0x10 # node addr exired time in hours (168h=1w 720h=1m 8760h=1y), by default 720h(1week) node-addr-expired=168 +# type of node addr [auto, static, dinamic] +node_addr_type=auto seed_nodes_ipv4=[195.154.133.160, 62.210.90.227] seed_nodes_port=[8079, 8079] diff --git a/libdap b/libdap index 97f2cafbc688e9b656427ab376d9841a7ff8b8ea..a479b3c1e56ece208e00c7a75a0cf656e6310dbb 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit 97f2cafbc688e9b656427ab376d9841a7ff8b8ea +Subproject commit a479b3c1e56ece208e00c7a75a0cf656e6310dbb diff --git a/libdap-chain b/libdap-chain index b11de781617e3137875fbdab281f26a796474657..447ea8c22eb5059f2f5688884406ed13ee9c37c9 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit b11de781617e3137875fbdab281f26a796474657 +Subproject commit 447ea8c22eb5059f2f5688884406ed13ee9c37c9 diff --git a/libdap-chain-global-db b/libdap-chain-global-db index 0edf531dd6e4e56521222e1ac73905a03e139a95..902f9ac862bdf484de9399db3987d49d7dadf5c0 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit 0edf531dd6e4e56521222e1ac73905a03e139a95 +Subproject commit 902f9ac862bdf484de9399db3987d49d7dadf5c0 diff --git a/libdap-chain-mempool b/libdap-chain-mempool index 61157623dc77de04628dcca6dae39536f1be10de..ee7139d8f6cb50122334b5edbe0d5a02aca367d6 160000 --- a/libdap-chain-mempool +++ b/libdap-chain-mempool @@ -1 +1 @@ -Subproject commit 61157623dc77de04628dcca6dae39536f1be10de +Subproject commit ee7139d8f6cb50122334b5edbe0d5a02aca367d6 diff --git a/libdap-chain-net b/libdap-chain-net index fb9dcf2b3b108464f74a2ce4d8ea4a72edbde9a4..3eb6ca1d03cd2e03db9fa8b178eba05c3e1101fe 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit fb9dcf2b3b108464f74a2ce4d8ea4a72edbde9a4 +Subproject commit 3eb6ca1d03cd2e03db9fa8b178eba05c3e1101fe diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index e0f74dbc745a65bb040a41e99460b21b14406a1d..77c26fa2203149bb8fc4f40e42eed83c5e41887d 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit e0f74dbc745a65bb040a41e99460b21b14406a1d +Subproject commit 77c26fa2203149bb8fc4f40e42eed83c5e41887d diff --git a/libdap-chain-wallet b/libdap-chain-wallet index 38ae5b21de140f15f7c994c44cbd70ca84b7f1ba..4a3ca1c4e8799f38cd1adb792f117bfe3027b0c0 160000 --- a/libdap-chain-wallet +++ b/libdap-chain-wallet @@ -1 +1 @@ -Subproject commit 38ae5b21de140f15f7c994c44cbd70ca84b7f1ba +Subproject commit 4a3ca1c4e8799f38cd1adb792f117bfe3027b0c0 diff --git a/libdap-client b/libdap-client index 4b745e81aa704db3f328b17eb9f8bd13feaa3cd0..03f1bdc836e332ab90dc33124a9bd2536d8740d4 160000 --- a/libdap-client +++ b/libdap-client @@ -1 +1 @@ -Subproject commit 4b745e81aa704db3f328b17eb9f8bd13feaa3cd0 +Subproject commit 03f1bdc836e332ab90dc33124a9bd2536d8740d4 diff --git a/libdap-crypto b/libdap-crypto index 77f0dd9d161ac902f28d5d64b3451d7ab50fe186..2657b6a4b4292f5a382694897fbfcf779e569cdf 160000 --- a/libdap-crypto +++ b/libdap-crypto @@ -1 +1 @@ -Subproject commit 77f0dd9d161ac902f28d5d64b3451d7ab50fe186 +Subproject commit 2657b6a4b4292f5a382694897fbfcf779e569cdf diff --git a/libdap-server-core b/libdap-server-core index dd803b2e03007c74c792b35a319fd7f9b6e73078..3f0e7584a16b035b0f64820a61ad08d1c179c410 160000 --- a/libdap-server-core +++ b/libdap-server-core @@ -1 +1 @@ -Subproject commit dd803b2e03007c74c792b35a319fd7f9b6e73078 +Subproject commit 3f0e7584a16b035b0f64820a61ad08d1c179c410 diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain index 429013c8e58d4bc4f8dcc765832fad7c6604fc71..001748d443a4cf8fef1886a6a9846e712967d0fd 160000 --- a/libdap-stream-ch-chain +++ b/libdap-stream-ch-chain @@ -1 +1 @@ -Subproject commit 429013c8e58d4bc4f8dcc765832fad7c6604fc71 +Subproject commit 001748d443a4cf8fef1886a6a9846e712967d0fd diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv index 51c01481f87f3ffc1fdad3054292bf910d2c5f31..26b14c86f7008d44086ef8cf72b4ba780462dbc2 160000 --- a/libdap-stream-ch-chain-net-srv +++ b/libdap-stream-ch-chain-net-srv @@ -1 +1 @@ -Subproject commit 51c01481f87f3ffc1fdad3054292bf910d2c5f31 +Subproject commit 26b14c86f7008d44086ef8cf72b4ba780462dbc2