Added etherscan vanilla

script-python/journal/compile-all.py

@@ -40,7 +40,7 @@ def compile_solidity_sources(source_dir, json_dir):
             except subprocess.CalledProcessError as e:
                 print(f"Error compiling {filename}: {e}")
 
-def extract_and_save_longest_bytecode(bytecode_dir, json_dir):
+def extract_and_save_longest_bytecode(bytecode_dir, json_dir, is_ethersolve):
     """
     Extracts the longest bytecode from each .json file and saves it in the specified output directory.
     """
@@ -77,13 +77,16 @@ def extract_and_save_longest_bytecode(bytecode_dir, json_dir):
 
                         # Find the second occurrence of '60406040' after the first
                         second_index = longest_bytecode.find('60806040', first_index + len('60806040'))
+
+                        if is_ethersolve:
+                                second_index = first_index
 
                         longest_bytecode = longest_bytecode[second_index:]
 
                         bytecode_file.write("0x" + longest_bytecode)
                     print(f"Extracted longest bytecode from {longest_contract_name} to {bytecode_filename}")
 
-def extract_and_save_bytecode(bytecode_dir, json_dir):
+def extract_and_save_bytecode(bytecode_dir, json_dir, is_ethersolve):
     """
     Extracts all bytecode from each .json file and saves it in the specified output directory.
     """
@@ -113,6 +116,9 @@ def extract_and_save_bytecode(bytecode_dir, json_dir):
 
                             # Find the second occurrence of '60406040' after the first
                             second_index = bytecode.find('60806040', first_index + len('60806040'))
+
+                            if is_ethersolve:
+                                second_index = first_index
 
                             bytecode = bytecode[second_index:]
 
@@ -126,14 +132,16 @@ def extract_and_save_bytecode(bytecode_dir, json_dir):
                              './reentrancy/json')
     compile_solidity_sources('./vanilla/source-code',
                              './vanilla/json')
-    """
-    extract_and_save_bytecode('./reentrancy/bytecode',
-                              './reentrancy/json')
-    extract_and_save_bytecode('./vanilla/bytecode',
-                              './vanilla/json')
-    """
 
-    extract_and_save_longest_bytecode('./vanilla/bytecode',
-                                      './vanilla/json')
-    extract_and_save_longest_bytecode('./reentrancy/bytecode',
-                                      './reentrancy/json')
+    extract_and_save_longest_bytecode('./vanilla/bytecode/evmlisa',
+                                      './vanilla/json',
+                                      False)
+    extract_and_save_longest_bytecode('./vanilla/bytecode/ethersolve',
+                                      './vanilla/json',
+                                      True)
+    extract_and_save_longest_bytecode('./reentrancy/bytecode/evmlisa',
+                                      './reentrancy/json',
+                                      False)
+    extract_and_save_longest_bytecode('./reentrancy/bytecode/ethersolve',
+                                      './reentrancy/json',
+                                      True)

script-python/journal/reentrancy/bytecode/ethersolve/buggy_1.bytecode

