Update bootnodes (#559)

tangle-network · Mar 15, 2024 · 7560b16 · 7560b16
1 parent 1c49ca0
commit 7560b16
Show file tree

Hide file tree

Showing 19 changed files with 49,148 additions and 98,318 deletions.
diff --git a/chainspecs/mainnet/mainnet-raw.json b/chainspecs/mainnet/mainnet-raw.json
diff --git a/chainspecs/mainnet/mainnet.json b/chainspecs/mainnet/mainnet.json
diff --git a/chainspecs/mainnet/tangle-mainnet.json b/chainspecs/mainnet/tangle-mainnet.json
diff --git a/monitoring/README.md → deployment/README.md b/monitoring/README.md → deployment/README.md
diff --git a/monitoring/alertmanager/alertmanager.yml → deployment/alertmanager/alertmanager.yml b/monitoring/alertmanager/alertmanager.yml → deployment/alertmanager/alertmanager.yml
diff --git a/deployment/docker-compose-archive.yml b/deployment/docker-compose-archive.yml
@@ -0,0 +1,86 @@
+# Docker compose file to start tangle node with all monitoring services
+version: '3.7'
+
+services:
+  tangle:
+    image: ghcr.io/webb-tools/tangle/tangle:${VERSION}
+    network_mode: host
+    entrypoint: /tangle
+    volumes:
+      - "tangle-data:/data"
+    command:
+      - "--chain=${CHAIN}"
+      - "--pruning=archive"
+      - "--prometheus-external"
+      - "--node-key=${NODE_KEY}"
+      - "--telemetry-url=wss://telemetry.polkadot.io/submit/ 1"
+    ports:
+      - "9944:9944"
+      - "9615:9615"
+      - "9933:9933"
+      - "30333:30333"
+
+  prometheus:
+    image: prom/prometheus
+    network_mode: host
+    restart: always
+    volumes:
+      - ./prometheus:/etc/prometheus/
+      - prometheus_data:/prometheus
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus'
+      - '--web.console.libraries=/usr/share/prometheus/console_libraries'
+      - '--web.console.templates=/usr/share/prometheus/consoles'
+    ports:
+      - 9090:9090
+
+  grafana:
+    image: grafana/grafana
+    network_mode: host
+    restart: always
+    environment:
+      GF_INSTALL_PLUGINS: 'grafana-clock-panel,grafana-simple-json-datasource'
+    volumes:
+      - grafana_data:/var/lib/grafana
+      - ./grafana/provisioning/:/etc/grafana/provisioning/
+    env_file:
+      - ./grafana/config.monitoring
+    ports:
+      - 3000:3000
+    depends_on:
+      - prometheus
+
+  alertmanager:
+    image: prom/alertmanager:v0.23.0
+    network_mode: host
+    restart: unless-stopped
+    ports:
+      - "9093:9093"
+    volumes:
+      - "./alertmanager:/config"
+      - alertmanager_data:/data
+    command: --config.file=/config/alertmanager.yml --log.level=debug
+
+  loki:
+    image: grafana/loki:2.5.0
+    network_mode: host
+    ports:
+      - "3100:3100"
+    volumes:
+      - ./loki/loki-config.yaml:/etc/loki/local-config.yaml
+    command: -config.file=/etc/loki/local-config.yaml
+
+  promtail:
+    image: grafana/promtail:2.5.0
+    network_mode: host
+    volumes:
+      - /root/collator_logs:/var/log
+      - ./loki/promtail-config.yaml:/etc/promtail/config.yml
+    command: -config.file=/etc/promtail/config.yml
+
+volumes:
+  prometheus_data: {}
+  alertmanager_data: {}
+  grafana_data: {}
+  tangle-data: {}
diff --git a/monitoring/docker-compose.yml → deployment/docker-compose-validator.yml b/monitoring/docker-compose.yml → deployment/docker-compose-validator.yml
@@ -3,16 +3,18 @@ version: '3.7'
 
 services:
   tangle:
-    image: ghcr.io/webb-tools/tangle/tangle:main
+    image: ghcr.io/webb-tools/tangle/tangle:${VERSION}
     network_mode: host
     entrypoint: /tangle
     volumes:
       - "tangle-data:/data"
     command:
-      - "--chain=tangle-testnet"
+      - "--chain=${CHAIN}"
+      - "--pruning=archive"
       - "--validator"
       - "--prometheus-external"
-      - "--telemetry-url wss://telemetry.polkadot.io/submit/ 0"
+      - "--node-key=${NODE_KEY}"
+      - "--telemetry-url=wss://telemetry.polkadot.io/submit/ 1"
     ports:
       - "9944:9944"
       - "9615:9615"

diff --git a/deployment/env.example b/deployment/env.example
@@ -0,0 +1,3 @@
+VERSION=
+NODE_KEY=
+CHAIN=
diff --git a/monitoring/grafana/config.monitoring → deployment/grafana/config.monitoring b/monitoring/grafana/config.monitoring → deployment/grafana/config.monitoring
diff --git a/...ana/provisioning/dashboards/dashboard.yml → ...ana/provisioning/dashboards/dashboard.yml b/...ana/provisioning/dashboards/dashboard.yml → ...ana/provisioning/dashboards/dashboard.yml
diff --git a/...na/provisioning/dashboards/substrate.json → ...na/provisioning/dashboards/substrate.json b/...na/provisioning/dashboards/substrate.json → ...na/provisioning/dashboards/substrate.json
diff --git a/...a/provisioning/datasources/datasource.yml → ...a/provisioning/datasources/datasource.yml b/...a/provisioning/datasources/datasource.yml → ...a/provisioning/datasources/datasource.yml
diff --git a/monitoring/loki/loki-config.yaml → deployment/loki/loki-config.yaml b/monitoring/loki/loki-config.yaml → deployment/loki/loki-config.yaml
diff --git a/monitoring/loki/promtail-config.yaml → deployment/loki/promtail-config.yaml b/monitoring/loki/promtail-config.yaml → deployment/loki/promtail-config.yaml
diff --git a/monitoring/prometheus/prometheus.yml → deployment/prometheus/prometheus.yml b/monitoring/prometheus/prometheus.yml → deployment/prometheus/prometheus.yml
diff --git a/monitoring/prometheus/rules.yml → deployment/prometheus/rules.yml b/monitoring/prometheus/rules.yml → deployment/prometheus/rules.yml
diff --git a/monitoring/tangle_logrotate.conf → deployment/tangle_logrotate.conf b/monitoring/tangle_logrotate.conf → deployment/tangle_logrotate.conf
diff --git a/node/src/command.rs b/node/src/command.rs
@@ -90,6 +90,10 @@ impl SubstrateCli for Cli {
 			"mainnet" => Box::new(chainspec::mainnet::tangle_mainnet_config(
 				tangle_primitives::MAINNET_CHAIN_ID,
 			)?),
+			"tangle-mainnet" => Box::new(chainspec::mainnet::ChainSpec::from_json_bytes(
+				&include_bytes!("../../chainspecs/mainnet/tangle-mainnet.json")[..],
+			)?),
+
 			path => Box::new(chainspec::testnet::ChainSpec::from_json_file(
 				std::path::PathBuf::from(path),
 			)?),

diff --git a/node/src/mainnet_fixtures.rs b/node/src/mainnet_fixtures.rs
@@ -31,19 +31,22 @@ pub fn get_root_key() -> AccountId {
 /// Mainnet bootnodes
 pub fn get_bootnodes() -> Vec<MultiaddrWithPeerId> {
 	vec![
-		"/ip4/3.22.222.30/tcp/30333/p2p/12D3KooWRdvZ3PRteq8DC78Z3z5ZiehipKrKhHDRpgvCjc8XSeQx"
+		"/ip4/213.199.45.84/tcp/30333/p2p/12D3KooWHtMDPXL4NJzdVBDKQmUrLBDqDFjLwXm6xnTMgcmnfgTz"
 			.parse()
 			.unwrap(),
-		"/ip4/18.119.14.21/tcp/30333/p2p/12D3KooWJP5NbEjEK1YihofJm3MMSJWrbRWjeEkRf3LtKvkj6mr9"
+		"/ip4/213.199.45.83/tcp/30333/p2p/12D3KooWSxrtFrdT4wQQqafGYGaS5Z6UfGiwpbHs2Gsqt9Pc1i7L"
 			.parse()
 			.unwrap(),
-		"/ip4/3.15.186.160/tcp/30333/p2p/12D3KooWDL3KiR6CpnEbgUgheje1cMGQtwH4euxGMPQBkwU5cZdu"
+		"/ip4/213.199.45.82/tcp/30333/p2p/12D3KooWExCWbJHKDdX6NSMwXRQK4AtwnCwdYMPTzBfqCYmRkuqH"
 			.parse()
 			.unwrap(),
-		"/ip4/3.137.213.159/tcp/30333/p2p/12D3KooWS4aniCJTz2RiNfNUka8TTa3gXak63FJgdAgfAWLCnsAi"
+		"/ip4/213.199.45.81/tcp/30333/p2p/12D3KooWRhiprU2Nck47vtSpYs1K9718WyDYx8UQKXWqo9zFccFu"
 			.parse()
 			.unwrap(),
-		"/ip4/3.144.191.66/tcp/30333/p2p/12D3KooWM8RYTbVygshTJAbiM5YqvTwWPbZrF8iQ9WS96nEE2Ebr"
+		"/ip4/213.199.45.80/tcp/30333/p2p/12D3KooWSc5zpr9cuFqfXqCFS8G4FVSEELHwrb5uP2mCdrsW9XTC"
+			.parse()
+			.unwrap(),
+		"/ip4/213.199.45.79/tcp/30333/p2p/12D3KooWGwU6web5sEVKzSFgFroJFbmuTcB42PEAHx6QPm86Cg9z"
 			.parse()
 			.unwrap(),
 	]
@@ -153,7 +156,7 @@ pub fn get_initial_authorities() -> Vec<(AccountId, BabeId, GrandpaId, ImOnlineI
 			hex!["a21d680b5daed8ca06772666e4245340d2fb6d363f7edab5cf78baa1456a5650"].into(),
 			hex!["c851a63384fa6d5f7708a233e7de8c4bc81c07cacd0a8f329cb294d47aa64b78"]
 				.unchecked_into(),
-			hex!["5b120ba5d2399de8ba3201d1c464973070934c570c539ddcad1318832353f7b0"]
+			hex!["a2948fb6f455ac9252ff39c59d46203dded2b0a2685e71a641942d58afc372a5"]
 				.unchecked_into(),
 			hex!["7842e1623d6a19cd267ad9b926ddb81a27c6aedc4cab58e99cd0ac3e2a53a762"]
 				.unchecked_into(),