deps: bump sov revs

informalsystems · Dec 1, 2023 · 09ccc5e · 09ccc5e
1 parent 48c00b2
commit 09ccc5e
Show file tree

Hide file tree

Showing 15 changed files with 599 additions and 394 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,9 +41,10 @@ tendermint-proto      = { version = "0.34", default-features = false }
 tendermint-testgen    = { version = "0.34", default-features = false }
 
 # sovereign dependencies
-sov-bank              = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
-sov-chain-state       = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
-sov-modules-api       = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
-sov-modules-macros    = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
-sov-state             = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
-sov-rollup-interface  = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
+sov-bank              = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
+sov-chain-state       = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
+sov-modules-api       = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
+sov-modules-macros    = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
+sov-mock-da           = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
+sov-state             = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
+sov-rollup-interface  = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
diff --git a/mocks/Cargo.toml b/mocks/Cargo.toml
@@ -38,8 +38,9 @@ tendermint-testgen   = { workspace = true }
 sov-bank             = { workspace = true }
 sov-chain-state      = { workspace = true }
 sov-modules-api      = { workspace = true }
+sov-mock-da          = { workspace = true }
 sov-state            = { workspace = true }
-sov-rollup-interface = { workspace = true, features = ["mocks"] }
+sov-rollup-interface = { workspace = true }
 
 [dev-dependencies]
 ibc-testkit           = { workspace = true }
