Skip to content
This repository was archived by the owner on Jun 24, 2024. It is now read-only.

Commit 3ca4585

Browse files
Farhad-ShabaniFarhad-Shabani
authored
deps: bump sov revs (#39)
1 parent 48c00b2 commit 3ca4585

File tree

15 files changed

+599
-394
lines changed

15 files changed

+599
-394
lines changed

‎Cargo.lock

+569-376
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+7-6
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ tendermint-proto = { version = "0.34", default-features = false }
4141
tendermint-testgen = { version = "0.34", default-features = false }
4242

4343
# sovereign dependencies
44-
sov-bank = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
45-
sov-chain-state = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
46-
sov-modules-api = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
47-
sov-modules-macros = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
48-
sov-state = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
49-
sov-rollup-interface = { git = "https://github.com/informalsystems/sovereign-sdk.git", rev = "876eb0b" }
44+
sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
45+
sov-chain-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
46+
sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
47+
sov-modules-macros = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
48+
sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
49+
sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }
50+
sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "88b77d6" }

‎mocks/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ tendermint-testgen = { workspace = true }
3838
sov-bank = { workspace = true }
3939
sov-chain-state = { workspace = true }
4040
sov-modules-api = { workspace = true }
41+
sov-mock-da = { workspace = true }
4142
sov-state = { workspace = true }
42-
sov-rollup-interface = { workspace = true, features = ["mocks"] }
43+
sov-rollup-interface = { workspace = true }
4344

