Chainx v5.0.0: Use BTC as chainx-evm gas (#655)

* Deprecated assets-bridge * Breaking: use BTC as chainx-evm gas instead of PCX * Run `make clippy` * Update xpallet-assets-bridge * Run `make format` * Bump ChainX version to 5.0.0 * Update bitcoin gateway deposit_evm * Rename BtcLedger to XBtcLedger * Add assets-bridge transfer_btc_to_evm * Update btc-ledger rpc * Update Copyright * Fix xpallet-btc-ledger tests * Update seed node * Update chainx-malan runtime version to 29 * Add metamask config * Set to the same runtime version --------- Co-authored-by: icodezjb <[email protected]>
chainx-org · Jun 1, 2023 · 4cb9a98 · 4cb9a98
1 parent 75099d5
commit 4cb9a98
Show file tree

Hide file tree

Showing 221 changed files with 2,438 additions and 645 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainx"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 description = "Fully Decentralized Interchain Crypto Asset Management on Polkadot"
@@ -37,6 +37,9 @@ members = [
   "xpallets/assets/rpc/runtime-api",
   "xpallets/assets-bridge",
   "xpallets/assets-registrar",
+  "xpallets/btc-ledger",
+  "xpallets/btc-ledger/rpc",
+  "xpallets/btc-ledger/rpc/runtime-api",
   "xpallets/dex/spot",
   "xpallets/dex/spot/rpc",
   "xpallets/dex/spot/rpc/runtime-api",

diff --git a/README.md b/README.md
@@ -50,6 +50,15 @@ Please refer to the [docs](https://chainx-org.github.io/documentation) for build
 
 Any kinds of contributions are highly welcome. Feel free to file an issue if you have any question or run into any issues.
 
+## Metamask config for BTC
+```
+Network name: ChainX
+RPC URL: https://mainnet.chainx.org/rpc
+Chain ID: 1501
+Currency symbol: BTC
+Block explorer URL (Optional): https://evm.chainx.org/
+```
+
 ## License
 
 [GPL v3](LICENSE)
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainx-cli"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 description = "Implementation of protocol https://chainx.org in Rust based on the Substrate framework."
 edition = "2021"
@@ -64,6 +64,7 @@ xp-protocol = { path = "../primitives/protocol" }
 
 xpallet-gateway-bitcoin = { path = "../xpallets/gateway/bitcoin" }
 xpallet-gateway-common = { path = "../xpallets/gateway/common" }
+xpallet-btc-ledger = { path = "../xpallets/btc-ledger" }
 
 [build-dependencies]
 substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }

diff --git a/cli/build.rs b/cli/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
 

diff --git a/cli/src/chain_spec.rs b/cli/src/chain_spec.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 #![allow(unused)]
 use std::collections::BTreeMap;
@@ -555,6 +555,7 @@ fn mainnet_genesis(
             sp_runtime::Permill::from_parts(125_000),
         ),
         x_assets_bridge: chainx::XAssetsBridgeConfig { admin_key: None },
+        x_btc_ledger: Default::default(),
     }
 }
 
@@ -809,6 +810,7 @@ fn malan_genesis(
             sp_runtime::Permill::from_parts(125_000),
         ),
         x_assets_bridge: malan::XAssetsBridgeConfig { admin_key: None },
+        x_btc_ledger: Default::default(),
     }
 }
 
@@ -986,5 +988,6 @@ fn build_dev_genesis(
             sp_runtime::Permill::from_parts(125_000),
         ),
         x_assets_bridge: dev::XAssetsBridgeConfig { admin_key: None },
+        x_btc_ledger: Default::default(),
     }
 }
diff --git a/cli/src/cli.rs b/cli/src/cli.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use sc_cli::{CliConfiguration, KeySubcommand, SignCmd, VanityCmd, VerifyCmd};
 

diff --git a/cli/src/command.rs b/cli/src/command.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 #![allow(clippy::borrowed_box)]
 
 use std::net::SocketAddr;

diff --git a/cli/src/config.rs b/cli/src/config.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use serde_json::value::Value;
 use std::collections::HashMap;

diff --git a/cli/src/genesis/assets.rs b/cli/src/genesis/assets.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 #![allow(clippy::type_complexity)]
 
 use xp_protocol::{BTC_DECIMALS, PCX, PCX_DECIMALS, X_BTC};

