diff --git a/deposit/bytecode-verification/deposit-spec.ini b/deposit/bytecode-verification/deposit-spec.ini index dee1e1f7a..68d997df7 100644 --- a/deposit/bytecode-verification/deposit-spec.ini +++ b/deposit/bytecode-verification/deposit-spec.ini @@ -24,12 +24,10 @@ status_code: _ => _ ; variables comment: schedule: ISTANBUL -call_stack: CALL_STACK this: THIS msg_sender: MSG_SENDER call_value: CALL_VALUE call_depth: CALL_DEPTH -coinbase: COIN_BASE active_accounts: accounts: requires: diff --git a/deposit/bytecode-verification/spec-tmpl.k b/deposit/bytecode-verification/spec-tmpl.k index 26b5af308..131d68000 100644 --- a/deposit/bytecode-verification/spec-tmpl.k +++ b/deposit/bytecode-verification/spec-tmpl.k @@ -2,15 +2,12 @@ rule {K} - 1 NORMAL {SCHEDULE} {OUTPUT} {STATUS_CODE} - {CALL_STACK} - _ _ => _ #parseByteStack({CODE}) @@ -29,31 +26,11 @@ rule {CALL_DEPTH} - _ {LOG} {REFUND} + ... - _ - ORIGIN_ID // tx.origin - BLOCK_HASHES // block.blockhash - - _ - _ - {COINBASE} // block.coinbase - _ - _ - _ - _ - _ - BLOCK_NUM // block.number - _ - _ - NOW // now = block.timestamp - _ - _ - _ - _ - + ... {ACTIVE_ACCOUNTS} SetItem({THIS}) SetItem(2) SetItem(4) _:Set @@ -87,16 +64,12 @@ rule {ACCOUNTS} ... - _ - _ - _ + ... + ... - requires #rangeAddress(ORIGIN_ID) - // builtins - andBool #rangeUInt(256, NOW) - andBool #rangeUInt(128, BLOCK_NUM) // Solidity + requires true {REQUIRES} ensures true {ENSURES}