Skip to content

Commit

Permalink
prepare for packaged version
Browse files Browse the repository at this point in the history
  • Loading branch information
gr0vity committed May 6, 2023
1 parent b4fef38 commit cdd2202
Show file tree
Hide file tree
Showing 32 changed files with 581 additions and 190 deletions.
6 changes: 5 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
.vscode/
build/
**egg-info**
nano_nodes/
**/*pycache*
**/*_cache*
.old*
config.json
venv_py/
**/.DS_Store
**/._.DS_Store
**/._.DS_Store
17 changes: 0 additions & 17 deletions .vscode/launch.json
View file

This file was deleted.

34 changes: 0 additions & 34 deletions app/pycmd.py
View file

This file was deleted.

0 submodules/xnomin/__init__.py → nanolab/__init__.py
View file
File renamed without changes.
115 changes: 115 additions & 0 deletions nanolab/configs/10node_network/change_blocks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
{
"_docker_tags": [ "db35_rev_a302_fde8", "nanocurrency/nano-beta:V25.0DB35", "nanocurrency/nano:V24.0" ],
"docker_tags": [
"nanocurrency/nano-beta:V25.0DB35"
],
"commands": [
{
"skip": false,
"type": "snippet",
"key": "setup_ledger_and_config",
"variables": {
"NL_CONFIG": "nanolab/configs/10node_network/nl_config_default.toml",
"REMOTE_IP": "127.0.0.1",
"SETUP_NODES": "nl_genesis nl_pr1 nl_pr2 nl_pr3 nl_pr4 nl_pr5 nl_pr6 nl_pr7 nl_pr8 nl_pr9 nl_pr10",
"LEDGER": "nanolab/data/ledgers/10pr_bucket0-1-88-90-100_10kaccs.ldb"
}
},
{
"skip" : false,
"type" : "threaded",
"commands" : [
{
"skip": false,
"type": "python",
"method": "publish_blocks",
"variables": {
"publish_params": {
"blocks_path": "nanolab/data/blocks/10node_bucket_rounds.json",
"bps": 1000,
"start_round" : 0,
"end_round" : 1,
"subset" :{
"start_index" : 0,
"end_index" : 12500
}
},
"logger_type": "rpc",
"logger_expected_count" : 50000,
"logger_timeout": 180,
"_logger_include_peers": ["nl_pr1"]
}
},{
"skip": false,
"type": "python",
"method": "publish_blocks",
"variables": {
"publish_params": {
"blocks_path": "nanolab/data/blocks/10node_bucket_rounds.json",
"bps": 1000,
"start_round" : 0,
"end_round" : 1,
"subset" :{
"start_index" : 12500,
"end_index" : 25000
}
}
}
},{
"skip": false,
"type": "python",
"method": "publish_blocks",
"variables": {
"publish_params": {
"blocks_path": "nanolab/data/blocks/10node_bucket_rounds.json",
"bps": 1000,
"start_round" : 0,
"end_round" : 1,
"subset" :{
"start_index" : 25000,
"end_index" : 37500
}
}
}
},{
"skip": false,
"type": "python",
"method": "publish_blocks",
"variables": {
"publish_params": {
"blocks_path": "nanolab/data/blocks/10node_bucket_rounds.json",
"bps": 1000,
"start_round" : 0,
"end_round" : 1,
"subset" :{
"start_index" : 37500,
"end_index" : 50000
}
}
}
}
]
},
{
"skip": true,
"type": "python",
"method": "publish_blocks",
"variables": {
"publish_params": {
"blocks_path": "nanolab/data/blocks/10node_bucket_rounds.json",
"bps": 1000,
"start_round" : 0,
"end_round" : 1,
"subset" :{
"start_index" : 0,
"end_index" : 1000
}

},
"logger_type": "rpc",
"logger_timeout": 30,
"logger_include_peers": ["nl_pr1"]
}
}
]
}
36 changes: 36 additions & 0 deletions nanolab/configs/10node_network/easy_setup.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"docker_tags": [
"nanocurrency/nano-beta:V25.0DB35", "nanocurrency/nano:V24.0", "db35_rev_a302_fde8"
],
"commands": [
{
"skip": false,
"type": "snippet",
"key": "setup_ledger_and_config",
"variables": {
"NL_CONFIG": "nanolab/configs/10node_network/nl_config_default.toml",
"REMOTE_IP": "127.0.0.1",
"SETUP_NODES": "nl_genesis nl_pr1 nl_pr2 nl_pr3 nl_pr4 nl_pr5 nl_pr6 nl_pr7 nl_pr8 nl_pr9 nl_pr10",
"LEDGER": "nanolab/data/ledgers/10pr_init.ldb"
}
},
{
"skip": false,
"type": "python",
"method": "publish_blocks",
"variables": {
"publish_params": {
"blocks_path": "nanolab/data/blocks/10node_100k_bintree.json",
"bps": 1000,
"subset" :{
"start_index" : 0,
"end_index" : 1000
}
},
"logger_type": "rpc",
"logger_timeout": 20,
"_logger_include_peers": ["nl_pr1"]
}
}
]
}
86 changes: 86 additions & 0 deletions nanolab/configs/10node_network/nl_config_default.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
genesis_key = "12C91837C846F875F56F67CD83040A832CFC0F131AF3DFF9E502C0D43F5D2D15"
canary_key = "FB4E458CB13508353C5B2574B82F1D1D61367F61E88707F773F068FF90050BEE"
epoch_count = 2
burn_amount = "140282366920938463463374607431768211454"
NANO_TEST_EPOCH_1 = "0xfff0000000000000"
NANO_TEST_EPOCH_2 = "0x000000000000000f"
NANO_TEST_EPOCH_2_RECV = "0x000000000000000f"
NANO_TEST_MAGIC_NUMBER = "LC"
remote_address = "127.0.0.1"
nanolooker_enable = false
nanolooker_port = 42100
nanolooker_node_name = "genesis"
nanolooker_mongo_port = 27017
#promexporter_enable = true
#prom_gateway = "https://nl-exporter.bnano.info"
#prom_runid = "nanoct"

