Skip to content

Commit

Permalink
feat : updated da blob creation code
Browse files Browse the repository at this point in the history
  • Loading branch information
ocdbytes committed Nov 4, 2024
1 parent b42b698 commit d5ed088
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 3 deletions.
16 changes: 15 additions & 1 deletion crates/orchestrator/src/jobs/da_job/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -400,11 +400,19 @@ fn refactor_state_update(state_update: &mut StateDiff) {
let addresses_in_storage_diffs: Vec<Felt> =
state_update.storage_diffs.clone().iter().map(|item| item.address).collect();

let address_to_insert = find_unique_addresses(addresses_in_nonces, addresses_in_storage_diffs);
let address_to_insert = find_unique_addresses(addresses_in_nonces, addresses_in_storage_diffs.clone());

for address in address_to_insert {
state_update.storage_diffs.push(ContractStorageDiffItem { address, storage_entries: vec![] })
}

let addresses_in_deployed_contracts =
state_update.deployed_contracts.clone().iter().map(|item| item.address).collect();
let addresses_to_insert = find_unique_addresses(addresses_in_deployed_contracts, addresses_in_storage_diffs);

for address in addresses_to_insert {
state_update.storage_diffs.push(ContractStorageDiffItem { address, storage_entries: vec![] })
}
}

