Skip to content

network changes #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DaMandal0rian wants to merge 2 commits into from
Closed

network changes #150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea3fc32
network changes
DaMandal0rian Jun 24, 2023
bb643e0
Prepare Gemini-3e
DaMandal0rian Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions aws/devnet/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ module "devnet" {
network_name = "devnet"
bootstrap-node-config = {
instance-type = var.instance_type
deployment-version = 0
deployment-version = 1
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "snapshot-2023-jun-08-2"
docker-tag = "snapshot-2023-jun-22-4"
reserved-only = false
prune = false
genesis-hash = "8a94e770a50298516444025b8c075034f8be7745812358d25189175fe504fc66"
genesis-hash = "2e45c5cbc42f10e3faaaaa44618927ee1403a08c9625d70891ae3f2fecc35e0b"
dsn-listen-port = 50000
node-dsn-port = 30433
disk-volume-size = var.disk_volume_size
Expand All @@ -24,7 +24,7 @@ module "devnet" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "snapshot-2023-jun-08-2"
docker-tag = "snapshot-2023-jun-22-4"
reserved-only = false
prune = false
node-dsn-port = 30433
Expand All @@ -34,11 +34,11 @@ module "devnet" {

rpc-node-config = {
instance-type = var.instance_type
deployment-version = 0
deployment-version = 1
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "snapshot-2023-jun-08-2"
docker-tag = "snapshot-2023-jun-22-4"
domain-prefix = "rpc"
reserved-only = false
prune = false
Expand All @@ -53,7 +53,7 @@ module "devnet" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "snapshot-2023-jun-08-2"
docker-tag = "snapshot-2023-jun-22-4"
domain-prefix = "domain"
reserved-only = false
prune = false
Expand All @@ -67,16 +67,16 @@ module "devnet" {

farmer-node-config = {
instance-type = var.instance_type
deployment-version = 0
deployment-version = 1
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "snapshot-2023-jun-08-2"
docker-tag = "snapshot-2023-jun-22-4"
reserved-only = false
prune = false
plot-size = "10G"
reward-address = var.farmer_reward_address
force-block-production = true
force-block-production = false
node-dsn-port = 30433
disk-volume-size = var.disk_volume_size
disk-volume-type = var.disk_volume_type
Expand Down
10 changes: 5 additions & 5 deletions aws/gemini-3d/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module "gemini-3d" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3d-2023-may-23"
docker-tag = "gemini-3d-2023-jun-14"
reserved-only = false
prune = false
genesis-hash = ""
Expand All @@ -24,7 +24,7 @@ module "gemini-3d" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3d-2023-may-23"
docker-tag = "gemini-3d-2023-jun-14"
reserved-only = false
prune = false
node-dsn-port = 30433
Expand All @@ -38,7 +38,7 @@ module "gemini-3d" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3d-2023-may-23"
docker-tag = "gemini-3d-2023-jun-14"
domain-prefix = "rpc"
reserved-only = false
prune = false
Expand All @@ -53,7 +53,7 @@ module "gemini-3d" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3d-2023-may-23"
docker-tag = "gemini-3d-2023-jun-14"
domain-prefix = "domain"
reserved-only = false
prune = false
Expand All @@ -71,7 +71,7 @@ module "gemini-3d" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3d-2023-may-23"
docker-tag = "gemini-3d-2023-jun-14"
reserved-only = false
prune = false
plot-size = "10G"
Expand Down
36 changes: 5 additions & 31 deletions aws/network-primitives/scripts/create_domain_node_compose_file.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,35 +43,26 @@ services:
- "30333:30333"
- "\${NODE_DSN_PORT}:30433"
labels:
caddy_0: \${DOMAIN_PREFIX}-\${NODE_ID}.system.\${NETWORK_NAME}.subspace.network
caddy_0: \${DOMAIN_PREFIX}-\${NODE_ID}.\${DOMAIN_LABEL}.\${NETWORK_NAME}.subspace.network
caddy_0.handle_path_0: /http
caddy_0.handle_path_0.reverse_proxy: "{{upstreams 8933}}"
caddy_0.handle_path_1: /ws
caddy_0.handle_path_1.reverse_proxy: "{{upstreams 8944}}"
caddy_1: \${DOMAIN_PREFIX}-\${NODE_ID}.\${DOMAIN_LABEL}.\${NETWORK_NAME}.subspace.network
caddy_1.handle_path_0: /http
caddy_1.handle_path_0.reverse_proxy: "{{upstreams 7933}}"
caddy_1.handle_path_1: /ws
caddy_1.handle_path_1.reverse_proxy: "{{upstreams 7944}}"
command: [
"--chain", \$NETWORK_NAME,
"--base-path", "/var/subspace",
"--execution", "wasm",
"--state-pruning", "archive",
"--blocks-pruning", "archive",
"--listen-addr", "/ip4/0.0.0.0/tcp/30333",
"--no-private-ipv4",
"--dsn-disable-private-ips",
"--piece-cache-size", \$PIECE_CACHE_SIZE,
"--node-key", \$NODE_KEY,
"--rpc-cors", "all",
"--rpc-port", "9933",
"--ws-port", "9944",
"--ws-external",
"--rpc-external",
"--in-peers", "500",
"--out-peers", "250",
"--in-peers-light", "500",
"--ws-max-connections", "10000",
"--rpc-max-connections", "10000",
EOF

reserved_only=${1}
Expand Down Expand Up @@ -107,21 +98,6 @@ fi

if [ ${enable_domains} == true ]; then
{
# system domain
echo ' "--",'
echo ' "--chain=${NETWORK_NAME}",'
echo ' "--validator",'
echo ' "--state-pruning", "archive",'
echo ' "--blocks-pruning", "archive",'
echo ' "--base-path", "/var/subspace/system_domain",'
echo ' "--keystore-path", "/var/subspace/keystore",'
echo ' "--rpc-cors", "all",'
echo ' "--rpc-port", "8933",'
echo ' "--ws-port", "8944",'
echo ' "--no-private-ipv4",'
echo ' "--unsafe-ws-external",'
echo ' "--relayer-id=${RELAYER_SYSTEM_ID}",'

# core domain
echo ' "--",'
echo ' "--chain=${NETWORK_NAME}",'
Expand All @@ -132,10 +108,8 @@ if [ ${enable_domains} == true ]; then
echo ' "--base-path", "/var/subspace/core_${DOMAIN_LABEL}_domain",'
echo ' "--keystore-path", "/var/subspace/keystore",'
echo ' "--rpc-cors", "all",'
echo ' "--rpc-port", "7933",'
echo ' "--ws-port", "7944",'
echo ' "--no-private-ipv4",'
echo ' "--unsafe-ws-external",'
echo ' "--rpc-port", "8933",'
echo ' "--unsafe-rpc-external",'
echo ' "--relayer-id=${RELAYER_DOMAIN_ID}",'

} >> ~/subspace/docker-compose.yml
Expand Down
1 change: 0 additions & 1 deletion aws/network-primitives/scripts/create_farmer_node_compose_file.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ services:
"--listen-addr", "/ip4/0.0.0.0/tcp/30333",
"--dsn-disable-private-ips",
"--piece-cache-size", \$PIECE_CACHE_SIZE,
"--no-private-ipv4",
"--node-key", \$NODE_KEY,
"--validator",
"--rpc-cors", "all",
Expand Down
3 changes: 1 addition & 2 deletions aws/network-primitives/scripts/create_full_node_compose_file.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ services:
"--listen-addr", "/ip4/0.0.0.0/tcp/30333",
"--dsn-disable-private-ips",
"--piece-cache-size", \$PIECE_CACHE_SIZE,
"--no-private-ipv4",
"--node-key", \$NODE_KEY,
"--in-peers", "1000",
"--out-peers", "1000",
Expand All @@ -46,7 +45,7 @@ services:
"--dsn-pending-in-connections", "1000",
"--dsn-pending-out-connections", "1000",
"--in-peers-light", "500",
"--ws-max-connections", "10000",
"--rpc-max-connections", "10000",
EOF

reserved_only=${1}
Expand Down
6 changes: 2 additions & 4 deletions aws/network-primitives/scripts/create_rpc_node_compose_file.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,16 @@ services:
"--state-pruning", "archive",
"--blocks-pruning", "archive",
"--listen-addr", "/ip4/0.0.0.0/tcp/30333",
"--no-private-ipv4",
"--dsn-disable-private-ips",
"--piece-cache-size", \$PIECE_CACHE_SIZE,
"--node-key", \$NODE_KEY,
"--rpc-cors", "all",
"--rpc-port", "9933",
"--ws-port", "9944",
"--ws-external",
"--rpc-external",
"--in-peers", "500",
"--out-peers", "250",
"--in-peers-light", "500",
"--ws-max-connections", "10000",
"--rpc-max-connections", "10000",
EOF

reserved_only=${1}
Expand Down