Skip to content

Commit

Permalink
Merge pull request #4935 from iron-fish/staging
Browse files Browse the repository at this point in the history
STAGING -> MASTER
  • Loading branch information
rohanjadvani authored Apr 25, 2024
2 parents f792fd7 + 4e5fff0 commit 8b26bfe
Show file tree
Hide file tree
Showing 103 changed files with 1,868 additions and 4,436 deletions.
167 changes: 37 additions & 130 deletions Cargo.lock

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

5 changes: 0 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ resolver = "2"

members = [
"benchmarks",
"ironfish-mpc",
"ironfish-phase2",
"ironfish-rust",
"ironfish-rust-nodejs",
"ironfish-zkp",
Expand All @@ -16,8 +14,5 @@ edition = "2021"
homepage = "https://ironfish.network/"
repository = "https://github.com/iron-fish/ironfish"

[patch.crates-io]
bellman = { git = "https://github.com/iron-fish/bellman", rev = "1cc52ca33e6db14233f1cbc0c9c5b7c822b229ec" }

[profile.release]
debug = true
6 changes: 3 additions & 3 deletions ironfish-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ironfish",
"version": "2.2.0",
"version": "2.3.0",
"description": "CLI for running and interacting with an Iron Fish node",
"author": "Iron Fish <[email protected]> (https://ironfish.network)",
"main": "build/src/index.js",
Expand Down Expand Up @@ -62,8 +62,8 @@
"@aws-sdk/client-s3": "3",
"@aws-sdk/client-secrets-manager": "3",
"@aws-sdk/s3-request-presigner": "3",
"@ironfish/rust-nodejs": "2.2.0",
"@ironfish/sdk": "2.2.0",
"@ironfish/rust-nodejs": "2.3.0",
"@ironfish/sdk": "2.3.0",
"@oclif/core": "1.23.1",
"@oclif/plugin-help": "5.1.12",
"@oclif/plugin-not-found": "2.3.1",
Expand Down
Loading

0 comments on commit 8b26bfe

Please sign in to comment.