Skip to content

WIP: Relates to Closed PR #1134 and Issue #674. Add suri_path and password_path options to CLI #1602

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

Draft
ltfschoen wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

WIP: Relates to Closed PR #1134 and Issue #674. Add suri_path and password_path options to CLI #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
18348d0
wip with errors
ltfschoen May 27, 2023
1f265cc
compiles but with error ERROR: Cannot infer the root project id
ltfschoen May 28, 2023
67d1fbe
working
ltfschoen May 28, 2023
b52c128
remove debugging println
ltfschoen May 28, 2023
22b5006
add fullstops for errors
ltfschoen May 28, 2023
6dd5701
wip
ltfschoen Apr 18, 2024
1411e34
merge latest master
ltfschoen Dec 18, 2024
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

[Unreleased]

## [5.0.2]

### Changed
- Target `pallet-revive` instead of `pallet-contracts` - [#1851](https://github.com/use-ink/cargo-contract/pull/1851)

### Added
- Add `suri-path` and `password-path` options for `cargo contract` commands including `upload`, `instantiate`, `call`, and `remove`

## [5.0.1]

### Changed
Expand Down
12 changes: 6 additions & 6 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.

4 changes: 2 additions & 2 deletions crates/analyze/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "contract-analyze"
version = "5.0.1"
version = "5.0.2"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"

Expand All @@ -14,7 +14,7 @@ keywords = ["wasm", "ink", "webassembly", "blockchain", "edsl"]
include = ["Cargo.toml", "*.rs", "LICENSE"]

[dependencies]
contract-metadata = { version = "5.0.1", path = "../metadata" }
contract-metadata = { version = "5.0.2", path = "../metadata" }
wasmparser = "0.220.0"
anyhow = "1.0.94"

Expand Down
4 changes: 2 additions & 2 deletions crates/build/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "contract-build"
version = "5.0.1"
version = "5.0.2"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"

Expand Down Expand Up @@ -49,7 +49,7 @@ crossterm = "0.28.1"

polkavm-linker = "0.17.1"

contract-metadata = { version = "5.0.1", path = "../metadata" }
contract-metadata = { version = "5.0.2", path = "../metadata" }

[target.'cfg(unix)'.dependencies]
uzers = "0.12"
Expand Down
12 changes: 6 additions & 6 deletions crates/cargo-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo-contract"
version = "5.0.1"
version = "5.0.2"
authors = ["Use Ink <ink@use.ink>"]
build = "build.rs"
edition = "2021"
Expand All @@ -18,11 +18,11 @@ include = [
]

[dependencies]
contract-build = { version = "5.0.1", path = "../build" }
contract-extrinsics = { version = "5.0.1", path = "../extrinsics" }
contract-transcode = { version = "5.0.1", path = "../transcode" }
contract-metadata = { version = "5.0.1", path = "../metadata" }
contract-analyze = { version = "5.0.1", path = "../analyze" }
contract-build = { version = "5.0.2", path = "../build" }
contract-extrinsics = { version = "5.0.2", path = "../extrinsics" }
contract-transcode = { version = "5.0.2", path = "../transcode" }
contract-metadata = { version = "5.0.2", path = "../metadata" }
contract-analyze = { version = "5.0.2", path = "../analyze" }

anyhow = "1.0.94"
clap = { version = "4.5.23", features = ["derive", "env"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/cargo-contract/src/cmd/call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ impl CallCommand {
{
let contract = parse_account(&self.contract)
.map_err(|e| anyhow::anyhow!("Failed to parse contract option: {}", e))?;
let signer = C::Signer::from_str(&self.extrinsic_cli_opts.suri)
.map_err(|_| anyhow::anyhow!("Failed to parse suri option"))?;

let signer: Result<Signer, Error> = self.extrinsic_cli_opts.signer(self.extrinsic_cli_opts);
let chain = self.extrinsic_cli_opts.chain_cli_opts.chain();
let token_metadata = TokenMetadata::query::<C>(&chain.url()).await?;
let storage_deposit_limit = self
Expand Down
Loading