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.

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

fix: compatibility with newer ckb-cli #71

Merged
merged 1 commit into from
Oct 25, 2022
Merged

fix: compatibility with newer ckb-cli #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 20 additions & 3 deletions src/bin/capsule.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ use ckb_capsule::signal;
use ckb_capsule::tester::Tester;
use ckb_capsule::version::Version;
use ckb_capsule::wallet::cli_types::HumanCapacity;
use ckb_capsule::wallet::{Address, Wallet, DEFAULT_CKB_CLI_BIN_NAME, DEFAULT_CKB_RPC_URL};
use ckb_capsule::wallet::{
Address, Wallet, DEFAULT_CKB_CLI_BIN_NAME, DEFAULT_CKB_INDEXER_RPC_URL, DEFAULT_CKB_RPC_URL,
};
use ckb_testtool::ckb_types::core::Capacity;

use clap::{App, AppSettings, Arg, SubCommand};
Expand Down Expand Up @@ -130,7 +132,16 @@ fn run_cli() -> Result<()> {
.help("Use previously deployed cells as inputs.").possible_values(&["on", "off"]).default_value("on").takes_value(true),
Arg::with_name("api")
.long("api")
.help("CKB RPC url").default_value(DEFAULT_CKB_RPC_URL).takes_value(true),
.help("CKB RPC url")
.env("API_URL")
.default_value(DEFAULT_CKB_RPC_URL)
.takes_value(true),
Arg::with_name("ckb-indexer-url")
.long("ckb-indexer-url")
.help("ckb-indexer RPC url")
.default_value(DEFAULT_CKB_INDEXER_RPC_URL)
.env("CKB_INDEXER_URL")
.takes_value(true),
Arg::with_name("ckb-cli")
.long("ckb-cli")
.help("CKB cli binary").default_value(DEFAULT_CKB_CLI_BIN_NAME).takes_value(true),
Expand Down Expand Up @@ -366,8 +377,14 @@ fn run_cli() -> Result<()> {
};
let context = Context::load()?;
let ckb_rpc_url = args.value_of("api").expect("api");
let ckb_indexer_rpc_url = args.value_of("ckb-indexer-url").expect("indexer url");
let ckb_cli_bin = args.value_of("ckb-cli").expect("ckb-cli");
let wallet = Wallet::load(ckb_rpc_url.to_string(), ckb_cli_bin.to_string(), address);
let wallet = Wallet::load(
ckb_rpc_url.to_string(),
ckb_indexer_rpc_url.to_string(),
ckb_cli_bin.to_string(),
address,
);
let deploy_env: DeployEnv = args
.value_of("env")
.expect("deploy env")
Expand Down
4 changes: 0 additions & 4 deletions src/wallet/cli_types/live_cell_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ use std::str::FromStr;
#[derive(Hash, Eq, PartialEq, Debug, Clone, Serialize, Deserialize)]
pub struct LiveCellInfoVec {
pub live_cells: Vec<LiveCellInfo>,
pub current_capacity: String,
pub current_count: usize,
pub total_capacity: String,
pub total_count: usize,
}

#[derive(Hash, Eq, PartialEq, Debug, Clone, Serialize, Deserialize)]
Expand Down
10 changes: 7 additions & 3 deletions src/wallet/collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ pub struct Collector {
locked_cells: HashSet<OutPoint>,
ckb_cli_bin: String,
api_uri: String,
indexer_uri: String,
}

impl Collector {
pub fn new(api_uri: String, ckb_cli_bin: String) -> Self {
pub fn new(api_uri: String, indexer_uri: String, ckb_cli_bin: String) -> Self {
Collector {
locked_cells: HashSet::default(),
api_uri,
indexer_uri,
ckb_cli_bin,
}
}
Expand Down Expand Up @@ -85,8 +87,9 @@ impl Collector {
Command::new(&self.ckb_cli_bin)
.arg("--url")
.arg(&self.api_uri)
.arg("--ckb-indexer-url")
.arg(&self.indexer_uri)
.arg("rpc")
.arg("--wait-for-sync")
.arg("get_tip_block_number")
.arg("--output-format")
.arg("json")
Expand All @@ -113,8 +116,9 @@ impl Collector {
Command::new(&self.ckb_cli_bin)
.arg("--url")
.arg(&self.api_uri)
.arg("--ckb-indexer-url")
.arg(&self.indexer_uri)
.arg("wallet")
.arg("--wait-for-sync")
Copy link
Contributor

@TheWaWaR TheWaWaR Sep 22, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The --ckb-indexer-url argument is needed.

https://github.com/nervosnetwork/ckb-cli/blob/e41c4a35d24987fd3ee43887929967be19ffc0b9/src/main.rs#L381-L389

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't notice this because I have run ckb-cli interactively before and there are saved urls.

This argument will need to be added to capsule deploy too and passed to ckb-cli?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, just like the argument --url above.

.arg("get-live-cells")
.arg("--address")
.arg(address.display_with_network(address.network()))
Expand Down
9 changes: 7 additions & 2 deletions src/wallet/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,27 @@ use std::process::{Command, Stdio};

pub const DEFAULT_CKB_CLI_BIN_NAME: &str = "ckb-cli";
pub const DEFAULT_CKB_RPC_URL: &str = "http://localhost:8114";
pub const DEFAULT_CKB_INDEXER_RPC_URL: &str = "http://localhost:8116";

pub struct Wallet {
ckb_cli_bin: String,
api_uri: String,
indexer_uri: String,
rpc_client: RpcClient,
address: Address,
genesis: BlockView,
collector: Collector,
}

impl Wallet {
pub fn load(uri: String, ckb_cli_bin: String, address: Address) -> Self {
pub fn load(uri: String, indexer_uri: String, ckb_cli_bin: String, address: Address) -> Self {
let rpc_client = RpcClient::new(&uri);
let genesis = rpc_client.get_block_by_number(0u64).expect("genesis");
let collector = Collector::new(uri.clone(), ckb_cli_bin.clone());
let collector = Collector::new(uri.clone(), indexer_uri.clone(), ckb_cli_bin.clone());
Wallet {
ckb_cli_bin,
api_uri: uri,
indexer_uri,
rpc_client,
address,
genesis: genesis.into(),
Expand Down Expand Up @@ -164,6 +167,8 @@ impl Wallet {
.stdout(Stdio::piped())
.arg("--url")
.arg(&self.api_uri)
.arg("--ckb-indexer-url")
.arg(&self.indexer_uri)
.arg("util")
.arg("sign-message")
.arg("--recoverable")
Expand Down