Merge pull request #125 from blckngm/fix-deploy-address-parsing

fix: fix address parsing

Cargo.toml

@@ -17,7 +17,6 @@ tera = "1.2"
 lazy_static = "1.4"
 serde = { version = "1.0", features = [ "derive" ] }
 ckb-testtool = "0.9.0"
-bech32 = "0.6"
 secp256k1 = "0.24"
 serde_json = "1.0"
 rpassword = "4.0"
@@ -38,6 +37,7 @@ chrono = { version = "0.4.24", default-features = false, features = ["std"] }
 # 0.2.3 breaks color output: https://github.com/matklad/xshell/issues/63
 xshell = "=0.2.2"
 path_macro = "1.0.0"
+ckb-sdk = "2.5.0"
 
 [build-dependencies]
 includedir_codegen = "0.6"

src/bin/capsule.rs

@@ -20,8 +20,8 @@ use ckb_capsule::recipe::get_recipe;
 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::{Wallet, DEFAULT_CKB_CLI_BIN_NAME, DEFAULT_CKB_RPC_URL};
+use ckb_sdk::{Address, HumanCapacity};
 use ckb_testtool::ckb_types::core::Capacity;
 
 use clap::{App, AppSettings, Arg, SubCommand};

src/deployment/deployment_process.rs

@@ -53,10 +53,7 @@ impl DeploymentProcess {
                 self.wallet.get_cell_output(live_cell.out_point());
             let wallet_lock: packed::Script = self.wallet.lock_script();
             if cell_output.lock() != wallet_lock {
-                let address = self
-                    .wallet
-                    .address()
-                    .display_with_network(self.wallet.address().network());
+                let address = self.wallet.address().to_string();
                 return Err(anyhow!("Can't unlock previously deployed cells with address '{}'\ncell '{}' uses lock:\n{}\naddress's lock:\n{}\n\nhint: update the lock field in `deployment.toml` or turn off migration with option `--migrate=off`", address, name, cell_output.lock(), wallet_lock));
             }
         }

src/deployment/plan.rs

@@ -1,6 +1,6 @@
 use super::recipe::DeploymentRecipe;
 use crate::deployment::recipe::*;
-use crate::wallet::cli_types::HumanCapacity;
+use ckb_sdk::HumanCapacity;
 use ckb_testtool::ckb_types::H256;
 use serde::Serialize;