Skip to content

Commit

Permalink
Merge branch 'trevor/new-featv3-cosmos-oct-28' into dan/cw-types-reuse
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-savu committed Nov 21, 2023
2 parents b36c558 + 5a9cd84 commit 02447da
Show file tree
Hide file tree
Showing 14 changed files with 292 additions and 273 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,3 @@ yarn-error.log
.vscode

tsconfig.editor.json

rust/neutron_validator_sigs
rust/relayer_db
1 change: 1 addition & 0 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

209 changes: 103 additions & 106 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
[workspace]
members = [
"agents/relayer",
"agents/scraper",
"agents/validator",
"chains/hyperlane-cosmos",
"chains/hyperlane-ethereum",
"chains/hyperlane-fuel",
"chains/hyperlane-sealevel",
"ethers-prometheus",
"hyperlane-base",
"hyperlane-core",
"hyperlane-test",
"sealevel/client",
"sealevel/libraries/access-control",
"sealevel/libraries/account-utils",
"sealevel/libraries/ecdsa-signature",
"sealevel/libraries/hyperlane-sealevel-connection-client",
"sealevel/libraries/hyperlane-sealevel-token",
"sealevel/libraries/interchain-security-module-interface",
"sealevel/libraries/message-recipient-interface",
"sealevel/libraries/multisig-ism",
"sealevel/libraries/serializable-account-meta",
"sealevel/libraries/test-transaction-utils",
"sealevel/libraries/test-utils",
"sealevel/programs/hyperlane-sealevel-token",
"sealevel/programs/hyperlane-sealevel-token-collateral",
"sealevel/programs/hyperlane-sealevel-token-native",
"sealevel/programs/hyperlane-sealevel-igp",
"sealevel/programs/hyperlane-sealevel-igp-test",
"sealevel/programs/ism/multisig-ism-message-id",
"sealevel/programs/ism/test-ism",
"sealevel/programs/mailbox",
"sealevel/programs/mailbox-test",
"sealevel/programs/test-send-receiver",
"sealevel/programs/validator-announce",
"utils/abigen",
"utils/backtrace-oneline",
"utils/hex",
"utils/run-locally",
"agents/relayer",
"agents/scraper",
"agents/validator",
"chains/hyperlane-cosmos",
"chains/hyperlane-ethereum",
"chains/hyperlane-fuel",
"chains/hyperlane-sealevel",
"ethers-prometheus",
"hyperlane-base",
"hyperlane-core",
"hyperlane-test",
"sealevel/client",
"sealevel/libraries/access-control",
"sealevel/libraries/account-utils",
"sealevel/libraries/ecdsa-signature",
"sealevel/libraries/hyperlane-sealevel-connection-client",
"sealevel/libraries/hyperlane-sealevel-token",
"sealevel/libraries/interchain-security-module-interface",
"sealevel/libraries/message-recipient-interface",
"sealevel/libraries/multisig-ism",
"sealevel/libraries/serializable-account-meta",
"sealevel/libraries/test-transaction-utils",
"sealevel/libraries/test-utils",
"sealevel/programs/hyperlane-sealevel-igp",
"sealevel/programs/hyperlane-sealevel-igp-test",
"sealevel/programs/hyperlane-sealevel-token",
"sealevel/programs/hyperlane-sealevel-token-collateral",
"sealevel/programs/hyperlane-sealevel-token-native",
"sealevel/programs/ism/multisig-ism-message-id",
"sealevel/programs/ism/test-ism",
"sealevel/programs/mailbox",
"sealevel/programs/mailbox-test",
"sealevel/programs/test-send-receiver",
"sealevel/programs/validator-announce",
"utils/abigen",
"utils/backtrace-oneline",
"utils/hex",
"utils/run-locally",
]

