Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ saorsa-core = "0.21.0"
saorsa-pqc = "0.5"

# Payment verification - autonomi network lookup + EVM payment
evmlib = "0.5.0"
evmlib = { git = "https://github.com/WithAutonomi/evmlib/", branch = "refactor/unify-payment-vault-v2" }
xor_name = "5"

# Caching - LRU cache for verified XorNames
Expand Down
10 changes: 3 additions & 7 deletions src/bin/ant-devnet/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,11 @@ async fn main() -> color_eyre::Result<()> {
.default_wallet_private_key()
.map_err(|e| color_eyre::eyre::eyre!("Failed to get wallet key: {e}"))?;

let (rpc_url, token_addr, payments_addr, merkle_addr) = match &network {
let (rpc_url, token_addr, vault_addr) = match &network {
evmlib::Network::Custom(custom) => (
custom.rpc_url_http.to_string(),
format!("{:?}", custom.payment_token_address),
format!("{:?}", custom.data_payments_address),
custom
.merkle_payments_address
.map(|addr| format!("{addr:?}")),
format!("{:?}", custom.payment_vault_address),
),
_ => {
return Err(color_eyre::eyre::eyre!(
Expand All @@ -93,8 +90,7 @@ async fn main() -> color_eyre::Result<()> {
rpc_url,
wallet_private_key: wallet_key,
payment_token_address: token_addr,
data_payments_address: payments_addr,
merkle_payments_address: merkle_addr,
payment_vault_address: vault_addr,
})
} else {
None
Expand Down
7 changes: 2 additions & 5 deletions src/devnet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,8 @@ pub struct DevnetEvmInfo {
pub wallet_private_key: String,
/// Payment token contract address.
pub payment_token_address: String,
/// Data payments contract address.
pub data_payments_address: String,
/// Merkle payments contract address (for batch payments).
#[serde(default, skip_serializing_if = "Option::is_none")]
pub merkle_payments_address: Option<String>,
/// Unified payment vault contract address (handles both single-node and merkle payments).
pub payment_vault_address: String,
}

/// Network state for devnet startup lifecycle.
Expand Down
Loading
Loading