diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7bccc56d48c754426c641319a7858f250208b70c..0000000000000000000000000000000000000000 --- a/.travis.yml +++ /dev/null @@ -1,47 +0,0 @@ -sudo: required -language: c -compiler: gcc -dist: xenial -notifications: - email: false - -before_install: - - git submodule init - - git submodule update - - cd cellframe-sdk - - git submodule init - - git submodule update - - cd .. - -script: - - mkdir build - - cd build - - cmake -DBUILD_CELLFRAME_NODE_TESTS=ON ../ - - make - - ctest - - cpack - - sudo dpkg -i *.deb - - ls -laR /opt/cellframe-node - - sudo /opt/cellframe-node/bin/cellframe-node-tool cert create cert0 sig_tesla - - sudo service cellframe-node start - - sudo systemctl status cellframe-node - - sudo /opt/cellframe-node/bin/cellframe-node-cli wallet new -w wallet0 - - sudo /opt/cellframe-node/bin/cellframe-node-cli token_decl -net private -chain gdb token TOK1 total_supply 1000000000000000000000000 signs_total 1 signs_emission 1 certs cert0 - - sudo /opt/cellframe-node/bin/cellframe-node-cli token_emit -net private -chain_emission gdb -chain_base_tx gdb -addr $(sudo /opt/cellframe-node/bin/cellframe-node-cli wallet list| grep addr | awk '{print $2}' |tr -d "\n") -token TOK1 -certs cert0 -emission_value 123000000000000 - - sudo /opt/cellframe-node/bin/cellframe-node-cli mempool_proc -net private -chain gdb -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - libjson-c-dev - - libev-dev - - libmagic-dev - - libldb-dev - - libtevent-dev - - libcurl4-gnutls-dev - - debconf-utils - - dconf-cli - - pv - - libpython3-dev - diff --git a/cfg.python.wrapper.in b/cfg.python.wrapper.in deleted file mode 100644 index 2c35ca1cffc0a4778eb51cc175a94cc93cda1163..0000000000000000000000000000000000000000 --- a/cfg.python.wrapper.in +++ /dev/null @@ -1,10 +0,0 @@ -export CC="@CMAKE_C_COMPILER@" -export CXX="@CMAKE_CXX_COMPILER@" - -export CFLAGS="@WRP_CFLAGS@ @CCOPT_SYSTEM@" -export CPPFLAGS="@WRP_CPPFLAGS@ @CCOPT_SYSTEM@" -export LDFLAGS="@WRP_LDFLAGS@ @LDOPT_SYSTEM@" - -#export LINKFORSHARED=" " - -eval "$*" diff --git a/dist/etc/network/KelVPN/chain-0.cfg b/dist/etc/network/KelVPN/chain-0.cfg new file mode 100644 index 0000000000000000000000000000000000000000..2430325677340e56a91b962a8e5c0b32e9cce849 --- /dev/null +++ b/dist/etc/network/KelVPN/chain-0.cfg @@ -0,0 +1,31 @@ +[chain] +id=0x0000000000000000 +shard_id=0x0000000000000000 +name=zerochain +load_priority=0 +# Possible values [token, emission, transaction, ca, decree, anchor] +datum_types=[token,emission,ca,decree,custom] +default_datum_types=[token,emission,ca,decree, custom] +mempool_auto_types=[] +consensus=dag_poa + +[files] +storage_dir=../../../var/lib/network/kelvpn/zerochain/ + +[dag] +is_single_line=true +is_celled=false +is_add_directly=false +datum_add_hashes_count=1 + +is_static_genesis_event=true +static_genesis_event=0xD2A07ED06264795F2E2ABEFDD2E3729B0B03413D24F7571EC040424D0BCE3261 + +[dag-poa] +auth_certs_prefix=kelvpn.root +auth_certs_number=3 +auth_certs_number_verify=2 +confirmations_timeout=15 +wait_sync_before_complete=120 +auto_confirmation=true +auto_round_complete=true diff --git a/dist/etc/network/KelVPN/main.cfg b/dist/etc/network/KelVPN/main.cfg new file mode 100644 index 0000000000000000000000000000000000000000..5d333ad70be4506322fc659ce2188e7f23baf221 --- /dev/null +++ b/dist/etc/network/KelVPN/main.cfg @@ -0,0 +1,23 @@ +[chain] +id=0x0000000000000001 +shard_id=0x0000000000000000 +name=main +load_priority=1 +# Possible values [token, emission, transaction, ca, decree, anchor] +datum_types=[transaction,anchor] +default_datum_types=[transaction, anchor] +mempool_auto_types=[all] +consensus=esbocs + +[files] +storage_dir=../../../var/lib/network/kelvpn/main/ + +[blocks] +is_celled=false + +[esbocs] +consensus_debug=true +min_validators_count=1 +auth_certs_prefix=kelvpn.master +validators_addrs=[1807::2023::0001::0000] +new_round_delay=30 \ No newline at end of file diff --git a/dist/share/ca/kelvpn.master.0.pub.dcert b/dist/share/ca/kelvpn.master.0.pub.dcert new file mode 100644 index 0000000000000000000000000000000000000000..47157962f6a4cec1a63ead641d595f48836607b3 Binary files /dev/null and b/dist/share/ca/kelvpn.master.0.pub.dcert differ diff --git a/dist/share/ca/kelvpn.master.1.pub.dcert b/dist/share/ca/kelvpn.master.1.pub.dcert new file mode 100644 index 0000000000000000000000000000000000000000..381494d65b94db4dd0f3aa5e58f80983c00614ce Binary files /dev/null and b/dist/share/ca/kelvpn.master.1.pub.dcert differ diff --git a/dist/share/ca/kelvpn.master.2.pub.dcert b/dist/share/ca/kelvpn.master.2.pub.dcert new file mode 100644 index 0000000000000000000000000000000000000000..01d0753bede2c4ea97fb7d41bdeae393eaffaf6d Binary files /dev/null and b/dist/share/ca/kelvpn.master.2.pub.dcert differ diff --git a/dist/share/ca/kelvpn.root.0.dcert b/dist/share/ca/kelvpn.root.0.dcert new file mode 100644 index 0000000000000000000000000000000000000000..b19c7d90d3cdd3146cf571597d9804e79c96e677 Binary files /dev/null and b/dist/share/ca/kelvpn.root.0.dcert differ diff --git a/dist/share/ca/kelvpn.root.1.dcert b/dist/share/ca/kelvpn.root.1.dcert new file mode 100644 index 0000000000000000000000000000000000000000..25404e6984c1747efd12309e597e6bc3fda81f02 Binary files /dev/null and b/dist/share/ca/kelvpn.root.1.dcert differ diff --git a/dist/share/ca/kelvpn.root.2.dcert b/dist/share/ca/kelvpn.root.2.dcert new file mode 100644 index 0000000000000000000000000000000000000000..476844c3a3e3ce8ba317b20e55f49391376b265f Binary files /dev/null and b/dist/share/ca/kelvpn.root.2.dcert differ diff --git a/dist/share/configs/network/KelVPN.cfg.tpl b/dist/share/configs/network/KelVPN.cfg.tpl new file mode 100644 index 0000000000000000000000000000000000000000..b18fcc3948a38d024e7a14443d7aa35924aa0f74 --- /dev/null +++ b/dist/share/configs/network/KelVPN.cfg.tpl @@ -0,0 +1,32 @@ +# KelVPN net config + +# General section +[general] +id=0x1807202300000000 +name=KelVPN +native_ticker=KEL +gdb_groups_prefix=kelvpn + + +# Possible values: light, full, archive, master, root +node-role={NODE_TYPE} +seed_nodes_aliases=[kelvpn.root.0,kelvpn.root.1,kelvpn.root.2] +seed_nodes_hostnames=[0.root.kelvpn.com,1.root.kelvpn.com,2.root.kelvpn.com] +seed_nodes_addrs=[1807::2023::0000::0000,1807::2023::0000::0001,1807::2023::0000::0002] +seed_nodes_port=[8079,8079,8079] +require_links=3 + +#[auth] +#type=ca +#acl_accept_ca_list=[] +#acl_accept_ca_gdb= +#acl_accept_ca_chains=all + +[dag-poa] +#events-sign-cert=kelvpn.root.0 + +[esbocs] +#blocks-sign-cert=mycert +#minimum_fee=1.0 +#fee_addr=myaddr + diff --git a/os/debian/config b/os/debian/config index 35f8f93d1ca6d42e81925cee37de2a191ac63f51..7eaaad5e9e18cfff17de2cb44c2964be946fe166 100755 --- a/os/debian/config +++ b/os/debian/config @@ -62,6 +62,15 @@ reconfigure|configure) db_go || true fi + db_input critical cellframe-node/kelvpn_enabled || true + db_go || true + + db_get cellframe-node/kelvpn_enabled + if [ "$RET" = "true" ]; then + db_input critical cellframe-node/kelvpn_node_type || true + db_go || true + fi + # db_input critical cellframe-node/kelvpn_minkowski_enabled || true # db_go || true diff --git a/os/debian/postinst b/os/debian/postinst index f79eb82bb7ca5aa5a4df8403edcfe0db8f976f78..90ecf1a079048cc8197f1080f553c6537d20d1d1 100755 --- a/os/debian/postinst +++ b/os/debian/postinst @@ -217,7 +217,37 @@ if [ "$RET" = "true" ]; then db_get cellframe-node/backbone_node_type || true NODE_TYPE=$RET sed -i "s/{NODE_TYPE}/$NODE_TYPE/g" $DAP_NET_CFG || true - echo "[*] Enabled Backbone" + echo "[*] Enabled Backbone Mainnet" +fi + + +# Init Backbone +NET_NAME="KelVPN" + +db_get cellframe-node/kelvpn_enabled || true +if [ "$RET" = "true" ]; then + + DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg" + DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl" + DAP_NET_CFG="" + + if [ -e "$DAP_CFG_NET" ]; then + if (( NEW_MINOR > OLD_MINOR )); then + echo "Need update KelVPN.cfg ..." + DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg" + else + echo "No need to update KelVPN.cfg, write as new" + DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.dpkg.new" + fi + else + DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg" + fi + + cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true + db_get cellframe-node/kelvpn_node_type || true + NODE_TYPE=$RET + sed -i "s/{NODE_TYPE}/$NODE_TYPE/g" $DAP_NET_CFG || true + echo "[*] Enabled KelVPN Mainnet" fi mkdir -p $DAP_PREFIX/var/log || true diff --git a/os/debian/templates b/os/debian/templates index 99817d3b04e6ff77ef47f0769ed8e8b95a65a5b8..68c05cbc90e2fd575de8ec053a0320bdb81e9395 100755 --- a/os/debian/templates +++ b/os/debian/templates @@ -142,14 +142,14 @@ Template: cellframe-node/backbone_enabled Default: true Choices: true, false Type: select -Description: Backbone: Enable network +Description: Backbone Mainnet: Enable network Backbone Mainnet: Enable network auto load on start Template: cellframe-node/backbone_node_type Type: select Default: full Choices: full, light, master, archive, root -Description: Backbone: Node role +Description: Backbone Mainnet: Node role Select node role:. Light - Synchronize only local wallets full - Sync all its cell @@ -157,6 +157,26 @@ Description: Backbone: Node role archive - Sync all the network root - Special predefined root nodes, usually produces zerochain and acts like archive as well +Template: cellframe-node/kelvpn_enabled +Default: false +Choices: true, false +Type: select +Description: KelVPN: Enable network + KelVPN Mainnet: Enable network auto load on start + +Template: cellframe-node/kelvpn_node_type +Type: select +Default: full +Choices: full, light, master, archive, root +Description: KelVPN Mainnet: Node role + Select node role:. + Light - Synchronize only local wallets + full - Sync all its cell + master - Allow to store values in chains and take comission, sync all shards that will need to be synced + archive - Sync all the network + root - Special predefined root nodes, usually produces zerochain and acts like archive as well + + Template: cellframe-node/enable_python_plugins Default: false Choices: true, false diff --git a/version.mk b/version.mk index 5f0e2a0dd3179e743f9bd9ea97f6def8ac40f2cf..5912a71e6691738933cdc50064b4075b626f3ad3 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ VERSION_MAJOR=5 VERSION_MINOR=2 -VERSION_PATCH=240 +VERSION_PATCH=241