Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(core): update rust to 1.81.0 and commit Cargo.lock #1343

Merged
merged 2 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:
cancel-in-progress: true

env:
RUST_VERSION: 1.80.1
RUST_VERSION: 1.81.0

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_l2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:
cancel-in-progress: true

env:
RUST_VERSION: 1.80.1
RUST_VERSION: 1.81.0

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hive_coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:

env:
RUST_VERSION: 1.80.1
RUST_VERSION: 1.81.0

jobs:
run-hive:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:
cancel-in-progress: true

env:
RUST_VERSION: 1.80.1
RUST_VERSION: 1.81.0

jobs:
docker_build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/levm_reporter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:

env:
RUST_VERSION: 1.80.1
RUST_VERSION: 1.81.0

jobs:
ef-test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/loc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:

env:
RUST_VERSION: 1.80.1
RUST_VERSION: 1.81.0

jobs:
loc:
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rust 1.80.1
rust 1.81.0
# golang 1.23.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.80 AS chef
FROM rust:1.81 AS chef

RUN apt-get update && apt-get install -y \
build-essential \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ asdf plugin add golang https://github.com/asdf-community/asdf-golang.git

And uncommenting the golang line in the asdf `.tool-versions` file:
```
rust 1.80.1
rust 1.81.0
golang 1.23.2
```

Expand Down
2 changes: 1 addition & 1 deletion crates/blockchain/dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.80 AS chef
FROM rust:1.81 AS chef

RUN apt-get update && apt-get install -y \
build-essential \
Expand Down
2 changes: 1 addition & 1 deletion crates/l2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.80 AS chef
FROM rust:1.81 AS chef

RUN apt-get update && apt-get install -y \
build-essential \
Expand Down
2 changes: 1 addition & 1 deletion crates/l2/contracts/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.80 AS chef
FROM rust:1.81 AS chef

RUN apt-get update && apt-get install -y \
build-essential \
Expand Down
2 changes: 1 addition & 1 deletion crates/networking/rpc/admin/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub fn node_info(storage: Store, local_node: Node) -> Result<Value, RpcErr> {
let node_info = NodeInfo {
enode: enode_url,
id: hex::encode(local_node.node_id),
name: "ethrex/0.1.0/rust1.80".to_string(),
name: "ethrex/0.1.0/rust1.81".to_string(),
ip: local_node.ip.to_string(),
ports: Ports {
discovery: local_node.udp_port,
Expand Down
2 changes: 1 addition & 1 deletion crates/networking/rpc/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ mod tests {
let result = map_http_requests(&request, context);
let rpc_response = rpc_response(request.id, result);
let expected_response = to_rpc_response_success_value(
r#"{"jsonrpc":"2.0","id":1,"result":{"enode":"enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@127.0.0.1:30303","id":"d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666","ip":"127.0.0.1","name":"ethrex/0.1.0/rust1.80","ports":{"discovery":30303,"listener":30303},"protocols":{"eth":{"chainId":3151908,"homesteadBlock":0,"daoForkBlock":null,"daoForkSupport":false,"eip150Block":0,"eip155Block":0,"eip158Block":0,"byzantiumBlock":0,"constantinopleBlock":0,"petersburgBlock":0,"istanbulBlock":0,"muirGlacierBlock":null,"berlinBlock":0,"londonBlock":0,"arrowGlacierBlock":null,"grayGlacierBlock":null,"mergeNetsplitBlock":0,"shanghaiTime":0,"cancunTime":0,"pragueTime":1718232101,"verkleTime":null,"terminalTotalDifficulty":0,"terminalTotalDifficultyPassed":true}}}}"#,
r#"{"jsonrpc":"2.0","id":1,"result":{"enode":"enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@127.0.0.1:30303","id":"d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666","ip":"127.0.0.1","name":"ethrex/0.1.0/rust1.81","ports":{"discovery":30303,"listener":30303},"protocols":{"eth":{"chainId":3151908,"homesteadBlock":0,"daoForkBlock":null,"daoForkSupport":false,"eip150Block":0,"eip155Block":0,"eip158Block":0,"byzantiumBlock":0,"constantinopleBlock":0,"petersburgBlock":0,"istanbulBlock":0,"muirGlacierBlock":null,"berlinBlock":0,"londonBlock":0,"arrowGlacierBlock":null,"grayGlacierBlock":null,"mergeNetsplitBlock":0,"shanghaiTime":0,"cancunTime":0,"pragueTime":1718232101,"verkleTime":null,"terminalTotalDifficulty":0,"terminalTotalDifficultyPassed":true}}}}"#,
);
assert_eq!(rpc_response.to_string(), expected_response.to_string())
}
Expand Down
Loading