diff --git a/CMakeLists.txt b/CMakeLists.txt index ff6f3828aea89d2b61bfcd8bdfe04dc1ed164d97..d8e77ad8e7d6993b3036198131e0add10e4a3196 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 2) SET( CPACK_PACKAGE_VERSION_MINOR 3) -SET( CPACK_PACKAGE_VERSION_PATCH 1) +SET( CPACK_PACKAGE_VERSION_PATCH 2) SET( CPACK_SYSTEM_NAME "debian-9.7-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") diff --git a/dist/etc/network/kelvin-testnet.cfg b/dist/etc/network/kelvin-testnet.cfg index 00db7a83000eb9935288ecb7dc03b93898ae29d8..28081d735df9cf1665b7f34650b5a4fc4454e650 100755 --- a/dist/etc/network/kelvin-testnet.cfg +++ b/dist/etc/network/kelvin-testnet.cfg @@ -7,16 +7,17 @@ type=development # Possible values: light, full, archive, master, root node-role=full #node-alias=addr-%node% -#node-ipv4=192.168.100.92 +#node-addr=0xffff000000020001 gdb_groups_prefix=kelvin-testnet -seed_nodes_ipv4=[195.154.133.160, 62.210.90.227] +seed_nodes_ipv4=[195.154.133.160, 62.210.90.227,104.248.201.95, 167.99.133.102, 159.65.24.58, 67.207.80.51, 157.230.173.166] seed_nodes_port=[8079, 8079] -seed_nodes_aliases=[kelvin.testnet.root.0,kelvin.testnet.root.1] -seed_nodes_addrs=[ffff::0000::0000::0001,ffff::0000::0000::0002] +seed_nodes_aliases=[kelvin.testnet.root.01, kelvin.testnet.root.02, kelvin.testnet.root.0, kelvin.testnet.root.1, kelvin.testnet.root.2, kelvin.testnet.root.3, kelvin.testnet.root.4] +seed_nodes_addrs=[ffff::0000::0001::0001, ffff::0000::0001::0002, ffff::0000::0000::0001, ffff::0000::0000::0002, ffff::0000::0000::0003, ffff::0000::0000::0004, ffff::0000::0000::0005] [dag-poa] -events-sign-cert=pvt.kelvin.testnet.root.0 +#events-sign-cert=pvt.kelvin.testnet.root.0 [dag-pos] -events-sign-wallet=my_wallet +#events-sign-wallet=my_wallet + diff --git a/dist/share/ca/kelvin.testnet.master.cell.1.dcert b/dist/share/ca/kelvin.testnet.master.cell.1.dcert new file mode 100644 index 0000000000000000000000000000000000000000..bc8931d7d57f98f2fa226b56f38fcdb585e0ca0f Binary files /dev/null and b/dist/share/ca/kelvin.testnet.master.cell.1.dcert differ diff --git a/dist/share/ca/kelvin.testnet.master.cell.2.dcert b/dist/share/ca/kelvin.testnet.master.cell.2.dcert new file mode 100644 index 0000000000000000000000000000000000000000..d32ab035057ec6597f53877cec52aee39d30a11c Binary files /dev/null and b/dist/share/ca/kelvin.testnet.master.cell.2.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.0.dcert b/dist/share/ca/kelvin.testnet.root.0.dcert index 8cae13ed48e2130004d2b94bc602b7c8c4c7a130..afc1573e32a013e870bc3e9a62805a926c69adc6 100644 Binary files a/dist/share/ca/kelvin.testnet.root.0.dcert and b/dist/share/ca/kelvin.testnet.root.0.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.01.dcert b/dist/share/ca/kelvin.testnet.root.01.dcert new file mode 100644 index 0000000000000000000000000000000000000000..050fd70aab2642a7f34043d75ae02c1b0c452136 Binary files /dev/null and b/dist/share/ca/kelvin.testnet.root.01.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.02.dcert b/dist/share/ca/kelvin.testnet.root.02.dcert new file mode 100644 index 0000000000000000000000000000000000000000..77a62da8003861262825c1fab2903bc9582c0827 Binary files /dev/null and b/dist/share/ca/kelvin.testnet.root.02.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.1.dcert b/dist/share/ca/kelvin.testnet.root.1.dcert index 265958cc709a88e01f8ae0b9481bd7b152bb7a0c..54264bd21466a5f5b4be8297cceb596d9f34d8d8 100644 Binary files a/dist/share/ca/kelvin.testnet.root.1.dcert and b/dist/share/ca/kelvin.testnet.root.1.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.2.dcert b/dist/share/ca/kelvin.testnet.root.2.dcert index 5617eee6f10a9774095a773736b263c8fc1d047a..b633b4f111e82a7b87eeffd4cb715e6614302d4f 100644 Binary files a/dist/share/ca/kelvin.testnet.root.2.dcert and b/dist/share/ca/kelvin.testnet.root.2.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.3.dcert b/dist/share/ca/kelvin.testnet.root.3.dcert index cbb219dcdf7a00ec1b5af5f0b6ecf75dbff55d09..8aacb3139d92336bf63fa505cb6dbc722bf8e7e5 100644 Binary files a/dist/share/ca/kelvin.testnet.root.3.dcert and b/dist/share/ca/kelvin.testnet.root.3.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.4.dcert b/dist/share/ca/kelvin.testnet.root.4.dcert index 251ac3cffb370e7185b076a2de4a69fc57ad63c6..98cb1d5c151f8e95fd954a8a665eee51b9dfa007 100644 Binary files a/dist/share/ca/kelvin.testnet.root.4.dcert and b/dist/share/ca/kelvin.testnet.root.4.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.5.dcert b/dist/share/ca/kelvin.testnet.root.5.dcert index 9a1877d7617c0e06ca8d457e9e27c75b80ef13c0..21cef0a09e81bc2a0609c5a526a929a93f7c09a0 100644 Binary files a/dist/share/ca/kelvin.testnet.root.5.dcert and b/dist/share/ca/kelvin.testnet.root.5.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.6.dcert b/dist/share/ca/kelvin.testnet.root.6.dcert index 66c1b2209ee59bff939ea4740c038a27658ce819..acc07467d15764f12a9e27e682c67596e6b7024a 100644 Binary files a/dist/share/ca/kelvin.testnet.root.6.dcert and b/dist/share/ca/kelvin.testnet.root.6.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.7.dcert b/dist/share/ca/kelvin.testnet.root.7.dcert index 42e5e212200c6edf2707e5b0cec8ec1476b79a57..dacc9520522a8b3cbf379744be6305ae7958fd00 100644 Binary files a/dist/share/ca/kelvin.testnet.root.7.dcert and b/dist/share/ca/kelvin.testnet.root.7.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.8.dcert b/dist/share/ca/kelvin.testnet.root.8.dcert index beed9099ba4e655603e539879feba285b40e4ec0..d627892b74b694dc0a834a6bd0d30f0eb58fb2e1 100644 Binary files a/dist/share/ca/kelvin.testnet.root.8.dcert and b/dist/share/ca/kelvin.testnet.root.8.dcert differ diff --git a/dist/share/ca/kelvin.testnet.root.9.dcert b/dist/share/ca/kelvin.testnet.root.9.dcert index b2458a883bf3827a5ae961c7dd5cfc4e6015582e..d73622dfb9ab7df8d6b974de199674c09f9800bb 100644 Binary files a/dist/share/ca/kelvin.testnet.root.9.dcert and b/dist/share/ca/kelvin.testnet.root.9.dcert differ diff --git a/libdap-chain b/libdap-chain index ae29573e9effcec6c9b4468f9efda9ea8fff40c0..ada528cb84b1c4c943636c1a433fac4c77654464 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit ae29573e9effcec6c9b4468f9efda9ea8fff40c0 +Subproject commit ada528cb84b1c4c943636c1a433fac4c77654464 diff --git a/libdap-chain-crypto b/libdap-chain-crypto index 3f9ca3093acde91b6cd92c7c3b95d8c1d9dea66d..01090326362ec6e39994875c6448b56342cfb0b5 160000 --- a/libdap-chain-crypto +++ b/libdap-chain-crypto @@ -1 +1 @@ -Subproject commit 3f9ca3093acde91b6cd92c7c3b95d8c1d9dea66d +Subproject commit 01090326362ec6e39994875c6448b56342cfb0b5