[representatives]
node_prefix = "nl"
host_port_peer = 44100
host_port_rpc = 45100
host_port_ws = 47100
config_node_path = "./nano_nodes/services/default_config-node_voting-disabled.toml"
config_rpc_path = "./nano_nodes/services/default_config-rpc.toml"
docker_tag = ""
#docker_tag = "pwo_elections-up-wip-exp-delay-221106"

[[representatives.nodes]]
name = "pr1"
seed = "1110000000000000000000000000000000000000000000000000000000000001"
vote_weight_percent = 10
config_node_path = "./nano_nodes/services/default_config-node.toml"

[[representatives.nodes]]
name = "pr2"
seed = "1110000000000000000000000000000000000000000000000000000000000002"
vote_weight_percent = 10
config_node_path = "./nano_nodes/services/default_config-node.toml"

[[representatives.nodes]]
name = "pr3"
seed = "1110000000000000000000000000000000000000000000000000000000000003"
vote_weight_percent = 10
config_node_path = "./nano_nodes/services/default_config-node.toml"

[[representatives.nodes]]
name = "pr4"
seed = "1110000000000000000000000000000000000000000000000000000000000004"
vote_weight_percent = 10
config_node_path = "./nano_nodes/services/default_config-node.toml"

[[representatives.nodes]]
name = "pr5"
seed = "1110000000000000000000000000000000000000000000000000000000000005"
vote_weight_percent = 10
config_node_path = "./nano_nodes/services/default_config-node.toml"

[[representatives.nodes]]
name = "pr6"
seed = "1110000000000000000000000000000000000000000000000000000000000006"
vote_weight_percent = 10
config_node_path = "./nano_nodes/services/default_config-node.toml"

[[representatives.nodes]]
name = "pr7"
seed = "1110000000000000000000000000000000000000000000000000000000000007"
vote_weight_percent = 10
config_node_path = "./nano_nodes/services/default_config-node.toml"