diff --git a/cli/src/genesis/bitcoin.rs b/cli/src/genesis/bitcoin.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use std::convert::TryFrom;
 

diff --git a/cli/src/genesis/mod.rs b/cli/src/genesis/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 pub mod assets;
 pub mod bitcoin;

diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 //! ChainX CLI library.
 

diff --git a/cli/src/logger.rs b/cli/src/logger.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use std::str::FromStr;
 

diff --git a/cli/src/res/chainx_regenesis.json b/cli/src/res/chainx_regenesis.json
@@ -3,7 +3,7 @@
   "id": "chainx",
   "chainType": "Live",
   "bootNodes": [
-    "/ip4/52.77.243.26/tcp/23555/ws/p2p/12D3KooWQ6GGfmvmmmsbKRmZqMA3A8rxaHz25HvA7JNBbcZhLXtk",
+    "/ip4/18.142.230.171/tcp/23555/ws/p2p/12D3KooWQ6GGfmvmmmsbKRmZqMA3A8rxaHz25HvA7JNBbcZhLXtk",
     "/ip4/120.26.57.227/tcp/36789/ws/p2p/12D3KooWEAX2BcQCZP79MuxQpqLQUop7P3tZY97eNxxUgc4ZTu3k",
     "/ip4/47.114.74.52/tcp/36789/ws/p2p/12D3KooWJPMUkGytfAMt3AMqm4AFn4VToXjbWZoC4Z2NxXNXvTwb"
   ],

