Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
11
67 changes: 42 additions & 25 deletions crates/central_systest_blobs/resources/preconfirmed_block.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"block_number": 4,
"block_number": 6,
"pre_confirmed_block": {
"l1_da_mode": "CALLDATA",
"l1_data_gas_price": {
Expand All @@ -17,16 +17,16 @@
"sequencer_address": "0x1000",
"starknet_version": "0.14.3",
"status": "PRE_CONFIRMED",
"timestamp": 1004,
"timestamp": 1006,
"transaction_receipts": [
{
"actual_fee": "0x6d1f42b7",
"actual_fee": "0x158bf1",
"events": [
{
"data": [
"0xf99e7cdfbcce0bf14ce17e4c57fd2d12ad1bca5fc8e46a9fbafc36b59a9955",
"0x1000",
"0x6d1f42b7",
"0x158bf1",
"0x0"
],
"from_address": "0x6bd1d71a2fb67a567618584ca31da288dbc2e1a8421e4045e05f52c19bfab83",
Expand All @@ -38,52 +38,58 @@
"execution_resources": {
"builtin_instance_counter": {
"pedersen_builtin": 4,
"poseidon_builtin": 15,
"range_check_builtin": 72
"poseidon_builtin": 17,
"range_check_builtin": 90
},
"data_availability": {
"l1_data_gas": 0,
"l1_gas": 2754,
"l1_gas": 4095,
"l2_gas": 0
},
"n_memory_holes": 0,
"n_steps": 3523,
"n_steps": 4403,
"total_gas_consumed": {
"l1_data_gas": 0,
"l1_gas": 2754,
"l2_gas": 1830762485
"l1_gas": 4646,
"l2_gas": 1407435
}
},
"execution_status": "SUCCEEDED",
"l2_to_l1_messages": [],
"transaction_hash": "0x5243be6398910bcd98bfbec1271759489364e2e35a73c1f42c0a83482c61aca",
"transaction_hash": "0x69baeec4f5fd1665ef711e66f55b891ea8c8427d2cacb2eb39e3b66d320ae0d",
"transaction_index": 0
}
],
"transaction_state_diffs": [
{
"declared_classes": [
"declared_classes": [],
"deployed_contracts": [
{
"class_hash": "0x4b0dc3014cc21eeeeba97610d8fb3eaf61c428c513a2e9bfcf1b7beb9cb99c0",
"compiled_class_hash": "0x50cb22f072d8c735911ff906272d7f4256b8fa8aea1c8c624f879f343694870"
"address": "0x4021329459ab2dacdd89c397996da9214211fa2abf2cda1bfb8f4cffe6db51f",
"class_hash": "0x4b0dc3014cc21eeeeba97610d8fb3eaf61c428c513a2e9bfcf1b7beb9cb99c0"
}
],
"deployed_contracts": [],
"migrated_compiled_classes": [],
"nonces": {
"0xf99e7cdfbcce0bf14ce17e4c57fd2d12ad1bca5fc8e46a9fbafc36b59a9955": "0x3"
"0xf99e7cdfbcce0bf14ce17e4c57fd2d12ad1bca5fc8e46a9fbafc36b59a9955": "0x5"
},
"old_declared_contracts": [],
"replaced_classes": [],
"storage_diffs": {
"0x4021329459ab2dacdd89c397996da9214211fa2abf2cda1bfb8f4cffe6db51f": [
{
"key": "0x1275130f95dda36bcbb6e9d28796c1d7e10b6e9fd5ed083e0ede4b12f613528",
"value": "0x2"
}
],
"0x6bd1d71a2fb67a567618584ca31da288dbc2e1a8421e4045e05f52c19bfab83": [
{
"key": "0x6fba6554adab51d0272b896b6f41768bd0491e5ad59c39fab38e65767974793",
"value": "0xffffffffffffffffffffffff92e0bd48"
"value": "0xffffffffffffffffffffffff92bbce2b"
},
{
"key": "0x723973208639b7839ce298f7ffea61e3f9533872defd7abdb91023db4658812",
"value": "0x6d1f42b7"
"value": "0x6d4431d4"
}
]
}
Expand All @@ -92,12 +98,23 @@
"transactions": [
{
"account_deployment_data": [],
"class_hash": "0x4b0dc3014cc21eeeeba97610d8fb3eaf61c428c513a2e9bfcf1b7beb9cb99c0",
"compiled_class_hash": "0x50cb22f072d8c735911ff906272d7f4256b8fa8aea1c8c624f879f343694870",
"calldata": [
"0x1",
"0xf99e7cdfbcce0bf14ce17e4c57fd2d12ad1bca5fc8e46a9fbafc36b59a9955",
"0x2730079d734ee55315f4f141eaed376bddd8c2133523d223a344c5604e0f7f8",
"0x6",
"0x4b0dc3014cc21eeeeba97610d8fb3eaf61c428c513a2e9bfcf1b7beb9cb99c0",
"0x0",
"0x2",
"0x1",
"0x1",
"0x0"
],
"fee_data_availability_mode": 0,
"nonce": "0x2",
"nonce": "0x4",
"nonce_data_availability_mode": 0,
"paymaster_data": [],
"proof_facts": [],
"resource_bounds": {
"L1_DATA_GAS": {
"max_amount": "0x186a0",
Expand All @@ -114,12 +131,12 @@
},
"sender_address": "0xf99e7cdfbcce0bf14ce17e4c57fd2d12ad1bca5fc8e46a9fbafc36b59a9955",
"signature": [
"0x147f1b7ec5f3836d7bd3be39af5136cb75f113deebcf7d1962da19ef00d8719",
"0x4d083fb99ab11fb5a577a559c27f9e65c4de397a735054cd6e038716434b53b"
"0x24b3b8fc254a82c56f7c592ebaf989fb2551228ac0f8d7fa2b0cb43ea94dc2a",
"0x70feac66dc56daf6857c6a34a4b547ca653a96fb3d674b180ce403684e8dbba"
],
"tip": "0x0",
"transaction_hash": "0x5243be6398910bcd98bfbec1271759489364e2e35a73c1f42c0a83482c61aca",
"type": "DECLARE",
"transaction_hash": "0x69baeec4f5fd1665ef711e66f55b891ea8c8427d2cacb2eb39e3b66d320ae0d",
"type": "INVOKE_FUNCTION",
"version": "0x3"
}
]
Expand Down
14 changes: 13 additions & 1 deletion crates/central_systest_blobs/src/cende_blob_regression_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -829,9 +829,9 @@ async fn test_make_data() {
// sender account.
// (from this point - all txs include non-zero fees, and no more bootstrap declares)
// 5. declare the test contract.
// TODO(Dori): the rest of the txs.
// 6. deploy the test contract.
// 7. deploy another instance of the test contract.
// TODO(Dori): the rest of the txs.
// 8. invoke the test contract: something with a state change.
// 9. invoke the test contract: test syscalls.
let erc20_contract = FeatureContract::ERC20(CairoVersion::Cairo1(RunnableCairo1::Casm));
Expand Down Expand Up @@ -862,6 +862,18 @@ async fn test_make_data() {
EXPECTED_FEE_TOKEN_ADDRESS.assert_eq(&token_address.to_string());
blob_factory.close_block().await;
blob_factory.make_declare_tx(test_contract, Some(*OPERATOR_ADDRESS));
blob_factory.close_block().await;
let _test_contract_address_0 = blob_factory.make_operator_deploy_tx(
test_contract,
calldata![Felt::ZERO, Felt::ZERO],
true, // charge fee
);
blob_factory.close_block().await;
let _test_contract_address_1 = blob_factory.make_operator_deploy_tx(
test_contract,
calldata![Felt::ONE, Felt::ONE],
true, // charge fee
);

let (blobs, preconfirmed_block) = blob_factory.finalize().await;
expect_file![CHAIN_INFO_PATH].assert_eq(&serde_json::to_string_pretty(&chain_info).unwrap());
Expand Down
Loading