diff --git a/Cargo.lock b/Cargo.lock index fc15ed2..a9d44ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -420,7 +420,7 @@ dependencies = [ [[package]] name = "clarinet-deployments" version = "2.10.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=323e24844cbec88b488c89c61fe8649bddc9bda9#323e24844cbec88b488c89c61fe8649bddc9bda9" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e7c6f1de28b305af1e240039fc62834caf927355#e7c6f1de28b305af1e240039fc62834caf927355" dependencies = [ "base58 0.2.0", "base64 0.21.7", @@ -446,7 +446,7 @@ dependencies = [ [[package]] name = "clarinet-files" version = "2.10.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=323e24844cbec88b488c89c61fe8649bddc9bda9#323e24844cbec88b488c89c61fe8649bddc9bda9" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e7c6f1de28b305af1e240039fc62834caf927355#e7c6f1de28b305af1e240039fc62834caf927355" dependencies = [ "bip39", "bitcoin", @@ -466,7 +466,7 @@ dependencies = [ [[package]] name = "clarinet-utils" version = "1.0.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=323e24844cbec88b488c89c61fe8649bddc9bda9#323e24844cbec88b488c89c61fe8649bddc9bda9" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e7c6f1de28b305af1e240039fc62834caf927355#e7c6f1de28b305af1e240039fc62834caf927355" dependencies = [ "hmac 0.12.1", "pbkdf2", @@ -497,7 +497,7 @@ dependencies = [ [[package]] name = "clarity-repl" version = "2.10.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=323e24844cbec88b488c89c61fe8649bddc9bda9#323e24844cbec88b488c89c61fe8649bddc9bda9" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e7c6f1de28b305af1e240039fc62834caf927355#e7c6f1de28b305af1e240039fc62834caf927355" dependencies = [ "ansi_term", "atty", @@ -505,7 +505,7 @@ dependencies = [ "clarity", "colored", "getrandom 0.2.15", - "hiro-system-kit 0.1.0 (git+https://github.com/hirosystems/clarinet.git?rev=323e24844cbec88b488c89c61fe8649bddc9bda9)", + "hiro-system-kit 0.1.0 (git+https://github.com/hirosystems/clarinet.git?rev=e7c6f1de28b305af1e240039fc62834caf927355)", "lazy_static", "pox-locking", "prettytable-rs", @@ -1313,7 +1313,7 @@ dependencies = [ [[package]] name = "hiro-system-kit" version = "0.1.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=323e24844cbec88b488c89c61fe8649bddc9bda9#323e24844cbec88b488c89c61fe8649bddc9bda9" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e7c6f1de28b305af1e240039fc62834caf927355#e7c6f1de28b305af1e240039fc62834caf927355" dependencies = [ "ansi_term", "atty", @@ -3148,7 +3148,7 @@ dependencies = [ [[package]] name = "stacks-codec" version = "2.10.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=323e24844cbec88b488c89c61fe8649bddc9bda9#323e24844cbec88b488c89c61fe8649bddc9bda9" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e7c6f1de28b305af1e240039fc62834caf927355#e7c6f1de28b305af1e240039fc62834caf927355" dependencies = [ "clarity", "serde", @@ -3211,7 +3211,7 @@ dependencies = [ [[package]] name = "stacks-rpc-client" version = "2.10.0" -source = "git+https://github.com/hirosystems/clarinet.git?rev=323e24844cbec88b488c89c61fe8649bddc9bda9#323e24844cbec88b488c89c61fe8649bddc9bda9" +source = "git+https://github.com/hirosystems/clarinet.git?rev=e7c6f1de28b305af1e240039fc62834caf927355#e7c6f1de28b305af1e240039fc62834caf927355" dependencies = [ "clarity", "hmac 0.12.1", diff --git a/Cargo.toml b/Cargo.toml index 3f418ff..c7441bf 100644 --- 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 index 92c5931..5a082bd 100644 --- 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 index f384144..2254500 100644 --- 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 index 7b2739b..5f1654f 100644 --- 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 index 5e9cdaf..5dcdc67 100644 --- 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 index 103c889..20daa97 100644 --- 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 \ No newline at end of file + name: stacks-blockchain diff --git a/templates/stateful-sets/stacks-signer-0.template.yaml b/templates/stateful-sets/stacks-signer-0.template.yaml index 71f33cd..39e5c00 100644 --- 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 \ No newline at end of file + storage: 1Gi diff --git a/templates/stateful-sets/stacks-signer-1.template.yaml b/templates/stateful-sets/stacks-signer-1.template.yaml index e25ed3b..8ca7d08 100644 --- 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 \ No newline at end of file + storage: 1Gi