From c00480095c5bc853f7f2648bab7a9f7bfe6b8c11 Mon Sep 17 00:00:00 2001 From: muXxer Date: Tue, 30 Apr 2024 14:19:29 +0200 Subject: [PATCH 1/2] Change time provider defaults --- pkg/network/p2p/manager.go | 1 - tools/genesis-snapshot/presets/presets_yaml.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/network/p2p/manager.go b/pkg/network/p2p/manager.go index 31ad21cc2..df555b832 100644 --- a/pkg/network/p2p/manager.go +++ b/pkg/network/p2p/manager.go @@ -2,7 +2,6 @@ package p2p import ( "context" - "time" "github.com/libp2p/go-libp2p/core/host" p2pnetwork "github.com/libp2p/go-libp2p/core/network" diff --git a/tools/genesis-snapshot/presets/presets_yaml.go b/tools/genesis-snapshot/presets/presets_yaml.go index d4660b336..d30b952cb 100644 --- a/tools/genesis-snapshot/presets/presets_yaml.go +++ b/tools/genesis-snapshot/presets/presets_yaml.go @@ -56,7 +56,7 @@ func TestnetProtocolParameters(networkName string, bech32HRP iotago.NetworkPrefi iotago.WithNetworkOptions(networkName, bech32HRP), iotago.WithStorageOptions(100, 1, 100, 1000, 1000, 1000), iotago.WithWorkScoreOptions(500, 110_000, 7_500, 40_000, 90_000, 50_000, 40_000, 70_000, 5_000, 15_000), - iotago.WithTimeProviderOptions(0, time.Now().Unix(), 10, 13), + iotago.WithTimeProviderOptions(0, time.Now().Unix(), 10, 8), iotago.WithLivenessOptions(10, 15, 4, 7, 100), iotago.WithSupplyOptions(4600000000000000, 63, 1, 17, 32, 21, 70), iotago.WithCongestionControlOptions(1, 1, 1, 400_000_000, 250_000_000, 50_000_000, 1000, 100), From a2cab5af3749184c4dd6c5b2d815b98b483235cb Mon Sep 17 00:00:00 2001 From: muXxer Date: Tue, 30 Apr 2024 14:19:46 +0200 Subject: [PATCH 2/2] Remove docker compose version --- deploy/ansible/roles/exporter/files/docker-compose.yml | 2 -- .../iota-core-node/templates/docker-compose-iota-core.yml.j2 | 1 - deploy/ansible/roles/metrics/templates/docker-compose.yml.j2 | 1 - tools/docker-network/docker-compose.yml | 1 - 4 files changed, 5 deletions(-) diff --git a/deploy/ansible/roles/exporter/files/docker-compose.yml b/deploy/ansible/roles/exporter/files/docker-compose.yml index 7f2516e1f..15a941f38 100644 --- a/deploy/ansible/roles/exporter/files/docker-compose.yml +++ b/deploy/ansible/roles/exporter/files/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: node_exporter: image: quay.io/prometheus/node-exporter:latest diff --git a/deploy/ansible/roles/iota-core-node/templates/docker-compose-iota-core.yml.j2 b/deploy/ansible/roles/iota-core-node/templates/docker-compose-iota-core.yml.j2 index 8a669661d..6a7a15f4a 100644 --- a/deploy/ansible/roles/iota-core-node/templates/docker-compose-iota-core.yml.j2 +++ b/deploy/ansible/roles/iota-core-node/templates/docker-compose-iota-core.yml.j2 @@ -6,7 +6,6 @@ {%- set _ = ips.append("/ip4/" + interface_details.ipv4.address + "/tcp/15600") -%} {%- endif -%} {% endfor -%} -version: '3.3' services: diff --git a/deploy/ansible/roles/metrics/templates/docker-compose.yml.j2 b/deploy/ansible/roles/metrics/templates/docker-compose.yml.j2 index 98697ef6d..66ceba5a3 100644 --- a/deploy/ansible/roles/metrics/templates/docker-compose.yml.j2 +++ b/deploy/ansible/roles/metrics/templates/docker-compose.yml.j2 @@ -1,5 +1,4 @@ #jinja2: trim_blocks:True, lstrip_blocks:True -version: "3" services: prometheus: diff --git a/tools/docker-network/docker-compose.yml b/tools/docker-network/docker-compose.yml index 0451c5053..cf57fb0f6 100644 --- a/tools/docker-network/docker-compose.yml +++ b/tools/docker-network/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.9" # Create a custom build that can be re-used within Docker network x-build-iota-core: &iota-core_build context: ${DOCKER_BUILD_CONTEXT:-../../}