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

Merge develop into next #4151

Merged
merged 16 commits into from
Dec 11, 2023
Merged

Merge develop into next #4151

Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
85f32f7
Make tx fee a variable in stackerdb dkg test and increase it
jferrant Dec 7, 2023
301243b
reduce number of signers and keys so test doesn't consume all availab…
xoloki Dec 7, 2023
ce5faa3
fix: RPC endpoints should default to proof=1
kantai Dec 8, 2023
1f5cc3f
Merge pull request #4139 from stacks-network/fix/proof-defaults
wileyj Dec 8, 2023
67e4f30
test: fix httpcore test for defaulting in proof query string
kantai Dec 8, 2023
ad493ad
Merge pull request #4140 from stacks-network/fix/test-httpcor
kantai Dec 11, 2023
1fbfa9a
fix: set maxburncap to 1BTC in sendrawtransaction (new in Bitcoin 25.0)
kantai Dec 9, 2023
7b04730
use bitcoin 25.0 for tests
wileyj Dec 8, 2023
38a14a9
set test_stackerdb_dkg to ignore
xoloki Dec 11, 2023
a064672
Merge branch 'develop' into bugfix/stackerdb-dkg-test
wileyj Dec 11, 2023
a6741ce
Merge pull request #4142 from stacks-network/feat/set-maxburn-sendrawtx
wileyj Dec 11, 2023
d1f834d
Merge branch 'develop' into bugfix/stackerdb-dkg-test
wileyj Dec 11, 2023
a7e9237
Merge pull request #4136 from stacks-network/bugfix/stackerdb-dkg-test
wileyj Dec 11, 2023
2c501b7
Merge branch 'develop' into ci/fix-develop-tests
wileyj Dec 11, 2023
ad88424
Merge pull request #4141 from stacks-network/ci/fix-develop-tests
wileyj Dec 11, 2023
09cc0f5
Merge branch 'next' into merge-next-1702320758
wileyj Dec 11, 2023
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
3 changes: 2 additions & 1 deletion testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2350,7 +2350,8 @@ impl BitcoinRPCRequest {
pub fn send_raw_transaction(config: &Config, tx: String) -> RPCResult<()> {
let payload = BitcoinRPCRequest {
method: "sendrawtransaction".to_string(),
params: vec![tx.into()],
// set maxfee (as uncapped) and maxburncap (new in bitcoin 25)
params: vec![tx.into(), 0.into(), 1_000_000.into()],
id: "stacks".to_string(),
jsonrpc: "2.0".to_string(),
};
Expand Down