Skip to content

Commit

Permalink
Revert "[CONTRACTS] Contracts branch update for 1.80 (#718)"
Browse files Browse the repository at this point in the history
This reverts commit cdd63fb.
  • Loading branch information
yeastplume committed Sep 19, 2024
1 parent cdd63fb commit 7ac35f1
Show file tree
Hide file tree
Showing 78 changed files with 221 additions and 10,171 deletions.
File renamed without changes.
141 changes: 57 additions & 84 deletions Cargo.lock

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

24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet"
version = "5.4.0-contracts.0"
version = "5.4.0-alpha.1"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -30,21 +30,21 @@ semver = "0.10"
rustyline = "6"
lazy_static = "1"

grin_wallet_api = { path = "./api", version = "5.4.0-contracts.0" }
grin_wallet_impls = { path = "./impls", version = "5.4.0-contracts.0" }
grin_wallet_libwallet = { path = "./libwallet", version = "5.4.0-contracts.0" }
grin_wallet_controller = { path = "./controller", version = "5.4.0-contracts.0" }
grin_wallet_config = { path = "./config", version = "5.4.0-contracts.0" }
grin_wallet_util = { path = "./util", version = "5.4.0-contracts.0" }
grin_wallet_api = { path = "./api", version = "5.4.0-alpha.1" }
grin_wallet_impls = { path = "./impls", version = "5.4.0-alpha.1" }
grin_wallet_libwallet = { path = "./libwallet", version = "5.4.0-alpha.1" }
grin_wallet_controller = { path = "./controller", version = "5.4.0-alpha.1" }
grin_wallet_config = { path = "./config", version = "5.4.0-alpha.1" }
grin_wallet_util = { path = "./util", version = "5.4.0-alpha.1" }


##### Grin Imports

# For Release
# grin_core = "5.4.0-contracts.0"
# grin_keychain = "5.4.0-contracts.0"
# grin_util = "5.4.0-contracts.0"
# grin_api = "5.4.0-contracts.0"
# grin_core = "5.4.0-alpha.1"
# grin_keychain = "5.4.0-alpha.1"
# grin_util = "5.4.0-alpha.1"
# grin_api = "5.4.0-alpha.1"

# For beta release

Expand All @@ -68,7 +68,7 @@ grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
######

[build-dependencies]
built = { version = "0.7", features = ["git2"]}
built = { version = "0.4", features = ["git2"]}

[dev-dependencies]
url = "2.1"
Expand Down
16 changes: 8 additions & 8 deletions api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_api"
version = "5.4.0-contracts.0"
version = "5.4.0-alpha.1"
authors = ["Grin Developers <[email protected]>"]
description = "Grin Wallet API"
license = "Apache-2.0"
Expand All @@ -22,17 +22,17 @@ ring = "0.16"
base64 = "0.12"
ed25519-dalek = "1.0.0-pre.4"

grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-contracts.0" }
grin_wallet_config = { path = "../config", version = "5.4.0-contracts.0" }
grin_wallet_impls = { path = "../impls", version = "5.4.0-contracts.0" }
grin_wallet_util = { path = "../util", version = "5.4.0-contracts.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-alpha.1" }
grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
grin_wallet_impls = { path = "../impls", version = "5.4.0-alpha.1" }
grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }

##### Grin Imports

# For Release
# grin_core = "5.4.0-contracts.0"
# grin_keychain = "5.4.0-contracts.0"
# grin_util = "5.4.0-contracts.0"
# grin_core = "5.4.0-alpha.1"
# grin_keychain = "5.4.0-alpha.1"
# grin_util = "5.4.0-alpha.1"

# For beta release

Expand Down
Loading

0 comments on commit 7ac35f1

Please sign in to comment.