diff --git a/Cargo.lock b/Cargo.lock index 872117a..389a279 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,6 +67,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -93,18 +94,31 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "056f2c01b2aed86e15b43c47d109bfc8b82553dc34e66452875e51247ec31ab2" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.4.2", + "alloy-core", + "alloy-eips 0.4.2", + "alloy-genesis 0.4.2", + "alloy-serde 0.4.2", +] + +[[package]] +name = "alloy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea8ebf106e84a1c37f86244df7da0c7587e697b71a0d565cce079449b85ac6f8" +dependencies = [ + "alloy-consensus 0.5.4", "alloy-contract", "alloy-core", - "alloy-eips", - "alloy-genesis", + "alloy-eips 0.5.4", + "alloy-genesis 0.5.4", "alloy-network", "alloy-node-bindings", "alloy-provider", "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types", - "alloy-serde", + "alloy-serde 0.5.4", "alloy-signer", "alloy-signer-local", "alloy-transport", @@ -130,10 +144,24 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "705687d5bfd019fee57cf9e206b27b30a9a9617535d5590a02b171e813208f8e" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives 0.8.9", "alloy-rlp", - "alloy-serde", + "auto_impl", + "c-kzg", + "derive_more 1.0.0", +] + +[[package]] +name = "alloy-consensus" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed961a48297c732a5d97ee321aa8bb5009ecadbcb077d8bec90cb54e651629" +dependencies = [ + "alloy-eips 0.5.4", + "alloy-primitives 0.8.9", + "alloy-rlp", + "alloy-serde 0.5.4", "auto_impl", "c-kzg", "derive_more 1.0.0", @@ -142,9 +170,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917f7d12cf3971dc8c11c9972f732b35ccb9aaaf5f28f2f87e9e6523bee3a8ad" +checksum = "460ab80ce4bda1c80bcf96fe7460520476f2c7b734581c6567fac2708e2a60ef" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -210,6 +238,17 @@ checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04" dependencies = [ "alloy-primitives 0.8.9", "alloy-rlp", +] + +[[package]] +name = "alloy-eip7702" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" +dependencies = [ + "alloy-primitives 0.8.9", + "alloy-rlp", + "derive_more 1.0.0", "k256", "serde", ] @@ -221,10 +260,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ffb906284a1e1f63c4607da2068c8197458a352d0b3e9796e67353d72a9be85" dependencies = [ "alloy-eip2930", - "alloy-eip7702", + "alloy-eip7702 0.1.1", + "alloy-primitives 0.8.9", + "alloy-rlp", + "c-kzg", + "derive_more 1.0.0", + "once_cell", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "alloy-eips" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b69e06cf9c37be824b9d26d6d101114fdde6af0c87de2828b414c05c4b3daa71" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702 0.3.2", "alloy-primitives 0.8.9", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.5.4", "c-kzg", "derive_more 1.0.0", "once_cell", @@ -239,7 +295,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8429cf4554eed9b40feec7f4451113e76596086447550275e3def933faf47ce3" dependencies = [ "alloy-primitives 0.8.9", - "alloy-serde", + "alloy-serde 0.4.2", + "serde", +] + +[[package]] +name = "alloy-genesis" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dde15e14944a88bd6a57d325e9a49b75558746fe16aaccc79713ae50a6a9574c" +dependencies = [ + "alloy-primitives 0.8.9", + "alloy-serde 0.5.4", "serde", ] @@ -257,9 +324,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fa8a1a3c4cbd221f2b8e3693aeb328fca79a757fe556ed08e47bbbc2a70db7" +checksum = "af5979e0d5a7bf9c7eb79749121e8256e59021af611322aee56e77e20776b4b3" dependencies = [ "alloy-primitives 0.8.9", "alloy-sol-types 0.8.9", @@ -271,17 +338,17 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fa23a6a9d612b52e402c995f2d582c25165ec03ac6edf64c861a76bc5b87cd" +checksum = "204237129086ce5dc17a58025e93739b01b45313841f98fa339eb1d780511e57" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-json-rpc", "alloy-network-primitives", "alloy-primitives 0.8.9", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 0.5.4", "alloy-signer", "alloy-sol-types 0.8.9", "async-trait", @@ -292,24 +359,24 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801492711d4392b2ccf5fc0bc69e299fa1aab15167d74dcaa9aab96a54f684bd" +checksum = "514f70ee2a953db21631cd817b13a1571474ec77ddc03d47616d5e8203489fde" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives 0.8.9", - "alloy-serde", + "alloy-serde 0.5.4", "serde", ] [[package]] name = "alloy-node-bindings" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1334a738aa1710cb8227441b3fcc319202ce78e967ef37406940242df4a454" +checksum = "27444ea67d360508753022807cdd0b49a95c878924c9c5f8f32668b7d7768245" dependencies = [ - "alloy-genesis", + "alloy-genesis 0.5.4", "alloy-primitives 0.8.9", "k256", "rand", @@ -372,13 +439,13 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfaa4ffec0af04e3555686b8aacbcdf7d13638133a0672749209069750f78a6" +checksum = "4814d141ede360bb6cd1b4b064f1aab9de391e7c4d0d4d50ac89ea4bc1e25fbd" dependencies = [ "alloy-chains", - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-json-rpc", "alloy-network", "alloy-network-primitives", @@ -388,6 +455,7 @@ dependencies = [ "alloy-rpc-client", "alloy-rpc-types-anvil", "alloy-rpc-types-eth", + "alloy-signer", "alloy-signer-local", "alloy-transport", "alloy-transport-http", @@ -400,21 +468,24 @@ dependencies = [ "futures", "futures-utils-wasm", "lru", + "parking_lot", "pin-project", "reqwest 0.12.8", + "schnellru", "serde", "serde_json", "thiserror", "tokio", "tracing", "url", + "wasmtimer", ] [[package]] name = "alloy-pubsub" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32cef487122ae75c91eb50154c70801d71fabdb976fec6c49e0af5e6486ab15" +checksum = "96ba46eb69ddf7a9925b81f15229cb74658e6eebe5dd30a5b74e2cd040380573" dependencies = [ "alloy-json-rpc", "alloy-primitives 0.8.9", @@ -453,9 +524,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370143ed581aace6e663342d21d209c6b2e34ee6142f7d6675adb518deeaf0dc" +checksum = "7fc2bd1e7403463a5f2c61e955bcc9d3072b63aa177442b0f9aa6a6d22a941e3" dependencies = [ "alloy-json-rpc", "alloy-primitives 0.8.9", @@ -474,58 +545,61 @@ dependencies = [ "tower", "tracing", "url", + "wasmtimer", ] [[package]] name = "alloy-rpc-types" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffc534b7919e18f35e3aa1f507b6f3d9d92ec298463a9f6beaac112809d8d06" +checksum = "eea9bf1abdd506f985a53533f5ac01296bcd6102c5e139bbc5d40bc468d2c916" dependencies = [ "alloy-primitives 0.8.9", "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-serde", + "alloy-serde 0.5.4", "serde", ] [[package]] name = "alloy-rpc-types-anvil" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d780adaa5d95b07ad92006b2feb68ecfa7e2015f7d5976ceaac4c906c73ebd07" +checksum = "2382fc63fb0cf3e02818d547b80cb66cc49a31f8803d0c328402b2008bc13650" dependencies = [ "alloy-primitives 0.8.9", - "alloy-serde", + "alloy-serde 0.5.4", "serde", ] [[package]] name = "alloy-rpc-types-engine" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0285c4c09f838ab830048b780d7f4a4f460f309aa1194bb049843309524c64c" +checksum = "886d22d41992287a235af2f3af4299b5ced2bcafb81eb835572ad35747476946" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives 0.8.9", "alloy-rlp", + "alloy-serde 0.5.4", "derive_more 1.0.0", + "serde", "strum 0.26.3", ] [[package]] name = "alloy-rpc-types-eth" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413f4aa3ccf2c3e4234a047c5fa4727916d7daf25a89f9b765df0ba09784fd87" +checksum = "00b034779a4850b4b03f5be5ea674a1cf7d746b2da762b34d1860ab45e48ca27" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-network-primitives", "alloy-primitives 0.8.9", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.5.4", "alloy-sol-types 0.8.9", "derive_more 1.0.0", "itertools 0.13.0", @@ -544,11 +618,22 @@ dependencies = [ "serde_json", ] +[[package]] +name = "alloy-serde" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028e72eaa9703e4882344983cfe7636ce06d8cce104a78ea62fd19b46659efc4" +dependencies = [ + "alloy-primitives 0.8.9", + "serde", + "serde_json", +] + [[package]] name = "alloy-signer" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd4e0ad79c81a27ca659be5d176ca12399141659fef2bcbfdc848da478f4504" +checksum = "592c185d7100258c041afac51877660c7bf6213447999787197db4842f0e938e" dependencies = [ "alloy-primitives 0.8.9", "async-trait", @@ -560,11 +645,11 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494e0a256f3e99f2426f994bcd1be312c02cb8f88260088dacb33a8b8936475f" +checksum = "6614f02fc1d5b079b2a4a5320018317b506fd0a6d67c1fd5542a71201724986c" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.5.4", "alloy-network", "alloy-primitives 0.8.9", "alloy-signer", @@ -708,9 +793,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac3e97dad3d31770db0fc89bd6a63b789fbae78963086733f960cf32c483904" +checksum = "be77579633ebbc1266ae6fd7694f75c408beb1aeb6865d0b18f22893c265a061" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -723,13 +808,14 @@ dependencies = [ "tower", "tracing", "url", + "wasmtimer", ] [[package]] name = "alloy-transport-http" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b367dcccada5b28987c2296717ee04b9a5637aacd78eacb1726ef211678b5212" +checksum = "91fd1a5d0827939847983b46f2f79510361f901dc82f8e3c38ac7397af142c6e" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -742,9 +828,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b90cf9cde7f2fce617da52768ee28f522264b282d148384a4ca0ea85af04fa3a" +checksum = "8073d1186bfeeb8fbdd1292b6f1a0731f3aed8e21e1463905abfae0b96a887a6" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -761,9 +847,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7153b88690de6a50bba81c11e1d706bc41dbb90126d607404d60b763f6a3947f" +checksum = "61f27837bb4a1d6c83a28231c94493e814882f0e9058648a97e908a5f3fc9fcf" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -3288,6 +3374,12 @@ dependencies = [ "ahash 0.7.8", ] +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + [[package]] name = "hashbrown" version = "0.14.5" @@ -4288,9 +4380,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "a00419de735aac21d53b0de5ce2c03bd3627277cf471300f27ebc89f7d828047" [[package]] name = "libredox" @@ -6089,9 +6181,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ "bitflags 2.6.0", "errno", @@ -6251,9 +6343,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.2.3" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb4a8e7cf6f3e2ba33751990b9744cb21d247da624468020d0479faeefc098a5" +checksum = "d8d25269dd3a12467afe2e510f69fb0b46b698e5afb296b59f2145259deaf8e8" dependencies = [ "sdd", ] @@ -6291,6 +6383,17 @@ dependencies = [ "syn 2.0.85", ] +[[package]] +name = "schnellru" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" +dependencies = [ + "ahash 0.8.11", + "cfg-if", + "hashbrown 0.13.2", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -6906,7 +7009,7 @@ dependencies = [ name = "sp1-ics07-tendermint-operator" version = "0.1.0" dependencies = [ - "alloy", + "alloy 0.5.4", "alloy-primitives 0.8.9", "alloy-sol-types 0.8.9", "anyhow", @@ -8186,7 +8289,7 @@ name = "unionlabs" version = "0.1.0" source = "git+https://github.com/unionlabs/union?rev=fe4b10691c3fb28436c44fa26042305b75d31e96#fe4b10691c3fb28436c44fa26042305b75d31e96" dependencies = [ - "alloy", + "alloy 0.4.2", "base64 0.21.7", "bcs", "bip32", @@ -8447,6 +8550,20 @@ dependencies = [ "semver 1.0.23", ] +[[package]] +name = "wasmtimer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee" +dependencies = [ + "futures", + "js-sys", + "parking_lot", + "pin-utils", + "slab", + "wasm-bindgen", +] + [[package]] name = "web-sys" version = "0.3.72" diff --git a/Cargo.toml b/Cargo.toml index 2fde32c..e8d3ca4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,9 +72,9 @@ reqwest = { version = "0.12", features = ["json"] } tokio = { version = "1", features = ["full"] } time = { version = "0.3", default-features = false, features = ["macros", "parsing"] } alloy-primitives = "0.8" -alloy-contract = "0.4" -alloy-node-bindings = "0.4" -alloy = "0.4" +alloy-contract = "0.5" +alloy-node-bindings = "0.5" +alloy = "0.5" bincode = "1.3" dotenv = "0.15" subtle-encoding = "0.5" diff --git a/bun.lockb b/bun.lockb index cbbc4d9..85ec8f6 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/contracts/script/SP1ICS07Tendermint.s.sol b/contracts/script/SP1ICS07Tendermint.s.sol index c4b62d1..63b0cb8 100644 --- a/contracts/script/SP1ICS07Tendermint.s.sol +++ b/contracts/script/SP1ICS07Tendermint.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; import { Script } from "forge-std/Script.sol"; import { stdJson } from "forge-std/StdJson.sol"; diff --git a/contracts/src/ISP1ICS07Tendermint.sol b/contracts/src/ISP1ICS07Tendermint.sol index 519f11c..1e86b7b 100644 --- a/contracts/src/ISP1ICS07Tendermint.sol +++ b/contracts/src/ISP1ICS07Tendermint.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; import { ILightClient } from "solidity-ibc/interfaces/ILightClient.sol"; import { IICS07TendermintMsgs } from "../src/msgs/IICS07TendermintMsgs.sol"; diff --git a/contracts/src/SP1ICS07Tendermint.sol b/contracts/src/SP1ICS07Tendermint.sol index d261211..63d66eb 100644 --- a/contracts/src/SP1ICS07Tendermint.sol +++ b/contracts/src/SP1ICS07Tendermint.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; import { IICS07TendermintMsgs } from "./msgs/IICS07TendermintMsgs.sol"; import { IUpdateClientMsgs } from "./msgs/IUpdateClientMsgs.sol"; diff --git a/contracts/src/errors/ISP1ICS07TendermintErrors.sol b/contracts/src/errors/ISP1ICS07TendermintErrors.sol index 0485711..2f2ff78 100644 --- a/contracts/src/errors/ISP1ICS07TendermintErrors.sol +++ b/contracts/src/errors/ISP1ICS07TendermintErrors.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; interface ISP1ICS07TendermintErrors { /// @notice The error that is returned when the verification key does not match the expected value. diff --git a/contracts/src/msgs/IICS07TendermintMsgs.sol b/contracts/src/msgs/IICS07TendermintMsgs.sol index dbc4a45..b5ca11e 100644 --- a/contracts/src/msgs/IICS07TendermintMsgs.sol +++ b/contracts/src/msgs/IICS07TendermintMsgs.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; import { IICS02ClientMsgs } from "solidity-ibc/msgs/IICS02ClientMsgs.sol"; diff --git a/contracts/src/msgs/IMembershipMsgs.sol b/contracts/src/msgs/IMembershipMsgs.sol index 0d44183..6d2a543 100644 --- a/contracts/src/msgs/IMembershipMsgs.sol +++ b/contracts/src/msgs/IMembershipMsgs.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; import { ISP1Msgs } from "./ISP1Msgs.sol"; import { IICS07TendermintMsgs } from "./IICS07TendermintMsgs.sol"; diff --git a/contracts/src/msgs/IMisbehaviourMsgs.sol b/contracts/src/msgs/IMisbehaviourMsgs.sol index b08458d..e1a8410 100644 --- a/contracts/src/msgs/IMisbehaviourMsgs.sol +++ b/contracts/src/msgs/IMisbehaviourMsgs.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; import { IICS07TendermintMsgs } from "./IICS07TendermintMsgs.sol"; import { ISP1Msgs } from "./ISP1Msgs.sol"; diff --git a/contracts/src/msgs/ISP1Msgs.sol b/contracts/src/msgs/ISP1Msgs.sol index 7b44793..2a1c076 100644 --- a/contracts/src/msgs/ISP1Msgs.sol +++ b/contracts/src/msgs/ISP1Msgs.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; /// @title SP1 Messages interface ISP1Msgs { diff --git a/contracts/src/msgs/IUcAndMembershipMsgs.sol b/contracts/src/msgs/IUcAndMembershipMsgs.sol index bbc877e..68f98f9 100644 --- a/contracts/src/msgs/IUcAndMembershipMsgs.sol +++ b/contracts/src/msgs/IUcAndMembershipMsgs.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; import { IUpdateClientMsgs } from "./IUpdateClientMsgs.sol"; import { IMembershipMsgs } from "./IMembershipMsgs.sol"; diff --git a/contracts/src/msgs/IUpdateClientMsgs.sol b/contracts/src/msgs/IUpdateClientMsgs.sol index ba44b85..3f47cca 100644 --- a/contracts/src/msgs/IUpdateClientMsgs.sol +++ b/contracts/src/msgs/IUpdateClientMsgs.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; import { IICS07TendermintMsgs } from "./IICS07TendermintMsgs.sol"; import { ISP1Msgs } from "./ISP1Msgs.sol"; diff --git a/contracts/src/utils/Paths.sol b/contracts/src/utils/Paths.sol index edcca7f..132e2a4 100644 --- a/contracts/src/utils/Paths.sol +++ b/contracts/src/utils/Paths.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; library Paths { /// @notice Compares two bytes arrays diff --git a/contracts/src/utils/UnionMembership.sol b/contracts/src/utils/UnionMembership.sol index c120ee3..738b5f3 100644 --- a/contracts/src/utils/UnionMembership.sol +++ b/contracts/src/utils/UnionMembership.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; import { Ics23, UnionIcs23 } from "union-lib/ICS23.sol"; diff --git a/contracts/test/Membership.t.sol b/contracts/test/Membership.t.sol index 5424b0e..bb287ef 100644 --- a/contracts/test/Membership.t.sol +++ b/contracts/test/Membership.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; // solhint-disable-next-line no-global-import import "forge-std/console.sol"; diff --git a/contracts/test/MembershipTest.sol b/contracts/test/MembershipTest.sol index cdf8628..6a27247 100644 --- a/contracts/test/MembershipTest.sol +++ b/contracts/test/MembershipTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; // solhint-disable-next-line no-global-import import "forge-std/console.sol"; diff --git a/contracts/test/Misbehaviour.t.sol b/contracts/test/Misbehaviour.t.sol index 4083908..69c35ac 100644 --- a/contracts/test/Misbehaviour.t.sol +++ b/contracts/test/Misbehaviour.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; // solhint-disable-next-line no-global-import import "forge-std/console.sol"; diff --git a/contracts/test/SP1ICS07TendermintTest.sol b/contracts/test/SP1ICS07TendermintTest.sol index 3da1257..77a603f 100644 --- a/contracts/test/SP1ICS07TendermintTest.sol +++ b/contracts/test/SP1ICS07TendermintTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; // solhint-disable-next-line no-global-import import "forge-std/console.sol"; diff --git a/contracts/test/UcAndMembership.t.sol b/contracts/test/UcAndMembership.t.sol index 1cae5aa..af7ebc1 100644 --- a/contracts/test/UcAndMembership.t.sol +++ b/contracts/test/UcAndMembership.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; // solhint-disable-next-line no-global-import import "forge-std/console.sol"; diff --git a/contracts/test/UnionMembership.t.sol b/contracts/test/UnionMembership.t.sol index 917e12f..4912a47 100644 --- a/contracts/test/UnionMembership.t.sol +++ b/contracts/test/UnionMembership.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; // solhint-disable-next-line no-global-import import "forge-std/console.sol"; diff --git a/contracts/test/UpdateClient.t.sol b/contracts/test/UpdateClient.t.sol index 88b1360..9d511b8 100644 --- a/contracts/test/UpdateClient.t.sol +++ b/contracts/test/UpdateClient.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.25; +pragma solidity ^0.8.28; // solhint-disable-next-line no-global-import import "forge-std/console.sol"; diff --git a/foundry.toml b/foundry.toml index 5dd7f22..5db627c 100644 --- a/foundry.toml +++ b/foundry.toml @@ -9,6 +9,7 @@ libs = ["node_modules", "contracts/lib"] fs_permissions = [{ access = "read-write", path = "./" },] via_ir = true no_match_path = "node_modules/**/test/**" +solc = "0.8.28" [fmt] bracket_spacing = true diff --git a/package.json b/package.json index eff3537..27a43c6 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,12 @@ }, "dependencies": { "@openzeppelin/contracts": "^5.1.0", - "forge-std": "github:foundry-rs/forge-std#v1.9.2", "sp1-contracts": "github:succinctlabs/sp1-contracts#v3.0.0", - "solidity-ibc": "github:cosmos/solidity-ibc-eureka#c3d851ff652a42e204846ce0ff60e373d477724d", + "solidity-ibc": "github:cosmos/solidity-ibc-eureka#e120d3168bbbde043e3c4a64c43ffebb36766c65", "union": "github:unionlabs/union#4a6e7229b78de70742cf719fb26409cab3cca631" }, "devDependencies": { + "forge-std": "github:foundry-rs/forge-std#v1.9.4", "solhint": "^5.0.3", "@defi-wonderland/natspec-smells": "^1.1.5" },