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

feat: add "message executed" event #16

Merged
merged 14 commits into from
Jan 17, 2025
Merged

feat: add "message executed" event #16

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
26eea58
feat: add "message executed" event
roberts-pumpurs Jan 13, 2025
1e51077
fix: create a new match context for gas service events
roberts-pumpurs Jan 14, 2025
6db9efa
refactor: propagating gas service program id
roberts-pumpurs Jan 14, 2025
8f498df
wip: add unittests to the event forwarder
roberts-pumpurs Jan 14, 2025
18f05b1
readme test
roberts-pumpurs Jan 14, 2025
6d5375e
test: call_contract event parsing test
roberts-pumpurs Jan 14, 2025
8ccd832
test: gas_credited event parsing test
roberts-pumpurs Jan 15, 2025
7c33f24
wip test for gas & call contract events
roberts-pumpurs Jan 15, 2025
eda03f7
refactor: fix event forwarding
roberts-pumpurs Jan 15, 2025
f8ed144
feat: update the solana contracts repo dep
roberts-pumpurs Jan 15, 2025
f6f2385
chore: linter cleanups
roberts-pumpurs Jan 15, 2025
7142d32
chore: update deny.toml
roberts-pumpurs Jan 15, 2025
847c1c7
feat: explicit "no-entrypoint" for programs
roberts-pumpurs Jan 15, 2025
f9d4d39
revert: readme update
roberts-pumpurs Jan 16, 2025
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
115 changes: 72 additions & 43 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,24 @@ solana-gateway-task-processor = { path = "crates/solana-gateway-task-processor"
effective-tx-sender = { path = "crates/effective-tx-sender" }

# Relayer core
amplifier-api = { git = "https://github.com/eigerco/axelar-relayer-core.git", branch = "main" }
relayer-engine = { git = "https://github.com/eigerco/axelar-relayer-core.git", branch = "main" }
relayer-amplifier-api-integration = { git = "https://github.com/eigerco/axelar-relayer-core.git", branch = "main" }
relayer-amplifier-state = { git = "https://github.com/eigerco/axelar-relayer-core.git", branch = "main" }
core-common-serde-utils = { git = "https://github.com/eigerco/axelar-relayer-core.git", package = "common-serde-utils", branch = "main" }
amplifier-api = { git = "https://github.com/eigerco/axelar-relayer-core.git", rev = "7f84b8d" }
relayer-engine = { git = "https://github.com/eigerco/axelar-relayer-core.git", rev = "7f84b8d" }
relayer-amplifier-api-integration = { git = "https://github.com/eigerco/axelar-relayer-core.git", rev = "7f84b8d" }
relayer-amplifier-state = { git = "https://github.com/eigerco/axelar-relayer-core.git", rev = "7f84b8d" }
core-common-serde-utils = { git = "https://github.com/eigerco/axelar-relayer-core.git", package = "common-serde-utils", rev = "7f84b8d" }

# Solana Gateway
axelar-solana-gateway = { git = "https://github.com/eigerco/solana-axelar.git", rev = "c08f0925", features = ["no-entrypoint"] }
axelar-solana-its = { git = "https://github.com/eigerco/solana-axelar.git", rev = "c08f0925", features = ["no-entrypoint"] }
axelar-solana-governance = { git = "https://github.com/eigerco/solana-axelar.git", rev = "c08f0925", features = ["no-entrypoint"] }
gateway-event-stack = { git = "https://github.com/eigerco/solana-axelar.git", rev = "c08f0925" }
axelar-solana-encoding = { git = "https://github.com/eigerco/solana-axelar.git", rev = "c08f0925" }
axelar-solana-gas-service = { git = "https://github.com/eigerco/solana-axelar.git", rev = "c08f0925" }
axelar-solana-memo-program = { git = "https://github.com/eigerco/solana-axelar.git", rev = "c08f0925" }
axelar-solana-gateway-test-fixtures = { git = "https://github.com/eigerco/solana-axelar.git", rev = "c08f0925" }
axelar-message-primitives = { git = "https://github.com/eigerco/solana-axelar.git", rev = "c08f0925" }
axelar-executable = { git = "https://github.com/eigerco/solana-axelar.git", rev = "c08f0925" }
its-instruction-builder = { git = "https://github.com/eigerco/solana-axelar.git", rev = "c08f0925" }
axelar-solana-gateway = { git = "https://github.com/eigerco/solana-axelar.git", rev = "61b074d460", features = ["no-entrypoint"] }
axelar-solana-its = { git = "https://github.com/eigerco/solana-axelar.git", rev = "61b074d460", features = ["no-entrypoint"] }
axelar-solana-governance = { git = "https://github.com/eigerco/solana-axelar.git", rev = "61b074d460", features = ["no-entrypoint"] }
gateway-event-stack = { git = "https://github.com/eigerco/solana-axelar.git", rev = "61b074d460" }
axelar-solana-encoding = { git = "https://github.com/eigerco/solana-axelar.git", rev = "61b074d460" }
axelar-solana-gas-service = { git = "https://github.com/eigerco/solana-axelar.git", rev = "61b074d460", features = ["no-entrypoint"] }
axelar-solana-memo-program = { git = "https://github.com/eigerco/solana-axelar.git", rev = "61b074d460", features = ["no-entrypoint"] }
axelar-solana-gateway-test-fixtures = { git = "https://github.com/eigerco/solana-axelar.git", rev = "61b074d460" }
axelar-message-primitives = { git = "https://github.com/eigerco/solana-axelar.git", rev = "61b074d460" }
axelar-executable = { git = "https://github.com/eigerco/solana-axelar.git", rev = "61b074d460" }
its-instruction-builder = { git = "https://github.com/eigerco/solana-axelar.git", rev = "61b074d460" }

# CLI
clap = { version = "4", features = ["derive"] }
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# Solana Axelar Relayer

<iframe src="https://link.excalidraw.com/readonly/QM7lGcOS61xQYfEK122k" width="100%" height="100%" style="border: none;"></iframe>
roberts-pumpurs marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 5 additions & 0 deletions crates/solana-axelar-relayer/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ async fn main() {
let rpc_client = retrying_solana_http_sender::new_client(&config.solana_rpc);
let event_forwarder_config = solana_event_forwarder::Config::new(
&config.solana_listener_component,
&config.solana_gateway_task_processor,
&config.amplifier_component,
);
let name_on_amplifier = config.amplifier_component.chain.clone();
Expand Down Expand Up @@ -128,6 +129,8 @@ mod tests {
let gateway_program_address_as_str = gateway_program_address.to_string();
let gas_service_config_pda = Pubkey::new_unique();
let gas_service_config_pda_as_str = gas_service_config_pda.to_string();
let gas_service_program_id = Pubkey::new_unique();
let gas_service_program_id_as_str = gas_service_program_id.to_string();
let solana_rpc = "https://api.solana-devnet.com".parse()?;
let solana_ws = "wss://api.solana-devnet.com".parse()?;
let solana_tx_scan_poll_period = Duration::from_millis(42);
Expand Down Expand Up @@ -166,6 +169,7 @@ mod tests {
[solana_gateway_task_processor]
signing_keypair = "{signing_keypair_as_str}"
gateway_program_address = "{gateway_program_address_as_str}"
gas_service_program_address = "{gas_service_program_id_as_str}"
gas_service_config_pda = "{gas_service_config_pda_as_str}"

[solana_rpc]
Expand Down Expand Up @@ -200,6 +204,7 @@ mod tests {
},
solana_gateway_task_processor: solana_gateway_task_processor::Config {
gateway_program_address,
gas_service_program_address: gas_service_program_id,
gas_service_config_pda,
signing_keypair,
},
Expand Down
10 changes: 9 additions & 1 deletion crates/solana-event-forwarder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ edition.workspace = true
[dependencies]
futures.workspace = true
axelar-solana-gas-service.workspace = true
solana-gateway-task-processor.workspace = true
relayer-amplifier-api-integration.workspace = true
solana-listener.workspace = true
relayer-engine.workspace = true
Expand All @@ -23,8 +24,15 @@ gateway-event-stack.workspace = true

[dev-dependencies]
base64.workspace = true
pretty_assertions.workspace = true
axelar-solana-gateway-test-fixtures.workspace = true
retrying-solana-http-sender.workspace = true
axelar-solana-memo-program.workspace = true
solana-test-validator.workspace = true
solana-rpc-client-api.workspace = true
solana-rpc.workspace = true
test-log.workspace = true
tokio.workspace = true
pretty_assertions.workspace = true

[lints]
workspace = true
Loading
Loading