Skip to content

Commit

Permalink
chore: fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
benluelo committed Jan 8, 2025
1 parent 0c4c244 commit 7cc031f
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 60 deletions.
24 changes: 12 additions & 12 deletions cosmwasm/ibc-union/light-clients/state-lens-ics23-mpt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ workspace = true
crate-type = ["cdylib", "rlib"]

[dependencies]
cometbls-light-client = { workspace = true, features = ["library"] }
cosmwasm-std = { workspace = true, features = ["abort"] }
ethereum-light-client-types = { workspace = true, features = ["serde", "ethabi", "bincode"] }
cometbls-light-client = { workspace = true, features = ["library"] }
cosmwasm-std = { workspace = true, features = ["abort"] }
ethereum-light-client-types = { workspace = true, features = ["serde", "ethabi", "bincode"] }
evm-storage-verifier = { workspace = true }
ibc-union-light-client = { workspace = true }
ibc-union-msg = { workspace = true }
ibc-union-spec = { workspace = true }
ics23 = { workspace = true }
rlp = { workspace = true }
serde = { workspace = true, features = ["derive"] }
state-lens-ics23-mpt-light-client-types = { workspace = true, features = ["serde", "ethabi", "bincode"] }
evm-storage-verifier = { workspace = true }
ibc-union-light-client = { workspace = true }
ibc-union-msg = { workspace = true }
ibc-union-spec = { workspace = true }
ics23 = { workspace = true }
rlp = { workspace = true }
serde = { workspace = true, features = ["derive"] }
thiserror = { workspace = true }
unionlabs = { workspace = true, features = ["ethabi", "stargate", "bincode"] }
thiserror = { workspace = true }
unionlabs = { workspace = true, features = ["ethabi", "stargate", "bincode"] }

