fix: set stacks-node config for 3.0

hirosystems · Oct 25, 2024 · c480bfb · c480bfb
1 parent d95105a
commit c480bfb
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,5 +39,5 @@ serial_test = "2.0.0"
 k8s_tests = []
 
 [patch.crates-io]
-clarinet-files = { version = "2",git = "https://github.com/hirosystems/clarinet.git", rev = "323e24844cbec88b488c89c61fe8649bddc9bda9" }
-clarinet-deployments = { version = "2",git = "https://github.com/hirosystems/clarinet.git", rev = "323e24844cbec88b488c89c61fe8649bddc9bda9" }
+clarinet-files = { version = "2",git = "https://github.com/hirosystems/clarinet.git", rev = "e7c6f1de28b305af1e240039fc62834caf927355" }
+clarinet-deployments = { version = "2",git = "https://github.com/hirosystems/clarinet.git", rev = "e7c6f1de28b305af1e240039fc62834caf927355" }
diff --git a/examples/new-network.example.json b/examples/new-network.example.json
@@ -292,7 +292,8 @@
       ],
       "execute_script": [],
       "bitcoin_node_image_url": "quay.io/hirosystems/bitcoind:devnet-v3",
-      "stacks_node_image_url": "quay.io/hirosystems/stacks-node:devnet-2.4.0.0.0",
+      "stacks_node_image_url": "quay.io/hirosystems/stacks-node:devnet-3.0",
+      "stacks_signer_image_url": "quay.io/hirosystems/stacks-signer:devnet-3.0",
       "stacks_api_image_url": "hirosystems/stacks-blockchain-api:latest",
       "stacks_explorer_image_url": "hirosystems/explorer:latest",
       "postgres_image_url": "postgres:14",

diff --git a/src/lib.rs b/src/lib.rs
@@ -1283,14 +1283,11 @@ impl StacksDevnetApiK8sManager {
                     disable_inbound_handshakes = true
                     disable_inbound_walks = true
                     public_ip_address = "1.1.1.1:1234"
-                    block_proposal_token = "12345"
+                    auth_token = "12345"
 
                     [miner]
-                    min_tx_fee = 1
                     first_attempt_time_ms = {}
-                    second_attempt_time_ms = {}
                     block_reward_recipient = "{}"
-                    wait_for_block_download = false
                     microblock_attempt_time_ms = 10
                     mining_key = "19ec1c3e31d139c989a23a27eac60d1abfad5277d3ae9604242514c738258efa01"
                 "#,
@@ -1301,7 +1298,6 @@ impl StacksDevnetApiK8sManager {
                 stacks_miner_secret_key_hex,
                 stacks_miner_secret_key_hex,
                 devnet_config.stacks_node_first_attempt_time_ms,
-                devnet_config.stacks_node_subsequent_attempt_time_ms,
                 miner_coinbase_recipient
             );
 

diff --git a/src/tests/fixtures/network-manifest.yaml b/src/tests/fixtures/network-manifest.yaml
@@ -148,8 +148,8 @@ devnet_settings:
       auto_extend: ~
   execute_script: []
   bitcoin_node_image_url: "quay.io/hirosystems/bitcoind:devnet-v3"
-  stacks_node_image_url: "quay.io/hirosystems/stacks-node:devnet-2.4.0.0.0"
-  stacks_signers_image_url: "quay.io/hirosystems/stacks-node:devnet-2.4.0.0.0"
+  stacks_node_image_url: "quay.io/hirosystems/stacks-node:devnet-3.0"
+  stacks_signers_image_url: "quay.io/hirosystems/stacks-node:devnet-3.0"
   stacks_api_image_url: "hirosystems/stacks-blockchain-api:latest"
   stacks_explorer_image_url: "hirosystems/explorer:latest"
   postgres_image_url: "postgres:14"

diff --git a/src/tests/fixtures/stacks-devnet-config.json b/src/tests/fixtures/stacks-devnet-config.json
@@ -308,8 +308,8 @@
       ],
       "execute_script": [],
       "bitcoin_node_image_url": "quay.io/hirosystems/bitcoind:devnet-v3",
-      "stacks_node_image_url": "quay.io/hirosystems/stacks-node:devnet-2.4.0.0.0",
-      "stacks_signers_image_url": "quay.io/hirosystems/stacks-node:devnet-2.4.0.0.0",
+      "stacks_node_image_url": "quay.io/hirosystems/stacks-node:devnet-3.0",
+      "stacks_signers_image_url": "quay.io/hirosystems/stacks-node:devnet-3.0",
       "stacks_api_image_url": "hirosystems/stacks-blockchain-api:latest",
       "stacks_explorer_image_url": "hirosystems/explorer:latest",
       "postgres_image_url": "postgres:14",

diff --git a/templates/deployments/stacks-blockchain.template.yaml b/templates/deployments/stacks-blockchain.template.yaml
@@ -43,7 +43,7 @@ spec:
               value: "1"
             - name: BLOCKSTACK_USE_TEST_GENESIS_CHAINSTATE
               value: "1"
-          image: quay.io/hirosystems/stacks-node:devnet-2.5
+          image: quay.io/hirosystems/stacks-node:devnet-3.0
           imagePullPolicy: IfNotPresent
           name: stacks-blockchain
           ports:
@@ -66,4 +66,4 @@ spec:
       volumes:
         - configMap:
             name: stacks-blockchain
-          name: stacks-blockchain
+          name: stacks-blockchain
diff --git a/templates/stateful-sets/stacks-signer-0.template.yaml b/templates/stateful-sets/stacks-signer-0.template.yaml
@@ -39,7 +39,7 @@ spec:
             - stacks-signer
             - run
             - --config=/src/stacks-signer-0/Signer.toml
-          image: quay.io/hirosystems/stacks-signer:devnet-2.5
+          image: quay.io/hirosystems/stacks-signer:devnet-3.0
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 30001
@@ -62,7 +62,7 @@ spec:
               cpu: 250m
               memory: 750Mi # todo: revisit allocation
             limits:
-              memory: 750Mi # todo: revisit allocation      
+              memory: 750Mi # todo: revisit allocation
       volumes:
         - configMap:
             name: stacks-signer-0
@@ -76,4 +76,4 @@ spec:
         storageClassName: premium-rwo
         resources:
           requests:
-            storage: 1Gi
+            storage: 1Gi
diff --git a/templates/stateful-sets/stacks-signer-1.template.yaml b/templates/stateful-sets/stacks-signer-1.template.yaml
@@ -39,9 +39,9 @@ spec:
             - stacks-signer
             - run
             - --config=/src/stacks-signer-1/Signer.toml
-          image: quay.io/hirosystems/stacks-signer:devnet-2.5
+          image: quay.io/hirosystems/stacks-signer:devnet-3.0
           imagePullPolicy: IfNotPresent
-          ports: 
+          ports:
             - containerPort: 30001
               name: signer-event
               protocol: TCP
@@ -62,7 +62,7 @@ spec:
               cpu: 250m
               memory: 750Mi # todo: revisit allocation
             limits:
-              memory: 750Mi # todo: revisit allocation      
+              memory: 750Mi # todo: revisit allocation
       volumes:
         - configMap:
             name: stacks-signer-1
@@ -76,4 +76,4 @@ spec:
         storageClassName: premium-rwo
         resources:
           requests:
-            storage: 1Gi
+            storage: 1Gi