[[representatives.nodes]]
name = "pr8"
seed = "1110000000000000000000000000000000000000000000000000000000000008"
vote_weight_percent = 10
config_node_path = "./nano_nodes/services/default_config-node.toml"

[[representatives.nodes]]
name = "pr9"
seed = "1110000000000000000000000000000000000000000000000000000000000009"
vote_weight_percent = 10
config_node_path = "./nano_nodes/services/default_config-node.toml"

[[representatives.nodes]]
name = "pr10"
seed = "1110000000000000000000000000000000000000000000000000000000000010"
vote_weight_percent = 10
config_node_path = "./nano_nodes/services/default_config-node.toml"
12 changes: 6 additions & 6 deletions app/configs/3node_network/easy_setup.json → ...lab/configs/3node_network/easy_setup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@
"type": "snippet",
"key": "setup_ledger_and_config",
"variables": {
"NL_CONFIG": "app/configs/3node_network/nl_config_default.toml",
"NL_CONFIG": "nanolab/configs/3node_network/nl_config_default.toml",
"REMOTE_IP": "127.0.0.1",
"SETUP_NODES": "nl_genesis nl_pr1 nl_pr2 nl_pr3",
"LEDGER": "app/data/ledgers/3pr_init.ldb"
"LEDGER": "nanolab/data/ledgers/3pr_init.ldb"
}
},
{
"skip": false,
"type": "python",
"class": "NodeInteraction",
"method": "publish_blocks_test",
"method": "publish_blocks",
"variables": {
"params": {
"blocks_path": "app/data/blocks/3node_net.bintree.50k.json",
"publish_params": {
"blocks_path": "nanolab/data/blocks/3node_net.bintree.50k.json",
"bps": 5000
},
"logger_type": "rpc",
"logger_timeout": 180,
"logger_include_peers": ["nl_genesis","nl_pr1"]
"logger_exclude_peers": ["nl_genesis","nl_pr1"]
}
}
]
Expand Down
44 changes: 44 additions & 0 deletions nanolab/configs/3node_network/nl_config_default.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
genesis_key = "12C91837C846F875F56F67CD83040A832CFC0F131AF3DFF9E502C0D43F5D2D15"
canary_key = "FB4E458CB13508353C5B2574B82F1D1D61367F61E88707F773F068FF90050BEE"
epoch_count = 2
burn_amount = "140282366920938463463374607431768211454"
NANO_TEST_EPOCH_1 = "0xfff0000000000000"
NANO_TEST_EPOCH_2 = "0x000000000000000f"
NANO_TEST_EPOCH_2_RECV = "0x000000000000000f"
NANO_TEST_MAGIC_NUMBER = "LC"
remote_address = "172.17.0.1"
nanolooker_enable = false
nanolooker_port = 41200
nanolooker_node_name = "genesis"
nanolooker_mongo_port = 27017
promexporter_enable = false
#prom_gateway = "https://nl-exporter.bnano.info"
#prom_runid = "nano-speed-testsuite"


[representatives]
node_prefix = "nl"
host_port_peer = 44100
host_port_rpc = 45100
host_port_ws = 47100
config_node_path = "./nano_nodes/services/default_config-node_voting-disabled.toml"
config_rpc_path = "./nano_nodes/services/default_config-rpc.toml"
docker_tag = "nanocurrency/nano-beta:latest"

[[representatives.nodes]]
name = "pr1"
seed = "1110000000000000000000000000000000000000000000000000000000000001"
vote_weight_percent = 33
config_node_path = "./nano_nodes/services/default_config-node.toml"

[[representatives.nodes]]
name = "pr2"
seed = "1110000000000000000000000000000000000000000000000000000000000002"
vote_weight_percent = 33
config_node_path = "./nano_nodes/services/default_config-node.toml"

[[representatives.nodes]]
name = "pr3"
seed = "1110000000000000000000000000000000000000000000000000000000000003"
vote_weight_percent = 33
config_node_path = "./nano_nodes/services/default_config-node.toml"
Loading

0 comments on commit cdd2202

Please sign in to comment.