Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
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
19 changes: 18 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,26 @@ Updated Motoko to [1.4.1](https://github.com/dfinity/motoko/releases/tag/1.4.1)

### Replica

Updated replica to elected commit 17d483c60a09b393ad82a2091b68a242ac69c72d.
Updated replica to elected commit 719ff387aab462ce5759c4c20c30de959fe9538c.
This incorporates the following executed proposals:

- [141436](https://dashboard.internetcomputer.org/proposal/141436)
- [141326](https://dashboard.internetcomputer.org/proposal/141326)
- [141215](https://dashboard.internetcomputer.org/proposal/141215)
- [141082](https://dashboard.internetcomputer.org/proposal/141082)
- [140946](https://dashboard.internetcomputer.org/proposal/140946)
- [140853](https://dashboard.internetcomputer.org/proposal/140853)
- [140768](https://dashboard.internetcomputer.org/proposal/140768)
- [140659](https://dashboard.internetcomputer.org/proposal/140659)
- [140602](https://dashboard.internetcomputer.org/proposal/140602)
- [140506](https://dashboard.internetcomputer.org/proposal/140506)
- [140491](https://dashboard.internetcomputer.org/proposal/140491)
- [140395](https://dashboard.internetcomputer.org/proposal/140395)
- [140270](https://dashboard.internetcomputer.org/proposal/140270)
- [140176](https://dashboard.internetcomputer.org/proposal/140176)
- [140091](https://dashboard.internetcomputer.org/proposal/140091)
- [140089](https://dashboard.internetcomputer.org/proposal/140089)

# 0.31.0

### chore!: `dfx generate` now imports `@icp-sdk/core` instead of `@dfinity/` packages
Expand Down
84 changes: 12 additions & 72 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/dfx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ bytes = "1"
flate2 = { version = "1.0.11", default-features = false, features = ["zlib-ng"] }
hex = "0.4.3"
reqwest.workspace = true
semver.workspace = true
serde = { version = "1.0", features = ["derive"] }
sha2 = "0.10.6"
tar = "0.4.26"
Expand Down Expand Up @@ -84,7 +85,7 @@ os_str_bytes = { version = "6.3.0", features = ["conversions"] }
patch = "0.7.0"
pem.workspace = true
petgraph = "0.6.0"
pocket-ic = { git = "https://github.com/dfinity/ic", rev = "17d483c60a09b393ad82a2091b68a242ac69c72d" }
pocket-ic = { git = "https://github.com/dfinity/ic", rev = "719ff387aab462ce5759c4c20c30de959fe9538c" }
rand = "0.8.5"
regex = "1.5.5"
reqwest = { workspace = true, features = ["blocking", "json"] }
Expand Down
3 changes: 2 additions & 1 deletion src/dfx/assets/build.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use flate2::Compression;
use flate2::write::GzEncoder;
use semver::Version;
use serde::Deserialize;
use sha2::{Digest, Sha256};
use std::collections::HashMap;
Expand Down Expand Up @@ -193,7 +194,7 @@ fn get_git_hash() -> Result<String, std::io::Error> {
.next()
.and_then(|v| v.parse::<u128>().ok())
{
if count < latest_distance {
if Version::parse(tag).is_ok() && count < latest_distance {
latest_tag = String::from(tag);
latest_distance = count;
}
Expand Down
26 changes: 13 additions & 13 deletions src/dfx/assets/dfx-asset-sources.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"replica-rev": "17d483c60a09b393ad82a2091b68a242ac69c72d",
"replica-rev": "719ff387aab462ce5759c4c20c30de959fe9538c",
"x86_64-darwin": {
"motoko": {
"url": "https://github.com/dfinity/motoko/releases/download/1.4.1/motoko-Darwin-x86_64-1.4.1.tar.gz",
"sha256": "92f18980095639acaa09782e3ba5a51f37729afddc9480705adcefcb783eae8e",
"version": "1.4.1"
},
"pocket-ic": {
"url": "https://download.dfinity.systems/ic/17d483c60a09b393ad82a2091b68a242ac69c72d/binaries/x86_64-darwin/pocket-ic.gz",
"sha256": "5b905178cf1bd28c469a3103ca712c21f5a0501e46c02ba1fe5789c41019ecaf",
"rev": "17d483c60a09b393ad82a2091b68a242ac69c72d"
"url": "https://download.dfinity.systems/ic/719ff387aab462ce5759c4c20c30de959fe9538c/binaries/x86_64-darwin/pocket-ic.gz",
"sha256": "05e46e490d608ee94ec8b64fe58111f064d6f36d0e9d8317b3dd0c9cf26ce331",
"rev": "719ff387aab462ce5759c4c20c30de959fe9538c"
}
},
"arm64-darwin": {
Expand All @@ -19,9 +19,9 @@
"version": "1.4.1"
},
"pocket-ic": {
"url": "https://download.dfinity.systems/ic/17d483c60a09b393ad82a2091b68a242ac69c72d/binaries/arm64-darwin/pocket-ic.gz",
"sha256": "76dc87bda23670e30168be3effb99fc8d62f7e3f9af375c6c6c2671e53c21410",
"rev": "17d483c60a09b393ad82a2091b68a242ac69c72d"
"url": "https://download.dfinity.systems/ic/719ff387aab462ce5759c4c20c30de959fe9538c/binaries/arm64-darwin/pocket-ic.gz",
"sha256": "7027f9622f8d552d54618ff469101b58455f888fe96cc87716b73dd4cc88b6a7",
"rev": "719ff387aab462ce5759c4c20c30de959fe9538c"
}
},
"x86_64-linux": {
Expand All @@ -31,9 +31,9 @@
"version": "1.4.1"
},
"pocket-ic": {
"url": "https://download.dfinity.systems/ic/17d483c60a09b393ad82a2091b68a242ac69c72d/binaries/x86_64-linux/pocket-ic.gz",
"sha256": "bb6bcc267fcd74f83b3d13f2bb14071f4b7c7fc6d4d6f0f67450e50b0e96011d",
"rev": "17d483c60a09b393ad82a2091b68a242ac69c72d"
"url": "https://download.dfinity.systems/ic/719ff387aab462ce5759c4c20c30de959fe9538c/binaries/x86_64-linux/pocket-ic.gz",
"sha256": "a67b88175828b8250753ba2978480f02ff2d5ad791bec99c3abf61c74e145883",
"rev": "719ff387aab462ce5759c4c20c30de959fe9538c"
}
},
"arm64-linux": {
Expand All @@ -43,9 +43,9 @@
"version": "1.4.1"
},
"pocket-ic": {
"url": "https://download.dfinity.systems/ic/17d483c60a09b393ad82a2091b68a242ac69c72d/binaries/arm64-linux/pocket-ic.gz",
"sha256": "d3155c403a05a5aca11fb6a72696c15b7530b41ea47c4e6a414f2e73f526580d",
"rev": "17d483c60a09b393ad82a2091b68a242ac69c72d"
"url": "https://download.dfinity.systems/ic/719ff387aab462ce5759c4c20c30de959fe9538c/binaries/arm64-linux/pocket-ic.gz",
"sha256": "ffe10ce5ffaf1c17d4a553c13a7693e8d6c1960ffe29b9089482e5a57075bef3",
"rev": "719ff387aab462ce5759c4c20c30de959fe9538c"
}
},
"common": {
Expand Down
1 change: 1 addition & 0 deletions src/dfx/src/actors/pocketic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ async fn initialize_pocketic(
verified_application: vec![],
application: vec![],
cloud_engine: vec![],
test_threshold_keys: None,
};
match replica_config.subnet_type {
ReplicaSubnetType::Application => subnet_config_set.application.push(<_>::default()),
Expand Down
Loading