Merge branch 'feat.multsig' of github.com:templexxx/starcoin into fea…

…t.multsig
starcoinorg · Jun 16, 2022 · 1c71eb0 · 1c71eb0
2 parents 08ff50e + f23a4ac
commit 1c71eb0
Show file tree

Hide file tree

Showing 106 changed files with 248 additions and 223 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/abi/decoder/Cargo.toml b/abi/decoder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-abi-decoder"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 edition = "2021"

diff --git a/abi/resolver/Cargo.toml b/abi/resolver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-abi-resolver"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 edition = "2021"
 

diff --git a/abi/types/Cargo.toml b/abi/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-abi-types"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 edition = "2021"

diff --git a/account/Cargo.toml b/account/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-account"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/account/api/Cargo.toml b/account/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-account-api"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/account/provider/Cargo.toml b/account/provider/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-account-provider"
-version = "1.11.10"
+version = "1.11.11"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/account/service/Cargo.toml b/account/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-account-service"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "benchmarks"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/block-relayer/Cargo.toml b/block-relayer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-block-relayer"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/chain/Cargo.toml b/chain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-chain"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/chain/api/Cargo.toml b/chain/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-chain-api"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/chain/chain-notify/Cargo.toml b/chain/chain-notify/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-chain-notify"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/chain/mock/Cargo.toml b/chain/mock/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-chain-mock"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/chain/open-block/Cargo.toml b/chain/open-block/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-open-block"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/chain/service/Cargo.toml b/chain/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-chain-service"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/cmd/airdrop/Cargo.toml b/cmd/airdrop/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "airdrop"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 edition = "2021"
 

diff --git a/cmd/db-exporter/Cargo.toml b/cmd/db-exporter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "db-exporter"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/cmd/faucet/Cargo.toml b/cmd/faucet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-faucet"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/cmd/generator/Cargo.toml b/cmd/generator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-generator"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/cmd/genesis-nft-miner/Cargo.toml b/cmd/genesis-nft-miner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "genesis-nft-miner"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/cmd/indexer/Cargo.toml b/cmd/indexer/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "starcoin-indexer"
 publish = false
-version = "1.11.10"
+version = "1.11.11"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/cmd/merkle-generator/Cargo.toml b/cmd/merkle-generator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "merkle-generator"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["caojiafeng <[email protected]>"]
 edition = "2021"
 

diff --git a/cmd/miner_client/Cargo.toml b/cmd/miner_client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-miner-client"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 edition = "2021"
 

diff --git a/cmd/miner_client/api/Cargo.toml b/cmd/miner_client/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-miner-client-api"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 edition = "2021"
 

diff --git a/cmd/peer-watcher/Cargo.toml b/cmd/peer-watcher/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-peer-watcher"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/cmd/replay/Cargo.toml b/cmd/replay/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-replay"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/cmd/resource-exporter/Cargo.toml b/cmd/resource-exporter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "resource-exporter"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/cmd/starcoin/Cargo.toml b/cmd/starcoin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-cmd"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/cmd/starcoin/src/account/rotate_auth_key_cmd.rs b/cmd/starcoin/src/account/rotate_auth_key_cmd.rs
@@ -14,7 +14,7 @@ use starcoin_types::identifier::Identifier;
 use starcoin_types::language_storage::ModuleId;
 use starcoin_vm_types::account_address::AccountAddress;
 use starcoin_vm_types::account_config::core_code_address;
-use starcoin_vm_types::transaction::authenticator::AccountPrivateKey;
+use starcoin_vm_types::transaction::authenticator::{AccountPrivateKey, AccountPublicKey};
 use starcoin_vm_types::transaction::{ScriptFunction, TransactionArgument, TransactionPayload};
 use starcoin_vm_types::value::MoveValue;
 
