Skip to content

Commit 910e8e8

Browse files
authored
feat(tron): migrate Tron agents from gRPC to HTTP API (#8370)
1 parent 2e622e8 commit 910e8e8

28 files changed

Lines changed: 621 additions & 579 deletions

File tree

.registryrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
564de5a59a50c5da171f2641eaac703f1b359683
1+
77d88fa972863bbdde722bca608c10718fb5a844

rust/main/Cargo.lock

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/main/agents/relayer/src/msg/op_batch.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ mod tests {
354354
..Default::default()
355355
},
356356
consider_null_transaction_receipt: false,
357-
grpc_urls: None,
358-
solidity_grpc_urls: None,
357+
wallet_urls: None,
358+
wallet_solidity_urls: None,
359359
energy_multiplier: None,
360360
}),
361361
metrics_conf: Default::default(),

rust/main/agents/relayer/src/relayer/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ fn generate_test_chain_conf(
8282
..Default::default()
8383
},
8484
consider_null_transaction_receipt: false,
85-
grpc_urls: None,
86-
solidity_grpc_urls: None,
85+
wallet_urls: None,
86+
wallet_solidity_urls: None,
8787
energy_multiplier: None,
8888
}),
8989
metrics_conf: PrometheusMiddlewareConf {

rust/main/agents/relayer/src/test_utils/dummy_data.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ pub fn dummy_chain_conf(domain: &HyperlaneDomain) -> ChainConf {
4242
transaction_overrides: Default::default(),
4343
op_submission_config: Default::default(),
4444
consider_null_transaction_receipt: false,
45-
grpc_urls: None,
46-
solidity_grpc_urls: None,
45+
wallet_urls: None,
46+
wallet_solidity_urls: None,
4747
energy_multiplier: None,
4848
}),
4949
metrics_conf: Default::default(),

rust/main/agents/scraper/src/agent.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,8 @@ mod test {
509509
..Default::default()
510510
},
511511
consider_null_transaction_receipt: false,
512-
grpc_urls: None,
513-
solidity_grpc_urls: None,
512+
wallet_urls: None,
513+
wallet_solidity_urls: None,
514514
energy_multiplier: None,
515515
}),
516516
metrics_conf: PrometheusMiddlewareConf {

rust/main/agents/validator/src/settings.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,19 @@ impl FromRawConf<RawValidatorSettings> for ValidatorSettings {
175175
let mut rpcs = get_rpc_urls(&chain, "rpcUrls", "customRpcUrls", &mut err);
176176
// this is only relevant for cosmos
177177
rpcs.extend(get_rpc_urls(&chain, "grpcUrls", "customGrpcUrls", &mut err));
178+
// tron wallet urls
179+
rpcs.extend(get_rpc_urls(
180+
&chain,
181+
"walletUrls",
182+
"customWalletUrls",
183+
&mut err,
184+
));
185+
rpcs.extend(get_rpc_urls(
186+
&chain,
187+
"walletSolidityUrls",
188+
"customWalletSolidityUrls",
189+
&mut err,
190+
));
178191

179192
cfg_unwrap_all!(cwp, err: [base, origin_chain, validator, checkpoint_syncer]);
180193

rust/main/chains/hyperlane-ethereum/src/config.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ pub struct ConnectionConf {
5454
/// non-null
5555
pub consider_null_transaction_receipt: bool,
5656

57-
// Tron specific rpcs
58-
/// gRPC urls
59-
pub grpc_urls: Option<Vec<Url>>,
60-
/// Solidity gRPC urls
61-
pub solidity_grpc_urls: Option<Vec<Url>>,
57+
// Tron specific
58+
/// Wallet HTTP API urls (full node REST endpoints)
59+
pub wallet_urls: Option<Vec<Url>>,
60+
/// Wallet Solidity HTTP API urls (solidity node REST endpoints)
61+
pub wallet_solidity_urls: Option<Vec<Url>>,
6262
/// Tron energy multiplier
6363
pub energy_multiplier: Option<f64>,
6464
}

rust/main/chains/hyperlane-ethereum/src/contracts/mailbox.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,8 +741,8 @@ mod test {
741741
transaction_overrides: Default::default(),
742742
op_submission_config: Default::default(),
743743
consider_null_transaction_receipt: false,
744-
grpc_urls: None,
745-
solidity_grpc_urls: None,
744+
wallet_urls: None,
745+
wallet_solidity_urls: None,
746746
energy_multiplier: None,
747747
};
748748

rust/main/chains/hyperlane-tron/Cargo.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,6 @@ tokio.workspace = true
3131
tracing-futures.workspace = true
3232
tracing.workspace = true
3333
url.workspace = true
34-
tonic = { workspace = true, features = [
35-
"transport",
36-
"tls",
37-
"tls-roots",
38-
"tls-native-roots",
39-
] }
40-
tower.workspace = true
41-
pin-project.workspace = true
4234
prost = { version = "0.13", default-features = true }
4335
prost-types = "0.13"
4436
time.workspace = true

0 commit comments

Comments
 (0)