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

feat(up-contract): serve HTML from string, fix deployment message on error, cors, and other misc. improvements #377

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
157 changes: 138 additions & 19 deletions Cargo.lock

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

11 changes: 9 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,11 @@ subxt = "0.37.0"
ink_env = "5.0.0"
sp-core = "31"
sp-weights = "30"
contract-build = "5.0.0-alpha"
contract-extrinsics = "5.0.0-alpha"
# TODO: git deps
#contract-build = "5.0.0-alpha"
contract-build = { git = "https://github.com/use-ink/cargo-contract", branch = "peter/chore-make-types-pub" }
#contract-extrinsics = "5.0.0-alpha"
contract-extrinsics = { git = "https://github.com/use-ink/cargo-contract", branch = "peter/chore-make-types-pub" }
heck = "0.5.0"

# parachains
Expand All @@ -71,3 +74,7 @@ console = "0.15"
os_info = { version = "3", default-features = false }
strum = "0.26"
strum_macros = "0.26"

# wallet-integration
axum = "0.7.9"
tower-http = "0.6.2"
7 changes: 7 additions & 0 deletions crates/pop-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ duct.workspace = true
env_logger.workspace = true
os_info.workspace = true
reqwest.workspace = true
serde = { workspace = true, version = "1.0", features = ["derive"] }
serde_json.workspace = true
tempfile.workspace = true
tokio.workspace = true
Expand Down Expand Up @@ -46,9 +47,15 @@ pop-telemetry = { path = "../pop-telemetry", version = "0.5.0", optional = true
# common
pop-common = { path = "../pop-common", version = "0.5.0" }

# wallet-integration
axum.workspace = true
tower-http = { workspace = true, features = ["fs", "cors"] }

[dev-dependencies]
assert_cmd.workspace = true
predicates.workspace = true
subxt.workspace = true
subxt-signer.workspace = true

[features]
default = ["contract", "parachain", "telemetry"]
Expand Down
134 changes: 134 additions & 0 deletions crates/pop-cli/src/assets/index.html

Large diffs are not rendered by default.

Loading