@@ -10,39 +10,48 @@ use alloy::providers::fillers::JoinFill;
1010use alloy:: providers:: fillers:: NonceFiller ;
1111use alloy:: providers:: fillers:: WalletFiller ;
1212use alloy:: providers:: { Provider , ProviderBuilder , RootProvider } ;
13- use alloy:: signers:: Signer as _ ;
14- use alloy_network :: Ethereum ;
13+ use alloy:: signers:: local :: PrivateKeySigner ;
14+ // use alloy::signers::Signer as _ ;
1515use alloy_network:: EthereumWallet ;
1616use alloy_primitives:: Address ;
17- use alloy_transport :: BoxTransport ;
17+ use alloy_provider :: fillers :: BlobGasFiller ;
1818use alloy_transport_ws:: WsConnect ;
1919use anyhow:: Context ;
2020use clap:: Parser ;
21- use secure_signer:: cryptography:: secp256k1:: Secp256k1 ;
21+ // use secure_signer::cryptography::secp256k1::Secp256k1;
2222use secure_signer:: key:: TryFromCanonicalString ;
23- use secure_signer_eth:: Signer ;
24- use secure_signer_loader:: { identifiers:: SignerIdentifier , Load } ;
23+ // use secure_signer_eth::Signer;
24+ use secure_signer_loader:: { identifiers:: SignerIdentifier /* Load*/ } ;
2525use serde:: { Deserialize , Serialize } ;
26- use tracing:: info;
26+ // use tracing::info;
2727
2828#[ derive( Parser , Debug , Serialize , Deserialize , Clone ) ]
29+ #[ clap( help_expected = true ) ]
2930pub struct Config {
3031 /// The address of the MCR settlement contract.
32+ #[ arg( long) ]
3133 pub mcr_contract_address : String ,
3234 /// The Ethereum RPC connection URL.
35+ #[ arg( long) ]
3336 pub rpc_url : String ,
3437 /// The Ethereum WebSocket connection URL.
38+ #[ arg( long) ]
3539 pub ws_url : String ,
3640 /// The Ethereum chain ID.
41+ #[ arg( long) ]
3742 pub chain_id : u64 ,
3843 /// The signer identifier.
3944#[ arg( value_parser = SignerIdentifier :: try_from_canonical_string) ]
45+ #[ arg( long) ]
4046 pub signer_identifier : SignerIdentifier ,
4147 /// Whether to run in settlement admin mode.
48+ #[ arg( long) ]
4249 pub run_commitment_admin_mode : bool ,
4350 /// The gas limit for transactions.
51+ #[ arg( long) ]
4452 pub gas_limit : u64 ,
4553 /// The number of retries for sending transactions.
54+ #[ arg( long) ]
4655 pub transaction_send_retries : u32 ,
4756}
4857
@@ -78,42 +87,66 @@ impl Config {
7887 FillProvider <
7988 JoinFill <
8089 JoinFill <
81- JoinFill < JoinFill < alloy:: providers:: Identity , GasFiller > , NonceFiller > ,
82- ChainIdFiller ,
90+ alloy:: providers:: Identity ,
91+ JoinFill <
92+ GasFiller ,
93+ JoinFill < BlobGasFiller , JoinFill < NonceFiller , ChainIdFiller > > ,
94+ > ,
8395 > ,
8496 WalletFiller < EthereumWallet > ,
8597 > ,
86- RootProvider < BoxTransport > ,
87- BoxTransport ,
88- Ethereum ,
98+ RootProvider ,
99+ > ,
100+ FillProvider <
101+ JoinFill <
102+ alloy:: providers:: Identity ,
103+ JoinFill <
104+ GasFiller ,
105+ JoinFill < BlobGasFiller , JoinFill < NonceFiller , ChainIdFiller > > ,
106+ > ,
107+ > ,
108+ RootProvider ,
89109 > ,
90110 > ,
91111 anyhow:: Error ,
92112 > {
93- let signer_identifier: Box < dyn Load < Secp256k1 > + Send > =
113+ let raw_key = self . signer_identifier . try_raw_private_key ( ) . context ( "failed to get the raw private key from the signer identifier; only local signers are currently supported" ) ?;
114+ // add the 0x
115+ let raw_key_string = format ! ( "0x{}" , hex:: encode( raw_key) ) ;
116+ let private_key_signer: PrivateKeySigner = raw_key_string. parse ( ) ?;
117+ let signer_address = private_key_signer. address ( ) ;
118+
119+ /*let signer_identifier: Box<dyn Load<Secp256k1> + Send> =
94120 Box::new(self.signer_identifier.clone());
95121 let signer_provider = signer_identifier.load().await?;
96- let signer = Signer :: try_new ( signer_provider, Some ( self . chain_id ) ) . await ?;
122+
123+ let signer = Signer::try_new(signer_provider, Some(self.chain_id)).await?;*
97124
98125 let signer_address = signer.address();
99- info ! ( "Signer address: {}" , signer_address) ;
126+ info!("Signer address: {}", signer_address);*/
100127 let contract_address = self
101128 . mcr_contract_address
102129 . parse ( )
103- . context ( "Failed to parse the contract address for the MCR settlement client" ) ?;
130+ . context ( "failed to parse the contract address for the MCR settlement client" ) ?;
104131
105132 // Build the rpc provider
106133 let rpc_provider = ProviderBuilder :: new ( )
107- . with_recommended_fillers ( )
108- . wallet ( EthereumWallet :: from ( signer) )
109- . on_builtin ( & self . rpc_url )
134+ . wallet ( EthereumWallet :: from ( private_key_signer) )
135+ . connect ( & self . rpc_url )
136+ . await
137+ . context ( "failed to create the RPC provider for the MCR settlement client" ) ?;
138+
139+ // Build the ws provider
140+ let ws = WsConnect :: new ( self . ws_url ) ;
141+ let ws_provider = ProviderBuilder :: new ( )
142+ . on_ws ( ws)
110143 . await
111- . context ( "Failed to create the RPC provider for the MCR settlement client" ) ?;
144+ . context ( "failed to create the WebSocket provider for the MCR settlement client" ) ?;
112145
113146 let client = Self :: build_with_provider (
114147 self . run_commitment_admin_mode ,
115148 rpc_provider,
116- self . ws_url ,
149+ ws_provider ,
117150 signer_address,
118151 contract_address,
119152 self . gas_limit ,
@@ -127,26 +160,19 @@ impl Config {
127160 }
128161
129162 // Helper to build the MCR client with a custom provider.
130- async fn build_with_provider < S , P > (
163+ async fn build_with_provider < R , W > (
131164 run_commitment_admin_mode : bool ,
132- rpc_provider : P ,
133- ws_url : S ,
165+ rpc_provider : R ,
166+ ws_provider : W ,
134167 signer_address : Address ,
135168 contract_address : Address ,
136169 gas_limit : u64 ,
137170 send_transaction_retries : u32 ,
138- ) -> Result < Client < P > , anyhow:: Error >
171+ ) -> Result < Client < R , W > , anyhow:: Error >
139172 where
140- P : Provider + Clone ,
141- S : Into < String > ,
173+ R : Provider + Clone ,
174+ W : Provider + Clone ,
142175 {
143- let ws = WsConnect :: new ( ws_url) ;
144-
145- let ws_provider = ProviderBuilder :: new ( )
146- . on_ws ( ws)
147- . await
148- . context ( "Failed to create the WebSocket provider for the MCR settlement client" ) ?;
149-
150176 let rule1: Box < dyn VerifyRule > = Box :: new ( SendTransactionErrorRule :: < UnderPriced > :: new ( ) ) ;
151177 let rule2: Box < dyn VerifyRule > =
152178 Box :: new ( SendTransactionErrorRule :: < InsufficentFunds > :: new ( ) ) ;
0 commit comments