@@ -0,0 +1 @@
+0x6080604052600060015560006004556001600960006101000a81548160ff0219169083151502179055506001600c60006101000a81548160ff02191690831515021790555060006016556001601960006101000a81548160ff0219169083151502179055503480156200007157600080fd5b506b60ef6b1aba6f0723300000006000819055506040518060400160405280601081526020017f486f74446f6c6c61727320546f6b656e00000000000000000000000000000000815250600f9080519060200190620000d292919062000189565b506012601160006101000a81548160ff021916908360ff1602179055506040518060400160405280600381526020017f4844530000000000000000000000000000000000000000000000000000000000815250601390805190602001906200013c92919062000189565b50600054600b60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555062000238565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10620001cc57805160ff1916838001178555620001fd565b82800160010185558215620001fd579182015b82811115620001fc578251825591602001919060010190620001df565b5b5090506200020c919062000210565b5090565b6200023591905b808211156200023157600081600090555060010162000217565b5090565b90565b611c7580620002486000396000f3fe608060405234801561001057600080fd5b50600436106101cf5760003560e01c80638ac2015f11610104578063a2bcc8c5116100a2578063d8fa982f11610071578063d8fa982f14610674578063dd62ed3e1461067e578063e096369d146106f6578063fef28f0b14610700576101cf565b8063a2bcc8c5146105f0578063a328c11f146105fa578063a9059cbb14610604578063c6604ad71461066a576101cf565b80639128b348116100de5780639128b3481461052b57806395d89b41146105355780639771238b146105b8578063a112c615146105c2576101cf565b80638ac2015f1461050d5780638d0c9354146105175780638f94454c14610521576101cf565b806327e235e31161017157806354611e351161014b57806354611e35146104295780635c658165146104335780636cfd7721146104ab57806370a08231146104b5576101cf565b806327e235e3146103a3578063313ce567146103fb578063501ea27d1461041f576101cf565b806318160ddd116101ad57806318160ddd146102c75780631abf48c0146102e557806323b872dd146102ef57806325fbee5814610375576101cf565b806306fdde03146101d4578063095ea7b3146102575780631578e01e146102bd575b600080fd5b6101dc61070a565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561021c578082015181840152602081019050610201565b50505050905090810190601f1680156102495780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6102a36004803603604081101561026d57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506107a8565b604051808215151515815260200191505060405180910390f35b6102c561089a565b005b6102cf610903565b6040518082815260200191505060405180910390f35b6102ed610909565b005b61035b6004803603606081101561030557600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610972565b604051808215151515815260200191505060405180910390f35b6103a16004803603602081101561038b57600080fd5b8101908080359060200190929190505050610c0a565b005b6103e5600480360360208110156103b957600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610ce4565b6040518082815260200191505060405180910390f35b610403610cfc565b604051808260ff1660ff16815260200191505060405180910390f35b610427610d0f565b005b610431610dbb565b005b6104956004803603604081101561044957600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610e7c565b6040518082815260200191505060405180910390f35b6104b3610ea1565b005b6104f7600480360360208110156104cb57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610f9b565b6040518082815260200191505060405180910390f35b610515610fe4565b005b61051f611103565b005b610529611222565b005b61053361131c565b005b61053d611398565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561057d578082015181840152602081019050610562565b50505050905090810190601f1680156105aa5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6105c0611436565b005b6105ee600480360360208110156105d857600080fd5b8101908080359060200190929190505050611555565b005b6105f861162f565b005b610602611726565b005b6106506004803603604081101561061a57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506117d8565b604051808215151515815260200191505060405180910390f35b61067261192f565b005b61067c611a29565b005b6106e06004803603604081101561069457600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611aa5565b6040518082815260200191505060405180910390f35b6106fe611b2c565b005b610708611bd8565b005b600f8054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156107a05780601f10610775576101008083540402835291602001916107a0565b820191906000526020600020905b81548152906001019060200180831161078357829003601f168201915b505050505081565b600081600d60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b600560165411156108aa57600080fd5b3373ffffffffffffffffffffffffffffffffffffffff166108fc678ac7230489e800009081150290604051600060405180830381858888f193505050506108f057600080fd5b6001601660008282540192505081905550565b60005481565b6005600454111561091957600080fd5b3373ffffffffffffffffffffffffffffffffffffffff166108fc678ac7230489e800009081150290604051600060405180830381858888f1935050505061095f57600080fd5b6001600460008282540192505081905550565b600080600d60008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905082600b60008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410158015610a435750828110155b610a4c57600080fd5b82600b60008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254019250508190555082600b60008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff811015610b995782600d60008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055505b8373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef856040518082815260200191505060405180910390a360019150509392505050565b80601060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c5657600080fd5b3373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050610c9457600080fd5b80601060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254039250508190555050565b600b6020528060005260406000206000915090505481565b601160009054906101000a900460ff1681565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc6003549081150290604051600060405180830381858888f19350505050610d7157600080fd5b33600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555047600381905550565b3373ffffffffffffffffffffffffffffffffffffffff166108fc601560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549081150290604051600060405180830381858888f1935050505015610e7a576000601560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b565b600d602052816000526040600020602052806000526040600020600091509150505481565b60003373ffffffffffffffffffffffffffffffffffffffff16601760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205460405180600001905060006040518083038185875af1925050503d8060008114610f40576040519150601f19603f3d011682016040523d82523d6000602084013e610f45565b606091505b5050905080610f5357600080fd5b6000601760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555050565b6000600b60008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b6000601260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541161103057600080fd5b6000601260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490503373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501580156110ba573d6000803e3d6000fd5b506000601260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555050565b6000601460003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541161114f57600080fd5b6000601460003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490503373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501580156111d9573d6000803e3d6000fd5b506000601460003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555050565b60003373ffffffffffffffffffffffffffffffffffffffff16600a60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205460405180600001905060006040518083038185875af1925050503d80600081146112c1576040519150601f19603f3d011682016040523d82523d6000602084013e6112c6565b606091505b50509050806112d457600080fd5b6000600a60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555050565b601960009054906101000a900460ff1661133557600080fd5b3373ffffffffffffffffffffffffffffffffffffffff166108fc670de0b6b3a76400009081150290604051600060405180830381858888f1935050505061137b57600080fd5b6000601960006101000a81548160ff021916908315150217905550565b60138054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561142e5780601f106114035761010080835404028352916020019161142e565b820191906000526020600020905b81548152906001019060200180831161141157829003601f168201915b505050505081565b6000600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541161148257600080fd5b6000600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490503373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f1935050505015801561150c573d6000803e3d6000fd5b506000600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555050565b80600860003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156115a157600080fd5b3373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050506115df57600080fd5b80600860003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254039250508190555050565b60003373ffffffffffffffffffffffffffffffffffffffff16600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205460405180600001905060006040518083038185875af1925050503d80600081146116ce576040519150601f19603f3d011682016040523d82523d6000602084013e6116d3565b606091505b505090508015611723576000600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b50565b600960009054906101000a900460ff1661173f57600080fd5b60003373ffffffffffffffffffffffffffffffffffffffff16670de0b6b3a764000060405180600001905060006040518083038185875af1925050503d80600081146117a7576040519150601f19603f3d011682016040523d82523d6000602084013e6117ac565b606091505b50509050806117ba57600080fd5b6000600960006101000a81548160ff02191690831515021790555050565b600081600b60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561182657600080fd5b81600b60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254039250508190555081600b60008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b60003373ffffffffffffffffffffffffffffffffffffffff16601860003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205460405180600001905060006040518083038185875af1925050503d80600081146119ce576040519150601f19603f3d011682016040523d82523d6000602084013e6119d3565b606091505b50509050806119e157600080fd5b6000601860003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555050565b600c60009054906101000a900460ff16611a4257600080fd5b3373ffffffffffffffffffffffffffffffffffffffff166108fc670de0b6b3a76400009081150290604051600060405180830381858888f19350505050611a8857600080fd5b6000600c60006101000a81548160ff021916908315150217905550565b6000600d60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc6006549081150290604051600060405180830381858888f19350505050611b8e57600080fd5b33600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555047600681905550565b60056001541115611be857600080fd5b3373ffffffffffffffffffffffffffffffffffffffff166108fc678ac7230489e800009081150290604051600060405180830381858888f19350505050611c2e57600080fd5b6001806000828254019250508190555056fea265627a7a723158206b6413dcf2ef59479e8627e0541881ae1a3a8afecbf42ff0188e0019fb01f68064736f6c63430005110032