From af1a006af73623a183f4eb4e3b6e546fb68bc068 Mon Sep 17 00:00:00 2001 From: jolestar Date: Wed, 16 Oct 2024 00:32:11 +0800 Subject: [PATCH] [bitcoin-move] Test Babylon Stake with Bitcoin Block Tester (#2766) --- Cargo.lock | 1 + crates/rooch-framework-tests/Cargo.toml | 1 + .../src/bbn_tx_loader.rs | 61 ++++ .../rooch-framework-tests/src/binding_test.rs | 60 +++- .../src/bitcoin_block_tester.rs | 315 +++++++++++++++--- crates/rooch-framework-tests/src/lib.rs | 1 + crates/rooch-framework-tests/src/main.rs | 13 +- .../src/tests/bbn_test.rs | 28 +- .../src/tests/bitcoin_tester_test.rs | 7 +- .../tester/864790.tester.genesis | Bin 2598443 -> 2671911 bytes crates/rooch-types/src/bitcoin/bbn.rs | 118 +++++-- .../rooch-types/src/framework/auth_payload.rs | 2 +- frameworks/bitcoin-move/doc/bbn.md | 72 +++- frameworks/bitcoin-move/sources/bbn.move | 296 ++++++++++------ 14 files changed, 784 insertions(+), 191 deletions(-) create mode 100644 crates/rooch-framework-tests/src/bbn_tx_loader.rs diff --git a/Cargo.lock b/Cargo.lock index aa737e996c..63db62a102 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9728,6 +9728,7 @@ dependencies = [ "bitcoin-move", "clap 4.5.17", "coerce", + "csv", "datatest-stable 0.1.3", "ethers", "framework-builder", diff --git a/crates/rooch-framework-tests/Cargo.toml b/crates/rooch-framework-tests/Cargo.toml index 582bc5a55e..bba44fefcf 100644 --- a/crates/rooch-framework-tests/Cargo.toml +++ b/crates/rooch-framework-tests/Cargo.toml @@ -29,6 +29,7 @@ coerce = { workspace = true } tokio = { workspace = true } clap = { features = ["derive", ], workspace = true } rand = { workspace = true } +csv = { workspace = true } move-core-types = { workspace = true } moveos-types = { workspace = true } diff --git a/crates/rooch-framework-tests/src/bbn_tx_loader.rs b/crates/rooch-framework-tests/src/bbn_tx_loader.rs new file mode 100644 index 0000000000..e6eb4b4089 --- /dev/null +++ b/crates/rooch-framework-tests/src/bbn_tx_loader.rs @@ -0,0 +1,61 @@ +// Copyright (c) RoochNetwork +// SPDX-License-Identifier: Apache-2.0 + +use std::{path::Path, str::FromStr}; + +use anyhow::Result; +use bitcoin::Txid; + +// Load the babylon staking transactions exported file + +// https://github.com/babylonlabs-io/staking-indexer + +// Transaction Hash,Staking Output Index,Inclusion Height,Staker Public Key,Staking Time,Finality Provider Public Key,Is Overflow,Staking Value +// 8440304144a4585d80b60888ba58944f3c626d5c2a813b8955052b2daac20b00,0,864791,04bd117663e6970dad57769a9105bf72f8f7ec162b8e44bf597f41babe5cf8a3,64000,fc8a5b9930c3383e94bd940890e93cfcf95b2571ad50df8063b7011f120b918a,true,4800000 +// ffaae2983630d3d51fac15180e2f89c1ae237e3648e11c5ec506113e78216e00,0,864791,3f1713f12f5ce2269c3360454fd552c77994f287f006b8f7e4c215b5f57a47ed,64000,db9160428e401753dc1a9952ffd4fa3386c7609cf8411d2b6d79c42323ca9923,true,1345800 +// a1fa47d149457a994d2199ceffc43793eb18287864a6b7314c14ba3649f07000,0,864791,ef548602c263dc77b3c75ebb82edae9f1f57c16b6551c40179e9eb942b454be6,64000,742f1eb3c7fdbd327fa44fcdddf17645d9c6b1287ea97463e046508234fa7537,true,600000 +// 7487946cb0598179b805ce73575bb22f99b2ca49d213bf57047ea864dc2f7800,0,864791,c749e4aa8436dc738373f1ccc9570ce9fe8a1d70bae1c25dac71f8e6e0c699ed,64000,0f5c19935a08f661a1c4dfeb5e51ce7f0cfcf4d2eeb405fe4c7d7bd668fc85e4,true,564500 + +#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] +pub struct BBNStakingTxRecord { + pub transaction_hash: String, + pub staking_output_index: u32, + pub inclusion_height: u64, + pub staker_public_key: String, + pub staking_time: u16, + pub finality_provider_public_key: String, + pub is_overflow: bool, + pub staking_value: u64, +} +impl BBNStakingTxRecord { + pub fn load_bbn_staking_txs>( + file_path: P, + block_height: u64, + ) -> Result> { + let mut rdr = csv::ReaderBuilder::new() + .has_headers(true) + .from_path(file_path.as_ref())?; + + let mut txs = vec![]; + for result in rdr.records() { + let record = result?; + let tx: BBNStakingTxRecord = record.deserialize(None)?; + if tx.inclusion_height == block_height { + txs.push(tx); + } + } + Ok(txs) + } + + pub fn txid(&self) -> Txid { + Txid::from_str(&self.transaction_hash).unwrap() + } + + pub fn staker_public_key(&self) -> Vec { + hex::decode(&self.staker_public_key).unwrap() + } + + pub fn finality_provider_public_key(&self) -> Vec { + hex::decode(&self.finality_provider_public_key).unwrap() + } +} diff --git a/crates/rooch-framework-tests/src/binding_test.rs b/crates/rooch-framework-tests/src/binding_test.rs index ace1ee0cd7..e276c03226 100644 --- a/crates/rooch-framework-tests/src/binding_test.rs +++ b/crates/rooch-framework-tests/src/binding_test.rs @@ -4,6 +4,7 @@ use anyhow::{bail, Result}; use metrics::RegistryService; use move_core_types::account_address::AccountAddress; +use move_core_types::u256::U256; use move_core_types::vm_status::KeptVMStatus; use moveos_config::DataDirPath; use moveos_store::MoveOSStore; @@ -11,13 +12,14 @@ use moveos_types::function_return_value::FunctionResult; use moveos_types::h256::H256; use moveos_types::module_binding::MoveFunctionCaller; use moveos_types::moveos_std::event::Event; +use moveos_types::moveos_std::gas_schedule::GasScheduleConfig; use moveos_types::moveos_std::object::ObjectMeta; use moveos_types::moveos_std::tx_context::TxContext; -use moveos_types::state::{FieldKey, ObjectChange, ObjectState, StateChangeSet}; +use moveos_types::state::{FieldKey, MoveStructType, ObjectChange, ObjectState, StateChangeSet}; use moveos_types::state_resolver::{ RootObjectResolver, StateKV, StateReaderExt, StateResolver, StatelessResolver, }; -use moveos_types::transaction::{FunctionCall, VerifiedMoveOSTransaction}; +use moveos_types::transaction::{FunctionCall, MoveAction, VerifiedMoveOSTransaction}; use rooch_config::RoochOpt; use rooch_db::RoochDB; use rooch_executor::actor::reader_executor::ReaderExecutorActor; @@ -25,8 +27,13 @@ use rooch_executor::actor::{executor::ExecutorActor, messages::ExecuteTransactio use rooch_genesis::RoochGenesis; use rooch_types::address::BitcoinAddress; use rooch_types::crypto::RoochKeyPair; +use rooch_types::framework::gas_coin::RGas; +use rooch_types::framework::transfer::TransferModule; use rooch_types::rooch_network::{BuiltinChainID, RoochNetwork}; -use rooch_types::transaction::{L1BlockWithBody, L1Transaction, RoochTransaction}; +use rooch_types::transaction::authenticator::BitcoinAuthenticator; +use rooch_types::transaction::{ + Authenticator, L1BlockWithBody, L1Transaction, RoochTransaction, RoochTransactionData, +}; use std::collections::VecDeque; use std::path::Path; use std::sync::Arc; @@ -47,6 +54,7 @@ pub fn get_data_dir() -> DataDirPath { } pub struct RustBindingTest { + network: RoochNetwork, //we keep the opt to ensure the temp dir is not be deleted before the test end opt: RoochOpt, pub sequencer: AccountAddress, @@ -102,6 +110,7 @@ impl RustBindingTest { None, )?; Ok(Self { + network, opt, root, sequencer: sequencer.to_rooch_address().into(), @@ -139,6 +148,33 @@ impl RustBindingTest { &self.rooch_db } + pub fn get_rgas(&mut self, addr: AccountAddress, amount: U256) -> Result<()> { + // transfer RGas from rooch dao account to addr + let function_call = + TransferModule::create_transfer_coin_action(RGas::struct_tag(), addr, amount); + let sender = self + .network + .genesis_config + .rooch_dao + .multisign_bitcoin_address + .to_rooch_address(); + let sequence_number = self.get_account_sequence_number(sender.into())?; + let tx_data = RoochTransactionData::new( + sender, + sequence_number, + self.network.chain_id.id, + GasScheduleConfig::CLI_DEFAULT_MAX_GAS_AMOUNT, + function_call, + ); + //RoochDao is a multisign account, so we need to sign the tx with the multisign account + //In test env, it is a 1-of-1 multisign account, so we can sign with the only key + let first_signature = BitcoinAuthenticator::sign(&self.kp, &tx_data); + let authenticator = Authenticator::bitcoin_multisign(vec![first_signature])?; + let tx = RoochTransaction::new(tx_data, authenticator); + self.execute(tx)?; + Ok(()) + } + //TODO let the module bundle to execute the function pub fn execute(&mut self, tx: RoochTransaction) -> Result { let execute_result = self.execute_as_result(tx)?; @@ -151,6 +187,24 @@ impl RustBindingTest { Ok(execute_result) } + pub fn execute_function_call_via_sequencer( + &mut self, + function_call: FunctionCall, + ) -> Result { + let action = MoveAction::Function(function_call); + let sequence_number = self.get_account_sequence_number(self.sequencer)?; + let tx_data = RoochTransactionData::new( + self.sequencer.into(), + sequence_number, + self.network.chain_id.id, + GasScheduleConfig::CLI_DEFAULT_MAX_GAS_AMOUNT, + action, + ); + let tx = tx_data.sign(&self.kp); + let result = self.execute_as_result(tx)?; + Ok(result) + } + pub fn execute_l1_block_and_tx( &mut self, l1_block: L1BlockWithBody, diff --git a/crates/rooch-framework-tests/src/bitcoin_block_tester.rs b/crates/rooch-framework-tests/src/bitcoin_block_tester.rs index b305e87dab..4bd413a352 100644 --- a/crates/rooch-framework-tests/src/bitcoin_block_tester.rs +++ b/crates/rooch-framework-tests/src/bitcoin_block_tester.rs @@ -1,15 +1,16 @@ // Copyright (c) RoochNetwork // SPDX-License-Identifier: Apache-2.0 -use crate::binding_test::RustBindingTest; +use crate::{bbn_tx_loader::BBNStakingTxRecord, binding_test::RustBindingTest}; use anyhow::{anyhow, bail, ensure, Result}; use bitcoin::{hashes::Hash, Block, OutPoint, TxOut, Txid}; use framework_builder::stdlib_version::StdlibVersion; +use move_core_types::{account_address::AccountAddress, u256::U256, vm_status::KeptVMStatus}; use moveos_types::{ move_std::string::MoveString, moveos_std::{ - module_store::ModuleStore, object::ObjectMeta, simple_multimap::SimpleMultiMap, - timestamp::Timestamp, + event::Event, module_store::ModuleStore, object::ObjectMeta, + simple_multimap::SimpleMultiMap, timestamp::Timestamp, }, state::{MoveState, MoveStructType, MoveType, ObjectChange, ObjectState}, state_resolver::StateResolver, @@ -18,6 +19,10 @@ use rooch_ord::ord_client::Charm; use rooch_relayer::actor::bitcoin_client_proxy::BitcoinClientProxy; use rooch_types::{ bitcoin::{ + bbn::{ + self, BBNModule, BBNParsedV0StakingTx, BBNStakeSeal, BBNStakingEvent, + BBNStakingFailedEvent, + }, inscription_updater::{ InscriptionCreatedEvent, InscriptionTransferredEvent, InscriptionUpdaterEvent, }, @@ -29,7 +34,7 @@ use rooch_types::{ rooch_network::{BuiltinChainID, RoochNetwork}, transaction::L1BlockWithBody, }; -use serde::{Deserialize, Serialize}; +use serde::{de::DeserializeOwned, Deserialize, Serialize}; use std::{ collections::{BTreeSet, HashMap, HashSet}, path::{Path, PathBuf}, @@ -37,12 +42,34 @@ use std::{ }; use tracing::{debug, error, info, trace}; +#[derive(Debug)] +struct ExecutedBlockData { + block_data: BlockData, + events: Vec, +} + +impl ExecutedBlockData { + pub fn filter_events(&self) -> Vec { + self.events + .iter() + .filter_map(|event| { + if event.event_type == T::struct_tag() { + let event = bcs::from_bytes::(&event.event_data).unwrap(); + Some(event) + } else { + None + } + }) + .collect() + } +} + /// Execute Bitcoin block and test base a emulated environment /// We prepare the Block's previous dependencies and execute the block pub struct BitcoinBlockTester { genesis: BitcoinTesterGenesis, binding_test: RustBindingTest, - executed_block: Option, + executed_block: Option, } impl BitcoinBlockTester { @@ -77,6 +104,7 @@ impl BitcoinBlockTester { let mut binding_test = RustBindingTest::new_with_network(network)?; let root_changes = vec![utxo_store_change]; binding_test.apply_changes(root_changes)?; + binding_test.get_rgas(binding_test.sequencer, U256::from(100000000000000u64))?; Ok(Self { genesis, binding_test, @@ -94,6 +122,7 @@ impl BitcoinBlockTester { let l1_block = L1BlockWithBody::new_bitcoin_block(block_data.height, block_data.block.clone()); let results = self.binding_test.execute_l1_block_and_tx(l1_block)?; + let mut events = vec![]; for result in results { for event in result.output.events { if event.event_type == InscriptionCreatedEvent::struct_tag() { @@ -107,6 +136,8 @@ impl BitcoinBlockTester { .events_from_move .push(InscriptionUpdaterEvent::InscriptionTransferred(event)); } + + events.push(event); } } @@ -129,7 +160,7 @@ impl BitcoinBlockTester { block_data.events_from_ord.len(), block_data.expect_inscriptions.len() ); - self.executed_block = Some(block_data); + self.executed_block = Some(ExecutedBlockData { block_data, events }); Ok(()) } @@ -139,8 +170,8 @@ impl BitcoinBlockTester { "No block executed, please execute block first" ); let mut utxo_set = HashMap::::new(); - let block_data = self.executed_block.as_ref().unwrap(); - for tx in block_data.block.txdata.as_slice() { + let executed_block_data = self.executed_block.as_ref().unwrap(); + for tx in executed_block_data.block_data.block.txdata.as_slice() { let txid = tx.compute_txid(); for (index, tx_out) in tx.output.iter().enumerate() { let vout = index as u32; @@ -182,37 +213,38 @@ impl BitcoinBlockTester { utxo_state, tx_out ); + //TODO migrate to verify inscription. //Ensure every utxo's seals are correct let seals = utxo_state.seals; if !seals.is_empty() { - let inscription_obj_ids = seals - .borrow(&MoveString::from( - Inscription::type_tag().to_canonical_string(), - )) - .expect("Inscription seal not found"); - for inscription_obj_id in inscription_obj_ids { - let inscription_obj = self.binding_test.get_object(inscription_obj_id)?; - ensure!( - inscription_obj.is_some(), - "Missing inscription object: {:?}", - inscription_obj_id - ); - let inscription_obj = inscription_obj.unwrap(); - let inscription = inscription_obj.value_as::().map_err(|e| { - error!( - "Parse Inscription Error: {:?}, object meta: {:?}, object value: {}", - e, - inscription_obj.metadata, - hex::encode(&inscription_obj.value) + let inscription_obj_ids = seals.borrow(&MoveString::from( + Inscription::type_tag().to_canonical_string(), + )); + if let Some(inscription_obj_ids) = inscription_obj_ids { + for inscription_obj_id in inscription_obj_ids { + let inscription_obj = self.binding_test.get_object(inscription_obj_id)?; + ensure!( + inscription_obj.is_some(), + "Missing inscription object: {:?}", + inscription_obj_id ); - e - })?; - ensure!( - inscription.location.outpoint == outpoint.into(), - "Inscription location not match: {:?}, {:?}", - inscription, - outpoint - ); + let inscription_obj = inscription_obj.unwrap(); + let inscription = inscription_obj.value_as::().map_err(|e| { + error!( + "Parse Inscription Error: {:?}, object meta: {:?}, object value: {}", + e, + inscription_obj.metadata, + hex::encode(&inscription_obj.value) + ); + e + })?; + ensure!( + inscription.location.outpoint == outpoint.into(), + "Inscription location not match: {:?}, {:?}", + inscription, + outpoint + ); + } } } } @@ -224,7 +256,7 @@ impl BitcoinBlockTester { self.executed_block.is_some(), "No block executed, please execute block first" ); - let block_data = self.executed_block.as_ref().unwrap(); + let block_data = &self.executed_block.as_ref().unwrap().block_data; info!( "verify {} inscriptions in block", block_data.expect_inscriptions.len() @@ -397,6 +429,169 @@ impl BitcoinBlockTester { Ok(()) } + pub fn execute_bbn_process(&mut self) -> Result<()> { + ensure!( + self.executed_block.is_some(), + "No block executed, please execute block first" + ); + let executed_block_data = self.executed_block.as_mut().unwrap(); + + for tx in executed_block_data.block_data.block.txdata.iter() { + let txid = tx.compute_txid(); + if BBNParsedV0StakingTx::is_possible_staking_tx(tx, &bbn::BBN_GLOBAL_PARAM_BBN1.tag) { + let function_call = BBNModule::create_process_bbn_tx_entry_call(txid)?; + let execute_result = self + .binding_test + .execute_function_call_via_sequencer(function_call)?; + debug!("BBN process result: {:?}", execute_result); + if execute_result.transaction_info.status != KeptVMStatus::Executed { + let op_return_data = bbn::try_get_bbn_op_return_ouput(&tx.output); + bail!( + "tx should success, txid: {:?}, status: {:?}, op_return_data from rust: {:?}", + txid, + execute_result.transaction_info.status, + op_return_data + ); + } + for event in execute_result.output.events { + executed_block_data.events.push(event); + } + } + } + + Ok(()) + } + + pub fn verify_bbn_stake(&self) -> Result<()> { + ensure!( + self.executed_block.is_some(), + "No block executed, please execute block first" + ); + + let executed_block_data = self.executed_block.as_ref().unwrap(); + + let bbn_staking_txs = executed_block_data + .block_data + .bbn_staking_records + .iter() + .map(|tx| (tx.txid().into_address(), tx.clone())) + .collect::>(); + + let bbn_staking_failed_events = + executed_block_data.filter_events::(); + let bbn_staking_events = executed_block_data.filter_events::(); + + info!( + "BBN staking txs: {}, staking failed events: {}, staking events: {}, total_events: {}", + bbn_staking_txs.len(), + bbn_staking_failed_events.len(), + bbn_staking_events.len(), + executed_block_data.events.len() + ); + + for event in &bbn_staking_failed_events { + debug!("Staking failed event: {:?}", event); + let txid = event.txid.into_address(); + ensure!( + !bbn_staking_txs.contains_key(&txid), + "Staking failed txid {:?} in event but also in staking txs from bbn indexer", + txid, + ); + } + + for (txid, _tx) in bbn_staking_txs.iter() { + let event = bbn_staking_events.iter().find(|event| event.txid == *txid); + ensure!( + event.is_some(), + "Staking txid {:?} in staking txs from bbn indexer but not in event", + txid, + ); + } + + for event in bbn_staking_events { + let stake_object_id = event.stake_object_id; + let txid = event.txid; + let bbn_staking_tx = bbn_staking_txs.get(&txid); + ensure!( + bbn_staking_tx.is_some(), + "Missing staking tx: {:?} in staking txs from bbn indexer", + txid + ); + + let bbn_staking_tx = bbn_staking_tx.unwrap(); + + let stake_obj = self.binding_test.get_object(&stake_object_id)?; + ensure!( + stake_obj.is_some(), + "Missing stake object: {:?}, staking tx: {:?}", + stake_object_id, + bbn_staking_tx + ); + let bbn_stake = stake_obj.unwrap().value_as::()?; + ensure!( + bbn_stake.staking_output_index == bbn_staking_tx.staking_output_index, + "Seal not match: {:?}, staking tx: {:?}", + bbn_stake, + bbn_staking_tx + ); + ensure!( + bbn_stake.staking_value == bbn_staking_tx.staking_value, + "Staking value not match: {:?}, staking tx: {:?}", + bbn_stake, + bbn_staking_tx + ); + ensure!( + bbn_stake.staking_time == bbn_staking_tx.staking_time, + "Staking time not match: {:?}, staking tx: {:?}", + bbn_stake, + bbn_staking_tx + ); + ensure!( + bbn_stake.staker_pub_key == bbn_staking_tx.staker_public_key(), + "Staker public key not match: {:?}, staking tx: {:?}", + bbn_stake, + bbn_staking_tx + ); + ensure!( + bbn_stake.finality_provider_pub_key + == bbn_staking_tx.finality_provider_public_key(), + "Finality provider public key not match: {:?}, staking tx: {:?}", + bbn_stake, + bbn_staking_tx + ); + + let staking_output_index = bbn_stake.staking_output_index; + let outpoint = rooch_types::bitcoin::types::OutPoint::new(txid, staking_output_index); + let utxo_object_id = utxo::derive_utxo_id(&outpoint); + let utxo_obj = self.binding_test.get_object(&utxo_object_id)?; + ensure!( + utxo_obj.is_some(), + "Missing utxo object: {:?} for staking tx: {:?}", + utxo_object_id, + bbn_staking_tx + ); + let utxo_obj = utxo_obj.unwrap(); + let utxo = utxo_obj.value_as::()?; + let seals = utxo.seals.borrow(&MoveString::from( + BBNStakeSeal::type_tag().to_canonical_string(), + )); + ensure!( + seals.is_some(), + "Missing seals in utxo: {:?}, staking tx: {:?}", + utxo, + bbn_staking_tx + ); + let seals = seals.unwrap(); + ensure!( + seals.contains(&stake_object_id), + "Missing seal object id in utxo: {:?}, staking tx: {:?}", + utxo, + bbn_staking_tx + ); + } + Ok(()) + } + pub fn get_inscription(&self, inscription_id: &InscriptionID) -> Result> { let object_id = inscription_id.object_id(); self.binding_test.get_object(&object_id) @@ -410,6 +605,8 @@ pub struct BlockData { pub expect_inscriptions: BTreeSet, pub events_from_ord: Vec, pub events_from_move: Vec, + #[serde(default)] + pub bbn_staking_records: Vec, } #[derive(Debug, Serialize, Deserialize)] @@ -439,7 +636,8 @@ impl BitcoinTesterGenesis { pub struct TesterGenesisBuilder { bitcoin_client: BitcoinClientProxy, - ord_event_dir: PathBuf, + ord_event_dir: Option, + bbn_staking_tx_csv: Option, blocks: Vec, block_txids: HashSet, utxo_store_change: ObjectChange, @@ -448,11 +646,13 @@ pub struct TesterGenesisBuilder { impl TesterGenesisBuilder { pub fn new>( bitcoin_client: BitcoinClientProxy, - ord_event_dir: P, + ord_event_dir: Option

, + bbn_staking_tx_csv: Option

, ) -> Result { Ok(Self { bitcoin_client, - ord_event_dir: ord_event_dir.as_ref().to_path_buf(), + ord_event_dir: ord_event_dir.map(|p| p.as_ref().to_path_buf()), + bbn_staking_tx_csv: bbn_staking_tx_csv.map(|p| p.as_ref().to_path_buf()), blocks: vec![], block_txids: HashSet::new(), utxo_store_change: ObjectChange::meta(BitcoinUTXOStore::genesis_object().metadata), @@ -476,14 +676,34 @@ impl TesterGenesisBuilder { block_header_result.height ); } - let ord_events = rooch_ord::event::load_events( - self.ord_event_dir.join(format!("{}.blk", block_height)), - )?; - info!( - "Load ord events: {} in block {}", - ord_events.len(), - block_height - ); + let ord_events = match &self.ord_event_dir { + None => vec![], + Some(ord_event_dir) => { + let ord_events = rooch_ord::event::load_events( + ord_event_dir.join(format!("{}.blk", block_height)), + )?; + info!( + "Load ord events: {} in block {}", + ord_events.len(), + block_height + ); + ord_events + } + }; + + let bbn_staking_records = match &self.bbn_staking_tx_csv { + None => vec![], + Some(bbn_staking_tx_csv) => { + let bbn_staking_txs = + BBNStakingTxRecord::load_bbn_staking_txs(bbn_staking_tx_csv, block_height)?; + info!( + "Load bbn staking txs: {} in block {}", + bbn_staking_txs.len(), + block_height + ); + bbn_staking_txs + } + }; for tx in &block.txdata { self.block_txids.insert(tx.compute_txid()); @@ -559,6 +779,7 @@ impl TesterGenesisBuilder { expect_inscriptions: BTreeSet::new(), events_from_ord: ord_events, events_from_move: vec![], + bbn_staking_records, }); Ok(self) } diff --git a/crates/rooch-framework-tests/src/lib.rs b/crates/rooch-framework-tests/src/lib.rs index 4f09aa68a4..2cdab8f023 100644 --- a/crates/rooch-framework-tests/src/lib.rs +++ b/crates/rooch-framework-tests/src/lib.rs @@ -1,6 +1,7 @@ // Copyright (c) RoochNetwork // SPDX-License-Identifier: Apache-2.0 +mod bbn_tx_loader; pub mod binding_test; pub mod bitcoin_block_tester; #[cfg(test)] diff --git a/crates/rooch-framework-tests/src/main.rs b/crates/rooch-framework-tests/src/main.rs index 4e3f1df404..fb63c1e195 100644 --- a/crates/rooch-framework-tests/src/main.rs +++ b/crates/rooch-framework-tests/src/main.rs @@ -29,7 +29,12 @@ struct TestBuilderOpts { pub btc_rpc_password: String, #[clap(long, id = "ord-events-dir")] - pub ord_events_dir: PathBuf, + pub ord_events_dir: Option, + + /// The csv file of bbn staking tx + /// Export the csv file via https://github.com/babylonlabs-io/staking-indexer + #[clap(long, id = "bbn-staking-tx-csv")] + pub bbn_staking_tx_csv: Option, /// Block heights to execute #[clap(long, id = "blocks")] @@ -50,7 +55,11 @@ async fn main() -> Result<()> { .into_actor(Some("bitcoin_client_for_rpc_service"), &actor_system) .await?; let bitcoin_client_proxy = BitcoinClientProxy::new(bitcoin_client_actor_ref.into()); - let mut builder = TesterGenesisBuilder::new(bitcoin_client_proxy, opts.ord_events_dir)?; + let mut builder = TesterGenesisBuilder::new( + bitcoin_client_proxy, + opts.ord_events_dir, + opts.bbn_staking_tx_csv, + )?; let mut blocks = opts.blocks; blocks.sort(); for block in blocks { diff --git a/crates/rooch-framework-tests/src/tests/bbn_test.rs b/crates/rooch-framework-tests/src/tests/bbn_test.rs index 8614dfccdd..36b4611118 100644 --- a/crates/rooch-framework-tests/src/tests/bbn_test.rs +++ b/crates/rooch-framework-tests/src/tests/bbn_test.rs @@ -5,11 +5,15 @@ use crate::{ binding_test, bitcoin_block_tester::BitcoinBlockTester, tests::bitcoin_data::bitcoin_tx_from_hex, }; -use moveos_types::{module_binding::MoveFunctionCaller, state_resolver::StateResolver}; -use rooch_types::bitcoin::bbn::{BBNGlobalParams, BBNStakingInfo}; +use moveos_types::{ + module_binding::MoveFunctionCaller, moveos_std::object::DynamicField, state::FieldKey, + state_resolver::StateResolver, +}; +use rooch_types::bitcoin::bbn::{BBNGlobalParamV1, BBNGlobalParams, BBNStakingInfo}; use tracing::{debug, warn}; // Test Babylon v3 transaction +//cargo run -p rooch-framework-tests -- --btc-rpc-url http://localhost:8332 --btc-rpc-username your_username --btc-rpc-password your_pwd --blocks 864790 --bbn-staking-tx-csv /path/to/bbn_staking_tx.csv #[tokio::test] async fn test_block_864790() { let _ = tracing_subscriber::fmt::try_init(); @@ -21,8 +25,10 @@ async fn test_block_864790() { let mut tester = BitcoinBlockTester::new(864790).unwrap(); tester.execute().unwrap(); + tester.execute_bbn_process().unwrap(); + tester.verify_utxo().unwrap(); - //TODO verify bbn tx + tester.verify_bbn_stake().unwrap(); } #[tokio::test] @@ -43,13 +49,19 @@ async fn test_bbn_tx() { let op_return_output = op_return_output_opt.unwrap(); debug!("op_return_output: {:?}", op_return_output); assert_eq!(op_return_output.op_return_output_idx, 1); - let bbn_global_params = binding_test - .get_object(&BBNGlobalParams::object_id()) + + let field_opt = binding_test + .get_field( + &BBNGlobalParams::object_id(), + &FieldKey::derive(&1u64).unwrap(), + ) + .unwrap(); + assert!(field_opt.is_some()); + let bbn_global_param = field_opt .unwrap() + .value_as::>() .unwrap() - .value_as::() - .unwrap(); - let bbn_global_param = bbn_global_params.get_global_param(1).unwrap(); + .value; let staking_info = BBNStakingInfo::build_staking_info( &op_return_output.op_return_data.staker_pub_key().unwrap(), &[op_return_output diff --git a/crates/rooch-framework-tests/src/tests/bitcoin_tester_test.rs b/crates/rooch-framework-tests/src/tests/bitcoin_tester_test.rs index 04cf1f30c9..8e32ec36d3 100644 --- a/crates/rooch-framework-tests/src/tests/bitcoin_tester_test.rs +++ b/crates/rooch-framework-tests/src/tests/bitcoin_tester_test.rs @@ -7,6 +7,7 @@ use std::str::FromStr; use tracing::{debug, warn}; // This test for testing BitcoinBlockTester +#[ignore = "the tester genesis need to be updated"] #[tokio::test] async fn test_block_100000() { let _ = tracing_subscriber::fmt::try_init(); @@ -19,11 +20,12 @@ async fn test_block_100000() { // Some testcase in the issue // https://github.com/rooch-network/rooch/issues/1985 -// cargo run -p rooch-framework-tests -- --btc-rpc-url http://localhost:9332 --btc-rpc-username your_username --btc-rpc-password your_pwd --blocks 790964 --blocks 855396 +// cargo run -p rooch-framework-tests -- --btc-rpc-url http://localhost:8332 --btc-rpc-username your_username --btc-rpc-password your_pwd --blocks 790964 --blocks 855396 // This test contains two block: 790964 and 855396 // The inscription 8706753 inscribed in block 790964 and spend as fee in block 855396 // https://ordiscan.com/inscription/8706753 // https://ordinals.com/inscription/8706753 +#[ignore = "the tester genesis need to be updated"] #[tokio::test] async fn test_block_790964() { let _ = tracing_subscriber::fmt::try_init(); @@ -72,6 +74,7 @@ async fn test_block_790964() { ); } +#[ignore = "the tester genesis need to be updated"] #[tokio::test] async fn test_block_781735() { let _ = tracing_subscriber::fmt::try_init(); @@ -104,6 +107,7 @@ async fn test_block_781735() { //Inscription use pointer to set the offset, and mint multi inscription in one input. //https://ordinals.com/tx/6ea3bf728b34c8c01ba4703e00ad688be100599b92fbdac71e6aea6ad8355552 +#[ignore = "the tester genesis need to be updated"] #[tokio::test] async fn test_block_832918() { let _ = tracing_subscriber::fmt::try_init(); @@ -121,6 +125,7 @@ async fn test_block_832918() { // Inscription inscribe and transfer in same tx // https://ordinals.com/tx/207322afdcca902cb36aeb674214dc5f80f9593f12c1de57830ad33adae46a0a +#[ignore = "the tester genesis need to be updated"] #[tokio::test] async fn test_block_794970() { let _ = tracing_subscriber::fmt::try_init(); diff --git a/crates/rooch-framework-tests/tester/864790.tester.genesis b/crates/rooch-framework-tests/tester/864790.tester.genesis index b750dd0c99607d06052849f3fb0c7e801bf93894..435ed368e8e9c7976751af7604db89976150d45e 100644 GIT binary patch delta 74176 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 R*yj_UPycxS=(F#>`43$-e=z_6 delta 123 zcmWN=yA6U+0EW?AK@k;S_yk1+6{ewelUrMSiHSqlSXfYzXjsCb{7-V;kC&-`Pjkc2 z!NH|V505@R1BQ$U7&BqYj5#3-maJH_`E0+}dt)Pwb*Fnx^q{F8HPc*Ade(~;ZDUJY F{Q=0PFXjLM diff --git a/crates/rooch-types/src/bitcoin/bbn.rs b/crates/rooch-types/src/bitcoin/bbn.rs index b0c9b7aabd..f58f5faebf 100644 --- a/crates/rooch-types/src/bitcoin/bbn.rs +++ b/crates/rooch-types/src/bitcoin/bbn.rs @@ -30,6 +30,7 @@ use moveos_types::{ }; use once_cell::sync::Lazy; use serde::{Deserialize, Serialize}; +use std::fmt; use std::str::FromStr; pub const MODULE_NAME: &IdentStr = ident_str!("bbn"); @@ -65,10 +66,9 @@ pub const V0_OP_RETURN_DATA_SIZE: usize = 71; // "min_staking_time": 64000, // "confirmation_depth": 10 // } -pub static BBN_GLOBAL_PARAM_BBN1: Lazy = Lazy::new(|| BBNGlobalParam { +pub static BBN_GLOBAL_PARAM_BBN1: Lazy = Lazy::new(|| BBNGlobalParamV1 { version: 1, activation_height: 864790, - staking_cap: 0, cap_height: 864799, tag: hex::decode("62626e31").unwrap(), covenant_pks: vec![ @@ -94,7 +94,7 @@ pub static BBN_GLOBAL_PARAM_BBN1: Lazy = Lazy::new(|| BBNGlobalP #[derive(Debug, Clone, Serialize, Deserialize)] pub struct BBNGlobalParams { - pub bbn_global_param: Vec, + pub max_version: u64, } impl MoveStructType for BBNGlobalParams { @@ -105,29 +105,20 @@ impl MoveStructType for BBNGlobalParams { impl MoveStructState for BBNGlobalParams { fn struct_layout() -> MoveStructLayout { - MoveStructLayout::new(vec![MoveTypeLayout::Vector(Box::new( - BBNGlobalParam::type_layout(), - ))]) + MoveStructLayout::new(vec![MoveTypeLayout::U64]) } } impl BBNGlobalParams { - pub fn get_global_param(&self, version: u64) -> Option<&BBNGlobalParam> { - self.bbn_global_param - .iter() - .find(|param| param.version == version) - } - pub fn object_id() -> ObjectID { object::named_object_id(&Self::struct_tag()) } } #[derive(Debug, Clone, Serialize, Deserialize)] -pub struct BBNGlobalParam { +pub struct BBNGlobalParamV1 { pub version: u64, pub activation_height: u64, - pub staking_cap: u64, pub cap_height: u64, pub tag: Vec, pub covenant_pks: Vec>, @@ -141,13 +132,13 @@ pub struct BBNGlobalParam { pub confirmation_depth: u16, } -impl MoveStructType for BBNGlobalParam { +impl MoveStructType for BBNGlobalParamV1 { const MODULE_NAME: &'static IdentStr = MODULE_NAME; - const STRUCT_NAME: &'static IdentStr = ident_str!("BBNGlobalParam"); + const STRUCT_NAME: &'static IdentStr = ident_str!("BBNGlobalParamV1"); const ADDRESS: AccountAddress = BITCOIN_MOVE_ADDRESS; } -impl MoveStructState for BBNGlobalParam { +impl MoveStructState for BBNGlobalParamV1 { fn struct_layout() -> MoveStructLayout { MoveStructLayout::new(vec![ MoveTypeLayout::U64, @@ -170,7 +161,7 @@ impl MoveStructState for BBNGlobalParam { } } -impl BBNGlobalParam { +impl BBNGlobalParamV1 { pub fn get_covenant_pks(&self) -> Vec { self.covenant_pks .iter() @@ -186,14 +177,14 @@ pub struct BBNStakeSeal { /// The stake transaction hash pub txid: AccountAddress, /// The stake utxo output index - pub vout: u32, + pub staking_output_index: u32, pub tag: Vec, pub staker_pub_key: Vec, pub finality_provider_pub_key: Vec, /// The stake time in block count pub staking_time: u16, - /// The stake amount in satoshi - pub staking_amount: u64, + /// The stake value amount in satoshi + pub staking_value: u64, } impl MoveStructType for BBNStakeSeal { @@ -217,7 +208,7 @@ impl MoveStructState for BBNStakeSeal { } } -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Clone, Serialize, Deserialize)] pub struct BBNV0OpReturnData { pub tag: Vec, pub version: u8, @@ -226,6 +217,21 @@ pub struct BBNV0OpReturnData { pub staking_time: u16, } +impl fmt::Debug for BBNV0OpReturnData { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("BBNV0OpReturnData") + .field("tag", &hex::encode(&self.tag)) + .field("version", &self.version) + .field("staker_pub_key", &hex::encode(&self.staker_pub_key)) + .field( + "finality_provider_pub_key", + &hex::encode(&self.finality_provider_pub_key), + ) + .field("staking_time", &self.staking_time) + .finish() + } +} + impl MoveStructType for BBNV0OpReturnData { const MODULE_NAME: &'static IdentStr = MODULE_NAME; const STRUCT_NAME: &'static IdentStr = ident_str!("BBNV0OpReturnData"); @@ -276,6 +282,53 @@ impl MoveStructState for BBNV0OpReturnOutput { } } +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct BBNStakingEvent { + pub block_height: u64, + pub txid: AccountAddress, + /// BBNStakeSeal object id + pub stake_object_id: ObjectID, +} + +impl MoveStructType for BBNStakingEvent { + const MODULE_NAME: &'static IdentStr = MODULE_NAME; + const STRUCT_NAME: &'static IdentStr = ident_str!("BBNStakingEvent"); + const ADDRESS: AccountAddress = BITCOIN_MOVE_ADDRESS; +} + +impl MoveStructState for BBNStakingEvent { + fn struct_layout() -> MoveStructLayout { + MoveStructLayout::new(vec![ + MoveTypeLayout::U64, + MoveTypeLayout::Address, + ObjectID::type_layout(), + ]) + } +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct BBNStakingFailedEvent { + pub block_height: u64, + pub txid: AccountAddress, + pub error: String, +} + +impl MoveStructType for BBNStakingFailedEvent { + const MODULE_NAME: &'static IdentStr = MODULE_NAME; + const STRUCT_NAME: &'static IdentStr = ident_str!("BBNStakingFailedEvent"); + const ADDRESS: AccountAddress = BITCOIN_MOVE_ADDRESS; +} + +impl MoveStructState for BBNStakingFailedEvent { + fn struct_layout() -> MoveStructLayout { + MoveStructLayout::new(vec![ + MoveTypeLayout::U64, + MoveTypeLayout::Address, + MoveTypeLayout::Vector(Box::new(MoveTypeLayout::U8)), + ]) + } +} + /// Rust bindings for BitcoinMove bitcoin module pub struct BBNModule<'a> { caller: &'a dyn MoveFunctionCaller, @@ -362,7 +415,7 @@ impl<'a> BBNModule<'a> { Ok(is_bbn_tx) } - pub fn create_process_bbn_tx_entry_call(&self, txid: Txid) -> Result { + pub fn create_process_bbn_tx_entry_call(txid: Txid) -> Result { Ok(Self::create_function_call( Self::PROCESS_BBN_TX_ENTRY_FUNCTION_NAME, vec![], @@ -395,6 +448,7 @@ const UNSPENDABLE_KEY_PATH: &str = static UNSPENDABLE_KEY_PATH_KEY: Lazy = Lazy::new(|| XOnlyPublicKey::from(PublicKey::from_str(UNSPENDABLE_KEY_PATH).unwrap())); +#[derive(Debug, Clone)] pub struct BBNParsedV0StakingTx { pub staking_output: TxOut, pub staking_output_idx: u32, @@ -773,7 +827,7 @@ fn parse_bbn_op_return_data(script: &Script) -> Result { }) } -fn try_get_bbn_op_return_ouput(outputs: &[TxOut]) -> Option { +pub fn try_get_bbn_op_return_ouput(outputs: &[TxOut]) -> Option { let mut result: Option = None; for (vout, output) in outputs.iter().enumerate() { if output.script_pubkey.is_op_return() { @@ -997,4 +1051,20 @@ mod tests { Amount::from_sat(30000400000) ); } + + //https://github.com/babylonlabs-io/staking-indexer/issues/26 + #[test] + fn test_parse_tx2() { + //https://mempool.space/tx/2aeeddb97b138ea622d9194818fa2fa3d8432125032ac1aec32461ae91d80b78 + let tx: Transaction = deserialize(&hex::decode("02000000000101a9f4558e50f0dcac3a624e806f38822bb5b83b02de946c2c2d5dac9b07843b99000000000046ffffff0284344c0000000000225120db09240cf52111e39179e50f5cf6c910a5478659ef94c29d668ebb9f469475450000000000000000496a4762626e3100d3d09d91bab234a9d21bf3c98092e82aec525caf67566edace08918408819689b3a838cbf2e61f2ecadf9f5924710e66dcf8212545884853073fe62c5ff5b949fa00014061a5eada8df8f5f3ce00f4389682530d268917f71631ad412a3d7c651342739033a868d4be039bb4dd0bc7c7ef5dada8c6a47171b07532a416fe2478be34303100000000").unwrap()).unwrap(); + let params = BBN_GLOBAL_PARAM_BBN1.clone(); + let expected_tag = ¶ms.tag; + let covenant_keys = params.get_covenant_pks(); + let covenant_quorum = params.covenant_quorum; + let _parsed_staking_tx = + BBNParsedV0StakingTx::parse_from_tx(&tx, expected_tag, &covenant_keys, covenant_quorum) + .unwrap(); + // println!("tx lock time: {}", tx.lock_time); + // println!("parsed_staking_tx: {:?}", parsed_staking_tx); + } } diff --git a/crates/rooch-types/src/framework/auth_payload.rs b/crates/rooch-types/src/framework/auth_payload.rs index 52cfb282b2..bcd9c43c24 100644 --- a/crates/rooch-types/src/framework/auth_payload.rs +++ b/crates/rooch-types/src/framework/auth_payload.rs @@ -224,7 +224,7 @@ pub struct MultisignAuthPayload { impl MultisignAuthPayload { pub fn build_multisig_payload(mut payloads: Vec) -> Result { - ensure!(payloads.len() > 1, "At least two signatures are required"); + ensure!(!payloads.is_empty(), "At least one signatures are required"); let first_payload = payloads.remove(0); let message_prefix = first_payload.message_prefix.clone(); let message_info = first_payload.message_info.clone(); diff --git a/frameworks/bitcoin-move/doc/bbn.md b/frameworks/bitcoin-move/doc/bbn.md index be4be2ec04..806dad7b0f 100644 --- a/frameworks/bitcoin-move/doc/bbn.md +++ b/frameworks/bitcoin-move/doc/bbn.md @@ -5,12 +5,15 @@ -- [Struct `BBNGlobalParam`](#0x4_bbn_BBNGlobalParam) +- [Struct `BBNGlobalParamV0`](#0x4_bbn_BBNGlobalParamV0) +- [Struct `BBNGlobalParamV1`](#0x4_bbn_BBNGlobalParamV1) - [Resource `BBNGlobalParams`](#0x4_bbn_BBNGlobalParams) - [Struct `BBNOpReturnOutput`](#0x4_bbn_BBNOpReturnOutput) - [Struct `BBNV0OpReturnData`](#0x4_bbn_BBNV0OpReturnData) - [Resource `BBNStakeSeal`](#0x4_bbn_BBNStakeSeal) - [Struct `BBNScriptPaths`](#0x4_bbn_BBNScriptPaths) +- [Struct `BBNStakingEvent`](#0x4_bbn_BBNStakingEvent) +- [Struct `BBNStakingFailedEvent`](#0x4_bbn_BBNStakingFailedEvent) - [Constants](#@Constants_0) - [Function `genesis_init`](#0x4_bbn_genesis_init) - [Function `init_for_upgrade`](#0x4_bbn_init_for_upgrade) @@ -23,13 +26,13 @@ - [Function `remove_temp_state`](#0x4_bbn_remove_temp_state) - [Function `block_height`](#0x4_bbn_block_height) - [Function `txid`](#0x4_bbn_txid) -- [Function `vout`](#0x4_bbn_vout) +- [Function `staking_output_index`](#0x4_bbn_staking_output_index) - [Function `outpoint`](#0x4_bbn_outpoint) - [Function `tag`](#0x4_bbn_tag) - [Function `staker_pub_key`](#0x4_bbn_staker_pub_key) - [Function `finality_provider_pub_key`](#0x4_bbn_finality_provider_pub_key) - [Function `staking_time`](#0x4_bbn_staking_time) -- [Function `staking_amount`](#0x4_bbn_staking_amount) +- [Function `staking_value`](#0x4_bbn_staking_value) - [Function `is_expired`](#0x4_bbn_is_expired) @@ -37,6 +40,7 @@ use 0x1::string; use 0x1::vector; use 0x2::bcs; +use 0x2::event; use 0x2::object; use 0x2::result; use 0x2::sort; @@ -53,13 +57,24 @@ - + -## Struct `BBNGlobalParam` +## Struct `BBNGlobalParamV0` -

struct BBNGlobalParam has copy, drop, store
+
struct BBNGlobalParamV0 has copy, drop, store
+

+
+
+
+
+
+## Struct `BBNGlobalParamV1`
+
+
+
+
struct BBNGlobalParamV1 has copy, drop, store
 

 
 
@@ -119,6 +134,28 @@
 
 
 
+
+
+## Struct `BBNStakingEvent`
+
+
+
+
struct BBNStakingEvent has copy, drop, store
+

+
+
+
+
+
+## Struct `BBNStakingFailedEvent`
+
+
+
+
struct BBNStakingFailedEvent has copy, drop, store
+

+
+
+
 
 
 ## Constants
@@ -232,6 +269,15 @@
 
 
 
+
+
+
+
+
const ErrorOutBlockRange: u64 = 15;
+

+
+
+
 
 
 
@@ -294,6 +340,8 @@
 
 ## Function `is_possible_bbn_tx`
 
+Check if the transaction is a possible Babylon transaction
+If the transaction contains an OP_RETURN output with the correct tag, it is considered a possible Babylon transaction
 
 
 
public fun is_possible_bbn_tx(txid: address): bool
@@ -392,13 +440,13 @@
 
 
 
-
+
 
-## Function `vout`
+## Function `staking_output_index`
 
 
 
-
public fun vout(stake: &bbn::BBNStakeSeal): u32
+
public fun staking_output_index(stake: &bbn::BBNStakeSeal): u32
 

 
 
@@ -458,13 +506,13 @@
 
 
 
-
+
 
-## Function `staking_amount`
+## Function `staking_value`
 
 
 
-
public fun staking_amount(stake: &bbn::BBNStakeSeal): u64
+
public fun staking_value(stake: &bbn::BBNStakeSeal): u64
 

 
 
diff --git a/frameworks/bitcoin-move/sources/bbn.move b/frameworks/bitcoin-move/sources/bbn.move
index 21ab3889c1..db6da82f2d 100644
--- a/frameworks/bitcoin-move/sources/bbn.move
+++ b/frameworks/bitcoin-move/sources/bbn.move
@@ -7,11 +7,13 @@ module bitcoin_move::bbn {
     use std::option::{Option, is_none, is_some, none, some};
     use std::vector;
     use std::vector::{length, borrow};
-    use moveos_std::object::{Self, Object};
+    use std::string::String;
+    use moveos_std::object::{Self, Object, ObjectID};
     use moveos_std::type_info;
     use moveos_std::bcs;
-    use moveos_std::result;
+    use moveos_std::result::{Self, Result, err_str, ok, is_err, as_err};
     use moveos_std::sort;
+    use moveos_std::event;
     use bitcoin_move::bitcoin;
     use bitcoin_move::types;
     use bitcoin_move::utxo;
@@ -20,7 +22,6 @@ module bitcoin_move::bbn {
     use bitcoin_move::types::{
         Transaction,
         txout_value,
-        tx_lock_time,
         txout_script_pubkey,
         TxOut
     };
@@ -51,12 +52,28 @@ module bitcoin_move::bbn {
     const ErrorFailedToFinalizeTaproot: u64 = 12;
     const ErrorUTXOAlreadySealed: u64 = 13;
     const ErrorNoBabylonStakingOutput: u64 = 14;
+    const ErrorOutBlockRange: u64 = 15;
 
     //https://github.com/babylonlabs-io/networks/blob/28651b301bb2efa0542b2268793948bcda472a56/parameters/parser/ParamsParser.go#L117
-    struct BBNGlobalParam has copy, drop, store {
+    struct BBNGlobalParamV0 has copy, drop, store {
         version: u64,
         activation_height: u64,
         staking_cap: u64,
+        tag: vector,
+        covenant_pks: vector>,
+        covenant_quorum: u32,
+        unbonding_time: u16,
+        unbonding_fee: u64,
+        max_staking_amount: u64,
+        min_staking_amount: u64,
+        min_staking_time: u16,
+        max_staking_time: u16,
+        confirmation_depth: u16
+    }
+
+    struct BBNGlobalParamV1 has copy, drop, store {
+        version: u64,
+        activation_height: u64,
         cap_height: u64,
         tag: vector,
         covenant_pks: vector>,
@@ -71,7 +88,7 @@ module bitcoin_move::bbn {
     }
 
     struct BBNGlobalParams has key {
-        bbn_global_param: vector
+        max_version: u64,
     }
 
     struct BBNOpReturnOutput has copy, store, drop {
@@ -93,14 +110,14 @@ module bitcoin_move::bbn {
         /// The stake transaction hash
         txid: address,
         /// The stake utxo output index
-        vout: u32,
+        staking_output_index: u32,
         tag: vector,
         staker_pub_key: vector,
         finality_provider_pub_key: vector,
         /// The stake time in block count
         staking_time: u16,
         /// The stake amount in satoshi
-        staking_amount: u64,
+        staking_value: u64,
     }
 
     struct BBNScriptPaths has store, copy, drop {
@@ -109,38 +126,107 @@ module bitcoin_move::bbn {
         slashing_path_script: ScriptBuf,
     }
 
+    struct BBNStakingEvent has store, copy, drop{
+        block_height: u64,
+        txid: address,
+        /// BBNStakeSeal object id
+        stake_object_id: ObjectID,
+    }
+
+    struct BBNStakingFailedEvent has store, copy, drop{
+        block_height: u64,
+        txid: address,
+        error: String,
+    }
+
     //https://github.com/babylonlabs-io/networks/blob/main/bbn-1/parameters/global-params.json
     // {
-    //     "version": 1,
-    //     "activation_height": 864790,
-    //     "cap_height": 864799,
-    //     "tag": "62626e31",
-    //     "covenant_pks": [
-    //         "03d45c70d28f169e1f0c7f4a78e2bc73497afe585b70aa897955989068f3350aaa",
-    //         "034b15848e495a3a62283daaadb3f458a00859fe48e321f0121ebabbdd6698f9fa",
-    //         "0223b29f89b45f4af41588dcaf0ca572ada32872a88224f311373917f1b37d08d1",
-    //         "02d3c79b99ac4d265c2f97ac11e3232c07a598b020cf56c6f055472c893c0967ae",
-    //         "038242640732773249312c47ca7bdb50ca79f15f2ecc32b9c83ceebba44fb74df7",
-    //         "03e36200aaa8dce9453567bba108bdc51f7f1174b97a65e4dc4402fc5de779d41c",
-    //         "03cbdd028cfe32c1c1f2d84bfec71e19f92df509bba7b8ad31ca6c1a134fe09204",
-    //         "03f178fcce82f95c524b53b077e6180bd2d779a9057fdff4255a0af95af918cee0",
-    //         "03de13fc96ea6899acbdc5db3afaa683f62fe35b60ff6eb723dad28a11d2b12f8c"
-    //     ],
-    //     "covenant_quorum": 6,
-    //     "unbonding_time": 1008,
-    //     "unbonding_fee": 32000,
-    //     "max_staking_amount": 50000000000,
-    //     "min_staking_amount": 500000,
-    //     "max_staking_time": 64000,
-    //     "min_staking_time": 64000,
-    //     "confirmation_depth": 10
+    //     "versions": [
+    //         {
+    //             "version": 0,
+    //             "activation_height": 857910,
+    //             "staking_cap": 100000000000,
+    //             "tag": "62626e31",
+    //             "covenant_pks": [
+    //                 "03d45c70d28f169e1f0c7f4a78e2bc73497afe585b70aa897955989068f3350aaa",
+    //                 "034b15848e495a3a62283daaadb3f458a00859fe48e321f0121ebabbdd6698f9fa",
+    //                 "0223b29f89b45f4af41588dcaf0ca572ada32872a88224f311373917f1b37d08d1",
+    //                 "02d3c79b99ac4d265c2f97ac11e3232c07a598b020cf56c6f055472c893c0967ae",
+    //                 "038242640732773249312c47ca7bdb50ca79f15f2ecc32b9c83ceebba44fb74df7",
+    //                 "03e36200aaa8dce9453567bba108bdc51f7f1174b97a65e4dc4402fc5de779d41c",
+    //                 "03cbdd028cfe32c1c1f2d84bfec71e19f92df509bba7b8ad31ca6c1a134fe09204",
+    //                 "03f178fcce82f95c524b53b077e6180bd2d779a9057fdff4255a0af95af918cee0",
+    //                 "03de13fc96ea6899acbdc5db3afaa683f62fe35b60ff6eb723dad28a11d2b12f8c"
+    //             ],
+    //             "covenant_quorum": 6,
+    //             "unbonding_time": 1008,
+    //             "unbonding_fee": 64000,
+    //             "max_staking_amount": 5000000,
+    //             "min_staking_amount": 500000,
+    //             "max_staking_time": 64000,
+    //             "min_staking_time": 64000,
+    //             "confirmation_depth": 10
+    //         },
+    //         {
+    //             "version": 1,
+    //             "activation_height": 864790,
+    //             "cap_height": 864799,
+    //             "tag": "62626e31",
+    //             "covenant_pks": [
+    //                 "03d45c70d28f169e1f0c7f4a78e2bc73497afe585b70aa897955989068f3350aaa",
+    //                 "034b15848e495a3a62283daaadb3f458a00859fe48e321f0121ebabbdd6698f9fa",
+    //                 "0223b29f89b45f4af41588dcaf0ca572ada32872a88224f311373917f1b37d08d1",
+    //                 "02d3c79b99ac4d265c2f97ac11e3232c07a598b020cf56c6f055472c893c0967ae",
+    //                 "038242640732773249312c47ca7bdb50ca79f15f2ecc32b9c83ceebba44fb74df7",
+    //                 "03e36200aaa8dce9453567bba108bdc51f7f1174b97a65e4dc4402fc5de779d41c",
+    //                 "03cbdd028cfe32c1c1f2d84bfec71e19f92df509bba7b8ad31ca6c1a134fe09204",
+    //                 "03f178fcce82f95c524b53b077e6180bd2d779a9057fdff4255a0af95af918cee0",
+    //                 "03de13fc96ea6899acbdc5db3afaa683f62fe35b60ff6eb723dad28a11d2b12f8c"
+    //             ],
+    //             "covenant_quorum": 6,
+    //             "unbonding_time": 1008,
+    //             "unbonding_fee": 32000,
+    //             "max_staking_amount": 50000000000,
+    //             "min_staking_amount": 500000,
+    //             "max_staking_time": 64000,
+    //             "min_staking_time": 64000,
+    //             "confirmation_depth": 10
+    //         }
+    //     ]
     // }
     public(friend) fun genesis_init() {
+        //bbn-1 version 0
+        let bbn_global_param_0 = BBNGlobalParamV0 {
+            version: 0,
+            activation_height: 857910,
+            staking_cap: 100000000000,
+            //bbn1
+            tag: x"62626e31",
+            //we keep the x-only pubkey in the vector
+            covenant_pks: vector[
+                x"03d45c70d28f169e1f0c7f4a78e2bc73497afe585b70aa897955989068f3350aaa",
+                x"034b15848e495a3a62283daaadb3f458a00859fe48e321f0121ebabbdd6698f9fa",
+                x"0223b29f89b45f4af41588dcaf0ca572ada32872a88224f311373917f1b37d08d1",
+                x"02d3c79b99ac4d265c2f97ac11e3232c07a598b020cf56c6f055472c893c0967ae",
+                x"038242640732773249312c47ca7bdb50ca79f15f2ecc32b9c83ceebba44fb74df7",
+                x"03e36200aaa8dce9453567bba108bdc51f7f1174b97a65e4dc4402fc5de779d41c",
+                x"03cbdd028cfe32c1c1f2d84bfec71e19f92df509bba7b8ad31ca6c1a134fe09204",
+                x"03f178fcce82f95c524b53b077e6180bd2d779a9057fdff4255a0af95af918cee0",
+                x"03de13fc96ea6899acbdc5db3afaa683f62fe35b60ff6eb723dad28a11d2b12f8c"
+            ],
+            covenant_quorum: 6,
+            unbonding_time: 1008,
+            unbonding_fee: 64000,
+            max_staking_amount: 5000000,
+            min_staking_amount: 500000,
+            min_staking_time: 64000,
+            max_staking_time: 64000,
+            confirmation_depth: 10
+        };
         // bbn-1 version 1
-        let bbn_global_params_1 = BBNGlobalParam {
+        let bbn_global_params_1 = BBNGlobalParamV1 {
             version: 1,
             activation_height: 864790,
-            staking_cap: 0,
             cap_height: 864799,
             //bbn1
             tag: x"62626e31",
@@ -166,9 +252,11 @@ module bitcoin_move::bbn {
             confirmation_depth: 10
         };
         let obj =
-            object::new_named_object(
-                BBNGlobalParams { bbn_global_param: vector[bbn_global_params_1] }
-            );
+            object::new_named_object(BBNGlobalParams {
+                max_version: 1,
+        });
+        object::add_field(&mut obj, 0, bbn_global_param_0);
+        object::add_field(&mut obj, 1, bbn_global_params_1);
         object::to_shared(obj);
     }
 
@@ -179,38 +267,25 @@ module bitcoin_move::bbn {
     }
 
     fun new_bbn_stake_seal(
-        block_height: u64, txid: address, vout: u32, tag: vector, staker_pub_key: vector,
-        finality_provider_pub_key: vector, staking_time: u16, staking_amount: u64
+        block_height: u64, txid: address, staking_output_index: u32, tag: vector, staker_pub_key: vector,
+        finality_provider_pub_key: vector, staking_time: u16, staking_value: u64
     ): Object {
         object::new(BBNStakeSeal {
-            block_height: block_height,
-            txid: txid,
-            vout: vout,
-            tag: tag,
-            staker_pub_key: staker_pub_key,
-            finality_provider_pub_key: finality_provider_pub_key,
-            staking_time: staking_time,
-            staking_amount: staking_amount
+            block_height,
+            txid,
+            staking_output_index,
+            tag,
+            staker_pub_key,
+            finality_provider_pub_key,
+            staking_time,
+            staking_value
         })
     }
 
-    fun get_bbn_param(block_height: u64): Option {
+    fun get_bbn_param_v1(): &BBNGlobalParamV1 {
         let object_id = object::named_object_id();
-        let params = object::borrow(object::borrow_object(object_id));
-        let i = 0;
-        let len = length(¶ms.bbn_global_param);
-        while (i < len) {
-            let param = borrow(¶ms.bbn_global_param, i);
-            i = i + 1;
-            if (param.cap_height !=0 && block_height > param.cap_height) {
-                continue
-            };
-            if (block_height < param.activation_height) {
-                continue
-            };
-            return some(*param)
-        };
-        none()
+        let param_obj = object::borrow_object(object_id);
+        object::borrow_field(param_obj, 1)
     }
 
     fun try_get_bbn_op_return_ouput(tx_output: &vector): Option {
@@ -273,17 +348,21 @@ module bitcoin_move::bbn {
         try_get_bbn_staking_output(types::tx_output(&tx), &script_buf::new(staking_output_pk_script))
     }
 
+    /// Check if the transaction is a possible Babylon transaction
+    /// If the transaction contains an OP_RETURN output with the correct tag, it is considered a possible Babylon transaction
     public fun is_possible_bbn_tx(txid: address): bool {
         let block_height_opt = bitcoin::get_tx_height(txid);
         if (is_none(&block_height_opt)) {
             return false
         };
         let block_height = option::destroy_some(block_height_opt);
-        let param_opt = get_bbn_param(block_height);
-        if (is_none(¶m_opt)) {
+        let param = get_bbn_param_v1();
+        if (block_height < param.activation_height) {
+            return false
+        };
+        if (block_height > param.cap_height) {
             return false
         };
-        let param = option::destroy_some(param_opt);
         let tx_opt = bitcoin::get_tx(txid);
         if (is_none(&tx_opt)) {
             return false
@@ -295,28 +374,28 @@ module bitcoin_move::bbn {
             return false
         };
         let output = option::destroy_some(output_opt);
-        validate_bbn_op_return_data(¶m, &tx, &output.op_return_data)
+        if (output.op_return_data.tag != param.tag) {
+            return false
+        };
+        true 
     }
 
     public entry fun process_bbn_tx_entry(txid: address){
         process_bbn_tx(txid)
     }
 
-    fun validate_bbn_op_return_data(param: &BBNGlobalParam, tx: &Transaction, op_return_data: &BBNV0OpReturnData): bool {
+    fun validate_bbn_op_return_data(param: &BBNGlobalParamV1, op_return_data: &BBNV0OpReturnData): Result {
+        if (op_return_data.version != 0) {
+            return err_str(b"Invalid version")
+        };
         if (op_return_data.tag != param.tag) {
-            return false
+            return err_str(b"Invalid tag")
         };
         if (op_return_data.staking_time < param.min_staking_time
             || op_return_data.staking_time > param.max_staking_time) {
-            return false
-        };
-        if (!vector::contains(¶m.covenant_pks, &op_return_data.finality_provider_pub_key)) {
-            return false
-        };
-        if (tx_lock_time(tx) < (op_return_data.staking_time as u32)) {
-            return false
+            return err_str(b"Invalid staking time")
         };
-        true
+        ok(true)
     }
 
     fun process_bbn_tx(txid: address) {
@@ -324,9 +403,8 @@ module bitcoin_move::bbn {
         assert!(is_some(&block_height_opt), ErrorTransactionNotFound);
         let block_height = option::destroy_some(block_height_opt);
 
-        let param_opt = get_bbn_param(block_height);
-        assert!(is_some(¶m_opt), ErrorNotBabylonTx);
-        let param = option::destroy_some(param_opt);
+        let param = get_bbn_param_v1();
+        assert!(block_height >= param.activation_height && block_height <= param.cap_height, ErrorOutBlockRange);
 
         let tx_opt = bitcoin::get_tx(txid);
         assert!(is_some(&tx_opt), ErrorTransactionNotFound);
@@ -335,27 +413,59 @@ module bitcoin_move::bbn {
         let tx_output = types::tx_output(&tx);
 
         let op_return_output_opt = try_get_bbn_op_return_ouput(tx_output);
-        assert!(is_some(&op_return_output_opt), ErrorNoBabylonOpReturn);
+        assert!(is_some(&op_return_output_opt), ErrorNotBabylonTx);
         let op_return_output = option::destroy_some(op_return_output_opt);
         
-        let BBNOpReturnOutput{op_return_output_idx: _, op_return_data} = op_return_output;
+        let process_result = process_parsed_bbn_tx(param, txid, block_height, &tx, op_return_output);
+        if (is_err(&process_result)) {
+            let error = result::unwrap_err(process_result);
+            let event = BBNStakingFailedEvent {
+                block_height,
+                txid,
+                error
+            };
+            event::emit(event);
+        }else{
+            let stake_object_id = result::unwrap(process_result);
+            let event = BBNStakingEvent {
+                block_height,
+                txid,
+                stake_object_id
+            };
+            event::emit(event);
+        }
+    }
 
-        let valid = validate_bbn_op_return_data(¶m, &tx, &op_return_data);
+    fun process_parsed_bbn_tx(param: &BBNGlobalParamV1, txid: address, block_height: u64, tx: &Transaction, op_return_output: BBNOpReturnOutput): Result {
         
-        assert!(valid, ErrorInvalidBabylonOpReturn);
+        let BBNOpReturnOutput{op_return_output_idx: _, op_return_data} = op_return_output;
+        let valid_result = validate_bbn_op_return_data(param, &op_return_data);
+        
+        if (is_err(&valid_result)) {
+            return as_err(valid_result)
+        };
 
         let staking_output_pk_script = build_staking_tx_output_script_pubkey(
             op_return_data.staker_pub_key, vector::singleton(op_return_data.finality_provider_pub_key), param.covenant_pks, param.covenant_quorum, op_return_data.staking_time
         );
 
+        let tx_output = types::tx_output(tx);
         let staking_output_opt = try_get_bbn_staking_output(tx_output, &staking_output_pk_script);
-        assert!(is_some(&staking_output_opt), ErrorNoBabylonStakingOutput);
+        if (is_none(&staking_output_opt)) {
+            return err_str(b"Staking output not found")
+        };
+    
         let staking_output_idx = option::destroy_some(staking_output_opt);
         let staking_output = borrow(tx_output, (staking_output_idx as u64));
 
         let seal_protocol = type_info::type_name();
 
         let txout_value = txout_value(staking_output);
+
+        if(txout_value < param.min_staking_amount || txout_value > param.max_staking_amount){
+            return err_str(b"Invalid staking amount")
+        };
+
         let out_point = types::new_outpoint(txid, staking_output_idx);
         let utxo_obj = utxo::borrow_mut_utxo(out_point);
         let utxo = object::borrow_mut(utxo_obj);
@@ -373,6 +483,8 @@ module bitcoin_move::bbn {
         
         let seal = utxo::new_utxo_seal(seal_protocol, seal_object_id);
         utxo::add_seal_internal(utxo, seal);
+
+        return ok(seal_object_id)
     }
 
     fun pubkey_to_rooch_address(pubkey: &vector): address {
@@ -460,12 +572,12 @@ module bitcoin_move::bbn {
         stake.txid
     }
 
-    public fun vout(stake: &BBNStakeSeal): u32 {
-        stake.vout
+    public fun staking_output_index(stake: &BBNStakeSeal): u32 {
+        stake.staking_output_index
     }
 
     public fun outpoint(stake: &BBNStakeSeal): types::OutPoint {
-        types::new_outpoint(stake.txid, stake.vout)
+        types::new_outpoint(stake.txid, stake.staking_output_index)
     }
 
     public fun tag(stake: &BBNStakeSeal): &vector {
@@ -484,8 +596,8 @@ module bitcoin_move::bbn {
         stake.staking_time
     }
 
-    public fun staking_amount(stake: &BBNStakeSeal): u64 {
-        stake.staking_amount
+    public fun staking_value(stake: &BBNStakeSeal): u64 {
+        stake.staking_value
     }
 
     public fun is_expired(stake: &BBNStakeSeal): bool {
@@ -674,14 +786,12 @@ module bitcoin_move::bbn {
         let bbn_opreturn_data_opt = parse_bbn_op_return_data(&script_buf);
         let bbn_opreturn_data = option::destroy_some(bbn_opreturn_data_opt);
         let BBNV0OpReturnData{tag:_, version:_, staker_pub_key, finality_provider_pub_key, staking_time} = bbn_opreturn_data;
-        let params_opt = get_bbn_param(864790);
-        assert!(is_some(¶ms_opt), 1000);
-        let params = option::destroy_some(params_opt);
+        let param = get_bbn_param_v1();
         let sb = build_staking_tx_output_script_pubkey(
             staker_pub_key,
             vector::singleton(finality_provider_pub_key),
-            params.covenant_pks,
-            params.covenant_quorum,
+            param.covenant_pks,
+            param.covenant_quorum,
             staking_time
         );
         let result = script_buf::into_bytes(sb);