Taurus and mainnet infra changes and refactor (#352)

* changes to cli parameters ansible * gemini-3h path changes * change cli parameters testing framework * change cli parameters for scripts * delete mainnet primitives and use new network primitives * update network primitives folder * gemini-3h path changes * mainnet path changes module * add taurus testnet module taurus module changes * ansible change cli parameters farmer * edits to paths gemini-3g * move gemini-3h primitives to archive
autonomys · Oct 23, 2024 · d4dbc32 · d4dbc32
1 parent 46ccbea
commit d4dbc32
Show file tree

Hide file tree

Showing 65 changed files with 1,975 additions and 725 deletions.
diff --git a/ansible/network/files/docker-compose-autoid.yml b/ansible/network/files/docker-compose-autoid.yml
@@ -118,13 +118,13 @@ services:
       "--rpc-methods", "safe",
       "--prometheus-listen-on", "0.0.0.0:9615",
       "--dsn-external-address", "/dns/domain.${NETWORK_NAME}.subspace.network/tcp/30433/p2p/${NODE_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
+      "--dsn-reserved-peer", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
+      "--dsn-reserved-peer", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
       "--",
       "--state-pruning", "archive",
@@ -136,8 +136,8 @@ services:
       "--rpc-methods", "safe",
       "--rpc-max-connections", "10000",
       "--operator-id", "0",
-      "--reserved-nodes", "/dns/bootstrap-0.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_AUTO_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-0.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_AUTO_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-1.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_AUTO_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-1.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_AUTO_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-0.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_AUTO_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-0.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_AUTO_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-1.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_AUTO_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-1.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_AUTO_PEER_ID}",
     ]
diff --git a/ansible/network/files/docker-compose-bootstrap-autoid.yml b/ansible/network/files/docker-compose-bootstrap-autoid.yml
@@ -78,13 +78,13 @@ services:
       - "/dns/bootstrap-${NODE_ID}.autoid.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${NODE_PEER_ID}"
       - "--external-address"
       - "/dns/bootstrap-${NODE_ID}.autoid.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${NODE_PEER_ID}"
-      - "--reserved-peers"
+      - "--reserved-peer"
       - "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}"
-      - "--bootstrap-nodes"
+      - "--bootstrap-node"
       - "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}"
-      - "--reserved-peers"
+      - "--reserved-peer"
       - "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}"
-      - "--bootstrap-nodes"
+      - "--bootstrap-node"
       - "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}"
   archival-node:
     image: ghcr.io/${REPO_ORG}/node:${DOCKER_TAG}
@@ -121,13 +121,13 @@ services:
       "--dsn-pending-out-connections", "1000",
       "--prometheus-listen-on", "0.0.0.0:9615",
       "--dsn-external-address", "/dns/bootstrap-${NODE_ID}.autoid.${NETWORK_NAME}.subspace.network/tcp/30433/p2p/${NODE_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
+      "--dsn-reserved-peer", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
+      "--dsn-reserved-peer", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
       "--",
       "--state-pruning", "archive",
@@ -137,8 +137,8 @@ services:
       "--rpc-cors", "all",
       "--rpc-listen-on", "0.0.0.0:8944",
       "--rpc-methods", "safe",
-      "--reserved-nodes", "/dns/bootstrap-0.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_AUTO_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-0.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_AUTO_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-1.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_AUTO_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-1.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_AUTO_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-0.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_AUTO_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-0.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_AUTO_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-1.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_AUTO_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-1.autoid.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_AUTO_PEER_ID}",
     ]
diff --git a/ansible/network/files/docker-compose-bootstrap-domain.yml b/ansible/network/files/docker-compose-bootstrap-domain.yml
@@ -78,13 +78,13 @@ services:
       - "/dns/bootstrap-${NODE_ID}.nova.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${NODE_PEER_ID}"
       - "--external-address"
       - "/dns/bootstrap-${NODE_ID}.nova.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${NODE_PEER_ID}"
-      - "--reserved-peers"
+      - "--reserved-peer"
       - "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}"
-      - "--bootstrap-nodes"
+      - "--bootstrap-node"
       - "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}"
-      - "--reserved-peers"
+      - "--reserved-peer"
       - "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}"
-      - "--bootstrap-nodes"
+      - "--bootstrap-node"
       - "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}"
   archival-node:
     image: ghcr.io/${REPO_ORG}/node:${DOCKER_TAG}
@@ -122,13 +122,13 @@ services:
       "--dsn-pending-out-connections", "1000",
       "--prometheus-listen-on", "0.0.0.0:9615",
       "--dsn-external-address", "/dns/bootstrap-${NODE_ID}.nova.${NETWORK_NAME}.subspace.network/tcp/30433/p2p/${NODE_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
+      "--dsn-reserved-peer", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
+      "--dsn-reserved-peer", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
       "--",
       "--state-pruning", "archive",
