Skip to content

Commit 8b26bfe

Browse files
authored
Merge pull request #4935 from iron-fish/staging
STAGING -> MASTER
2 parents f792fd7 + 4e5fff0 commit 8b26bfe

File tree

103 files changed

+1868
-4436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1868
-4436
lines changed

Cargo.lock

Lines changed: 37 additions & 130 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ resolver = "2"
33

44
members = [
55
"benchmarks",
6-
"ironfish-mpc",
7-
"ironfish-phase2",
86
"ironfish-rust",
97
"ironfish-rust-nodejs",
108
"ironfish-zkp",
@@ -16,8 +14,5 @@ edition = "2021"
1614
homepage = "https://ironfish.network/"
1715
repository = "https://github.com/iron-fish/ironfish"
1816

19-
[patch.crates-io]
20-
bellman = { git = "https://github.com/iron-fish/bellman", rev = "1cc52ca33e6db14233f1cbc0c9c5b7c822b229ec" }
21-
2217
[profile.release]
2318
debug = true

ironfish-cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ironfish",
3-
"version": "2.2.0",
3+
"version": "2.3.0",
44
"description": "CLI for running and interacting with an Iron Fish node",
55
"author": "Iron Fish <[email protected]> (https://ironfish.network)",
66
"main": "build/src/index.js",
@@ -62,8 +62,8 @@
6262
"@aws-sdk/client-s3": "3",
6363
"@aws-sdk/client-secrets-manager": "3",
6464
"@aws-sdk/s3-request-presigner": "3",
65-
"@ironfish/rust-nodejs": "2.2.0",
66-
"@ironfish/sdk": "2.2.0",
65+
"@ironfish/rust-nodejs": "2.3.0",
66+
"@ironfish/sdk": "2.3.0",
6767
"@oclif/core": "1.23.1",
6868
"@oclif/plugin-help": "5.1.12",
6969
"@oclif/plugin-not-found": "2.3.1",

0 commit comments

Comments
 (0)