Merge branch 'development' into junius/feat-new-timegraph-tokenomics

.github/ISSUE_TEMPLATE/report-a-bug.md

@@ -15,13 +15,10 @@ _Tell us what happened. In particular, be specific about any changes you made. I
 
 _What did you expect to happen after you followed the steps you described in the last section? What actually happened?_
 
-**Environment**
+**Logs**
 
-_Describe the environment in which you encountered this bug. Use the list below as a starting point and add additional information if you think it's relevant._
-
-- Operating system:
-- Template version/tag:
-- Rust version (run `rustup show`):
+_Provide any logs including task_ids, tc_cli output, etc; if
+applicable, provide screenshots to help illustrate the problem_
 
 **Steps to Reproduce**
 
@@ -32,12 +29,6 @@ _Replace the example steps below with actual steps to reproduce the bug you're r
 3. step 2
 4. bug...
 
-
-**Logs, Errors or Screenshots**
-
-_Please provide the text of any logs or errors that you experienced; if
-applicable, provide screenshots to help illustrate the problem._
-
 **Additional Information**
 
 _Please add any other details that you think may help us solve your problem._

.github/workflows/merge-docker-tc-cli.yaml

@@ -50,7 +50,7 @@ jobs:
           toolchain: stable
           target: x86_64-unknown-linux-musl,wasm32-unknown-unknown
       - name: Install musl deps
-        run: apt-get update && apt-get install -y musl-tools
+        run: sudo apt-get update && sudo apt-get install -y musl-tools
       - name: Rust cache
         uses: Swatinem/rust-cache@v2
       - name: Install Foundry

config/docker/Dockerfile.tc-cli

@@ -1,3 +1,7 @@
+FROM alpine:latest as certs
+RUN apk --update add ca-certificates
+
 FROM scratch
+COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY tc-cli tc-cli
 ENTRYPOINT ["/tc-cli"]

gmp/grpc/Cargo.toml

@@ -20,7 +20,7 @@ serde = { workspace = true, features = ["derive"] }
 serde-big-array = "0.5.1"
 time-primitives = { workspace = true, features = ["std"] }
 tokio = { workspace = true, features = ["macros", "signal"] }
-tonic = "0.12.2"
+tonic = { version = "0.12.3", features = ["transport", "tls", "tls-roots"] }
 
 [build-dependencies]
 tonic-build = "0.12.2"

gmp/grpc/src/lib.rs

@@ -10,7 +10,7 @@ use time_primitives::{
 use tokio::sync::Mutex;
 use tonic::metadata::{Ascii, MetadataValue};
 use tonic::service::interceptor::{InterceptedService, Interceptor};
-use tonic::transport::Channel;
+use tonic::transport::{Channel, ClientTlsConfig};
 use tonic::{Request, Status};
 
 mod codec;
@@ -60,7 +60,12 @@ impl IConnectorBuilder for Connector {
 		Self: Sized,
 	{
 		let address = gmp_rust::mnemonic_to_address(params.mnemonic);
-		let channel = Channel::from_shared(params.url)?.connect().await?;
+		let channel = if params.url.starts_with("https") {
+			let tls_config = ClientTlsConfig::new().with_native_roots();
+			Channel::from_shared(params.url)?.tls_config(tls_config)?.connect().await?
+		} else {
+			Channel::from_shared(params.url)?.connect().await?
+		};
 		let client = GmpClient::with_interceptor(channel, AddressInterceptor::new(address));
 		Ok(Self {
 			network: params.network_id,

pallets/tasks/src/tests.rs

@@ -275,6 +275,22 @@ fn test_max_batches_per_block() {
 	})
 }
 
+#[test]
+fn test_read_event_task_assignment() {
+	new_test_ext().execute_with(|| {
+		register_gateway(ETHEREUM, 42);
+		let shard = create_shard(ETHEREUM, 3, 1);
+		let shard2 = create_shard(ETHEREUM, 3, 1);
+		register_shard(shard);
+		register_shard(shard2);
+		Tasks::create_task(ETHEREUM, Task::SubmitGatewayMessage { batch_id: 0 });
+		roll(1);
+		assert!(Tasks::get_shard_tasks(shard2).contains(&0));
+		// before `break` was added in #1165 the following assertion failed
+		assert!(!Tasks::get_shard_tasks(shard).contains(&0));
+	})
+}
+
 mod bench_helper {
 	use super::*;
 

tc-cli/Cargo.toml

@@ -14,7 +14,7 @@ clap.workspace = true
 futures.workspace = true
 gmp.workspace = true
 hex.workspace = true
-reqwest = { version = "0.12.7", default-features = false, features = ["json"] }
+reqwest = { version = "0.12.7", default-features = false, features = ["json", "rustls-tls-native-roots"] }
 serde = { workspace = true, features = ["derive"] }
 serde_yaml = "0.9.34"
 surf = { version = "2.3.2", default-features = false, features = [ "h1-client-rustls" ] }