From d3a1e5a3ffa6cd8731e62c8737d3d6f06294a1ee Mon Sep 17 00:00:00 2001 From: Ranadeep Biswas Date: Tue, 7 May 2024 12:58:04 +0200 Subject: [PATCH] add DA fee sovereign-labs/sovereign-sdk-wip#572 --- mocks/src/relayer/builder.rs | 3 ++- mocks/src/relayer/handle/rollup.rs | 3 ++- mocks/src/sovereign/manual.rs | 3 ++- mocks/src/sovereign/rollup.rs | 5 +++-- mocks/src/sovereign/runner.rs | 8 ++++++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mocks/src/relayer/builder.rs b/mocks/src/relayer/builder.rs index 11058f70..38ee0b29 100644 --- a/mocks/src/relayer/builder.rs +++ b/mocks/src/relayer/builder.rs @@ -7,6 +7,7 @@ use sov_consensus_state_tracker::CelestiaService; use sov_consensus_state_tracker::HasConsensusState; #[cfg(feature = "mock-da")] use sov_consensus_state_tracker::MockDaService; +use sov_mock_da::MockFee; use sov_modules_api::{Context, Spec, WorkingSet}; use sov_prover_storage_manager::new_orphan_storage; use sov_rollup_interface::services::da::DaService; @@ -75,7 +76,7 @@ where pub async fn setup

(self) -> DefaultRelayer where S: Spec> + Send + Sync, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, P: MerkleProofSpec + Clone + 'static,

::Hasher: Send, diff --git a/mocks/src/relayer/handle/rollup.rs b/mocks/src/relayer/handle/rollup.rs index 159b5319..05f7b141 100644 --- a/mocks/src/relayer/handle/rollup.rs +++ b/mocks/src/relayer/handle/rollup.rs @@ -7,6 +7,7 @@ use ibc_core::host::ValidationContext; use ibc_query::core::channel::QueryPacketCommitmentRequest; use ibc_query::core::client::{QueryClientStateRequest, QueryConsensusStateRequest}; use sov_consensus_state_tracker::HasConsensusState; +use sov_mock_da::MockFee; use sov_modules_api::{Spec, WorkingSet}; use sov_rollup_interface::services::da::DaService; use sov_state::{MerkleProofSpec, ProverStorage}; @@ -20,7 +21,7 @@ use crate::utils::{wait_for_block, MutexUtil}; impl Handle for MockRollup where S: Spec> + Send + Sync, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, ::Spec: Clone, P: MerkleProofSpec + Clone + 'static, diff --git a/mocks/src/sovereign/manual.rs b/mocks/src/sovereign/manual.rs index 8034d974..323b54eb 100644 --- a/mocks/src/sovereign/manual.rs +++ b/mocks/src/sovereign/manual.rs @@ -21,6 +21,7 @@ use ibc_core::host::types::path::{ use ibc_core::host::{ExecutionContext, ValidationContext}; use sov_consensus_state_tracker::HasConsensusState; use sov_ibc::context::IbcContext; +use sov_mock_da::MockFee; use sov_modules_api::{Spec, StateCheckpoint}; use sov_rollup_interface::services::da::DaService; use sov_state::{MerkleProofSpec, ProverStorage}; @@ -31,7 +32,7 @@ use crate::cosmos::{dummy_tm_client_state, dummy_tm_consensus_state}; impl MockRollup where S: Spec> + Send + Sync, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, P: MerkleProofSpec + Clone + 'static,

::Hasher: Send, diff --git a/mocks/src/sovereign/rollup.rs b/mocks/src/sovereign/rollup.rs index 4e95a7e6..cc215f4c 100644 --- a/mocks/src/sovereign/rollup.rs +++ b/mocks/src/sovereign/rollup.rs @@ -14,6 +14,7 @@ use sov_consensus_state_tracker::{ConsensusStateTracker, HasConsensusState}; use sov_ibc::call::CallMessage as IbcCallMessage; use sov_ibc::context::IbcContext; use sov_kernels::basic::BasicKernel; +use sov_mock_da::MockFee; use sov_modules_api::{Context, Spec, WorkingSet}; use sov_rollup_interface::services::da::DaService; use sov_state::{MerkleProofSpec, ProverStorage, Storage}; @@ -30,7 +31,7 @@ type Mempool = Vec>; pub struct MockRollup where S: Spec, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, P: MerkleProofSpec, { @@ -47,7 +48,7 @@ where impl MockRollup where S: Spec> + Send + Sync, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, P: MerkleProofSpec + Clone + 'static,

::Hasher: Send, diff --git a/mocks/src/sovereign/runner.rs b/mocks/src/sovereign/runner.rs index 0bf6c123..61b32144 100644 --- a/mocks/src/sovereign/runner.rs +++ b/mocks/src/sovereign/runner.rs @@ -2,6 +2,7 @@ use std::time::Duration; use sov_consensus_state_tracker::HasConsensusState; +use sov_mock_da::MockFee; use sov_modules_api::runtime::capabilities::{Kernel, KernelSlotHooks}; use sov_modules_api::{ CallResponse, DispatchCall, Gas, GasMeter, Genesis, KernelWorkingSet, SlotData, Spec, @@ -21,7 +22,7 @@ use crate::utils::{wait_for_block, MutexUtil}; impl MockRollup where S: Spec> + Send + Sync, - Da: DaService + Clone, + Da: DaService + Clone, Da::Spec: HasConsensusState, P: MerkleProofSpec + Clone + 'static,

::Hasher: Send, @@ -59,7 +60,10 @@ where let height = loop { self.da_core.grow_blocks(pre_state_root.as_ref().to_vec()); // Dummy transaction to trigger the block generation - self.da_service().send_transaction(&[0; 32]).await.unwrap(); + self.da_service() + .send_transaction(&[0; 32], MockFee::zero()) + .await + .unwrap(); tokio::time::sleep(Duration::from_millis(100)).await; match self.da_service().get_last_finalized_block_header().await { Ok(header) => {