Skip to content
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.

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

Generate extended contract metadata #62

Merged
merged 54 commits into from
Jul 23, 2020
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
0929ce8
Generate main.rs with quote for passing extension metadata
ascjones Jul 3, 2020
8c0b8bc
Update template to scale-info 0.3
ascjones Jul 3, 2020
955f59e
Rename ink_abi package to ink_metadata
ascjones Jul 3, 2020
9359c4c
Temporarily change ink dependency branch to aj-extra-metadata
ascjones Jul 3, 2020
42a57ee
Fix up metadata generation codegen
ascjones Jul 3, 2020
3d2c57a
Promote metadata mod to directory
ascjones Jul 8, 2020
f367355
Move InkProjectExtension data structure over from ink! PR
ascjones Jul 8, 2020
c29225b
Revert "Generate main.rs with quote for passing extension metadata"
ascjones Jul 8, 2020
56c63b1
Make it compile
ascjones Jul 8, 2020
972287a
Flatten metadata struct
ascjones Jul 8, 2020
ac87a89
Fmt
ascjones Jul 8, 2020
3f600e5
Capture ink metadata from stdout
ascjones Jul 8, 2020
5327852
Update comment
ascjones Jul 8, 2020
88f3624
Construct hardcoded metadata values
ascjones Jul 8, 2020
d590c81
Remove contract metadata builder, it is redundant
ascjones Jul 8, 2020
94ad425
Generate contract wasm hash
ascjones Jul 9, 2020
50355c7
Refactor: extract CrateMetadata for use in both metadata and build
ascjones Jul 9, 2020
d63550b
Merge branch 'master' into aj-metadata
ascjones Jul 9, 2020
7339774
Fmt
ascjones Jul 9, 2020
8d11f56
Rust version
ascjones Jul 9, 2020
aafbb41
Contract version
ascjones Jul 9, 2020
0345b7c
Add remaining optional enhanced metadata
ascjones Jul 9, 2020
f2af4f6
Merge branch 'master' into aj-metadata
ascjones Jul 9, 2020
767e1eb
Move wasm build, make repo and license work
ascjones Jul 10, 2020
be4c7b1
Just use a String for the license
ascjones Jul 10, 2020
1f4eaa1
Remove unused variants
ascjones Jul 10, 2020
da0055a
Read docs and homepage urls directly from manifest
ascjones Jul 10, 2020
0e0c17d
Read user defined metadata
ascjones Jul 10, 2020
c1ec746
Fmt
ascjones Jul 10, 2020
9bc614c
This PR no longer depends on an updated version of ink!
ascjones Jul 10, 2020
3aa9d3f
Fix test error, refactor commands to use common method name
ascjones Jul 10, 2020
d9c6bfd
Fmt
ascjones Jul 10, 2020
716272a
Refactor crate metadata collection
ascjones Jul 13, 2020
70073f2
Remove ink_lang dependency from generated metadata crate
ascjones Jul 13, 2020
3c9e429
Fmt
ascjones Jul 13, 2020
fbe61c8
Return metadata path from generation
ascjones Jul 13, 2020
1f3bfb4
Fmt
ascjones Jul 13, 2020
b0f7965
Test metadata wasm hash
ascjones Jul 13, 2020
8e84082
Fmt
ascjones Jul 13, 2020
7a53a77
Read ink language version
ascjones Jul 14, 2020
9516ec4
Ensure tmp dir is cleaned up after build
ascjones Jul 14, 2020
04e334a
Make cargo-contract tmp dir not hidden
ascjones Jul 14, 2020
6eef8be
Fmt
ascjones Jul 14, 2020
f6855dd
Test source compiler, contract name, contract version
ascjones Jul 14, 2020
c3406c7
Use ink branch temporarily
ascjones Jul 14, 2020
f2b18a3
Test for authors and documentation
ascjones Jul 14, 2020
4148a33
Test user provided metadata section
ascjones Jul 14, 2020
e40c25f
Drop automatically handles tempdir removal
ascjones Jul 16, 2020
a7dad23
Remove redundant unwind bound
ascjones Jul 16, 2020
b323496
Comment crate features
ascjones Jul 21, 2020
04ade57
Revert template to point at ink master
ascjones Jul 21, 2020
5d0ce9a
Self
ascjones Jul 21, 2020
df03f97
Update comment
ascjones Jul 21, 2020
5bcc24d
Remove redundant comment
ascjones Jul 21, 2020
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
88 changes: 72 additions & 16 deletions Cargo.lock

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

15 changes: 13 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,19 @@ colored = "1.9"
toml = "0.5.4"
cargo-xbuild = "0.5.32"
rustc_version = "0.2.3"
blake2 = "0.9.0"
semver = { version = "0.10.0", features = ["serde"] }
serde = { version = "1.0", default-features = false, features = ["derive"] }
serde_json = "1.0"
tempfile = "3.1.0"
url = { version = "2.1.1", features = ["serde"] }

# dependencies for optional extrinsics feature
async-std = { version = "=1.5.0", optional = true }
sp-core = { version = "2.0.0-rc3", optional = true }
subxt = { version = "0.9.0", package = "substrate-subxt", optional = true }
futures = { version = "0.3.2", optional = true }
hex = { version = "0.4.0", optional = true }
url = { version = "2.1.1", optional = true }

[build-dependencies]
anyhow = "1.0"
Expand All @@ -54,5 +57,13 @@ wabt = "0.9.2"

[features]
default = []
extrinsics = ["sp-core", "subxt", "async-std", "futures", "hex", "url"]

# Enable this for (experimental) commands to deploy, instantiate and call contracts.
#
# Disabled by default
extrinsics = ["sp-core", "subxt", "async-std", "futures", "hex"]

# Enable this to execute long running tests, which usually are only run on the CI server
#
# Disabled by default
test-ci-only = []
Loading