diff --git a/contracts/local-deployments-artifacts/static-artifacts/OpcodeTester.json b/contracts/local-deployments-artifacts/static-artifacts/OpcodeTester.json
index 57c46dffc..9e5ee8028 100644
--- a/contracts/local-deployments-artifacts/static-artifacts/OpcodeTester.json
+++ b/contracts/local-deployments-artifacts/static-artifacts/OpcodeTester.json
@@ -1,7 +1,7 @@
 {
   "_format": "hh-sol-artifact-1",
   "contractName": "OpcodeTester",
-  "sourceName": "contracts/test-contracts/OpcodeTester.sol",
+  "sourceName": "src/_testing/unit/opcodes/OpcodeTester.sol",
   "abi": [
     {
       "inputs": [
@@ -54,8 +54,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b506040516200183c3803806200183c8339818101604052810190620000379190620000e9565b80600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506200011b565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620000b18262000084565b9050919050565b620000c381620000a4565b8114620000cf57600080fd5b50565b600081519050620000e381620000b8565b92915050565b6000602082840312156200010257620001016200007f565b5b60006200011284828501620000d2565b91505092915050565b611711806200012b6000396000f3fe6080604052600436106100345760003560e01c8063690696f0146100395780638f0a4cc414610043578063a147ee551461006e575b600080fd5b6100416100ab565b005b34801561004f57600080fd5b506100586100c5565b6040516100659190610f61565b60405180910390f35b34801561007a57600080fd5b5061009560048036038101906100909190610fd9565b6100eb565b6040516100a2919061101f565b60405180910390f35b6100b3610103565b6100bb610614565b6100c3610dde565b565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60006020528060005260406000206000915090505481565b600060405161011190610f13565b604051809103906000f08015801561012d573d6000803e3d6000fd5b50905060008173ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527fb3907bb9000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101d991906110ab565b6000604051808303816000865af19150503d8060008114610216576040519150601f19603f3d011682016040523d82523d6000602084013e61021b565b606091505b5050809150508015610262576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102599061111f565b60405180910390fd5b8173ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527fb3907bb9000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161030991906110ab565b600060405180830381855afa9150503d8060008114610344576040519150601f19603f3d011682016040523d82523d6000602084013e610349565b606091505b5050809150508015610390576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103879061111f565b60405180910390fd5b8173ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527fe32689ab000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161043791906110ab565b6000604051808303816000865af19150503d8060008114610474576040519150601f19603f3d011682016040523d82523d6000602084013e610479565b606091505b505080915050806104bf576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104b69061118b565b60405180910390fd5b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527fa378ff3e000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161058891906110ab565b6000604051808303816000865af19150503d80600081146105c5576040519150601f19603f3d011682016040523d82523d6000602084013e6105ca565b606091505b50508091505080610610576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610607906111f7565b60405180910390fd5b5050565b60005b601d8161ffff16116106f55760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020546106879190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191681526020019081526020016000208190555080806106ed90611288565b915050610617565b506001600080602060f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191681526020019081526020016000205461075b9190611246565b600080602060f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020819055506000603090505b60488161ffff161161089c5760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191681526020019081526020016000205461082e9190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002081905550808061089490611288565b9150506107be565b506000605090505b605b8161ffff16116109825760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020546109149190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002081905550808061097a90611288565b9150506108a4565b506000606090505b609f8161ffff1611610a685760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020546109fa9190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020819055508080610a6090611288565b91505061098a565b50600060a090505b60a48161ffff1611610b4e5760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002054610ae09190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020819055508080610b4690611288565b915050610a70565b50600060f090505b60f58161ffff1611610c345760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002054610bc69190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020819055508080610c2c90611288565b915050610b56565b50600160008060fa60f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002054610c9a9190611246565b60008060fa60f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002081905550600060fd90505b60ff8161ffff1611610ddb5760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002054610d6d9190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020819055508080610dd390611288565b915050610cfd565b50565b6000600254600143610df091906112b2565b4048464144604051602001610e0a96959493929190611320565b60405160208183030381529060405290506000454344425a604051602001610e36959493929190611381565b604051602081830303815290604052905060008036336000357fffffffff0000000000000000000000000000000000000000000000000000000016343a32604051602001610e8a979695949392919061146d565b60405160208183030381529060405290506002548383604051602001610eb19291906114d7565b60405160208183030381529060405282604051602001610ed29291906114d7565b604051602081830303815290604052604051602001610ef2929190611534565b60405160208183030381529060405280519060200120600281905550505050565b6101778061156583390190565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610f4b82610f20565b9050919050565b610f5b81610f40565b82525050565b6000602082019050610f766000830184610f52565b92915050565b600080fd5b60007fffff00000000000000000000000000000000000000000000000000000000000082169050919050565b610fb681610f81565b8114610fc157600080fd5b50565b600081359050610fd381610fad565b92915050565b600060208284031215610fef57610fee610f7c565b5b6000610ffd84828501610fc4565b91505092915050565b6000819050919050565b61101981611006565b82525050565b60006020820190506110346000830184611010565b92915050565b600081519050919050565b600081905092915050565b60005b8381101561106e578082015181840152602081019050611053565b60008484015250505050565b60006110858261103a565b61108f8185611045565b935061109f818560208601611050565b80840191505092915050565b60006110b7828461107a565b915081905092915050565b600082825260208201905092915050565b7f65787465726e616c526576657274204661696c65640000000000000000000000600082015250565b60006111096015836110c2565b9150611114826110d3565b602082019050919050565b60006020820190508181036000830152611138816110fc565b9050919050565b7f63616c6c6d65546f53656c664465737472756374204661696c65640000000000600082015250565b6000611175601b836110c2565b91506111808261113f565b602082019050919050565b600060208201905081810360008301526111a481611168565b9050919050565b7f65786563757465416c6c206f6e2079756c436f6e7472616374204661696c6564600082015250565b60006111e16020836110c2565b91506111ec826111ab565b602082019050919050565b60006020820190508181036000830152611210816111d4565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061125182611006565b915061125c83611006565b925082820190508082111561127457611273611217565b5b92915050565b600061ffff82169050919050565b60006112938261127a565b915061ffff82036112a7576112a6611217565b5b600182019050919050565b60006112bd82611006565b91506112c883611006565b92508282039050818111156112e0576112df611217565b5b92915050565b6000819050919050565b6112f9816112e6565b82525050565b600061130a82610f20565b9050919050565b61131a816112ff565b82525050565b600060c08201905061133560008301896112f0565b61134260208301886112f0565b61134f6040830187611010565b61135c6060830186611010565b6113696080830185611311565b61137660a0830184611010565b979650505050505050565b600060a0820190506113966000830188611010565b6113a36020830187611010565b6113b06040830186611010565b6113bd6060830185611010565b6113ca6080830184611010565b9695505050505050565b600082825260208201905092915050565b82818337600083830152505050565b6000601f19601f8301169050919050565b600061141183856113d4565b935061141e8385846113e5565b611427836113f4565b840190509392505050565b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b61146781611432565b82525050565b600060c082019050818103600083015261148881898b611405565b90506114976020830188610f52565b6114a4604083018761145e565b6114b16060830186611010565b6114be6080830185611010565b6114cb60a0830184610f52565b98975050505050505050565b60006114e3828561107a565b91506114ef828461107a565b91508190509392505050565b60006115068261103a565b61151081856113d4565b9350611520818560208601611050565b611529816113f4565b840191505092915050565b600060408201905061154960008301856112f0565b818103602083015261155b81846114fb565b9050939250505056fe608060405234801561001057600080fd5b50610157806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063b3907bb91461003b578063e32689ab14610045575b600080fd5b61004361004f565b005b61004d61008a565b005b6040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161008190610101565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16ff5b600082825260208201905092915050565b7f4f50434f44452046440000000000000000000000000000000000000000000000600082015250565b60006100eb6009836100a4565b91506100f6826100b5565b602082019050919050565b6000602082019050818103600083015261011a816100de565b905091905056fea2646970667358221220115a603bf9ff965c5aa74dbbc65a190a4a073a7f1c3da57101dbe38e391d992264736f6c63430008130033a2646970667358221220e63d8ef27ec8da7d116949ef8faa386498505481265c37405593418f0a63764a64736f6c63430008130033",
-  "deployedBytecode": "0x6080604052600436106100345760003560e01c8063690696f0146100395780638f0a4cc414610043578063a147ee551461006e575b600080fd5b6100416100ab565b005b34801561004f57600080fd5b506100586100c5565b6040516100659190610f61565b60405180910390f35b34801561007a57600080fd5b5061009560048036038101906100909190610fd9565b6100eb565b6040516100a2919061101f565b60405180910390f35b6100b3610103565b6100bb610614565b6100c3610dde565b565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60006020528060005260406000206000915090505481565b600060405161011190610f13565b604051809103906000f08015801561012d573d6000803e3d6000fd5b50905060008173ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527fb3907bb9000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101d991906110ab565b6000604051808303816000865af19150503d8060008114610216576040519150601f19603f3d011682016040523d82523d6000602084013e61021b565b606091505b5050809150508015610262576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102599061111f565b60405180910390fd5b8173ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527fb3907bb9000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161030991906110ab565b600060405180830381855afa9150503d8060008114610344576040519150601f19603f3d011682016040523d82523d6000602084013e610349565b606091505b5050809150508015610390576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103879061111f565b60405180910390fd5b8173ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527fe32689ab000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161043791906110ab565b6000604051808303816000865af19150503d8060008114610474576040519150601f19603f3d011682016040523d82523d6000602084013e610479565b606091505b505080915050806104bf576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104b69061118b565b60405180910390fd5b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527fa378ff3e000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161058891906110ab565b6000604051808303816000865af19150503d80600081146105c5576040519150601f19603f3d011682016040523d82523d6000602084013e6105ca565b606091505b50508091505080610610576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610607906111f7565b60405180910390fd5b5050565b60005b601d8161ffff16116106f55760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020546106879190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191681526020019081526020016000208190555080806106ed90611288565b915050610617565b506001600080602060f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191681526020019081526020016000205461075b9190611246565b600080602060f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020819055506000603090505b60488161ffff161161089c5760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191681526020019081526020016000205461082e9190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002081905550808061089490611288565b9150506107be565b506000605090505b605b8161ffff16116109825760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020546109149190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002081905550808061097a90611288565b9150506108a4565b506000606090505b609f8161ffff1611610a685760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020546109fa9190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020819055508080610a6090611288565b91505061098a565b50600060a090505b60a48161ffff1611610b4e5760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002054610ae09190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020819055508080610b4690611288565b915050610a70565b50600060f090505b60f58161ffff1611610c345760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002054610bc69190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020819055508080610c2c90611288565b915050610b56565b50600160008060fa60f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002054610c9a9190611246565b60008060fa60f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002081905550600060fd90505b60ff8161ffff1611610ddb5760016000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002054610d6d9190611246565b6000808360f01b7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020819055508080610dd390611288565b915050610cfd565b50565b6000600254600143610df091906112b2565b4048464144604051602001610e0a96959493929190611320565b60405160208183030381529060405290506000454344425a604051602001610e36959493929190611381565b604051602081830303815290604052905060008036336000357fffffffff0000000000000000000000000000000000000000000000000000000016343a32604051602001610e8a979695949392919061146d565b60405160208183030381529060405290506002548383604051602001610eb19291906114d7565b60405160208183030381529060405282604051602001610ed29291906114d7565b604051602081830303815290604052604051602001610ef2929190611534565b60405160208183030381529060405280519060200120600281905550505050565b6101778061156583390190565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610f4b82610f20565b9050919050565b610f5b81610f40565b82525050565b6000602082019050610f766000830184610f52565b92915050565b600080fd5b60007fffff00000000000000000000000000000000000000000000000000000000000082169050919050565b610fb681610f81565b8114610fc157600080fd5b50565b600081359050610fd381610fad565b92915050565b600060208284031215610fef57610fee610f7c565b5b6000610ffd84828501610fc4565b91505092915050565b6000819050919050565b61101981611006565b82525050565b60006020820190506110346000830184611010565b92915050565b600081519050919050565b600081905092915050565b60005b8381101561106e578082015181840152602081019050611053565b60008484015250505050565b60006110858261103a565b61108f8185611045565b935061109f818560208601611050565b80840191505092915050565b60006110b7828461107a565b915081905092915050565b600082825260208201905092915050565b7f65787465726e616c526576657274204661696c65640000000000000000000000600082015250565b60006111096015836110c2565b9150611114826110d3565b602082019050919050565b60006020820190508181036000830152611138816110fc565b9050919050565b7f63616c6c6d65546f53656c664465737472756374204661696c65640000000000600082015250565b6000611175601b836110c2565b91506111808261113f565b602082019050919050565b600060208201905081810360008301526111a481611168565b9050919050565b7f65786563757465416c6c206f6e2079756c436f6e7472616374204661696c6564600082015250565b60006111e16020836110c2565b91506111ec826111ab565b602082019050919050565b60006020820190508181036000830152611210816111d4565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061125182611006565b915061125c83611006565b925082820190508082111561127457611273611217565b5b92915050565b600061ffff82169050919050565b60006112938261127a565b915061ffff82036112a7576112a6611217565b5b600182019050919050565b60006112bd82611006565b91506112c883611006565b92508282039050818111156112e0576112df611217565b5b92915050565b6000819050919050565b6112f9816112e6565b82525050565b600061130a82610f20565b9050919050565b61131a816112ff565b82525050565b600060c08201905061133560008301896112f0565b61134260208301886112f0565b61134f6040830187611010565b61135c6060830186611010565b6113696080830185611311565b61137660a0830184611010565b979650505050505050565b600060a0820190506113966000830188611010565b6113a36020830187611010565b6113b06040830186611010565b6113bd6060830185611010565b6113ca6080830184611010565b9695505050505050565b600082825260208201905092915050565b82818337600083830152505050565b6000601f19601f8301169050919050565b600061141183856113d4565b935061141e8385846113e5565b611427836113f4565b840190509392505050565b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b61146781611432565b82525050565b600060c082019050818103600083015261148881898b611405565b90506114976020830188610f52565b6114a4604083018761145e565b6114b16060830186611010565b6114be6080830185611010565b6114cb60a0830184610f52565b98975050505050505050565b60006114e3828561107a565b91506114ef828461107a565b91508190509392505050565b60006115068261103a565b61151081856113d4565b9350611520818560208601611050565b611529816113f4565b840191505092915050565b600060408201905061154960008301856112f0565b818103602083015261155b81846114fb565b9050939250505056fe608060405234801561001057600080fd5b50610157806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063b3907bb91461003b578063e32689ab14610045575b600080fd5b61004361004f565b005b61004d61008a565b005b6040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161008190610101565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16ff5b600082825260208201905092915050565b7f4f50434f44452046440000000000000000000000000000000000000000000000600082015250565b60006100eb6009836100a4565b91506100f6826100b5565b602082019050919050565b6000602082019050818103600083015261011a816100de565b905091905056fea2646970667358221220115a603bf9ff965c5aa74dbbc65a190a4a073a7f1c3da57101dbe38e391d992264736f6c63430008130033a2646970667358221220e63d8ef27ec8da7d116949ef8faa386498505481265c37405593418f0a63764a64736f6c63430008130033",
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161115a38038061115a83398101604081905261002f91610054565b600180546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6110c7806100936000396000f3fe6080604052600436106100345760003560e01c8063690696f0146100395780638f0a4cc414610043578063a147ee551461009a575b600080fd5b6100416100d5565b005b34801561004f57600080fd5b506001546100709073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b3480156100a657600080fd5b506100c76100b5366004610dc8565b60006020819052908152604090205481565b604051908152602001610091565b6100dd6100ef565b6100e561063c565b6100ed610c44565b565b60006040516100fd90610dbc565b604051809103906000f080158015610119573d6000803e3d6000fd5b5060408051600481526024810182526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fb3907bb900000000000000000000000000000000000000000000000000000000179052905191925060009173ffffffffffffffffffffffffffffffffffffffff84169161019991610e41565b6000604051808303816000865af19150503d80600081146101d6576040519150601f19603f3d011682016040523d82523d6000602084013e6101db565b606091505b50909150508015610272576040517f08c379a0000000000000000000000000000000000000000000000000000000008152602060048201526024808201527f4572726f723a2065787465726e616c52657665727420646964206e6f7420726560448201527f766572740000000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b60408051600481526024810182526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fb3907bb900000000000000000000000000000000000000000000000000000000179052905173ffffffffffffffffffffffffffffffffffffffff8416916102eb91610e41565b600060405180830381855afa9150503d8060008114610326576040519150601f19603f3d011682016040523d82523d6000602084013e61032b565b606091505b509091505080156103bd576040517f08c379a0000000000000000000000000000000000000000000000000000000008152602060048201526024808201527f4572726f723a2065787465726e616c52657665727420646964206e6f7420726560448201527f76657274000000000000000000000000000000000000000000000000000000006064820152608401610269565b60408051600481526024810182526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fe32689ab00000000000000000000000000000000000000000000000000000000179052905173ffffffffffffffffffffffffffffffffffffffff84169161043691610e41565b6000604051808303816000865af19150503d8060008114610473576040519150601f19603f3d011682016040523d82523d6000602084013e610478565b606091505b5050809150508061050b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f4572726f723a2072657665727463616c6c6d65546f53656c664465737472756360448201527f74204661696c65640000000000000000000000000000000000000000000000006064820152608401610269565b60015460408051600481526024810182526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fa378ff3e00000000000000000000000000000000000000000000000000000000179052905173ffffffffffffffffffffffffffffffffffffffff909216916105899190610e41565b6000604051808303816000865af19150503d80600081146105c6576040519150601f19603f3d011682016040523d82523d6000602084013e6105cb565b606091505b50508091505080610638576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f65786563757465416c6c206f6e2079756c436f6e7472616374204661696c65646044820152606401610269565b5050565b60005b600b8161ffff16116106d4577fffff00000000000000000000000000000000000000000000000000000000000060f082901b1660009081526020819052604090205461068c906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b166000908152602081905260409020556106cd600182610e95565b905061063f565b5060105b601d8161ffff161161076d577fffff00000000000000000000000000000000000000000000000000000000000060f082901b16600090815260208190526040902054610725906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b16600090815260208190526040902055610766600182610e95565b90506106d8565b507e2000000000000000000000000000000000000000000000000000000000000060009081526020527f0e50cdfef060ff4ae83dba37f786195c629c8b0ccdbe7a22b3da87f8ab7ae239546107c3906001610e7c565b7e2000000000000000000000000000000000000000000000000000000000000060009081526020527f0e50cdfef060ff4ae83dba37f786195c629c8b0ccdbe7a22b3da87f8ab7ae2395560305b60488161ffff16116108a5577fffff00000000000000000000000000000000000000000000000000000000000060f082901b1660009081526020819052604090205461085d906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b1660009081526020819052604090205561089e600182610e95565b9050610810565b5060505b605b8161ffff161161093e577fffff00000000000000000000000000000000000000000000000000000000000060f082901b166000908152602081905260409020546108f6906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b16600090815260208190526040902055610937600182610e95565b90506108a9565b5060605b609f8161ffff16116109d7577fffff00000000000000000000000000000000000000000000000000000000000060f082901b1660009081526020819052604090205461098f906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b166000908152602081905260409020556109d0600182610e95565b9050610942565b5060a05b60a48161ffff1611610a70577fffff00000000000000000000000000000000000000000000000000000000000060f082901b16600090815260208190526040902054610a28906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b16600090815260208190526040902055610a69600182610e95565b90506109db565b5060f05b60f58161ffff1611610b09577fffff00000000000000000000000000000000000000000000000000000000000060f082901b16600090815260208190526040902054610ac1906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b16600090815260208190526040902055610b02600182610e95565b9050610a74565b507efa00000000000000000000000000000000000000000000000000000000000060009081526020527f5a4c6900172b15702052e06818580b12ea1fe9c2b87992d0d87c54d1018b333354610b5f906001610e7c565b7efa00000000000000000000000000000000000000000000000000000000000060009081526020527f5a4c6900172b15702052e06818580b12ea1fe9c2b87992d0d87c54d1018b33335560fd5b60ff8161ffff1611610c41577fffff00000000000000000000000000000000000000000000000000000000000060f082901b16600090815260208190526040902054610bf9906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b16600090815260208190526040902055610c3a600182610e95565b9050610bac565b50565b600254600090610c55600143610eb7565b604080516020810193909352904090820152434060608201524860808201524660a08201524160c08201524460e08201526101000160405160208183030381529060405290506000454344425a6040805160208101969096528501939093526060840191909152608083015260a082015260c001604051602081830303815290604052905060008036336000357fffffffff0000000000000000000000000000000000000000000000000000000016343a32604051602001610d1d9796959493929190610eca565b60405160208183030381529060405290508282604051602001610d41929190610f75565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815290829052610d7e918390602001610f75565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190528051602090910120600255505050565b60ff80610f9383390190565b600060208284031215610dda57600080fd5b81357fffff00000000000000000000000000000000000000000000000000000000000081168114610e0a57600080fd5b9392505050565b6000815160005b81811015610e325760208185018101518683015201610e18565b50600093019283525090919050565b6000610e0a8284610e11565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b80820180821115610e8f57610e8f610e4d565b92915050565b61ffff818116838216019080821115610eb057610eb0610e4d565b5092915050565b81810381811115610e8f57610e8f610e4d565b60c081528660c0820152868860e0830137600060e088830181019190915273ffffffffffffffffffffffffffffffffffffffff96871660208301527fffffffff000000000000000000000000000000000000000000000000000000009590951660408201526060810193909352608083019190915290921660a0830152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101919050565b6000610f8a610f848386610e11565b84610e11565b94935050505056fe6080604052348015600f57600080fd5b5060e18061001e6000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c8063b3907bb9146037578063e32689ab14603f575b600080fd5b603d6045565b005b603d6000ff5b6040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600960248201527f4f50434f44452046440000000000000000000000000000000000000000000000604482015260640160405180910390fdfea2646970667358221220868db823990a509cd2746b1f1a6273241894b2e33cbc6954461aa8d5dbdc6b2b64736f6c63430008130033a2646970667358221220fe695414ae5491baf8ef36c5bef30a8db5b9e98b8c6d4739af973b2e3112c4a864736f6c63430008130033",
+  "deployedBytecode": "0x6080604052600436106100345760003560e01c8063690696f0146100395780638f0a4cc414610043578063a147ee551461009a575b600080fd5b6100416100d5565b005b34801561004f57600080fd5b506001546100709073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b3480156100a657600080fd5b506100c76100b5366004610dc8565b60006020819052908152604090205481565b604051908152602001610091565b6100dd6100ef565b6100e561063c565b6100ed610c44565b565b60006040516100fd90610dbc565b604051809103906000f080158015610119573d6000803e3d6000fd5b5060408051600481526024810182526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fb3907bb900000000000000000000000000000000000000000000000000000000179052905191925060009173ffffffffffffffffffffffffffffffffffffffff84169161019991610e41565b6000604051808303816000865af19150503d80600081146101d6576040519150601f19603f3d011682016040523d82523d6000602084013e6101db565b606091505b50909150508015610272576040517f08c379a0000000000000000000000000000000000000000000000000000000008152602060048201526024808201527f4572726f723a2065787465726e616c52657665727420646964206e6f7420726560448201527f766572740000000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b60408051600481526024810182526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fb3907bb900000000000000000000000000000000000000000000000000000000179052905173ffffffffffffffffffffffffffffffffffffffff8416916102eb91610e41565b600060405180830381855afa9150503d8060008114610326576040519150601f19603f3d011682016040523d82523d6000602084013e61032b565b606091505b509091505080156103bd576040517f08c379a0000000000000000000000000000000000000000000000000000000008152602060048201526024808201527f4572726f723a2065787465726e616c52657665727420646964206e6f7420726560448201527f76657274000000000000000000000000000000000000000000000000000000006064820152608401610269565b60408051600481526024810182526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fe32689ab00000000000000000000000000000000000000000000000000000000179052905173ffffffffffffffffffffffffffffffffffffffff84169161043691610e41565b6000604051808303816000865af19150503d8060008114610473576040519150601f19603f3d011682016040523d82523d6000602084013e610478565b606091505b5050809150508061050b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f4572726f723a2072657665727463616c6c6d65546f53656c664465737472756360448201527f74204661696c65640000000000000000000000000000000000000000000000006064820152608401610269565b60015460408051600481526024810182526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fa378ff3e00000000000000000000000000000000000000000000000000000000179052905173ffffffffffffffffffffffffffffffffffffffff909216916105899190610e41565b6000604051808303816000865af19150503d80600081146105c6576040519150601f19603f3d011682016040523d82523d6000602084013e6105cb565b606091505b50508091505080610638576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f65786563757465416c6c206f6e2079756c436f6e7472616374204661696c65646044820152606401610269565b5050565b60005b600b8161ffff16116106d4577fffff00000000000000000000000000000000000000000000000000000000000060f082901b1660009081526020819052604090205461068c906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b166000908152602081905260409020556106cd600182610e95565b905061063f565b5060105b601d8161ffff161161076d577fffff00000000000000000000000000000000000000000000000000000000000060f082901b16600090815260208190526040902054610725906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b16600090815260208190526040902055610766600182610e95565b90506106d8565b507e2000000000000000000000000000000000000000000000000000000000000060009081526020527f0e50cdfef060ff4ae83dba37f786195c629c8b0ccdbe7a22b3da87f8ab7ae239546107c3906001610e7c565b7e2000000000000000000000000000000000000000000000000000000000000060009081526020527f0e50cdfef060ff4ae83dba37f786195c629c8b0ccdbe7a22b3da87f8ab7ae2395560305b60488161ffff16116108a5577fffff00000000000000000000000000000000000000000000000000000000000060f082901b1660009081526020819052604090205461085d906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b1660009081526020819052604090205561089e600182610e95565b9050610810565b5060505b605b8161ffff161161093e577fffff00000000000000000000000000000000000000000000000000000000000060f082901b166000908152602081905260409020546108f6906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b16600090815260208190526040902055610937600182610e95565b90506108a9565b5060605b609f8161ffff16116109d7577fffff00000000000000000000000000000000000000000000000000000000000060f082901b1660009081526020819052604090205461098f906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b166000908152602081905260409020556109d0600182610e95565b9050610942565b5060a05b60a48161ffff1611610a70577fffff00000000000000000000000000000000000000000000000000000000000060f082901b16600090815260208190526040902054610a28906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b16600090815260208190526040902055610a69600182610e95565b90506109db565b5060f05b60f58161ffff1611610b09577fffff00000000000000000000000000000000000000000000000000000000000060f082901b16600090815260208190526040902054610ac1906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b16600090815260208190526040902055610b02600182610e95565b9050610a74565b507efa00000000000000000000000000000000000000000000000000000000000060009081526020527f5a4c6900172b15702052e06818580b12ea1fe9c2b87992d0d87c54d1018b333354610b5f906001610e7c565b7efa00000000000000000000000000000000000000000000000000000000000060009081526020527f5a4c6900172b15702052e06818580b12ea1fe9c2b87992d0d87c54d1018b33335560fd5b60ff8161ffff1611610c41577fffff00000000000000000000000000000000000000000000000000000000000060f082901b16600090815260208190526040902054610bf9906001610e7c565b7fffff00000000000000000000000000000000000000000000000000000000000060f083901b16600090815260208190526040902055610c3a600182610e95565b9050610bac565b50565b600254600090610c55600143610eb7565b604080516020810193909352904090820152434060608201524860808201524660a08201524160c08201524460e08201526101000160405160208183030381529060405290506000454344425a6040805160208101969096528501939093526060840191909152608083015260a082015260c001604051602081830303815290604052905060008036336000357fffffffff0000000000000000000000000000000000000000000000000000000016343a32604051602001610d1d9796959493929190610eca565b60405160208183030381529060405290508282604051602001610d41929190610f75565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815290829052610d7e918390602001610f75565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190528051602090910120600255505050565b60ff80610f9383390190565b600060208284031215610dda57600080fd5b81357fffff00000000000000000000000000000000000000000000000000000000000081168114610e0a57600080fd5b9392505050565b6000815160005b81811015610e325760208185018101518683015201610e18565b50600093019283525090919050565b6000610e0a8284610e11565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b80820180821115610e8f57610e8f610e4d565b92915050565b61ffff818116838216019080821115610eb057610eb0610e4d565b5092915050565b81810381811115610e8f57610e8f610e4d565b60c081528660c0820152868860e0830137600060e088830181019190915273ffffffffffffffffffffffffffffffffffffffff96871660208301527fffffffff000000000000000000000000000000000000000000000000000000009590951660408201526060810193909352608083019190915290921660a0830152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101919050565b6000610f8a610f848386610e11565b84610e11565b94935050505056fe6080604052348015600f57600080fd5b5060e18061001e6000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c8063b3907bb9146037578063e32689ab14603f575b600080fd5b603d6045565b005b603d6000ff5b6040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600960248201527f4f50434f44452046440000000000000000000000000000000000000000000000604482015260640160405180910390fdfea2646970667358221220868db823990a509cd2746b1f1a6273241894b2e33cbc6954461aa8d5dbdc6b2b64736f6c63430008130033a2646970667358221220fe695414ae5491baf8ef36c5bef30a8db5b9e98b8c6d4739af973b2e3112c4a864736f6c63430008130033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }
diff --git a/contracts/src/_testing/unit/opcodes/OpcodeTester.sol b/contracts/src/_testing/unit/opcodes/OpcodeTester.sol
index 6e348b53c..8eb1b1004 100644
--- a/contracts/src/_testing/unit/opcodes/OpcodeTester.sol
+++ b/contracts/src/_testing/unit/opcodes/OpcodeTester.sol
@@ -270,6 +270,7 @@ contract OpcodeTester {
     bytes memory fieldsToHashSection1 = abi.encode(
       rollingBlockDetailComputations,
       blockhash(block.number - 1),
+      blockhash(block.number),
       block.basefee,
       block.chainid,
       block.coinbase,