@@ -50,6 +51,7 @@ native = [
     "sov-bank/native",
     "sov-chain-state/native",
     "sov-modules-api/native",
+    "sov-mock-da/native",
     "sov-state/native",
     "sov-rollup-interface/native",
     "sov-ibc/native",

diff --git a/mocks/src/relayer/mod.rs b/mocks/src/relayer/mod.rs
@@ -6,8 +6,8 @@ pub mod relay;
 #[cfg(feature = "native")]
 pub mod relayer_type {
     use basecoin_store::impls::InMemoryStore;
+    use sov_mock_da::MockDaSpec;
     use sov_modules_api::default_context::DefaultContext;
-    use sov_rollup_interface::mocks::MockDaSpec;
 
     use super::relay::MockRelayer;
     use crate::cosmos::app::MockCosmosChain;

diff --git a/mocks/src/sovereign/builder.rs b/mocks/src/sovereign/builder.rs
@@ -1,8 +1,8 @@
 use ibc_core::host::types::identifiers::ChainId;
 use sov_bank::TokenConfig;
+use sov_mock_da::MockDaSpec;
 use sov_modules_api::default_context::DefaultContext;
 use sov_modules_api::{Context, WorkingSet};
-use sov_rollup_interface::mocks::MockDaSpec;
 use sov_state::ProverStorage;
 
 use super::app::TestApp;
@@ -66,7 +66,7 @@ impl DefaultBuilder {
 
         TestApp::<'ws, DefaultContext, MockDaSpec>::new(
             self.chain_id.clone(),
-            DefaultContext::new(relayer_address.0),
+            DefaultContext::new(relayer_address.0, 0),
             self.runtime.bank.clone(),
             &self.runtime.ibc,
             self.runtime.ibc_transfer.clone(),

diff --git a/modules/sov-ibc-transfer/src/call.rs b/modules/sov-ibc-transfer/src/call.rs
@@ -11,7 +11,7 @@ use ibc_core::channel::types::timeout::TimeoutHeight;
 use ibc_core::host::types::identifiers::{ChannelId, PortId};
 use ibc_core::host::ExecutionContext;
 use ibc_core::primitives::{Signer, Timestamp};
-use sov_modules_api::{Context, WorkingSet};
+use sov_modules_api::{Context, StateMapAccessor, WorkingSet};
 
 use super::context::EscrowExtraData;
 use super::IbcTransfer;

diff --git a/modules/sov-ibc-transfer/src/context.rs b/modules/sov-ibc-transfer/src/context.rs
@@ -20,7 +20,7 @@ use ibc_core::primitives::Signer;
 use ibc_core::router::module::Module;
 use ibc_core::router::types::module::ModuleExtras;
 use sov_bank::Coins;
-use sov_modules_api::{Context, WorkingSet};
+use sov_modules_api::{Context, StateMapAccessor, WorkingSet};
 use sov_rollup_interface::digest::Digest;
 use uint::FromDecStrErr;
 

diff --git a/modules/sov-ibc-transfer/src/lib.rs b/modules/sov-ibc-transfer/src/lib.rs
@@ -11,6 +11,7 @@ pub mod context;
 mod genesis;
 
 use anyhow::anyhow;
+use ibc_core::handler::types::events::IbcEvent;
 use serde::{Deserialize, Serialize};
 use sov_modules_api::{Context, Error, Module, ModuleInfo, StateMap, WorkingSet};
 
@@ -58,6 +59,8 @@ impl<C: Context> Module for IbcTransfer<C> {
 
     type CallMessage = ();
 
+    type Event = IbcEvent;
+
     fn genesis(&self, config: &Self::Config, working_set: &mut WorkingSet<C>) -> Result<(), Error> {
         Ok(self.init_module(config, working_set)?)
     }

diff --git a/modules/sov-ibc-transfer/src/query.rs b/modules/sov-ibc-transfer/src/query.rs
@@ -2,7 +2,7 @@
 use jsonrpsee::core::RpcResult;
 use jsonrpsee::types::ErrorObjectOwned;
 use sov_modules_api::macros::rpc_gen;
-use sov_modules_api::{Context, WorkingSet};
+use sov_modules_api::{Context, StateMapAccessor, WorkingSet};
 
 use super::IbcTransfer;
 

diff --git a/modules/sov-ibc/src/clients/context.rs b/modules/sov-ibc/src/clients/context.rs
@@ -16,7 +16,7 @@ use ibc_core::host::types::path::{ClientConsensusStatePath, ClientStatePath, Pat
 use ibc_core::host::ValidationContext;
 use ibc_core::primitives::proto::Any;
 use ibc_core::primitives::Timestamp;
-use sov_modules_api::{Context, DaSpec};
+use sov_modules_api::{Context, DaSpec, StateMapAccessor, StateVecAccessor};
 
 use super::{AnyClientState, AnyConsensusState};
 use crate::context::IbcContext;

diff --git a/modules/sov-ibc/src/codec.rs b/modules/sov-ibc/src/codec.rs
@@ -5,7 +5,8 @@ use std::marker::PhantomData;
 use ibc_core::channel::types::commitment::{AcknowledgementCommitment, PacketCommitment};
 use ibc_core::primitives::proto::Protobuf;
 use prost::Message;
-use sov_state::codec::{BorshCodec, StateCodec, StateValueCodec};
+use sov_state::codec::BorshCodec;
+use sov_state::storage::{StateCodec, StateValueCodec};
 
 #[derive(Default, Clone)]
 pub struct ProtobufCodec<Raw> {

diff --git a/modules/sov-ibc/src/context.rs b/modules/sov-ibc/src/context.rs
@@ -22,7 +22,9 @@ use ibc_core::host::types::path::{
 use ibc_core::host::{ExecutionContext, ValidationContext};
 use ibc_core::primitives::proto::Any;
 use ibc_core::primitives::{Signer, Timestamp};
-use sov_modules_api::{Context, DaSpec, WorkingSet};
+use sov_modules_api::{
+    Context, DaSpec, StateMapAccessor, StateValueAccessor, StateVecAccessor, WorkingSet,
+};
 
 use crate::clients::{AnyClientState, AnyConsensusState};
 use crate::Ibc;

diff --git a/modules/sov-ibc/src/genesis.rs b/modules/sov-ibc/src/genesis.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use sov_modules_api::{Context, DaSpec, Module, WorkingSet};
+use sov_modules_api::{Context, DaSpec, Module, StateValueAccessor, WorkingSet};
 
 use crate::Ibc;
 

diff --git a/modules/sov-ibc/src/lib.rs b/modules/sov-ibc/src/lib.rs
@@ -15,6 +15,7 @@ pub mod genesis;
 
 #[cfg(feature = "native")]
 mod query;
+use ibc_core::handler::types::events::IbcEvent;
 #[cfg(feature = "native")]
 pub use query::*;
 
@@ -134,6 +135,8 @@ impl<C: Context, Da: DaSpec> sov_modules_api::Module for Ibc<C, Da> {
 
     type CallMessage = call::CallMessage<C>;
 
+    type Event = IbcEvent;
+
     fn genesis(&self, config: &Self::Config, working_set: &mut WorkingSet<C>) -> Result<(), Error> {
         Ok(self.init_module(config, working_set)?)
     }

diff --git a/modules/sov-ibc/src/query/context.rs b/modules/sov-ibc/src/query/context.rs
@@ -14,7 +14,7 @@ use ibc_core::host::types::path::{
 };
 use ibc_core::host::ValidationContext;
 use ibc_query::core::context::{ProvableContext, QueryContext};
-use sov_modules_api::{Context, DaSpec};
+use sov_modules_api::{Context, DaSpec, StateMapAccessor, StateValueAccessor, StateVecAccessor};
 
 use crate::context::IbcContext;