[features]
default = []
Expand Down
76 changes: 56 additions & 20 deletions evm/scripts/Deploy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import "../contracts/core/OwnableIBCHandler.sol";
import "../contracts/clients/CometblsClient.sol";
import {StateLensIcs23Ics23Client} from
"../contracts/clients/StateLensIcs23Ics23Client.sol";
import {StateLensIcs23MptClient} from "../contracts/clients/StateLensIcs23MptClient.sol";
import {StateLensIcs23MptClient} from
"../contracts/clients/StateLensIcs23MptClient.sol";
import "../contracts/apps/ucs/00-pingpong/PingPong.sol";
import "../contracts/apps/ucs/01-relay/Relay.sol";
import "../contracts/apps/ucs/02-nft/NFT.sol";
Expand Down Expand Up @@ -119,7 +120,8 @@ abstract contract UnionScript is UnionBase {
abi.encode(
address(new StateLensIcs23MptClient()),
abi.encodeCall(
StateLensIcs23MptClient.initialize, (address(handler), owner)
StateLensIcs23MptClient.initialize,
(address(handler), owner)
)
)
)
Expand Down Expand Up @@ -241,8 +243,10 @@ abstract contract UnionScript is UnionBase {
{
IBCHandler handler = deployIBCHandler(owner);
CometblsClient cometblsClient = deployCometbls(handler, owner);
StateLensIcs23MptClient stateLensIcs23MptClient = deployStateLensIcs23MptClient(handler, owner);
StateLensIcs23Ics23Client stateLensIcs23Ics23Client = deployStateLensIcs23Ics23Client(handler, owner);
StateLensIcs23MptClient stateLensIcs23MptClient =
deployStateLensIcs23MptClient(handler, owner);
StateLensIcs23Ics23Client stateLensIcs23Ics23Client =
deployStateLensIcs23Ics23Client(handler, owner);
PingPong pingpong = deployUCS00(handler, owner, 100000000000000);
UCS01Relay relay = deployUCS01(handler, owner);
UCS02NFT nft = deployUCS02(handler, owner);
Expand Down Expand Up @@ -415,7 +419,9 @@ contract DeployStateLensIcs23Ics23Client is UnionScript {

vm.stopBroadcast();

console.log("StateLensIcs23Ics23Client: ", address(stateLensIcs23Ics23Client));
console.log(
"StateLensIcs23Ics23Client: ", address(stateLensIcs23Ics23Client)
);
}
}

Expand Down Expand Up @@ -445,17 +451,25 @@ contract DeployIBC is UnionScript {
Multicall multicall
) = deployIBC(vm.addr(privateKey));
handler.registerClient(LightClients.COMETBLS, cometblsClient);
handler.registerClient(LightClients.STATE_LENS_EVM, stateLensIcs23MptClient);
handler.registerClient(LightClients.STATE_LENS_COSMOS, stateLensIcs23Ics23Client);
handler.registerClient(
LightClients.STATE_LENS_EVM, stateLensIcs23MptClient
);
handler.registerClient(
LightClients.STATE_LENS_COSMOS, stateLensIcs23Ics23Client
);

vm.stopBroadcast();

console.log("Deployer: ", address(deployer));
console.log("Sender: ", vm.addr(privateKey));
console.log("IBCHandler: ", address(handler));
console.log("CometblsClient: ", address(cometblsClient));
console.log("StateLensIcs23MptClient: ", address(stateLensIcs23MptClient));
console.log("StateLensIcs23Ics23Client: ", address(stateLensIcs23Ics23Client));
console.log(
"StateLensIcs23MptClient: ", address(stateLensIcs23MptClient)
);
console.log(
"StateLensIcs23Ics23Client: ", address(stateLensIcs23Ics23Client)
);
console.log("UCS00: ", address(pingpong));
console.log("UCS01: ", address(relay));
console.log("UCS02: ", address(nft));
Expand Down Expand Up @@ -488,17 +502,25 @@ contract DeployDeployerAndIBC is UnionScript {
Multicall multicall
) = deployIBC(vm.addr(privateKey));
handler.registerClient(LightClients.COMETBLS, cometblsClient);
handler.registerClient(LightClients.STATE_LENS_EVM, stateLensIcs23MptClient);
handler.registerClient(LightClients.STATE_LENS_COSMOS, stateLensIcs23Ics23Client);
handler.registerClient(
LightClients.STATE_LENS_EVM, stateLensIcs23MptClient
);
handler.registerClient(
LightClients.STATE_LENS_COSMOS, stateLensIcs23Ics23Client
);

vm.stopBroadcast();

console.log("Deployer: ", address(deployer));
console.log("Sender: ", vm.addr(privateKey));
console.log("IBCHandler: ", address(handler));
console.log("CometblsClient: ", address(cometblsClient));
console.log("StateLensIcs23MptClient: ", address(stateLensIcs23MptClient));
console.log("StateLensIcs23Ics23Client: ", address(stateLensIcs23Ics23Client));
console.log(
"StateLensIcs23MptClient: ", address(stateLensIcs23MptClient)
);
console.log(
"StateLensIcs23Ics23Client: ", address(stateLensIcs23Ics23Client)
);
console.log("UCS00: ", address(pingpong));
console.log("UCS01: ", address(relay));
console.log("UCS02: ", address(nft));
Expand Down Expand Up @@ -563,7 +585,10 @@ contract GetDeployed is Script {
);
console.log(
string(
abi.encodePacked("StateLensIcs23MptClient: ", stateLensIcs23MptClient.toHexString())
abi.encodePacked(
"StateLensIcs23MptClient: ",
stateLensIcs23MptClient.toHexString()
)
)
);
console.log(
Expand Down Expand Up @@ -624,10 +649,14 @@ contract GetDeployed is Script {
"args",
abi.encode(
implOf(stateLensIcs23MptClient),
abi.encodeCall(StateLensIcs23MptClient.initialize, (handler, sender))
abi.encodeCall(
StateLensIcs23MptClient.initialize, (handler, sender)
)
)
);
impls.serialize(stateLensIcs23MptClient.toHexString(), proxyStateLensIcs23MptClient);
impls.serialize(
stateLensIcs23MptClient.toHexString(), proxyStateLensIcs23MptClient
);

string memory proxyUCS00 = "proxyUCS00";
proxyUCS00.serialize(
Expand Down Expand Up @@ -729,10 +758,16 @@ contract GetDeployed is Script {
"implStateLensIcs23MptClient";
implStateLensIcs23MptClient.serialize(
"contract",
string("contracts/clients/StateLensIcs23MptClient.sol:StateLensIcs23MptClient")
string(
"contracts/clients/StateLensIcs23MptClient.sol:StateLensIcs23MptClient"
)
);
implStateLensIcs23MptClient =
implStateLensIcs23MptClient.serialize("args", bytes(hex""));
impls.serialize(
implOf(stateLensIcs23MptClient).toHexString(),
implStateLensIcs23MptClient
);
implStateLensIcs23MptClient = implStateLensIcs23MptClient.serialize("args", bytes(hex""));
impls.serialize(implOf(stateLensIcs23MptClient).toHexString(), implStateLensIcs23MptClient);

string memory implUCS00 = "implUCS00";
implUCS00.serialize(
Expand Down Expand Up @@ -1119,7 +1154,8 @@ contract UpgradeStateLensIcs23Ics23Client is Script {
console.log(
string(
abi.encodePacked(
"StateLensIcs23Ics23Client: ", stateLensIcs23Ics23Client.toHexString()
"StateLensIcs23Ics23Client: ",
stateLensIcs23Ics23Client.toHexString()
)
)
);
Expand Down
28 changes: 14 additions & 14 deletions voyager/modules/client-bootstrap/state-lens/ics23-ics23/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ name = "voyager-client-bootstrap-module-state-lens-ics23-ics23"
version = "0.1.0"

[dependencies]
alloy = { workspace = true, features = ["rpc", "rpc-types", "transports", "transport-http", "transport-ws", "reqwest", "provider-ws"] }
beacon-api = { workspace = true }
beacon-api-types = { workspace = true, features = ["serde"] }
cometbft-rpc = { workspace = true }
alloy = { workspace = true, features = ["rpc", "rpc-types", "transports", "transport-http", "transport-ws", "reqwest", "provider-ws"] }
beacon-api = { workspace = true }
beacon-api-types = { workspace = true, features = ["serde"] }
cometbft-rpc = { workspace = true }
ibc-union-spec.workspace = true
jsonrpsee = { workspace = true, features = ["macros", "server", "tracing"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
state-lens-ics23-ics23-light-client-types = { workspace = true, features = ["serde"] }
ibc-union-spec.workspace = true
jsonrpsee = { workspace = true, features = ["macros", "server", "tracing"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
tendermint-light-client-types = { workspace = true, features = ["serde"] }
tokio = { workspace = true }
tracing = { workspace = true }
unionlabs = { workspace = true }
voyager-message = { workspace = true }
voyager-vm = { workspace = true }
tendermint-light-client-types = { workspace = true, features = ["serde"] }
tokio = { workspace = true }
tracing = { workspace = true }
unionlabs = { workspace = true }
voyager-message = { workspace = true }
voyager-vm = { workspace = true }

[dev-dependencies]
tokio = { workspace = true, features = ["full"] }
28 changes: 14 additions & 14 deletions voyager/modules/client/state-lens/ics23-ics23/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ name = "voyager-client-module-state-lens-ics23-ics23"
version = "0.1.0"

[dependencies]
alloy = { workspace = true, features = ["sol-types"] }
alloy = { workspace = true, features = ["sol-types"] }
futures = { workspace = true }
jsonrpsee = { workspace = true, features = ["macros", "server", "tracing"] }
macros = { workspace = true }
protos = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
state-lens-ics23-ics23-light-client-types = { workspace = true, features = ["serde", "ethabi"] }
futures = { workspace = true }
jsonrpsee = { workspace = true, features = ["macros", "server", "tracing"] }
macros = { workspace = true }
protos = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }
unionlabs = { workspace = true }
voyager-message = { workspace = true }
voyager-vm = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }
unionlabs = { workspace = true }
voyager-message = { workspace = true }
voyager-vm = { workspace = true }

0 comments on commit 7cc031f

Please sign in to comment.