@@ -138,8 +138,8 @@ services:
       "--rpc-cors", "all",
       "--rpc-listen-on", "0.0.0.0:8944",
       "--rpc-methods", "safe",
-      "--reserved-nodes", "/dns/bootstrap-0.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-0.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-1.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-1.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-0.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-0.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-1.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-1.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_PEER_ID}",
     ]
diff --git a/ansible/network/files/docker-compose-bootstrap.yml b/ansible/network/files/docker-compose-bootstrap.yml
@@ -79,13 +79,13 @@ services:
       - "/dns/bootstrap-${NODE_ID}.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}"
       - "--external-address"
       - "/dns/bootstrap-${NODE_ID}.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}"
-      - "--reserved-peers"
+      - "--reserved-peer"
       - "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}"
-      - "--bootstrap-nodes"
+      - "--bootstrap-node"
       - "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}"
-      - "--reserved-peers"
+      - "--reserved-peer"
       - "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}"
-      - "--bootstrap-nodes"
+      - "--bootstrap-node"
       - "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}"
   archival-node:
     image: ghcr.io/${REPO_ORG}/node:${DOCKER_TAG}
@@ -120,7 +120,7 @@ services:
       "--dsn-pending-in-connections", "1000",
       "--dsn-pending-out-connections", "1000",
       "--prometheus-listen-on", "0.0.0.0:9615",
-      "--reserved-nodes", "/dns/${BOOTSTRAP_NODE_PEER}.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_NODE_PEER_ID}",
-      "--bootstrap-nodes", "/dns/${BOOTSTRAP_NODE_PEER}.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_NODE_PEER_ID}",
+      "--reserved-peer", "/dns/${BOOTSTRAP_NODE_PEER}.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_NODE_PEER_ID}",
+      "--bootstrap-node", "/dns/${BOOTSTRAP_NODE_PEER}.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_NODE_PEER_ID}",
 
     ]
diff --git a/ansible/network/files/docker-compose-domain.yml b/ansible/network/files/docker-compose-domain.yml
@@ -119,13 +119,13 @@ services:
       "--rpc-methods", "safe",
       "--prometheus-listen-on", "0.0.0.0:9615",
       "--dsn-external-address", "/dns/domain.${NETWORK_NAME}.subspace.network/tcp/30433/p2p/${NODE_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
+      "--dsn-reserved-peer", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
+      "--dsn-reserved-peer", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
       "--",
       "--state-pruning", "archive",
@@ -137,8 +137,8 @@ services:
       "--rpc-methods", "safe",
       "--rpc-max-connections", "10000",
       "--operator-id", "0",
-      "--reserved-nodes", "/dns/bootstrap-0.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-0.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-1.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-1.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-0.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-0.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_0_OPERATOR_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-1.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-1.nova.${NETWORK_NAME}.subspace.network/tcp/30334/p2p/${NODE_1_OPERATOR_PEER_ID}",
     ]
diff --git a/ansible/network/files/docker-compose-farmer.yml b/ansible/network/files/docker-compose-farmer.yml
@@ -100,13 +100,9 @@ services:
       "--rpc-listen-on", "0.0.0.0:9944",
       "--rpc-methods", "unsafe",
       "--prometheus-listen-on", "0.0.0.0:9615",
-      "--reserved-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
       "--force-synced",
       "--force-authoring",

diff --git a/ansible/network/files/docker-compose-rpc.yml b/ansible/network/files/docker-compose-rpc.yml
@@ -115,12 +115,12 @@ services:
       "--rpc-listen-on", "0.0.0.0:9944",
       "--rpc-methods", "safe",
       "--prometheus-listen-on", "0.0.0.0:9615",
-      "--reserved-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
-      "--reserved-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_0_PEER_ID}",
+      "--reserved-peer", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
+      "--bootstrap-node", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30333/p2p/${BOOTSTRAP_1_PEER_ID}",
+      "--dsn-reserved-peer", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-0.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_0_SUBSPACE_PEER_ID}",
-      "--dsn-reserved-peers", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
+      "--dsn-reserved-peer", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
       "--dsn-bootstrap-nodes", "/dns/bootstrap-1.${NETWORK_NAME}.subspace.network/tcp/30533/p2p/${BOOTSTRAP_1_SUBSPACE_PEER_ID}",
     ]
diff --git a/resources/gemini-3h/main.tf b/resources/gemini-3h/main.tf
@@ -1,7 +1,7 @@
 module "gemini-3h" {
-  source          = "../../templates/terraform/network-primitives"
-  path_to_scripts = "../../templates/terraform/network-primitives/scripts"
-  path_to_configs = "../../templates/terraform/network-primitives/configs"
+  source          = "../../templates/terraform/network-primitives-archive/gemini-3h"
+  path_to_scripts = "../../templates/terraform/network-primitives-archive/gemini-3h/scripts"
+  path_to_configs = "../../templates/terraform/network-primitives-archive/gemini-3h/configs"
   network_name    = var.network_name
 
   bootstrap-node-config = {