Skip to content

Use new ink entrance crate #728

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.

Sign up for GitHub

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

Merged
ascjones merged 20 commits into from
Sep 21, 2022
Merged

Use new ink entrance crate #728

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ebb7e2b
Replace all ink_lang with new ink crate
ascjones Sep 7, 2022
95d744b
Fix ink_metadata imports
ascjones Sep 7, 2022
bc0043f
Fmt
ascjones Sep 7, 2022
2040536
Merge branch 'master' into aj/ink_crate
ascjones Sep 15, 2022
f9a65f1
Change ink-debug feature to use entrance crate
ascjones Sep 15, 2022
d7fae81
Use master branc of ink in new template
ascjones Sep 15, 2022
ad0bb4b
Update to master ink
ascjones Sep 15, 2022
10abd2c
Set RUSTC_BOOTSTRAP
ascjones Sep 15, 2022
bb169d2
Fix tests
ascjones Sep 15, 2022
2e9c305
Update CHANGELOG.md
ascjones Sep 15, 2022
6b28ccb
Set RUSTC_BOOTSTRAP because we depend on ink!
ascjones Sep 16, 2022
8abef65
Set default-features = false for ink dep
ascjones Sep 16, 2022
c63e13b
Set RUSTC_BOOTSTRAP in cargo config file
ascjones Sep 16, 2022
9b59b0a
Reenable RUSTC_BOOTSTRAP
ascjones Sep 16, 2022
725ed68
Don't need RUSTC_BOOTSTRAP in CI script now
ascjones Sep 16, 2022
5517efb
Merge branch 'master' into aj/ink_crate
ascjones Sep 20, 2022
551d04a
Remove config with RUSTC_BOOTSTRAP, update ink
ascjones Sep 20, 2022
c2f9ca4
Debug format error message to show reason
ascjones Sep 20, 2022
f8e2580
Use github versions of ink deps
ascjones Sep 20, 2022
f1917f7
Use latest ink release
ascjones Sep 21, 2022
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
Prev Previous commit
Use latest ink release
  • Loading branch information
@ascjones
ascjones committed Sep 21, 2022
commit f1917f72e81b30414374014e29efe48221b29005
87 changes: 39 additions & 48 deletions Cargo.lock
View file
Open in desktop

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

3 changes: 1 addition & 2 deletions crates/cargo-contract/templates/new/_Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ authors = ["[your_name] <[your_email]>"]
edition = "2021"

[dependencies]
# todo: update to crates.io version once released
ink = { package = "ink", git = "https://github.com/paritytech/ink", branch = "master", default-features = false }
ink = { version = "4.0.0-alpha.3", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }
Expand Down
8 changes: 3 additions & 5 deletions crates/transcode/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ env_logger = "0.9.1"
escape8259 = "0.5.2"
hex = "0.4.3"
indexmap = "1.9.1"
# todo: update to crates.io version once released
ink_env = { package = "ink_env", git = "https://github.com/paritytech/ink", branch = "master" }
ink_metadata = { package = "ink_metadata", git = "https://github.com/paritytech/ink", branch = "master", features = ["derive"] }
ink_env = "4.0.0-alpha.3"
ink_metadata = { package = "ink_metadata", version = "4.0.0-alpha.3" }
itertools = "0.10.4"
tracing = "0.1.36"
nom = "7.1.1"
Expand All @@ -39,8 +38,7 @@ sp-runtime = "6.0.0"

[dev-dependencies]
assert_matches = "1.5.0"
# todo: update to crates.io version once released
ink = { package = "ink", git = "https://github.com/paritytech/ink", branch = "master" }
ink = "4.0.0-alpha.3"

[features]
# This `std` feature is required for testing using an inline contract's metadata, because `ink!` annotates the metadata
Expand Down