feat: support set hardfork from command line (#1422)

* feat: hardfork subcommand * fix: fix the difference between enabled and determined * Update core/api/src/jsonrpc/impl/axon.rs Co-authored-by: Flouse <[email protected]> * Update core/consensus/src/engine.rs Co-authored-by: Flouse <[email protected]> * docs: the default dev chain id is changed since #1418 (#1434) * chore(Dockerfile): add health-check shell script (#1432) * ci: add health-check shell script * ci: remove blank line --------- Co-authored-by: Flouse <[email protected]> --------- Co-authored-by: Flouse <[email protected]> Co-authored-by: Simon <[email protected]>
axonweb3 · Sep 19, 2023 · 7ae0a82 · 7ae0a82
1 parent e719adb
commit 7ae0a82
Show file tree

Hide file tree

Showing 21 changed files with 553 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/config-parser/Cargo.toml b/common/config-parser/Cargo.toml
@@ -11,6 +11,8 @@ reqwest = "0.11"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 stringreader = "0.1"
+strum = "0.25"
+strum_macros = "0.25"
 tentacle-multiaddr = "0.3"
 toml = "0.7"
 

diff --git a/common/config-parser/src/types/spec.rs b/common/config-parser/src/types/spec.rs
@@ -10,7 +10,7 @@ use clap::{
     builder::{StringValueParser, TypedValueParser, ValueParserFactory},
     Args,
 };
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 use common_crypto::Secp256k1RecoverablePrivateKey;
 use protocol::{
@@ -40,7 +40,7 @@ pub struct ChainSpec {
 #[derive(Clone, Debug, Deserialize)]
 pub struct Genesis {
     pub timestamp:        u64,
-    pub extra_data:       HarforkInput,
+    pub extra_data:       HardforkInput,
     pub base_fee_per_gas: U256,
     pub chain_id:         u64,
 
@@ -261,24 +261,37 @@ impl Genesis {
             timestamp: self.timestamp,
             // todo: if Hardforkinput is empty, it must change to latest hardfork info to init
             // genesis
-            extra_data: Into::<HardforkInfoInner>::into(self.extra_data.clone())
-                .encode()
-                .unwrap(),
+            extra_data: if self.extra_data.block_number != 0 {
+                Default::default()
+            } else {
+                Into::<HardforkInfoInner>::into(self.extra_data.clone())
+                    .encode()
+                    .unwrap()
+            },
             base_fee_per_gas: self.base_fee_per_gas,
             chain_id: self.chain_id,
             ..Default::default()
         }
     }
 }
 
-#[derive(Clone, Debug, Deserialize)]
-pub struct HarforkInput {
-    block_number: u64,
-    hardforks:    Vec<HardforkType>,
+use clap::ValueEnum;
+use strum_macros::EnumIter;
+
+#[derive(Clone, Debug, Deserialize, Args)]
+pub struct HardforkInput {
+    #[arg(
+        long = "hardfork-start-number",
+        required = false,
+        requires = "hardforks"
+    )]
+    pub block_number: u64,
+    #[arg(long = "feature", requires = "block_number")]
+    pub hardforks:    Vec<HardforkName>,
 }
 
-impl From<HarforkInput> for HardforkInfoInner {
-    fn from(value: HarforkInput) -> Self {
+impl From<HardforkInput> for HardforkInfoInner {
+    fn from(value: HardforkInput) -> Self {
         let flags = {
             let r = value.hardforks.into_iter().fold(0, |acc, s| acc | s as u64);
 
@@ -292,7 +305,7 @@ impl From<HarforkInput> for HardforkInfoInner {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Copy)]
-enum HardforkType {
+#[derive(Clone, Debug, Serialize, Deserialize, Copy, ValueEnum, EnumIter, PartialEq, Eq, Hash)]
+pub enum HardforkName {
     None = 0b0,
 }
diff --git a/core/api/Cargo.toml b/core/api/Cargo.toml
@@ -10,19 +10,20 @@ beef = "0.5"
 ckb-jsonrpc-types = "0.108"
 ckb-traits = "0.108"
 ckb-types = "0.108"
-jsonrpsee = { version = "0.16", features = ["macros","server"] }
+jsonrpsee = { version = "0.16", features = ["macros", "server"] }
 log = "0.4"
 parking_lot = "0.12"
 pprof = { version = "0.11", features = ["prost-codec"], optional = true }
 rlp = "0.5"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+strum = "0.25"
 
 common-apm = { path = "../../common/apm" }
 common-config-parser = { path = "../../common/config-parser" }
 core-consensus = { path = "../../core/consensus" }
 core-executor = { path = "../../core/executor" }
-core-interoperation ={ path = "../../core/interoperation" }
+core-interoperation = { path = "../../core/interoperation" }
 either = { version = "1.8", features = ["serde"] }
 protocol = { path = "../../protocol", package = "axon-protocol" }
 

diff --git a/core/api/src/adapter.rs b/core/api/src/adapter.rs
@@ -6,8 +6,8 @@ use protocol::traits::{
 use protocol::trie::Trie as _;
 use protocol::types::{
     Account, BigEndianHash, Block, BlockNumber, Bytes, CkbRelatedInfo, ExecutorContext,
-    HardforkInfo, Hash, Header, Metadata, Proposal, Receipt, SignedTransaction, TxResp, H160, H256,
-    MAX_BLOCK_GAS_LIMIT, NIL_DATA, RLP_NULL, U256,
+    HardforkInfo, HardforkInfoInner, Hash, Header, Metadata, Proposal, Receipt, SignedTransaction,
+    TxResp, H160, H256, MAX_BLOCK_GAS_LIMIT, NIL_DATA, RLP_NULL, U256,
 };
 use protocol::{async_trait, codec::ProtocolCodec, trie, ProtocolResult};
 
@@ -289,4 +289,8 @@ where
     async fn hardfork_info(&self, ctx: Context) -> ProtocolResult<HardforkInfo> {
         MetadataHandle::new(self.get_metadata_root(ctx).await?).hardfork_infos()
     }
+
+    async fn hardfork_proposal(&self, ctx: Context) -> ProtocolResult<Option<HardforkInfoInner>> {
+        self.storage.hardfork_proposal(ctx).await
+    }
 }