Merge pull request #7 from EthanYuan/v0.116.1-branch-chain-remove-dao

remove dao type script deployment in genesis block
EthanYuan · Jul 25, 2024 · 9ab878a · 9ab878a
2 parents b6d1aae + d2e17c5
commit 9ab878a
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 1,394 deletions.
diff --git a/resource/specs/dev.toml b/resource/specs/dev.toml
@@ -25,10 +25,6 @@ file = { bundled = "specs/cells/secp256k1_blake160_sighash_all" }
 create_type_id = true
 capacity = 100_000_0000_0000
 [[genesis.system_cells]]
-file = { bundled = "specs/cells/dao" }
-create_type_id = true
-capacity = 16_000_0000_0000
-[[genesis.system_cells]]
 file = { bundled = "specs/cells/secp256k1_data" }
 create_type_id = false
 capacity = 1_048_617_0000_0000

diff --git a/resource/src/template.rs b/resource/src/template.rs
@@ -1,7 +1,7 @@
 /// Default chain spec.
-pub const DEFAULT_SPEC: &str = "mainnet";
+pub const DEFAULT_SPEC: &str = "dev";
 /// The list of bundled chain specs.
-pub const AVAILABLE_SPECS: &[&str] = &["mainnet", "testnet", "staging", "dev"];
+pub const AVAILABLE_SPECS: &[&str] = &["dev"];
 /// The default RPC listen port *8114*.
 pub const DEFAULT_RPC_PORT: &str = "8114";
 /// The default P2P listen port *8115*.

diff --git a/spec/src/consensus.rs b/spec/src/consensus.rs
@@ -9,8 +9,7 @@ use crate::{
         self, Deployment, DeploymentPos, ThresholdState, Versionbits, VersionbitsCache,
         VersionbitsConditionChecker, VersionbitsIndexer,
     },
-    OUTPUT_INDEX_DAO, OUTPUT_INDEX_SECP256K1_BLAKE160_MULTISIG_ALL,
-    OUTPUT_INDEX_SECP256K1_BLAKE160_SIGHASH_ALL,
+    OUTPUT_INDEX_SECP256K1_BLAKE160_MULTISIG_ALL, OUTPUT_INDEX_SECP256K1_BLAKE160_SIGHASH_ALL,
 };
 use ckb_constant::{
     consensus::TAU,
@@ -345,7 +344,7 @@ impl ConsensusBuilder {
             "genesis block must contain the witness for cellbase"
         );
 
-        self.inner.dao_type_hash = self.get_type_hash(OUTPUT_INDEX_DAO).unwrap_or_default();
+        self.inner.dao_type_hash = Byte32::default();
         self.inner.secp256k1_blake160_sighash_all_type_hash =
             self.get_type_hash(OUTPUT_INDEX_SECP256K1_BLAKE160_SIGHASH_ALL);
         self.inner.secp256k1_blake160_multisig_all_type_hash =

diff --git a/spec/src/lib.rs b/spec/src/lib.rs
@@ -22,8 +22,8 @@ use ckb_hash::{blake2b_256, new_blake2b};
 use ckb_jsonrpc_types::Script;
 use ckb_pow::{Pow, PowEngine};
 use ckb_resource::{
-    Resource, CODE_HASH_DAO, CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL,
-    CODE_HASH_SECP256K1_BLAKE160_SIGHASH_ALL, CODE_HASH_SECP256K1_DATA,
+    Resource, CODE_HASH_SECP256K1_BLAKE160_MULTISIG_ALL, CODE_HASH_SECP256K1_BLAKE160_SIGHASH_ALL,
+    CODE_HASH_SECP256K1_DATA,
 };
 use ckb_types::{
     bytes::Bytes,
@@ -59,12 +59,10 @@ const SPECIAL_CELL_PRIVKEY: H256 =
 
 /// The output index of SECP256K1/blake160 script in the genesis no.0 transaction
 pub const OUTPUT_INDEX_SECP256K1_BLAKE160_SIGHASH_ALL: u64 = 1;
-/// The output index of DAO script in the genesis no.0 transaction
-pub const OUTPUT_INDEX_DAO: u64 = 2;
 /// The output data index of SECP256K1 in the genesis no.0 transaction
-pub const OUTPUT_INDEX_SECP256K1_DATA: u64 = 3;
+pub const OUTPUT_INDEX_SECP256K1_DATA: u64 = 2;
 /// The output index of SECP256K1/multisig script in the genesis no.0 transaction
-pub const OUTPUT_INDEX_SECP256K1_BLAKE160_MULTISIG_ALL: u64 = 4;
+pub const OUTPUT_INDEX_SECP256K1_BLAKE160_MULTISIG_ALL: u64 = 3;
 
 /// The CKB block chain specification
 #[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
@@ -737,7 +735,6 @@ impl ChainSpec {
             OUTPUT_INDEX_SECP256K1_BLAKE160_SIGHASH_ALL as usize,
             &CODE_HASH_SECP256K1_BLAKE160_SIGHASH_ALL,
         )?;
-        check_cells_data_hash(0, OUTPUT_INDEX_DAO as usize, &CODE_HASH_DAO)?;
         check_cells_data_hash(
             0,
             OUTPUT_INDEX_SECP256K1_DATA as usize,

diff --git a/test/src/main.rs b/test/src/main.rs
@@ -417,10 +417,6 @@ fn all_specs() -> Vec<Box<dyn Spec>> {
         Box::new(ForksContainSameUncle),
         Box::new(SendConflictTxToRelay),
         Box::new(SendConflictTxToRelayRBF),
-        Box::new(WithdrawDAO),
-        Box::new(WithdrawDAOWithOverflowCapacity),
-        Box::new(DAOWithSatoshiCellOccupied),
-        Box::new(SpendSatoshiCell::new()),
         Box::new(MiningBasic),
         Box::new(BlockTemplates),
         Box::new(BootstrapCellbase),
@@ -554,7 +550,6 @@ fn all_specs() -> Vec<Box<dyn Spec>> {
         Box::new(ConflictInProposed),
         Box::new(RemoveConflictFromPending),
         Box::new(SubmitConflict),
-        Box::new(DAOVerify),
         Box::new(AvoidDuplicatedProposalsWithUncles),
         Box::new(BlockSyncRelayerCollaboration),
         Box::new(RpcGetBlockTemplate),

diff --git a/test/src/specs/dao/dao_tx.rs b/test/src/specs/dao/dao_tx.rs