Skip to content

Commit a2cfe8f

Browse files
Merge branch 'develop' into test/epoch34-clarity5
2 parents 1cbfc60 + 10a7c5b commit a2cfe8f

File tree

27 files changed

+41
-40
lines changed

27 files changed

+41
-40
lines changed

clarity-types/src/representations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl StacksMessageCodec for ClarityName {
106106
// must encode a valid string
107107
let s = String::from_utf8(bytes).map_err(|_e| {
108108
codec_error::DeserializeError(
109-
"Failed to parse Clarity name: could not contruct from utf8".to_string(),
109+
"Failed to parse Clarity name: could not construct from utf8".to_string(),
110110
)
111111
})?;
112112

clarity-types/src/tests/representations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ fn test_clarity_name_serialization(#[case] name: &str) {
9898

9999
// the first byte is the length of the buffer.
100100
#[rstest]
101-
#[case::invalid_utf8(vec![4, 0xFF, 0xFE, 0xFD, 0xFC], "Failed to parse Clarity name: could not contruct from utf8")]
101+
#[case::invalid_utf8(vec![4, 0xFF, 0xFE, 0xFD, 0xFC], "Failed to parse Clarity name: could not construct from utf8")]
102102
#[case::invalid_name(vec![2, b'2', b'i'], "Failed to parse Clarity name: InvalidClarityName(\"2i\")")] // starts with number
103103
#[case::too_long(vec![MAX_STRING_LEN + 1], "Failed to deserialize clarity name: too long")]
104104
#[case::wrong_length(vec![3, b'a'], "failed to fill whole buffer")]

clarity/src/vm/contexts.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub enum AssetMapEntry {
8888
}
8989

9090
/**
91-
The AssetMap is used to track which assets have been transfered from whom
91+
The AssetMap is used to track which assets have been transferred from whom
9292
during the execution of a transaction.
9393
*/
9494
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -559,7 +559,7 @@ impl fmt::Display for AssetMap {
559559
}
560560
for (principal, principal_map) in self.asset_map.iter() {
561561
for (asset, transfer) in principal_map.iter() {
562-
write!(f, "{principal} transfered [")?;
562+
write!(f, "{principal} transferred [")?;
563563
for t in transfer {
564564
write!(f, "{t}, ")?;
565565
}

clarity/src/vm/docs/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,7 @@ const MINT_TOKEN: SpecialAPI = SpecialAPI {
22092209
output_type: "(response bool uint)",
22102210
signature: "(ft-mint? token-name amount recipient)",
22112211
description: "`ft-mint?` is used to increase the token balance for the `recipient` principal for a token
2212-
type defined using `define-fungible-token`. The increased token balance is _not_ transfered from another principal, but
2212+
type defined using `define-fungible-token`. The increased token balance is _not_ transferred from another principal, but
22132213
rather minted.
22142214
22152215
If a non-positive amount is provided to mint, this function returns `(err 1)`. Otherwise, on successfully mint, it
@@ -2341,7 +2341,7 @@ const BURN_TOKEN: SpecialAPI = SpecialAPI {
23412341
output_type: "(response bool uint)",
23422342
signature: "(ft-burn? token-name amount sender)",
23432343
description: "`ft-burn?` is used to decrease the token balance for the `sender` principal for a token
2344-
type defined using `define-fungible-token`. The decreased token balance is _not_ transfered to another principal, but
2344+
type defined using `define-fungible-token`. The decreased token balance is _not_ transferred to another principal, but
23452345
rather destroyed, reducing the circulating supply.
23462346
23472347
On a successful burn, it returns `(ok true)`. The burn may fail with error code:

contrib/boot-contracts-stateful-prop-tests/tests/pox-4/pox_CommandModel.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export class Stub {
126126
burnBlockHeight,
127127
);
128128

129-
// Get the operator's pool stackers that no longer have partially commited
129+
// Get the operator's pool stackers that no longer have partially committed
130130
// STX for the next reward cycle by comparing their unlock height to
131131
// the next reward cycle's first block (only if the wallet is an operator).
132132
const stackersToRemoveAmountToCommit = wallet.lockedAddresses.filter((
@@ -167,7 +167,7 @@ export class Stub {
167167
wallet.lockedAddresses.splice(expStackerIndex, 1);
168168
});
169169

170-
// For each pool stacker that no longer have partially commited STX for
170+
// For each pool stacker that no longer have partially committed STX for
171171
// the next reward cycle, decrement the operator's amountToCommit
172172
// (partial-stacked) by the stacker's amountLocked.
173173
stackersToRemoveAmountToCommit.forEach((expStacker) => {

contrib/init/stacks.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ConditionPathExists=/etc/stacks-blockchain/Config.toml
1111
ConditionPathIsDirectory=/stacks-blockchain
1212

1313
[Service]
14+
LimitNOFILE=524288
1415
ExecStart=/usr/local/bin/stacks-node start --config /etc/stacks-blockchain/Config.toml
1516

1617
# Make sure the config directory is readable by the service user

libsigner/src/events.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ pub enum SignerEvent<T: SignerEventTrait> {
184184
SignerMessages {
185185
/// The signer set to which the message belongs (either 0 or 1)
186186
signer_set: u32,
187-
/// Each message of type `T` is paired with the `StacksPublicKey` of the slot from which it was retreived
187+
/// Each message of type `T` is paired with the `StacksPublicKey` of the slot from which it was retrieved
188188
messages: Vec<(StacksPublicKey, T)>,
189189
/// the time at which this event was received by the signer's event processor
190190
received_time: SystemTime,

libsigner/src/tests/signer_state.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ fn determine_latest_supported_signer_protocol_versions() {
212212
panic!("Unexpected state machine update message version");
213213
};
214214

215-
// Let's update 3 signers (60 percent) to support seperate but greater protocol versions
215+
// Let's update 3 signers (60 percent) to support separate but greater protocol versions
216216
for (i, address) in addresses.into_iter().skip(1).take(3).enumerate() {
217217
let new_version = local_update.local_supported_signer_protocol_version + i as u64 + 1;
218218
let new_update = StateMachineUpdateMessage::new(

libsigner/src/v0/messages.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ impl StacksMessageCodec for SignerMessage {
273273
}
274274
}
275275

276-
/// Work around for the fact that a lot of the structs being desierialized are not defined in messages.rs
276+
/// Work around for the fact that a lot of the structs being deserialized are not defined in messages.rs
277277
pub trait StacksMessageCodecExtensions: Sized {
278278
/// Serialize the struct to the provided writer
279279
fn inner_consensus_serialize<W: Write>(&self, fd: &mut W) -> Result<(), CodecError>;
@@ -326,7 +326,7 @@ impl StacksMessageCodec for PeerInfo {
326326
// must encode a valid string
327327
let server_version = String::from_utf8(bytes).map_err(|_e| {
328328
CodecError::DeserializeError(
329-
"Failed to parse server version name: could not contruct from utf8".to_string(),
329+
"Failed to parse server version name: could not construct from utf8".to_string(),
330330
)
331331
})?;
332332
let pox_consensus = read_next::<ConsensusHash, _>(fd)?;

stacks-common/src/types/chainstate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ impl TrieHash {
8585
}
8686

8787
/// Convert to a String that can be used in e.g. sqlite
88-
/// If we did not implement this seperate from Display,
88+
/// If we did not implement this separate from Display,
8989
/// we would use the stacks_common::util::hash::to_hex function
9090
/// which is the unrolled version of this function.
9191
#[allow(clippy::inherent_to_string_shadow_display)]

0 commit comments

Comments
 (0)