Skip to content
This repository has been archived by the owner on Dec 15, 2023. It is now read-only.

Adapt to OZ 0.5.0 account #321

Merged
merged 2 commits into from
Oct 25, 2022
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
Prev Previous commit
Adapt precalculation and test
  • Loading branch information
FabijanC committed Oct 25, 2022
commit dbc841dffe70c7a0eee3aa70c6ba3a2adfcf49f1
2 changes: 1 addition & 1 deletion starknet_devnet/contract_class_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ class ContractClassWrapper:
)
)
DEFAULT_ACCOUNT_HASH_BYTES = to_bytes(
250058203962332945652607154704986145054927159797127109843768594742871092378
2308850740939678659398575035812067402979543458539300415910488838841673668983
)
8 changes: 4 additions & 4 deletions test/expected/invoke_function_invocation.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"execution_resources": {
"n_steps": 243,
"n_steps": 269,
"builtin_instance_counter": {
"range_check_builtin": 3
"range_check_builtin": 7
},
"n_memory_holes": 3
"n_memory_holes": 11
},
"messages": [],
"call_type": "CALL",
"class_hash": "0x8d8726481b7b8a4a8f95aa2ce6a18932c33148600c75b1b4fe40c5987c6c9a",
"class_hash": "0x51ac361b170bfbaeb1f5b3a33cc8827ae9990a5060103cb11d30be8b5375977",
"result": ["0x0"],
"events": [],
"calldata": [
Expand Down
10 changes: 5 additions & 5 deletions test/expected/invoke_receipt.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"actual_fee": "0x15fe22d104800",
"actual_fee": "0x16010bdfe1800",
"block_hash": "0x2",
"block_number": 2,
"events": [
{
"data": [
"0x347be35996a21f6bf0623e75dbce52baba918ad5ae8d83b6f416045ab22961a",
"0x388ca486b82e20cc81965d056b4cdcaacdffe0cf08e20ed8ba10ea97a487004",
"0x15fe22d104800",
"0x16010bdfe1800",
"0x0"
],
"from_address": "0x62230ea046a9a5fbc261ac77d03c8d41e5d442db2284587570ab46455fd2488",
Expand All @@ -18,10 +18,10 @@
],
"execution_resources": {
"builtin_instance_counter": {
"range_check_builtin": 3
"range_check_builtin": 7
},
"n_memory_holes": 3,
"n_steps": 243
"n_memory_holes": 11,
"n_steps": 269
},
"l2_to_l1_messages": [],
"status": "ACCEPTED_ON_L2",
Expand Down
2 changes: 1 addition & 1 deletion test/expected/invoke_receipt_account_event.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"data": [
"0x347be35996a21f6bf0623e75dbce52baba918ad5ae8d83b6f416045ab22961a",
"0x388ca486b82e20cc81965d056b4cdcaacdffe0cf08e20ed8ba10ea97a487004",
"0x5a50a44700",
"0x5a569a2800",
"0x0"
],
"from_address": "0x62230ea046a9a5fbc261ac77d03c8d41e5d442db2284587570ab46455fd2488",
Expand Down
2 changes: 1 addition & 1 deletion test/expected/invoke_receipt_event.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"data": [
"0x347be35996a21f6bf0623e75dbce52baba918ad5ae8d83b6f416045ab22961a",
"0x388ca486b82e20cc81965d056b4cdcaacdffe0cf08e20ed8ba10ea97a487004",
"0x160cb01b55800",
"0x160e24a2c4000",
"0x0"
],
"from_address": "0x62230ea046a9a5fbc261ac77d03c8d41e5d442db2284587570ab46455fd2488",
Expand Down
4 changes: 2 additions & 2 deletions test/rpc/test_data/get_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@
EVENT_FEE_1 = [
int(PREDEPLOYED_ACCOUNT_ADDRESS, 16),
EVENT_FEE_ADDRESS_2,
143100000000000, # WEI
143200000000000, # WEI
0,
]
EVENT_FEE_2 = [
int(PREDEPLOYED_ACCOUNT_ADDRESS, 16),
EVENT_FEE_ADDRESS_2,
387900000000000, # WEI
388000000000000, # WEI
0,
]

Expand Down
2 changes: 1 addition & 1 deletion test/test_account.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
INVOKE_CONTENT = load_file_content("invoke.json")
DEPLOY_CONTENT = load_file_content("deploy.json")
SALTY_ACCOUNT_ADDRESS = (
"0x00e5cadfe20c4192c560a8e803f779e21775d5288697f23487d256f1013510aa"
"0x030dec1363f9fc6ecf36be88845e43025861a851dce1439a61c1e7b148a9892b"
)
INVALID_HASH = "0x58d4d4ed7580a7a98ab608883ec9fe722424ce52c19f2f369eeea301f535914"
SALT = "0x99"
Expand Down