[workspace.package]
Expand All @@ -62,14 +62,14 @@ bytes = "1"
clap = "4"
color-eyre = "0.6"
config = "0.13.3"
cosmrs = { version = "0.14", default-features = false, features = [
"cosmwasm",
"rpc",
"tokio",
"grpc",
] }
convert_case = "0.6"
cosmwasm-std = { version = "*", features = ["stargate"] }
cosmrs = { version = "0.14", default-features = false, features = [
"cosmwasm",
"rpc",
"tokio",
"grpc",
] }
crunchy = "0.2"
ctrlc = "3.2"
curve25519-dalek = { version = "~3.2", features = ["serde"] }
Expand All @@ -85,9 +85,14 @@ fuels-code-gen = "0.38"
futures = "0.3"
futures-util = "0.3"
generic-array = { version = "0.14", features = ["serde", "more_lengths"] }
getrandom = { version = "0.2", features = [
"js",
] } # Required for WASM support https://docs.rs/getrandom/latest/getrandom/#webassembly-support
# Required for WASM support https://docs.rs/getrandom/latest/getrandom/#webassembly-support
bech32 = "0.9.1"
elliptic-curve = "0.12.3"
getrandom = { version = "0.2", features = ["js"] }
hex = "0.4.3"
hpl-interface = "=0.0.6-rc3"
hyper = "0.14"
hyper-tls = "0.5.0"
itertools = "0.11.0"
jsonrpc-core = "18.0"
k256 = { version = "0.13.1", features = ["std", "ecdsa"] }
Expand All @@ -108,24 +113,27 @@ primitive-types = "=0.12.1"
prometheus = "0.13"
regex = "1.5"
reqwest = "0.11"
ripemd = "0.1.3"
rlp = "=0.5.2"
rocksdb = "0.21.0"
sea-orm = { version = "0.11.1", features = [
"sqlx-postgres",
"runtime-tokio-native-tls",
"with-bigdecimal",
"with-time",
"macros",
"sqlx-postgres",
"runtime-tokio-native-tls",
"with-bigdecimal",
"with-time",
"macros",
] }
sea-orm-migration = { version = "0.11.1", features = [
"sqlx-postgres",
"runtime-tokio-native-tls",
"sqlx-postgres",
"runtime-tokio-native-tls",
] }
semver = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_bytes = "0.11"
serde_derive = "1.0"
serde_json = "1.0"
sha2 = { version = "0.10.6", default-features = false }
sha256 = "1.1.4"
sha3 = "0.10"
solana-account-decoder = "=1.14.13"
solana-banks-client = "=1.14.13"
Expand All @@ -140,7 +148,7 @@ solana-sdk = "=1.14.13"
solana-transaction-status = "=1.14.13"
solana-zk-token-sdk = "=1.14.13"
spl-associated-token-account = { version = "=1.1.2", features = [
"no-entrypoint",
"no-entrypoint",
] }
spl-noop = { version = "=0.1.3", features = ["no-entrypoint"] }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
Expand All @@ -151,12 +159,14 @@ strum = "0.25.0"
strum_macros = "0.25.2"
tempfile = "3.3"
tendermint = "0.32.2"
tendermint-rpc = { version = "0.32.0", features = ["http-client", "tokio"] }
thiserror = "1.0"
time = "0.3"
tiny-keccak = "2.0.2"
toml_edit = "0.19.14"
tokio = { version = "1", features = ["parking_lot"] }
tokio-test = "0.4"
toml_edit = "0.19.14"
tonic = "0.9.2"
tracing = { version = "0.1", features = ["release_max_level_debug"] }
tracing-error = "0.2"
tracing-futures = "0.2"
Expand All @@ -167,159 +177,146 @@ url = "2.3"
walkdir = "2"
warp = "0.3"
which = "4.3"
sha256 = "1.1.4"
bech32 = "0.9.1"
tonic = "0.9.2"
sha2 = { version = "0.10.6", default-features = false }
ripemd = "0.1.3"
hyper = "0.14"
hyper-tls = "0.5.0"
hex = "0.4.3"
tendermint-rpc = { version = "0.32.0", features = ["http-client", "tokio"] }
hpl-interface = "=0.0.6-rc3"
elliptic-curve = "0.12.3"

## TODO: remove this
cosmwasm-schema = "1.2.7"


[workspace.dependencies.ethers]
features = []
git = "https://github.com/hyperlane-xyz/ethers-rs"
tag = "2023-06-01"
features = []

[workspace.dependencies.ethers-contract]
features = ["legacy"]
git = "https://github.com/hyperlane-xyz/ethers-rs"
tag = "2023-06-01"
features = ["legacy"]