4445
[dev-dependencies]
4546
ibc-testkit = { workspace = true }
@@ -50,6 +51,7 @@ native = [
5051
"sov-bank/native",
5152
"sov-chain-state/native",
5253
"sov-modules-api/native",
54+
"sov-mock-da/native",
5355
"sov-state/native",
5456
"sov-rollup-interface/native",
5557
"sov-ibc/native",

‎mocks/src/relayer/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ pub mod relay;
66
#[cfg(feature = "native")]
77
pub mod relayer_type {
88
use basecoin_store::impls::InMemoryStore;
9+
use sov_mock_da::MockDaSpec;
910
use sov_modules_api::default_context::DefaultContext;
10-
use sov_rollup_interface::mocks::MockDaSpec;
1111

1212
use super::relay::MockRelayer;
1313
use crate::cosmos::app::MockCosmosChain;

‎mocks/src/sovereign/builder.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use ibc_core::host::types::identifiers::ChainId;
22
use sov_bank::TokenConfig;
3+
use sov_mock_da::MockDaSpec;
34
use sov_modules_api::default_context::DefaultContext;
45
use sov_modules_api::{Context, WorkingSet};
5-
use sov_rollup_interface::mocks::MockDaSpec;
66
use sov_state::ProverStorage;
77

88
use super::app::TestApp;
@@ -66,7 +66,7 @@ impl DefaultBuilder {
6666

6767
TestApp::<'ws, DefaultContext, MockDaSpec>::new(
6868
self.chain_id.clone(),
69-
DefaultContext::new(relayer_address.0),
69+
DefaultContext::new(relayer_address.0, 0),
7070
self.runtime.bank.clone(),
7171
&self.runtime.ibc,
7272
self.runtime.ibc_transfer.clone(),

‎modules/sov-ibc-transfer/src/call.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use ibc_core::channel::types::timeout::TimeoutHeight;
1111
use ibc_core::host::types::identifiers::{ChannelId, PortId};
1212
use ibc_core::host::ExecutionContext;
1313
use ibc_core::primitives::{Signer, Timestamp};
14-
use sov_modules_api::{Context, WorkingSet};
14+
use sov_modules_api::{Context, StateMapAccessor, WorkingSet};
1515

1616
use super::context::EscrowExtraData;
1717
use super::IbcTransfer;

‎modules/sov-ibc-transfer/src/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use ibc_core::primitives::Signer;
2020
use ibc_core::router::module::Module;
2121
use ibc_core::router::types::module::ModuleExtras;
2222
use sov_bank::Coins;
23-
use sov_modules_api::{Context, WorkingSet};
23+
use sov_modules_api::{Context, StateMapAccessor, WorkingSet};
2424
use sov_rollup_interface::digest::Digest;
2525
use uint::FromDecStrErr;
2626

‎modules/sov-ibc-transfer/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ pub mod context;
1111
mod genesis;
1212

1313
use anyhow::anyhow;
14+
use ibc_core::handler::types::events::IbcEvent;
1415
use serde::{Deserialize, Serialize};
1516
use sov_modules_api::{Context, Error, Module, ModuleInfo, StateMap, WorkingSet};
1617

@@ -58,6 +59,8 @@ impl<C: Context> Module for IbcTransfer<C> {
5859

5960
type CallMessage = ();
6061

62+
type Event = IbcEvent;
63+
6164
fn genesis(&self, config: &Self::Config, working_set: &mut WorkingSet<C>) -> Result<(), Error> {
6265
Ok(self.init_module(config, working_set)?)
6366
}

‎modules/sov-ibc-transfer/src/query.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
use jsonrpsee::core::RpcResult;
33
use jsonrpsee::types::ErrorObjectOwned;
44
use sov_modules_api::macros::rpc_gen;
5-
use sov_modules_api::{Context, WorkingSet};
5+
use sov_modules_api::{Context, StateMapAccessor, WorkingSet};
66

77
use super::IbcTransfer;
88

‎modules/sov-ibc/src/clients/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use ibc_core::host::types::path::{ClientConsensusStatePath, ClientStatePath, Pat
1616
use ibc_core::host::ValidationContext;
1717
use ibc_core::primitives::proto::Any;
1818
use ibc_core::primitives::Timestamp;
19-
use sov_modules_api::{Context, DaSpec};
19+
use sov_modules_api::{Context, DaSpec, StateMapAccessor, StateVecAccessor};
2020

2121
use super::{AnyClientState, AnyConsensusState};
2222
use crate::context::IbcContext;

‎modules/sov-ibc/src/codec.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ use std::marker::PhantomData;
55
use ibc_core::channel::types::commitment::{AcknowledgementCommitment, PacketCommitment};
66
use ibc_core::primitives::proto::Protobuf;
77
use prost::Message;
8-
use sov_state::codec::{BorshCodec, StateCodec, StateValueCodec};
8+
use sov_state::codec::BorshCodec;
9+
use sov_state::storage::{StateCodec, StateValueCodec};
910

1011
#[derive(Default, Clone)]
1112
pub struct ProtobufCodec<Raw> {

‎modules/sov-ibc/src/context.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ use ibc_core::host::types::path::{
2222
use ibc_core::host::{ExecutionContext, ValidationContext};
2323
use ibc_core::primitives::proto::Any;
2424
use ibc_core::primitives::{Signer, Timestamp};
25-
use sov_modules_api::{Context, DaSpec, WorkingSet};
25+
use sov_modules_api::{
26+
Context, DaSpec, StateMapAccessor, StateValueAccessor, StateVecAccessor, WorkingSet,
27+
};
2628

2729
use crate::clients::{AnyClientState, AnyConsensusState};
2830
use crate::Ibc;

‎modules/sov-ibc/src/genesis.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use anyhow::Result;
2-
use sov_modules_api::{Context, DaSpec, Module, WorkingSet};
2+
use sov_modules_api::{Context, DaSpec, Module, StateValueAccessor, WorkingSet};
33

44
use crate::Ibc;
55

‎modules/sov-ibc/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub mod genesis;
1515

1616
#[cfg(feature = "native")]
1717
mod query;
18+
use ibc_core::handler::types::events::IbcEvent;
1819
#[cfg(feature = "native")]
1920
pub use query::*;
2021

@@ -134,6 +135,8 @@ impl<C: Context, Da: DaSpec> sov_modules_api::Module for Ibc<C, Da> {
134135

135136
type CallMessage = call::CallMessage<C>;
136137

138+
type Event = IbcEvent;
139+
137140
fn genesis(&self, config: &Self::Config, working_set: &mut WorkingSet<C>) -> Result<(), Error> {
138141
Ok(self.init_module(config, working_set)?)
139142
}

‎modules/sov-ibc/src/query/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use ibc_core::host::types::path::{
1414
};
1515
use ibc_core::host::ValidationContext;
1616
use ibc_query::core::context::{ProvableContext, QueryContext};
17-
use sov_modules_api::{Context, DaSpec};
17+
use sov_modules_api::{Context, DaSpec, StateMapAccessor, StateValueAccessor, StateVecAccessor};
1818

1919
use crate::context::IbcContext;
2020

0 commit comments

Comments
 (0)