Skip to content

Commit 0f8ad98

Browse files
fselmofselmo
committed
[WIP] Wrap up stTransaction tests fine tuning
1 parent 3922b0b commit 0f8ad98

13 files changed

+114
-104
lines changed

‎scripts/convert_addresses.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,16 @@ class Context(Enum):
297297
"sha3Filler.yml",
298298
"suicideFiller.yml",
299299
"swapFiller.yml",
300+
"Opcodes_TransactionInitFiller.json",
301+
"CreateMessageSuccessFiller.json",
302+
"CreateTransactionSuccessFiller.json",
303+
"EmptyTransaction3Filler.json",
304+
"SuicidesAndInternalCallSuicidesBonusGasAtCallFiller.json",
305+
"SuicidesStopAfterSuicideFiller.json",
306+
"SuicidesAndInternalCallSuicidesBonusGasAtCallFailedFiller.json",
307+
"SuicidesAndInternalCallSuicidesSuccessFiller.json",
308+
"StoreGasOnCreateFiller.json",
309+
"TransactionSendingToEmptyFiller.json",
300310

301311
# Directory patterns (examples - add as needed)
302312
"/stCreate2/",

‎src/ethereum_test_specs/static_state/common/common.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def compiled(self) -> bytes:
121121
else:
122122
options.append(arg)
123123