fn find_unique_addresses(nonce_addresses: Vec<Felt>, storage_diff_addresses: Vec<Felt>) -> Vec<Felt> {
Expand Down Expand Up @@ -486,6 +494,12 @@ pub mod test {
"src/tests/jobs/da_job/test_data/test_blob/671070.txt",
"src/tests/jobs/da_job/test_data/nonces/671070.txt"
)]
#[case(
178, // Block from pragma madara and orch test run
"src/tests/jobs/da_job/test_data/state_update/178.txt",
"src/tests/jobs/da_job/test_data/test_blob/178.txt",
"src/tests/jobs/da_job/test_data/nonces/178.txt"
)]
#[tokio::test]
async fn test_state_update_to_blob_data(
#[case] block_no: u64,
Expand Down
10 changes: 10 additions & 0 deletions crates/orchestrator/src/tests/jobs/da_job/test_data/nonces/178.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"nonce": "0",
"address": "2087021424722619777119509474943472645767659996348769578120564519014510906823"
},
{
"nonce": "0",
"address": "2227221089168209069826941066512062806409572016263164839237971044383978786453"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"block_hash": "0x385bbbcaada37fbd2be407d02479a86faf632294161451159433f1687afa80a",
"old_root": "0x39cc0b3f01d1b4b06a57f1e77d0be8093b9be560380a5b88bc2fefd9932d129",
"new_root": "0x249a0f2b937b67ec50021fe7520937d3b8f94564e6d1f935d3b009bbbc45645",
"state_diff": {
"storage_diffs": [
{
"address": "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
"storage_entries": [
{
"key": "0x68803f24598877e0945e64be0baadefff792986d2c5a2b6e7c8aa334d1c0e52",
"value": "0xf43fc2c03458b02"
},
{
"key": "0x709c6298f62a9011c05499b9f5ccce4ecc3e0753e48096edef484c409c25181",
"value": "0x189f07e"
}
]
},
{
"address": "0x4ec8ffda0fb4db938740a4fa54b3962852b8af5cf323b3d5f6f7ee102258e95",
"storage_entries": [
{
"key": "0x2b1577440dd7bedf920cb6de2f9fc6bf7ba98c78c85a3fa1f8311aac95e1759",
"value": "0x7c"
},
{
"key": "0x3b56d7f084d750efc42861fede4548333aff235c695a18e4747698157962a0b",
"value": "0x3c3af083273bcb2bedc6d7f38055d79a"
},
{
"key": "0x3b56d7f084d750efc42861fede4548333aff235c695a18e4747698157962a0a",
"value": "0x3a4ab88085f30eb952f488e972dc0035"
}
]
},
{
"address": "0x1",
"storage_entries": [
{
"key": "0xa8",
"value": "0x2ba8421b4e16ae6c77ba5d61446527e4320d2a57465f11147386a3b2f5f7758"
}
]
}
],
"deprecated_declared_classes": [],
"declared_classes": [
{
"class_hash": "0x29ed6994318833535323c098faa060a20120dc763c281dbe5fb9541a7eaf6c5",
"compiled_class_hash": "0xb0ea1eb7b2bbd82380f7b1237ea2fb047719137bf2a7d019dd5e468accc007"
}
],
"deployed_contracts": [
{
"address": "0x4220016ed41491dce777cc24efc06a1e88722c3e70506313f504573bce64627",
"class_hash": "0x29ed6994318833535323c098faa060a20120dc763c281dbe5fb9541a7eaf6c5"
}
],
"replaced_classes": [],
"nonces": [
{
"contract_address": "0x4fe5eea46caa0a1f344fafce82b39d66b552f00d3cd12e89073ef4b4ab37860",
"nonce": "0xd0"
}
]
}
}

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion madara
2 changes: 1 addition & 1 deletion pathfinder
Submodule pathfinder updated 42 files
+26 −16 crates/common/src/error.rs
+6 −0 crates/common/src/receipt.rs
+164 −2 crates/common/src/state_update.rs
+18 −14 crates/executor/src/types.rs
+2 −0 crates/gateway-types/src/reply.rs
+14 −0 crates/make-stream/src/lib.rs
+27 −4 crates/merkle-tree/src/class.rs
+53 −5 crates/merkle-tree/src/contract.rs
+9 −8 crates/merkle-tree/src/contract_state.rs
+207 −120 crates/merkle-tree/src/tree.rs
+1 −1 crates/p2p/src/builder.rs
+48 −42 crates/p2p/src/client/conv.rs
+52 −13 crates/p2p/src/client/peer_agnostic.rs
+12 −2 crates/p2p/src/client/peer_agnostic/fixtures.rs
+1 −0 crates/p2p_proto/proto/class.proto
+1 −0 crates/p2p_proto/proto/transaction.proto
+26 −5 crates/p2p_proto/src/class.rs
+25 −20 crates/p2p_proto/src/transaction.rs
+2 −2 crates/pathfinder/examples/re_execute.rs
+7 −1 crates/pathfinder/src/p2p_network/sync_handlers.rs
+3 −3 crates/pathfinder/src/p2p_network/sync_handlers/tests.rs
+0 −1 crates/pathfinder/src/state.rs
+7 −18 crates/pathfinder/src/state/sync.rs
+4 −4 crates/pathfinder/src/sync.rs
+7 −12 crates/pathfinder/src/sync/checkpoint.rs
+27 −0 crates/pathfinder/src/sync/checkpoint/fixture.rs
+4 −0 crates/pathfinder/src/sync/error.rs
+209 −8 crates/pathfinder/src/sync/state_updates.rs
+2 −6 crates/pathfinder/src/sync/track.rs
+23 −6 crates/rpc/src/dto/fee.rs
+11 −5 crates/rpc/src/dto/receipt.rs
+4 −5 crates/rpc/src/lib.rs
+120 −80 crates/rpc/src/method/estimate_fee.rs
+12 −8 crates/rpc/src/method/estimate_message_fee.rs
+76 −92 crates/rpc/src/method/get_storage_proof.rs
+33 −17 crates/rpc/src/pathfinder/methods/get_proof.rs
+46 −31 crates/rpc/src/v06/method/estimate_fee.rs
+12 −8 crates/rpc/src/v06/method/estimate_message_fee.rs
+4 −4 crates/rpc/src/v06/method/simulate_transactions.rs
+1 −0 crates/rpc/src/v08.rs
+1 −0 crates/storage/src/connection/transaction.rs
+1 −0 crates/storage/src/test_utils.rs

0 comments on commit d5ed088

Please sign in to comment.