Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update stacks-core dependencies #1701

Merged
merged 1 commit into from
Mar 3, 2025
Merged

chore: update stacks-core dependencies #1701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 27 additions & 9 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion components/clarinet-deployments/src/onchain/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ fn sign_transaction_payload(
let signer_addr = get_stacks_address(&public_key, network);

let spending_condition = TransactionSpendingCondition::Singlesig(SinglesigSpendingCondition {
signer: signer_addr.bytes,
signer: *signer_addr.bytes(),
nonce,
tx_fee,
hash_mode: SinglesigHashMode::P2PKH,
Expand Down
50 changes: 16 additions & 34 deletions components/stacks-codec/src/codec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,17 +578,11 @@ impl MultisigSpendingCondition {
}

pub fn address_mainnet(&self) -> StacksAddress {
StacksAddress {
version: C32_ADDRESS_VERSION_MAINNET_MULTISIG,
bytes: self.signer,
}
StacksAddress::new(C32_ADDRESS_VERSION_MAINNET_MULTISIG, self.signer).unwrap()
}

pub fn address_testnet(&self) -> StacksAddress {
StacksAddress {
version: C32_ADDRESS_VERSION_TESTNET_MULTISIG,
bytes: self.signer,
}
StacksAddress::new(C32_ADDRESS_VERSION_TESTNET_MULTISIG, self.signer).unwrap()
}

/// Authenticate a spending condition against an initial sighash.
Expand Down Expand Up @@ -653,7 +647,7 @@ impl MultisigSpendingCondition {
self.signatures_required as usize,
&pubkeys,
) {
Some(a) => a.bytes,
Some(a) => *a.bytes(),
None => {
return Err(CodecError::SigningError(
"Failed to generate address from public keys".to_string(),
Expand Down Expand Up @@ -703,21 +697,15 @@ impl SinglesigSpendingCondition {
SinglesigHashMode::P2PKH => C32_ADDRESS_VERSION_MAINNET_SINGLESIG,
SinglesigHashMode::P2WPKH => C32_ADDRESS_VERSION_MAINNET_MULTISIG,
};
StacksAddress {
version,
bytes: self.signer,
}
StacksAddress::new(version, self.signer).unwrap()
}

pub fn address_testnet(&self) -> StacksAddress {
let version = match self.hash_mode {
SinglesigHashMode::P2PKH => C32_ADDRESS_VERSION_TESTNET_SINGLESIG,
SinglesigHashMode::P2WPKH => C32_ADDRESS_VERSION_TESTNET_MULTISIG,
};
StacksAddress {
version,
bytes: self.signer,
}
StacksAddress::new(version, self.signer).unwrap()
}

/// Authenticate a spending condition against an initial sighash.
Expand All @@ -743,7 +731,7 @@ impl SinglesigSpendingCondition {
1,
&vec![pubkey],
) {
Some(a) => a.bytes,
Some(a) => *a.bytes(),
None => {
return Err(CodecError::SigningError(
"Failed to generate address from public key".to_string(),
Expand Down Expand Up @@ -792,17 +780,11 @@ impl OrderIndependentMultisigSpendingCondition {
}

pub fn address_mainnet(&self) -> StacksAddress {
StacksAddress {
version: C32_ADDRESS_VERSION_MAINNET_MULTISIG,
bytes: self.signer,
}
StacksAddress::new(C32_ADDRESS_VERSION_MAINNET_MULTISIG, self.signer).unwrap()
}

pub fn address_testnet(&self) -> StacksAddress {
StacksAddress {
version: C32_ADDRESS_VERSION_TESTNET_MULTISIG,
bytes: self.signer,
}
StacksAddress::new(C32_ADDRESS_VERSION_TESTNET_MULTISIG, self.signer).unwrap()
}

/// Authenticate a spending condition against an initial sighash.
Expand Down Expand Up @@ -865,7 +847,7 @@ impl OrderIndependentMultisigSpendingCondition {
self.signatures_required as usize,
&pubkeys,
) {
Some(a) => a.bytes,
Some(a) => *a.bytes(),
None => {
return Err(CodecError::SigningError(
"Failed to generate address from public keys".to_string(),
Expand Down Expand Up @@ -903,7 +885,7 @@ impl TransactionSpendingCondition {

Some(TransactionSpendingCondition::Singlesig(
SinglesigSpendingCondition {
signer: signer_addr.bytes,
signer: *signer_addr.bytes(),
nonce: 0,
tx_fee: 0,
hash_mode: SinglesigHashMode::P2PKH,
Expand All @@ -923,7 +905,7 @@ impl TransactionSpendingCondition {

Some(TransactionSpendingCondition::Singlesig(
SinglesigSpendingCondition {
signer: signer_addr.bytes,
signer: *signer_addr.bytes(),
nonce: 0,
tx_fee: 0,
hash_mode: SinglesigHashMode::P2WPKH,
Expand All @@ -946,7 +928,7 @@ impl TransactionSpendingCondition {

Some(TransactionSpendingCondition::Multisig(
MultisigSpendingCondition {
signer: signer_addr.bytes,
signer: *signer_addr.bytes(),
nonce: 0,
tx_fee: 0,
hash_mode: MultisigHashMode::P2SH,
Expand All @@ -969,7 +951,7 @@ impl TransactionSpendingCondition {

Some(TransactionSpendingCondition::OrderIndependentMultisig(
OrderIndependentMultisigSpendingCondition {
signer: signer_addr.bytes,
signer: *signer_addr.bytes(),
nonce: 0,
tx_fee: 0,
hash_mode: OrderIndependentMultisigHashMode::P2SH,
Expand All @@ -992,7 +974,7 @@ impl TransactionSpendingCondition {

Some(TransactionSpendingCondition::OrderIndependentMultisig(
OrderIndependentMultisigSpendingCondition {
signer: signer_addr.bytes,
signer: *signer_addr.bytes(),
nonce: 0,
tx_fee: 0,
hash_mode: OrderIndependentMultisigHashMode::P2WSH,
Expand All @@ -1015,7 +997,7 @@ impl TransactionSpendingCondition {

Some(TransactionSpendingCondition::Multisig(
MultisigSpendingCondition {
signer: signer_addr.bytes,
signer: *signer_addr.bytes(),
nonce: 0,
tx_fee: 0,
hash_mode: MultisigHashMode::P2WSH,
Expand Down Expand Up @@ -3022,7 +3004,7 @@ pub fn build_contract_call_transaction(
.unwrap();

let spending_condition = TransactionSpendingCondition::Singlesig(SinglesigSpendingCondition {
signer: signer_addr.bytes,
signer: *signer_addr.bytes(),
nonce,
tx_fee: fee,
hash_mode: SinglesigHashMode::P2PKH,
Expand Down
2 changes: 1 addition & 1 deletion components/stacks-rpc-client/src/crypto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pub fn sign_transaction_payload(
let signer_addr = compute_stacks_address(&keypair.public_key, wallet.mainnet);

let spending_condition = TransactionSpendingCondition::Singlesig(SinglesigSpendingCondition {
signer: signer_addr.bytes,
signer: *signer_addr.bytes(),
nonce,
tx_fee,
hash_mode: SinglesigHashMode::P2PKH,
Expand Down
Loading