124-
with tempfile.NamedTemporaryFile(mode="w+", delete=False) as tmp:
124+
with tempfile.NamedTemporaryFile(mode="w+", delete=False, suffix=".yul") as tmp:
125125
tmp.write(native_yul_options + self.code_raw[source_start:])
126126
tmp_path = tmp.name
127127
compiled_code = compile_yul(

‎tests/static/state_tests/stBugs/returndatacopyPythonBug_Tue_03_48_41-1432Filler.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,43 +19,43 @@
1919
},
2020
"network" : [">=Cancun"],
2121
"result" : {
22-
"0xffffffffffffffffffffffffffffffffffffffff" : {
22+
"<contract:target:0xffffffffffffffffffffffffffffffffffffffff>" : {
2323
"storage": {
2424
"0x01" : "0x00"
2525
}
2626
},
27-
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
27+
"<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
2828
"nonce": "0x01"
2929
}
3030
}
3131
}
3232
],
3333
"pre": {
34-
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
34+
"<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>": {
3535
"balance": "0x38beec8feeca2598",
3636
"code": "",
3737
"nonce": "0x00",
3838
"storage": {}
3939
},
40-
"0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
40+
"<contract:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>": {
4141
"balance": "0x2ce99fc81ed55962",
4242
"code": ":raw 0x7b1db054ccc801c0666b34b3c6242bbfc5e98f20c14fb95e0118be9ad054326f33d50e215ff59297861847ea911a6a9d566103a560a860fb60cb6342a46f5073b94f5374fce5edbc8e2a8697c15331677e6ebf0b632c1e2816f26d135e2f826dc603850e0db21d105b778732a34b873c7d943050b8659794f0bd3e841d35a2231ef6027e97f8cde11728fa2051e87933cf858e4e5e91baa74fc1e9ffe4c7b15ba600e8678f095989dc68f47e67d704be2b41c7f8670a",
4343
"nonce": "0x3f",
4444
"storage": {}
4545
},
46-
"0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
46+
"<contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>": {
4747
"balance": "0x442f5872dd93b01a",
4848
"code": ":raw 0x610326610100fd79c940b5f2046740058558468f238b85db7f6bbe3f3d51e92a3e326102d85268b7f7c4147541c695f376705288410b81b217e80726fb9e4c5c7b4c49eca0c1b6b9137e117c16c26c9816459f38396ffc36da48d65defdc7d055cbc846c07e81cfab0607c6cbc968774d4de7df8e3236f581e688cc2081a96b1cad9e0fb6103ca601361019f6101016364b68c8e73ffffffffffffffffffffffffffffffffffffffff63200fbd63f16017610215610161610119635af7465b73000000000000000000000000000000000000000863792c6916f1799bf4fddda49ae97714e7d325ceab23acd5f4a15b52104741161261023f608ff360197021a04ff3f933b9ad91b735bfbfe41da7066b499c5d47b6de1fe398cb91fd68f681cbb8661dd457cf713cef75dabf5ea496d7012f4c56b9fee6c4208461022d61021661036e610200630277795a73ffffffffffffffffffffffffffffffffffffffff6333d3d55ff1644720e3ce666101ad526b874cead08499d57a5497d3776102fa60ff60f561014863202b2ea873d94f5374fce5edbc8e2a8697c15331677e6ebf0b6302e83dbef1327144ce205e051f296fb116fc9e5f3c280919af70f3c93c5d5cefff338db2b1165b4918f1780a73852663192a9579a68b50eefdc639ca0b62ab4d5230",
4949
"nonce": "0x1c",
5050
"storage": {}
5151
},
52-
"0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
52+
"<contract:0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b>": {
5353
"balance": "0x161150e7531f1933",
5454
"code": ":raw 0x6102dd6103e06103146052632318d76f7332f4d5419b41e6887cca98e0943f141a5c66df986347cfe65df16abd0c6d6c4cec6593afaa8c7de1769c96cd0751aa76a98c8196fa8c92e70d7bda1799c91c7f05de318110659b819438774667f9ec15a6e0233f75669e43360bd4e0a0764e9f395117afcd072774ce12d13dc73305858002a921407eb6508e3a3be377d4825dbf618a393c7c061e75a8a496a33afe0f017f2e3354789e321838b083d48893f23dced4592e9ea08fe3f80970d6334b626c6f1f6ede8bcc81d03a7ccc244231cb6606db986101d761010761031c61025673ffffffffffffffffffffffffffffffffffffffff6311ecd01bfa7aa6d0c1c5158ef0db6994192acbd4cac6abc8449d80fc2c3247194668e0d9606bd390266d7f78712766f4765076283ad67450d7ab4df6f3f6ee014ab802ec9d55727ed96dc0b9ce7bd14b193dc1f0d11ce19283c77ef651d4d2e7c180715ff7fcbc995ea8b27613cc516dad16d17f29a93220ce0d6edb0a65d3d474dbc39cba5bcb3d4fcf6a9fef19107dc04511df2752fb346103ce6101c163459d135bf0712ab2475fbb2ba0720711a903dbecfa0429bf6811e6e90cbb0f13d4ee61050c7052c865e0216b4096186fc604fb563fa59f761263ee91d55e407fdffe82ca1558f793f3a218dd9ba69084621fdea97de498f0b0e1874331115e31aaad4d87227362a9ec3e1c1be11cdb23097bbc600c64692eeadfa97f1616b8aec24564487dc74f8e17e6a133b5dbe576838697de73f856197203ef1a733a54f7edb0dbd60f9d52db6b5c1477169b77f0d86917ed731a20db4b9e5b836bd26bffefab084a31c4afda166f8156612f281da0be688e5bdb1f31ed7869bc62343a7665abad657369482449e68b3acfe820997d3ddf5785384d51aaa0612dab5ddbf2a9bf550736ad42293387d70693587d74f6ccfae5218d01559bac159497edb6a665eae52f52784975568a159c0cae9044d258c55b10f4d1008d29ab1df7fceb76b789e2a8cdbaa9c67c42cd1ebe81716ead0e94c721279d77d3a0b3de311596d547292878449ccce511e6991b3dc636a16278159a9f61014a6102216342ce224df06f3d9a062274cd9a67ccba17c2cb06de46628e0bf703610106602e636db4b55bf06102056102c9633ff89b31f0788e55af17e19973f2c3f5d4c21c169890b9a92491f91aa1e714605d526103a1601f609b6103ee73d94f5374fce5edbc8e2a8697c15331677e6ebf0b6335adeabdf46d26060d385ed594e21b02b23a6c4c157350e7ab6a3ef66f83a29845b4ba85c4fdfbd0054a620123ad6893eff4b525b0f4b08d73285f36f3bcac6a985b906c348472b7cbc5a02e61678666f0c50eecdc1167f20fc1dc41c2fd95856d7752e55ede4e56f4f536a04d436a7fd418a1ca44c0173c10f1806ba284f9c9c7c13670005de594dec538cd56c2743b66fdfa7683ae0df6917b8bbcb53461be606ef617322e6448e3e4124dbe061257a8f486529de36997f08ce92502957f85587a18082b5b5b49e36de5a83e8a270663088571bf2fdf8f5f29b949976b41e3859928a237f5e5df84c17d3c431e82328f9093e64defbdd07d74d84835800999791abc41260472d96f9362604d077b198e859adc806beae7200cf116d2b55e89ddd564abc3900e69a68b0f6f0e9e4f12998728815d01c42f3b109ed25561027b610132635f449586f06101726101ec631fe4bdc3f06101316101246103b33e60bd19610284610305fd6102db6102e4631ea09dc6f06b72a6cf13500241c2a5e5c4e1777ea9ed9b05ba9b57d70dd270ece76ecf21d3a41ad554f795167084dcab761d4c8437774cad4bb13b2bece16d40358df93ec0f49abe102cd44e475560476101f3fd605b61030a6328f7e2e9f032604a547db71c0237247865fa2add74c8b27041c5718a2554a72662720296dff5b3b5327d59df4558b8a5b2c9e7d15eb3947a70064f935c8fdf0a4e6f644aa31b42c17d0280e50ea92a366c3d060c12c6a16a75522fbeb3d7cca702807f521781ab6101b252639cceb9e27f37ee8fde4ed3a23d3ec8db334ac1caa7e06523b0132dd615cf3fc16140d34c19761617823c3af47c42bc36b69cb4385463595c7f6f9ea451396fe05303603e0cd401e13df744e2a67382774d943941551704ff14dfa8646efbb2d8abc4ac6e258e99240372924b8001f8f0650d66b37411d484b18f41e779702bd1c169fa52bbfc8af4a45f20acb0ef956edb2ecbc0d4eadbbbf6732f8bd33b367a33c0faf0cf1970bcd38093a50a44fd253b0e74f2706239c499217b7bdae332e21d5d5e7e795c998cceed14cf46977e7d3cbb3c79ef0530c36fa8ac3fd8d49f10bb0ae919fa149adead7f67dae0b9ba628e056e0e87e029b8e5f42821d775338e6774301ecb428b3938237c6ee22b0b5edf2ad6997869f427ba0672a7168614233e85f61dae5ed428643a53f605116d6dad586dce62833a62ca8c914c646b1f861a5b1c4ea7298a95029e63cb849fe08b6c943cb9d854c7d50ad04cfdfe64718e2868b8f2b53e55fe01a152c8496cbcc69956787447062b734cebde6c6452e9efc4aba5bf071cbff56208a52561a8ef635f52399b724f3369d988884f58166d734881774eff46d77b76b189c89c55b1c6591f178d2d21bf2b023adf9bc5b862127935e3346d98d56047a3f71241fd5a24abbb0cfc463fb8a5e67e327b055696fe51258dd07526ebd8439bcebb514ae26dc12d653a5c1263707c5109097ec5dcdb3918ab114985f709d3003b50e58fba91007825a6b80073f644eaa306051808460fc3b2d8e276b2187c583f7ef29ee0b0c34f9ee57bac9ebb996402e3300ddf06c760fc5f531f6b1e2beda77fa15c07f90f92422822e8d33c5d2409ea75197f7cd6d61770eddb078206cfc7c57b006cd0e9a9ec65fa4fc683da22cfaf6dfc995feb5f8386a052851fc58b7402f32e7ef9343d4633def4c0a4b9be12f2cd7c646073e14ca3fb977524f677714c3d994ea05f1997a246537d2fc0ab20ed2a5958f3712602bee2a270429abbd3ff3b9945f72f58dcf4f86eb344417a87dfa1ebd701a0ff381bb40b620bb8287cd7781d2ef7c0fd8695f705465fbadf99fdffef2afd94b0e76531b6ea0d537a23d2332d13c20368a0724e41bc1130a6b1ebc3464527e34c26a43751649f9dfe4f8e7957981a9fc08558c90d38079f1921b60fe6fa448171fec55c4c630575e811712211cf72f489a4e83a2f5427eab647b075a91064929de0a65517",
5555
"nonce": "0x1d",
5656
"storage": {}
5757
},
58-
"0xffffffffffffffffffffffffffffffffffffffff": {
58+
"<contract:target:0xffffffffffffffffffffffffffffffffffffffff>": {
5959
"balance": "0x16b3e0323b4f717d",
6060
"code": ":raw 0x7e4fc1426b49cd8e2c770339616ce9c501fb746715dd4a20219229d0673ac05575993bd089a6663f6dff488574195b848fbb357eb7be1f61026352605861011761027f60e373c94f5374fce5edbc8e2a8697c15331677e6ebf0b63748b4abbfa60e76101bc6103f33e60d861036a6315193f47f07aff076e997770d03b70288679871dc28aa5a1399b21c8afa8155ecd7e75dd05f9d7eb42fa3e79c6a2109dff2a1e53e612fbe000bed18eec8345f00574f537c72820d8b97350ae523a8f7467ae14a8bd9aae6be55862b685e32476cc67ae2c6a40cf55729540d111f44c63629458da68e7ad2a9b389ed3bb60682169ea8a7b3a1bcf92621919c062413cb5986101236103596101776103be73d94f5374fce5edbc8e2a8697c15331677e6ebf0b631f6d9dfffa6103716101f760163e76d609ca9a51645238e4f1f8268f973c3a01a0b67479a34563d1e70065610173525b64e6d218af5474c3d8045447d06c726801695cfa26fdfaa6460a868569cd662855a55716140ae07eb1e25aeaf04ae7cf54e8aa7a22206da5a6e52bdd3ef82ad40a4681d25811167f7b0a3f66a727652592924dc1291a6085d537c5da2d6272a54f882460bc76407d666361c40cc56bc8778a8bc9a9b45d44c78cfe4333fe0c49418dd61f183d41132f755340e48ababb825a26ebc0ca693a8b465121200fd21a727b4c365a65a3255278f6705e5ca0f6146fccd3766a6e5b9decfb6e50968851e829313a2cc9d5b518e2586166c31ba04ed3f5a377310bd9993aa534b007858d9545342410ce8c156d780a8cb477a65efed30aa9d6bd63c48a134c9cb0c677ecda48aacef0c17c91de37e3cfdae69153742406995ea81bbae6a201663b9b37a6a9f597ae8d5a634f40e44e517174ea92616bc228ced0d712c265c2925470326102f26102146101b13e601d6103a360726103ec73ffffffffffffffffffffffffffffffffffffffff6319628a1bf4740e5f285d15a08a263b0a444516266bd51fe7266771604469df3c080d07dd47c4eb9e7344a87541ddc5a6971632a021033eb3542b375cd06bd0dfb48f6acde07152794b556839563efff1afed3b0a857615166526175e7184b83cc2dedf61ec5d65d1eee66efcb87b4f2c73335db9fba49e3d40638cd7f462f1d3b315f18dc1f692a68b24036102c16101f36102f23e783d6331b166ee517c71a4ba159dd322b9fa5f3237dfb85d2594edd580948177bd72d2244f767352371e3428d28bc6356c553b18d00e6b3cf602061672c2abbd7763059f61940b0d19fde33f7b5a960861025b61021d6101d361035173b94f5374fce5edbc8e2a8697c15331677e6ebf0b635ba25f69f4790d251e9ae89c718dd41c3f57b0c304fbb83978de28d23499bdd1729c04301ff527ccc9f7ed74a8dbd906b468d4487ffba738f193e3047b02e40beb08b4f11707681ef103ec1b00585a85f27227a179917ef15e97a359268b06ff34bcee23a869974fbca6e201cb16179743ac0f8c9f867003d5e26a5aad5217ebfff31407169237230772efaab6cd87fbc9fd408d4ac5a048e43fb4e7a261037c6101f76103e13e",
6161
"nonce": "0x1c",
@@ -67,8 +67,8 @@
6767
"gasLimit": ["0x85edf4", "0x2dc6c0"],
6868
"gasPrice": "0x0a",
6969
"nonce": "0x00",
70-
"secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
71-
"to": "0xffffffffffffffffffffffffffffffffffffffff",
70+
"secretKey": "<sender:key:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>",
71+
"to": "<contract:target:0xffffffffffffffffffffffffffffffffffffffff>",
7272
"value": ["0xa4759940", "0x00"]
7373
}
7474
}

‎tests/static/state_tests/stTransactionTest/CreateMessageSuccessFiller.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"network" : [">=Cancun"],
1818
"result" : {
19-
"<contract:target:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
19+
"b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
2020
"balance" : "100",
2121
"nonce" : "1"
2222
},
@@ -29,14 +29,14 @@
2929
}
3030
],
3131
"pre" : {
32-
"<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
32+
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
3333
"balance" : "400000000",
3434
"code" : "",
3535
"nonce" : "0",
3636
"storage" : {
3737
}
3838
},
39-
"<contract:target:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
39+
"b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
4040
"balance" : "0",
4141
"code" : "{(MSTORE 0 0x600c600055) (CREATE 0 27 5)}",
4242
"nonce" : "0",
@@ -53,8 +53,8 @@
5353
],
5454
"gasPrice" : "10",
5555
"nonce" : "0",
56-
"secretKey" : "<sender:key:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>",
57-
"to" : "<contract:target:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>",
56+
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
57+
"to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
5858
"value" : [
5959
"100"
6060
]

‎tests/static/state_tests/stTransactionTest/CreateTransactionSuccessFiller.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
}
2828
],
2929
"pre" : {
30-
"<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
30+
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
3131
"balance" : "100000000",
3232
"code" : "",
3333
"nonce" : "0",
@@ -44,7 +44,7 @@
4444
],
4545
"gasPrice" : "10",
4646
"nonce" : "0",
47-
"secretKey" : "<sender:key:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>",
47+
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
4848
"to" : "",
4949
"value" : [
5050
"100"

‎tests/static/state_tests/stTransactionTest/EmptyTransaction3Filler.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
"6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
2020
"code" : "0x"
2121
},
22-
"<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
22+
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
2323
"//balance" : "47000",
2424
"nonce" : "1"
2525
}
2626
}
2727
}
2828
],
2929
"pre" : {
30-
"<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>" : {
30+
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
3131
"balance" : "100000000",
3232
"code" : "",
3333
"nonce" : "0",
@@ -44,7 +44,7 @@
4444
],
4545
"gasPrice" : "10",
4646
"nonce" : "",
47-
"secretKey" : "<sender:key:0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8>",
47+
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
4848
"to" : "",
4949
"value" : [
5050
""

0 commit comments

Comments
 (0)