Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: relayer uses the new solana gateway #2

Merged
merged 9 commits into from
Dec 12, 2024
Merged

refactor: relayer uses the new solana gateway #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
da8101d
refactor: task processor using the new gateway
roberts-pumpurs Dec 10, 2024
da20e40
feat: update event forwarder to use the new gateway
roberts-pumpurs Dec 11, 2024
6d9fd54
chore: xtask fmt
roberts-pumpurs Dec 11, 2024
86c7925
refactor: components split up nicely
roberts-pumpurs Dec 11, 2024
4ebbdd5
chore: clippy fixes
roberts-pumpurs Dec 11, 2024
24b11a4
chore: remove unused deps
roberts-pumpurs Dec 11, 2024
8126111
chore: fix broken test
roberts-pumpurs Dec 11, 2024
2ee9c7b
chore cargo update
roberts-pumpurs Dec 11, 2024
b25942f
chore: updated deps & deny.toml
roberts-pumpurs Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,185 changes: 1,363 additions & 822 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 17 additions & 14 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,13 @@ relayer-amplifier-state = { git = "https://github.com/eigerco/axelar-relayer-cor
core-common-serde-utils = { git = "https://github.com/eigerco/axelar-relayer-core.git", package = "common-serde-utils", branch = "main" }

# Solana Gateway
gmp-gateway = { git = "https://github.com/eigerco/solana-axelar.git", branch = "main", features = ["no-entrypoint"] }
axelar-rkyv-encoding = { git = "https://github.com/eigerco/solana-axelar.git", branch = "main" }
axelar-message-primitives = { git = "https://github.com/eigerco/solana-axelar.git", branch = "main" }
axelar-executable = { git = "https://github.com/eigerco/solana-axelar.git", branch = "main" }
axelar-solana-gateway = { git = "https://github.com/eigerco/solana-axelar.git", rev = "91c8cf2", features = ["no-entrypoint"] }
axelar-solana-its = { git = "https://github.com/eigerco/solana-axelar.git", rev = "91c8cf2", features = ["no-entrypoint"] }
axelar-solana-governance = { git = "https://github.com/eigerco/solana-axelar.git", rev = "91c8cf2", features = ["no-entrypoint"] }
gateway-event-stack = { git = "https://github.com/eigerco/solana-axelar.git", rev = "91c8cf2" }
axelar-solana-encoding = { git = "https://github.com/eigerco/solana-axelar.git", rev = "91c8cf2" }
axelar-message-primitives = { git = "https://github.com/eigerco/solana-axelar.git", rev = "91c8cf2" }
axelar-executable = { git = "https://github.com/eigerco/solana-axelar.git", rev = "91c8cf2" }

# CLI
clap = { version = "4", features = ["derive"] }
Expand All @@ -98,14 +101,14 @@ bs58 = "0.5"
redact = { version = "0.1", features = ["serde"] }
thiserror = "1"
uuid = { version = "1.2", features = ["v4", "serde"] }
typed-builder = "0.18"
typed-builder = "0.2"
derive_builder = "0.20"
bnum = "0.12"
hex = "0.4"
quanta = "0.12"
backoff = { version = "0.4", features = ["tokio"] }
indoc = "2"
itertools = "0.12"
itertools = "0.13"
num-traits = "0.2"
memmap2 = "0.9"
bytemuck = "1.19"
Expand All @@ -114,10 +117,10 @@ bytemuck = "1.19"
serde = { version = "1", features = ["derive"] }
toml = "0.8"
serde_json = "1"
simd-json = "0.13"
simd-json = "0.14"

# Tests
rstest = { version = "0.21" }
rstest = { version = "0.23" }
test-log = { version = "0.2", features = ["trace"], default-features = false }
pretty_assertions = "1"
mockall = "0.13"
Expand All @@ -130,12 +133,12 @@ color-eyre = "0.6"
reqwest = { version = "0.12", default-features = false, features = ["json", "gzip", "deflate", "rustls-tls", "stream", "http2"] }

# Solana
solana-client = "2"
solana-rpc-client = "2"
solana-rpc-client-api = "2"
solana-program = "2"
solana-sdk = "2"
solana-transaction-status = "2"
solana-client = "=2.0.16"
solana-rpc-client = "=2.0.16"
solana-rpc-client-api = "=2.0.16"
solana-program = "=2.0.16"
solana-sdk = "=2.0.16"
solana-transaction-status = "=2.0.16"

# Async
tokio = { version = "1", features = ["rt", "signal", "rt-multi-thread", "macros"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/solana-axelar-relayer/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,6 @@ mod tests {
FAbbOyAg51Xklqm2Q954WWFmu3lluHCWUGB9eSHshIurTmDd+8o15A==
-----END PRIVATE KEY-----
"}
.to_string()
.to_owned()
}
}
5 changes: 2 additions & 3 deletions crates/solana-event-forwarder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ futures.workspace = true
relayer-amplifier-api-integration.workspace = true
solana-listener.workspace = true
relayer-engine.workspace = true
gmp-gateway.workspace = true
tracing.workspace = true
eyre.workspace = true
bs58.workspace = true
solana-sdk.workspace = true
axelar-message-primitives.workspace = true
axelar-rkyv-encoding.workspace = true
axelar-solana-gateway.workspace = true
gateway-event-stack.workspace = true

[dev-dependencies]
base64.workspace = true
Expand Down
Loading
Loading