[workspace.dependencies.ethers-core]
features = []
git = "https://github.com/hyperlane-xyz/ethers-rs"
tag = "2023-06-01"
features = []

[workspace.dependencies.ethers-providers]
features = []
git = "https://github.com/hyperlane-xyz/ethers-rs"
tag = "2023-06-01"
features = []

[workspace.dependencies.ethers-signers]
features = ["aws"]
git = "https://github.com/hyperlane-xyz/ethers-rs"
tag = "2023-06-01"
features = ["aws"]

[patch.crates-io.curve25519-dalek]
version = "3.2.2"
git = "https://github.com/Eclipse-Laboratories-Inc/curve25519-dalek"
branch = "v3.2.2-relax-zeroize"
git = "https://github.com/Eclipse-Laboratories-Inc/curve25519-dalek"
version = "3.2.2"

[patch.crates-io.ed25519-dalek]
version = "1.0.1"
git = "https://github.com/Eclipse-Laboratories-Inc/ed25519-dalek"
branch = "main"
git = "https://github.com/Eclipse-Laboratories-Inc/ed25519-dalek"
version = "1.0.1"

[patch.crates-io.primitive-types]
version = "=0.12.1"
git = "https://github.com/hyperlane-xyz/parity-common.git"
branch = "hyperlane"
git = "https://github.com/hyperlane-xyz/parity-common.git"
version = "=0.12.1"

[patch.crates-io.rlp]
version = "=0.5.2"
git = "https://github.com/hyperlane-xyz/parity-common.git"
branch = "hyperlane"
git = "https://github.com/hyperlane-xyz/parity-common.git"
version = "=0.5.2"

[patch.crates-io.solana-account-decoder]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.solana-banks-client]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.solana-banks-interface]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.solana-banks-server]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.solana-clap-utils]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.solana-cli-config]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.solana-client]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.solana-program]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.solana-program-test]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.solana-sdk]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.solana-transaction-status]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.solana-zk-token-sdk]
version = "=1.14.13"
git = "https://github.com/hyperlane-xyz/solana.git"
tag = "hyperlane-1.14.13-2023-07-04"
version = "=1.14.13"

[patch.crates-io.spl-associated-token-account]
version = "=1.1.2"
git = "https://github.com/hyperlane-xyz/solana-program-library.git"
branch = "hyperlane"
git = "https://github.com/hyperlane-xyz/solana-program-library.git"
version = "=1.1.2"

[patch.crates-io.spl-noop]
version = "=0.1.3"
git = "https://github.com/hyperlane-xyz/solana-program-library.git"
branch = "hyperlane"
git = "https://github.com/hyperlane-xyz/solana-program-library.git"
version = "=0.1.3"

[patch.crates-io.spl-token]
version = "=3.5.0"
git = "https://github.com/hyperlane-xyz/solana-program-library.git"
branch = "hyperlane"
git = "https://github.com/hyperlane-xyz/solana-program-library.git"
version = "=3.5.0"

[patch.crates-io.spl-token-2022]
version = "=0.5.0"
git = "https://github.com/hyperlane-xyz/solana-program-library.git"
branch = "hyperlane"
git = "https://github.com/hyperlane-xyz/solana-program-library.git"
version = "=0.5.0"

[patch.crates-io.spl-type-length-value]
version = "=0.1.0"

git = "https://github.com/hyperlane-xyz/solana-program-library.git"
branch = "hyperlane"

[patch.crates-io.tendermint]
version = "=0.32.2"
git = "https://github.com/hyperlane-xyz/tendermint-rs.git"
branch = "trevor/0.32.2-fork"
git = "https://github.com/hyperlane-xyz/tendermint-rs.git"
version = "=0.32.2"

[patch.crates-io.tendermint-rpc]
version = "=0.32.2"
git = "https://github.com/hyperlane-xyz/tendermint-rs.git"
branch = "trevor/0.32.2-fork"
git = "https://github.com/hyperlane-xyz/tendermint-rs.git"
version = "=0.32.2"
Loading

0 comments on commit 02447da

Please sign in to comment.