Skip to content

Commit 787e3e9

Browse files
obycodeobycode
committed
fix: always use chain_id from config when building txs
1 parent 3b5101f commit 787e3e9

File tree

13 files changed

+1358
-403
lines changed

13 files changed

+1358
-403
lines changed

‎testnet/stacks-node/src/tests/epoch_205.rs

Lines changed: 84 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,14 @@ fn test_exact_block_costs() {
7878
(ok 1)))
7979
";
8080

81-
let contract_publish_tx =
82-
make_contract_publish(&spender_sk, 0, 210_000, contract_name, contract_content);
81+
let contract_publish_tx = make_contract_publish(
82+
&spender_sk,
83+
0,
84+
210_000,
85+
conf.burnchain.chain_id,
86+
contract_name,
87+
contract_content,
88+
);
8389

8490
// make txs that alternate between
8591
let txs: Vec<_> = (1..transactions_to_broadcast + 1)
@@ -89,6 +95,7 @@ fn test_exact_block_costs() {
8995
&spender_sk,
9096
nonce,
9197
200_000,
98+
conf.burnchain.chain_id,
9299
&spender_addr_c32,
93100
contract_name,
94101
"db-get2",
@@ -99,6 +106,7 @@ fn test_exact_block_costs() {
99106
&spender_sk,
100107
nonce,
101108
200_000,
109+
conf.burnchain.chain_id,
102110
&spender_addr_c32,
103111
contract_name,
104112
"db-get2",
@@ -307,14 +315,22 @@ fn test_dynamic_db_method_costs() {
307315
amount: 200_000_000,
308316
});
309317

310-
let contract_publish_tx =
311-
make_contract_publish(&spender_sk, 0, 210_000, contract_name, contract_content);
318+
let contract_publish_tx = make_contract_publish(
319+
&spender_sk,
320+
0,
321+
210_000,
322+
conf.burnchain.chain_id,
323+
contract_name,
324+
contract_content,
325+
);
312326

327+
let chain_id = conf.burnchain.chain_id;
313328
let make_db_get1_call = |nonce| {
314329
make_contract_call(
315330
&spender_sk,
316331
nonce,
317332
200_000,
333+
chain_id,
318334
&spender_addr_c32,
319335
contract_name,
320336
"db-get1",
@@ -327,6 +343,7 @@ fn test_dynamic_db_method_costs() {
327343
&spender_sk,
328344
nonce,
329345
200_000,
346+
chain_id,
330347
&spender_addr_c32,
331348
contract_name,
332349
"db-get2",
@@ -800,6 +817,7 @@ fn test_cost_limit_switch_version205() {
800817
&creator_sk,
801818
0,
802819
1100000,
820+
conf.burnchain.chain_id,
803821
"increment-contract",
804822
&giant_contract,
805823
),
@@ -828,6 +846,7 @@ fn test_cost_limit_switch_version205() {
828846
&alice_sk,
829847
0,
830848
1000,
849+
conf.burnchain.chain_id,
831850
&creator_addr.into(),
832851
"increment-contract",
833852
"increment-many",
@@ -862,6 +881,7 @@ fn test_cost_limit_switch_version205() {
862881
&bob_sk,
863882
0,
864883
1000,
884+
conf.burnchain.chain_id,
865885
&creator_addr.into(),
866886
"increment-contract",
867887
"increment-many",
@@ -902,65 +922,6 @@ fn bigger_microblock_streams_in_2_05() {
902922
.collect();
903923
let spender_addrs: Vec<PrincipalData> = spender_sks.iter().map(|x| to_addr(x).into()).collect();
904924

905-
let txs: Vec<Vec<_>> = spender_sks
906-
.iter()
907-
.enumerate()
908-
.map(|(ix, spender_sk)| {
909-
// almost fills a whole block
910-
make_contract_publish_microblock_only(
911-
spender_sk,
912-
0,
913-
1049230,
914-
&format!("large-{}", ix),
915-
&format!("
916-
;; a single one of these transactions consumes over half the runtime budget
917-
(define-constant BUFF_TO_BYTE (list
918-
0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b 0x0c 0x0d 0x0e 0x0f
919-
0x10 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 0x1f
920-
0x20 0x21 0x22 0x23 0x24 0x25 0x26 0x27 0x28 0x29 0x2a 0x2b 0x2c 0x2d 0x2e 0x2f
921-
0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39 0x3a 0x3b 0x3c 0x3d 0x3e 0x3f
922-
0x40 0x41 0x42 0x43 0x44 0x45 0x46 0x47 0x48 0x49 0x4a 0x4b 0x4c 0x4d 0x4e 0x4f
923-
0x50 0x51 0x52 0x53 0x54 0x55 0x56 0x57 0x58 0x59 0x5a 0x5b 0x5c 0x5d 0x5e 0x5f
924-
0x60 0x61 0x62 0x63 0x64 0x65 0x66 0x67 0x68 0x69 0x6a 0x6b 0x6c 0x6d 0x6e 0x6f
925-
0x70 0x71 0x72 0x73 0x74 0x75 0x76 0x77 0x78 0x79 0x7a 0x7b 0x7c 0x7d 0x7e 0x7f
926-
0x80 0x81 0x82 0x83 0x84 0x85 0x86 0x87 0x88 0x89 0x8a 0x8b 0x8c 0x8d 0x8e 0x8f
927-
0x90 0x91 0x92 0x93 0x94 0x95 0x96 0x97 0x98 0x99 0x9a 0x9b 0x9c 0x9d 0x9e 0x9f
928-
0xa0 0xa1 0xa2 0xa3 0xa4 0xa5 0xa6 0xa7 0xa8 0xa9 0xaa 0xab 0xac 0xad 0xae 0xaf
929-
0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xb6 0xb7 0xb8 0xb9 0xba 0xbb 0xbc 0xbd 0xbe 0xbf
930-
0xc0 0xc1 0xc2 0xc3 0xc4 0xc5 0xc6 0xc7 0xc8 0xc9 0xca 0xcb 0xcc 0xcd 0xce 0xcf
931-
0xd0 0xd1 0xd2 0xd3 0xd4 0xd5 0xd6 0xd7 0xd8 0xd9 0xda 0xdb 0xdc 0xdd 0xde 0xdf
932-
0xe0 0xe1 0xe2 0xe3 0xe4 0xe5 0xe6 0xe7 0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef
933-
0xf0 0xf1 0xf2 0xf3 0xf4 0xf5 0xf6 0xf7 0xf8 0xf9 0xfa 0xfb 0xfc 0xfd 0xfe 0xff
934-
))
935-
(define-private (crash-me-folder (input (buff 1)) (ctr uint))
936-
(begin
937-
(unwrap-panic (index-of BUFF_TO_BYTE input))
938-
(unwrap-panic (index-of BUFF_TO_BYTE input))
939-
(unwrap-panic (index-of BUFF_TO_BYTE input))
940-
(unwrap-panic (index-of BUFF_TO_BYTE input))
941-
(unwrap-panic (index-of BUFF_TO_BYTE input))
942-
(unwrap-panic (index-of BUFF_TO_BYTE input))
943-
(unwrap-panic (index-of BUFF_TO_BYTE input))
944-
(unwrap-panic (index-of BUFF_TO_BYTE input))
945-
(+ u1 ctr)
946-
)
947-
)
948-
(define-public (crash-me (name (string-ascii 128)))
949-
(begin
950-
(fold crash-me-folder BUFF_TO_BYTE u0)
951-
(print name)
952-
(ok u0)
953-
)
954-
)
955-
(begin
956-
(crash-me \"{}\"))
957-
",
958-
&format!("large-contract-{}", &ix)
959-
)
960-
)
961-
})
962-
.collect();
963-
964925
let (mut conf, miner_account) = neon_integration_test_conf();
965926

966927
for spender_addr in spender_addrs.iter() {
@@ -1022,6 +983,66 @@ fn bigger_microblock_streams_in_2_05() {
1022983
]);
1023984
conf.burnchain.pox_2_activation = Some(10_003);
1024985

986+
let txs: Vec<Vec<_>> = spender_sks
987+
.iter()
988+
.enumerate()
989+
.map(|(ix, spender_sk)| {
990+
// almost fills a whole block
991+
make_contract_publish_microblock_only(
992+
spender_sk,
993+
0,
994+
1049230,
995+
conf.burnchain.chain_id,
996+
&format!("large-{}", ix),
997+
&format!("
998+
;; a single one of these transactions consumes over half the runtime budget
999+
(define-constant BUFF_TO_BYTE (list
1000+
0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b 0x0c 0x0d 0x0e 0x0f
1001+
0x10 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 0x1f
1002+
0x20 0x21 0x22 0x23 0x24 0x25 0x26 0x27 0x28 0x29 0x2a 0x2b 0x2c 0x2d 0x2e 0x2f
1003+
0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39 0x3a 0x3b 0x3c 0x3d 0x3e 0x3f
1004+
0x40 0x41 0x42 0x43 0x44 0x45 0x46 0x47 0x48 0x49 0x4a 0x4b 0x4c 0x4d 0x4e 0x4f
1005+
0x50 0x51 0x52 0x53 0x54 0x55 0x56 0x57 0x58 0x59 0x5a 0x5b 0x5c 0x5d 0x5e 0x5f
1006+
0x60 0x61 0x62 0x63 0x64 0x65 0x66 0x67 0x68 0x69 0x6a 0x6b 0x6c 0x6d 0x6e 0x6f
1007+
0x70 0x71 0x72 0x73 0x74 0x75 0x76 0x77 0x78 0x79 0x7a 0x7b 0x7c 0x7d 0x7e 0x7f
1008+
0x80 0x81 0x82 0x83 0x84 0x85 0x86 0x87 0x88 0x89 0x8a 0x8b 0x8c 0x8d 0x8e 0x8f
1009+
0x90 0x91 0x92 0x93 0x94 0x95 0x96 0x97 0x98 0x99 0x9a 0x9b 0x9c 0x9d 0x9e 0x9f
1010+
0xa0 0xa1 0xa2 0xa3 0xa4 0xa5 0xa6 0xa7 0xa8 0xa9 0xaa 0xab 0xac 0xad 0xae 0xaf
1011+
0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xb6 0xb7 0xb8 0xb9 0xba 0xbb 0xbc 0xbd 0xbe 0xbf
1012+
0xc0 0xc1 0xc2 0xc3 0xc4 0xc5 0xc6 0xc7 0xc8 0xc9 0xca 0xcb 0xcc 0xcd 0xce 0xcf
1013+
0xd0 0xd1 0xd2 0xd3 0xd4 0xd5 0xd6 0xd7 0xd8 0xd9 0xda 0xdb 0xdc 0xdd 0xde 0xdf
1014+
0xe0 0xe1 0xe2 0xe3 0xe4 0xe5 0xe6 0xe7 0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef
1015+
0xf0 0xf1 0xf2 0xf3 0xf4 0xf5 0xf6 0xf7 0xf8 0xf9 0xfa 0xfb 0xfc 0xfd 0xfe 0xff
1016+
))
1017+
(define-private (crash-me-folder (input (buff 1)) (ctr uint))
1018+
(begin
1019+
(unwrap-panic (index-of BUFF_TO_BYTE input))
1020+
(unwrap-panic (index-of BUFF_TO_BYTE input))
1021+
(unwrap-panic (index-of BUFF_TO_BYTE input))
1022+
(unwrap-panic (index-of BUFF_TO_BYTE input))
1023+
(unwrap-panic (index-of BUFF_TO_BYTE input))
1024+
(unwrap-panic (index-of BUFF_TO_BYTE input))
1025+
(unwrap-panic (index-of BUFF_TO_BYTE input))
1026+
(unwrap-panic (index-of BUFF_TO_BYTE input))
1027+
(+ u1 ctr)
1028+
)
1029+
)
1030+
(define-public (crash-me (name (string-ascii 128)))
1031+
(begin
1032+
(fold crash-me-folder BUFF_TO_BYTE u0)
1033+
(print name)
1034+
(ok u0)
1035+
)
1036+
)
1037+
(begin
1038+
(crash-me \"{}\"))
1039+
",
1040+
&format!("large-contract-{}", &ix)
1041+
)
1042+
)
1043+
})
1044+
.collect();
1045+
10251046
test_observer::spawn();
10261047
test_observer::register_any(&mut conf);
10271048

0 commit comments

Comments
 (0)