@@ -67,6 +67,7 @@ impl CommandAction for RotateAuthenticationKeyCommand {
     ) -> Result<Self::ReturnItem> {
         let client = ctx.state().account_client();
         let opt: &RotateAuthKeyOpt = ctx.opt();
+
         let private_key = match (opt.from_input.as_ref(), opt.from_file.as_ref()) {
             (Some(p), _) => AccountPrivateKey::from_encoded_string(p)?,
             (None, Some(p)) => {
@@ -77,7 +78,18 @@ impl CommandAction for RotateAuthenticationKeyCommand {
                 bail!("private key should be specified, use <input>, <from-file>")
             }
         };
-        let auth_key = private_key.public_key().authentication_key();
+
+        let account_public_key = match &private_key.public_key() {
+            AccountPublicKey::Multi(_) => {
+                bail!(
+                    "{} is multisig address, you could use execute-function to rotate it step by step",
+                    opt.account_address
+                );
+            }
+            m => m.clone(),
+        };
+
+        let auth_key = account_public_key.authentication_key();
         let mut txn_opt = opt.transaction_opts.clone();
         txn_opt.blocking = true;
         txn_opt.sender = Option::from(opt.account_address);

diff --git a/cmd/starcoin/src/main.rs b/cmd/starcoin/src/main.rs
@@ -6,10 +6,11 @@ use scmd::CmdContext;
 use starcoin_account_provider::ProviderFactory;
 use starcoin_cmd::*;
 use starcoin_cmd::{CliState, StarcoinOpt};
-use starcoin_config::{Connect, G_APP_VERSION, G_CRATE_VERSION};
+use starcoin_config::{Connect, NodeConfig, G_APP_VERSION, G_CRATE_VERSION};
 use starcoin_logger::prelude::*;
 use starcoin_node_api::errors::NodeStartError;
 use starcoin_rpc_client::RpcClient;
+use std::fs;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -33,6 +34,21 @@ fn run() -> Result<()> {
                         (client, None)
                     } else {
                         info!("Start starcoin node...");
+                        // check and do some clean work
+                        let config = NodeConfig::load_with_opt(opt)
+                            .expect("load config with opt should success.");
+                        let ipc_file = config.rpc.get_ipc_file();
+                        if ipc_file.exists() {
+                            // check if ipc is connectable
+                            info!(
+                                "ipc_file: {:?} already exists, try to check if it's connectable",
+                                ipc_file
+                            );
+                            if RpcClient::connect_ipc(&ipc_file).is_err() {
+                                info!("ipc_file: {:?} is not usable, just to remove it.", ipc_file);
+                                _ = fs::remove_file(ipc_file);
+                            }
+                        }
                         let (node_handle, config) = starcoin_node::run_node_by_opt(opt)?;
                         match node_handle {
                             //first cli use local connect.

diff --git a/cmd/tx-factory/Cargo.toml b/cmd/tx-factory/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-tx-factory"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/commons/accumulator/Cargo.toml b/commons/accumulator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-accumulator"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/commons/api-limiter/Cargo.toml b/commons/api-limiter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "api-limiter"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 edition = "2021"

diff --git a/commons/bcs_ext/Cargo.toml b/commons/bcs_ext/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bcs-ext"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/commons/decrypt/Cargo.toml b/commons/decrypt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-decrypt"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 edition = "2021"

diff --git a/commons/forkable-jellyfish-merkle/Cargo.toml b/commons/forkable-jellyfish-merkle/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "forkable-jellyfish-merkle"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Diem Association <[email protected]>", "Starcoin Core Dev <[email protected]>"]
 description = "Diem jellyfish merkle"
 license = "Apache-2.0"

diff --git a/commons/logger/Cargo.toml b/commons/logger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-logger"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/commons/metrics/Cargo.toml b/commons/metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-metrics"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/commons/proptest-helpers/Cargo.toml b/commons/proptest-helpers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-proptest-helpers"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/commons/scmd/Cargo.toml b/commons/scmd/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "scmd"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/commons/serde-helpers/Cargo.toml b/commons/serde-helpers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "serde-helpers"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false

diff --git a/commons/service-registry/Cargo.toml b/commons/service-registry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starcoin-service-registry"
-version = "1.11.10"
+version = "1.11.11"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false