Skip to content

Commit

Permalink
Merge branch 'main' into ma/simple-stake-table
Browse files Browse the repository at this point in the history
  • Loading branch information
sveitser authored Dec 10, 2024
2 parents fabe4af + bc5b7f1 commit 2ec9e1f
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions contracts/script/multisigTransactionProposals/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ source .env.contracts && \
ts-node contracts/script/multisigTransactionProposals/safeSDK/modifyProverModeProposal.ts setProver
```

Open the the URL shown in the console to sign the transaction in the Safe UI.
Open the URL shown in the console to sign the transaction in the Safe UI.

Once successful, all signers will see a transaction request on the SAFE UI e.g.
`https://app.safe.global/transactions/queue?safe=$SAFE_MULTISIG_ADDRESS`
Expand Down Expand Up @@ -84,7 +84,7 @@ source .env.contracts && \
ts-node contracts/script/multisigTransactionProposals/safeSDK/modifyStateHistoryRetentionPeriod.ts
```

Open the the URL shown in the console to sign the transaction in the Safe UI.
Open the URL shown in the console to sign the transaction in the Safe UI.

Once successful, all signers will see a transaction request on the SAFE UI e.g.
`https://app.safe.global/transactions/queue?safe=$SAFE_MULTISIG_ADDRESS`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ impl HotShotEventProcessingTask {

let public_api_url = roll_call_info.public_api_url;

// Send the the discovered public url to the sink
// Send the discovered public url to the sink
let send_result = url_sender.send(public_api_url).await;
if let Err(err) = send_result {
tracing::error!("url sender closed: {}", err);
Expand Down
2 changes: 1 addition & 1 deletion node-metrics/src/api/node_validator/v0/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ impl HotshotQueryServiceLeafStreamRetriever {
/// will use the given base [Url] to be able to retrieve the stream of
/// [Leaf]s from the Hotshot Query Service.
///
/// The [Url] is expected to point to the the API version root of the
/// The [Url] is expected to point to the API version root of the
/// Hotshot Query Service. Example:
/// https://example.com/v0
pub fn new(base_url: Url) -> Self {
Expand Down
6 changes: 3 additions & 3 deletions node-metrics/src/service/client_state/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ impl ProcessDistributeBlockDetailHandlingTask {
}

/// [process_distribute_block_detail_handling_stream] is a function that
/// processes the the [Stream] of incoming [BlockDetail] and distributes them
/// processes the [Stream] of incoming [BlockDetail] and distributes them
/// to all subscribed clients.
async fn process_distribute_block_detail_handling_stream<S, K>(
client_thread_state: Arc<RwLock<ClientThreadState<K>>>,
Expand Down Expand Up @@ -1073,7 +1073,7 @@ impl ProcessDistributeNodeIdentityHandlingTask {
}

/// [process_distribute_node_identity_handling_stream] is a function that
/// processes the the [Stream] of incoming [NodeIdentity] and distributes them
/// processes the [Stream] of incoming [NodeIdentity] and distributes them
/// to all subscribed clients.
async fn process_distribute_node_identity_handling_stream<S, K>(
client_thread_state: Arc<RwLock<ClientThreadState<K>>>,
Expand Down Expand Up @@ -1143,7 +1143,7 @@ impl ProcessDistributeVotersHandlingTask {
}

/// [process_distribute_voters_handling_stream] is a function that processes
/// the the [Stream] of incoming [BitVec] and distributes them to all
/// the [Stream] of incoming [BitVec] and distributes them to all
/// subscribed clients.
async fn process_distribute_voters_handling_stream<S, K>(
client_thread_state: Arc<RwLock<ClientThreadState<K>>>,
Expand Down
2 changes: 1 addition & 1 deletion node-metrics/src/service/data_state/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ where
// Where's the stake table?
let signatures = signatures.as_ref();

// Let's determine the the participants of the voter participants
// Let's determine the participants of the voter participants
// in the Quorum Certificate.

// We shouldn't ever have a BitVec that is empty, with the possible
Expand Down
2 changes: 1 addition & 1 deletion sequencer/src/genesis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ mod test {

let genesis: Genesis = toml::from_str(&toml).unwrap_or_else(|err| panic!("{err:#}"));

// validate the the fee_contract address
// validate the fee_contract address
let result = genesis.validate_fee_contract(anvil.endpoint()).await;

// check if the result from the validation is an error
Expand Down
2 changes: 1 addition & 1 deletion types/src/v0/impls/auction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ impl BidTx {
.charge_fee(FeeInfo::new(self.account(), self.amount()), recipient)
.map_err(ExecutionError::from)?;

// Charge the the gas amount
// Charge the gas amount
state
.charge_fee(FeeInfo::new(self.account(), self.gas_price()), recipient)
.map_err(ExecutionError::from)?;
Expand Down

0 comments on commit 2ec9e1f

Please sign in to comment.