diff --git a/cli/src/res/malan.json b/cli/src/res/malan.json
@@ -3,7 +3,7 @@
   "id": "chainx-malan",
   "chainType": "Live",
   "bootNodes": [
-    "/ip4/120.26.57.227/tcp/26789/ws/p2p/12D3KooWANojjJuis3SnDF5hjFGqEUkFHhf34yPgJJLe9yZcznW6"
+    "/ip4/18.142.230.171/tcp/26789/ws/p2p/12D3KooWANojjJuis3SnDF5hjFGqEUkFHhf34yPgJJLe9yZcznW6"
   ],
   "telemetryEndpoints": [
     [

diff --git a/contracts/AssetsBridgeAdaptor.sol → contracts/deprecated_AssetsBridgeAdaptor.sol b/contracts/AssetsBridgeAdaptor.sol → contracts/deprecated_AssetsBridgeAdaptor.sol
diff --git a/contracts/AssetsBridgeErc20.sol → contracts/deprecated_AssetsBridgeErc20.sol b/contracts/AssetsBridgeErc20.sol → contracts/deprecated_AssetsBridgeErc20.sol
@@ -9,7 +9,7 @@ import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.4.1/contr
 import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.4.1/contracts/security/Pausable.sol";
 import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.4.1/contracts/access/Ownable.sol";
 
-import "./AssetsBridgeAdaptor.sol";
+import "./deprecated_AssetsBridgeAdaptor.sol";
 
 /**
  * @dev Implementation of the {IERC20} interface.

diff --git a/contracts/AssetsBridgeErc20_OnlyAdmin.sol → ...eprecated_AssetsBridgeErc20_OnlyAdmin.sol b/contracts/AssetsBridgeErc20_OnlyAdmin.sol → ...eprecated_AssetsBridgeErc20_OnlyAdmin.sol
@@ -9,7 +9,7 @@ import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.4.1/contr
 import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.4.1/contracts/security/Pausable.sol";
 import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.4.1/contracts/access/Ownable.sol";
 
-import "./AssetsBridgeAdaptor.sol";
+import "./deprecated_AssetsBridgeAdaptor.sol";
 
 /**
  * @dev Implementation of the {IERC20} interface.

diff --git a/contracts/AssetsBridgeErc20_OnlyOwner.sol → ...eprecated_AssetsBridgeErc20_OnlyOwner.sol b/contracts/AssetsBridgeErc20_OnlyOwner.sol → ...eprecated_AssetsBridgeErc20_OnlyOwner.sol
@@ -9,7 +9,7 @@ import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.4.1/contr
 import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.4.1/contracts/security/Pausable.sol";
 import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.4.1/contracts/access/Ownable.sol";
 
-import "./AssetsBridgeAdaptor.sol";
+import "./deprecated_AssetsBridgeAdaptor.sol";
 
 /**
  * @dev Implementation of the {IERC20} interface.

diff --git a/docs/xbtc_in_chainx_evm.md b/docs/xbtc_in_chainx_evm.md
@@ -1,4 +1,4 @@
-# XBTC in ChainX-EVM
+# [deprecated] XBTC in ChainX-EVM 
 
 ## 1. XBTC
 ChainX is the community-run layer2 network of bitcoin, and your portal into the world of Bitcoin ecosysterm.

diff --git a/executor/Cargo.toml b/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainx-executor"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

diff --git a/executor/src/lib.rs b/executor/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 pub use sc_executor::NativeElseWasmExecutor;
 

diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainx-primitives"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

diff --git a/primitives/assets-registrar/Cargo.toml b/primitives/assets-registrar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-assets-registrar"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

diff --git a/primitives/assets-registrar/src/lib.rs b/primitives/assets-registrar/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 //! The asset registrar primitives.
 

diff --git a/primitives/gateway/bitcoin/Cargo.toml b/primitives/gateway/bitcoin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-gateway-bitcoin"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

diff --git a/primitives/gateway/bitcoin/src/detector.rs b/primitives/gateway/bitcoin/src/detector.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use sp_std::fmt::Debug;
 

diff --git a/primitives/gateway/bitcoin/src/extractor.rs b/primitives/gateway/bitcoin/src/extractor.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use crate::types::OpReturnAccount;
 use frame_support::log::{debug, error};

diff --git a/primitives/gateway/bitcoin/src/lib.rs b/primitives/gateway/bitcoin/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 //! Some primitives and utils about ChainX gateway bitcoin.
 

diff --git a/primitives/gateway/bitcoin/src/types.rs b/primitives/gateway/bitcoin/src/types.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;

diff --git a/primitives/gateway/bitcoin/src/utils.rs b/primitives/gateway/bitcoin/src/utils.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use frame_support::log::{error, warn};
 use sp_std::{cmp::Ordering, prelude::Vec};

diff --git a/primitives/gateway/common/Cargo.toml b/primitives/gateway/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-gateway-common"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

diff --git a/primitives/gateway/common/src/lib.rs b/primitives/gateway/common/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 //! Common concepts with regard to the ChainX gateway system.
 

diff --git a/primitives/genesis-builder/Cargo.toml b/primitives/genesis-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-genesis-builder"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

diff --git a/primitives/genesis-builder/src/lib.rs b/primitives/genesis-builder/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 //! The genesis builder primitives.
 

diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-io"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

diff --git a/primitives/io/src/lib.rs b/primitives/io/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 

diff --git a/primitives/mining/common/Cargo.toml b/primitives/mining/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-mining-common"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

diff --git a/primitives/mining/common/src/lib.rs b/primitives/mining/common/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 

diff --git a/primitives/mining/staking/Cargo.toml b/primitives/mining/staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-mining-staking"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

diff --git a/primitives/mining/staking/src/lib.rs b/primitives/mining/staking/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 

diff --git a/primitives/protocol/Cargo.toml b/primitives/protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-protocol"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

diff --git a/primitives/protocol/src/asset.rs b/primitives/protocol/src/asset.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use chainx_primitives::{AssetId, Decimals};
 

diff --git a/primitives/protocol/src/lib.rs b/primitives/protocol/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 //! Some protocol details in the ChainX.
 

diff --git a/primitives/protocol/src/network.rs b/primitives/protocol/src/network.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;

diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-rpc"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

diff --git a/primitives/rpc/src/lib.rs b/primitives/rpc/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 use std::{
     fmt::{Debug, Display},

diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-runtime"
-version = "4.4.0"
+version = "5.0.0"
 authors = ["The ChainX Authors"]
 edition = "2021"
 
@@ -15,8 +15,8 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
 
 # EVM
-fp-rpc = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18", default-features = false }
-pallet-ethereum = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18", default-features = false }
+fp-rpc = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc", default-features = false }
+pallet-ethereum = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc", default-features = false }
 
 [dev-dependencies]
 hex = "0.4"

diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 //! ChainX Runtime Modules shared primitive types.
 

diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019-2022 ChainX Project Authors. Licensed under GPL-3.0.
+// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0.
 
 #![cfg_attr(not(feature = "std"), no_std)]