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.

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

Merge develop into next #4151

Merged
merged 16 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
Make tx fee a variable in stackerdb dkg test and increase it
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
  • Loading branch information
jferrant committed Dec 7, 2023
commit 85f32f7730d35286862daecd5ddfa2e3f2b9ecf0
3 changes: 1 addition & 2 deletions clarity/src/vm/functions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ macro_rules! switch_on_global_epoch {
};
}

use crate::vm::ClarityVersion;

use super::errors::InterpreterError;
use crate::vm::ClarityVersion;

mod arithmetic;
mod assets;
Expand Down
5 changes: 3 additions & 2 deletions testnet/stacks-node/src/tests/signer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,11 @@ fn setup_stx_btc_node(

info!("Send pox contract-publish...");

let tx_fee = 100_000;
let tx = make_contract_publish(
publisher_private_key,
0,
10_000,
tx_fee,
&pox_contract_id.name,
pox_contract,
);
Expand All @@ -146,7 +147,7 @@ fn setup_stx_btc_node(
let tx = make_contract_publish(
publisher_private_key,
1,
10_000,
tx_fee,
&stackerdb_contract_id.name,
stackerdb_contract,
);
Expand Down