diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2018-2024 Simon Shine +Copyright 2018-2026 Simon Shine Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/evm-opcodes.cabal b/evm-opcodes.cabal --- a/evm-opcodes.cabal +++ b/evm-opcodes.cabal @@ -1,11 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.1. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack name: evm-opcodes -version: 0.2.0 +version: 0.3.0 synopsis: Opcode types for Ethereum Virtual Machine (EVM) description: This library provides opcode types for the Ethereum Virtual Machine. category: Ethereum, Finance, Network @@ -13,7 +13,7 @@ bug-reports: https://github.com/sshine/evm-opcodes/issues author: Simon Shine maintainer: simon@simonshine.dk -copyright: 2018-2024 Simon Shine +copyright: 2018-2026 Simon Shine license: MIT license-file: LICENSE build-type: Simple @@ -38,9 +38,9 @@ ghc-options: -Wall -Wnoncanonical-monad-instances -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints build-depends: base >=4.12 && <5 - , bytestring >=0.10 + , bytestring >=0.10 && <0.13 , cereal ==0.5.* - , containers >=0.6 && <0.8 + , containers >=0.6 && <0.9 , data-dword ==0.3.* , text >=1.2 default-language: Haskell2010 @@ -56,9 +56,9 @@ test build-depends: base >=4.12 && <5 - , bytestring >=0.10 + , bytestring >=0.10 && <0.13 , cereal ==0.5.* - , containers >=0.6 && <0.8 + , containers >=0.6 && <0.9 , data-dword ==0.3.* , evm-opcodes , hedgehog @@ -79,9 +79,9 @@ bench build-depends: base >=4.12 && <5 - , bytestring >=0.10 + , bytestring >=0.10 && <0.13 , cereal ==0.5.* - , containers >=0.6 && <0.8 + , containers >=0.6 && <0.9 , data-dword ==0.3.* , evm-opcodes , tasty-bench diff --git a/src/EVM/Opcode.hs b/src/EVM/Opcode.hs --- a/src/EVM/Opcode.hs +++ b/src/EVM/Opcode.hs @@ -2,7 +2,7 @@ -- | -- Module: EVM.Opcode --- Copyright: 2018-2024 Simon Shine +-- Copyright: 2018-2026 Simon Shine -- Maintainer: Simon Shine -- License: MIT -- diff --git a/src/EVM/Opcode/Internal.hs b/src/EVM/Opcode/Internal.hs --- a/src/EVM/Opcode/Internal.hs +++ b/src/EVM/Opcode/Internal.hs @@ -6,7 +6,7 @@ -- | -- Module: EVM.Opcode.Internal --- Copyright: 2018-2024 Simon Shine +-- Copyright: 2018-2026 Simon Shine -- Maintainer: Simon Shine -- License: MIT -- @@ -92,6 +92,8 @@ | CHAINID -- ^ 0x46, https://eips.ethereum.org/EIPS/eip-1344 | SELFBALANCE -- ^ 0x47, https://eips.ethereum.org/EIPS/eip-1884 | BASEFEE -- ^ 0x48, https://eips.ethereum.org/EIPS/eip-3198 + | BLOBHASH -- ^ 0x49, https://eips.ethereum.org/EIPS/eip-4844 + | BLOBBASEFEE -- ^ 0x4a, https://eips.ethereum.org/EIPS/eip-7516 -- 50s: Stack, Memory, Storage and Flow Operations | POP -- ^ 0x50 @@ -106,8 +108,12 @@ | MSIZE -- ^ 0x59 | GAS -- ^ 0x5a | JUMPDEST j -- ^ 0x5b + | TLOAD -- ^ 0x5c, https://eips.ethereum.org/EIPS/eip-1153 + | TSTORE -- ^ 0x5d, https://eips.ethereum.org/EIPS/eip-1153 + | MCOPY -- ^ 0x5e, https://eips.ethereum.org/EIPS/eip-5656 - -- 60s & 70s: Push Operations + -- 5f, 60s & 70s: Push Operations + | PUSH0 -- ^ 0x5f, https://eips.ethereum.org/EIPS/eip-3855 | PUSH !Word256 -- ^ 0x60 - 0x7f (PUSH1 - PUSH32) -- 80s: Duplication Operations (DUP) @@ -276,6 +282,8 @@ CHAINID -> OpcodeSpec 0x46 0 1 "chainid" SELFBALANCE -> OpcodeSpec 0x47 0 1 "selfbalance" BASEFEE -> OpcodeSpec 0x48 0 1 "basefee" + BLOBHASH -> OpcodeSpec 0x49 1 1 "blobhash" + BLOBBASEFEE -> OpcodeSpec 0x4a 0 1 "blobbasefee" -- 50s: Stack, Memory, Storage and Flow Operations -- Hex α δ @@ -291,8 +299,12 @@ MSIZE -> OpcodeSpec 0x59 0 1 "msize" GAS -> OpcodeSpec 0x5a 0 1 "gas" JUMPDEST{} -> OpcodeSpec 0x5b 0 0 "jumpdest" + TLOAD -> OpcodeSpec 0x5c 1 1 "tload" + TSTORE -> OpcodeSpec 0x5d 2 0 "tstore" + MCOPY -> OpcodeSpec 0x5e 3 0 "mcopy" - -- 60s & 70s: Push Operations + -- 5f, 60s & 70s: Push Operations + PUSH0 -> OpcodeSpec 0x5f 0 1 "push0" PUSH n -> let (pushHex, pushConst) = push' n in OpcodeSpec { opcodeEncoding = pushHex diff --git a/src/EVM/Opcode/Labelled.hs b/src/EVM/Opcode/Labelled.hs --- a/src/EVM/Opcode/Labelled.hs +++ b/src/EVM/Opcode/Labelled.hs @@ -2,7 +2,7 @@ -- | -- Module: EVM.Opcode.Labelled --- Copyright: 2018-2024 Simon Shine +-- Copyright: 2018-2026 Simon Shine -- Maintainer: Simon Shine -- License: MIT -- diff --git a/src/EVM/Opcode/Positional.hs b/src/EVM/Opcode/Positional.hs --- a/src/EVM/Opcode/Positional.hs +++ b/src/EVM/Opcode/Positional.hs @@ -1,6 +1,6 @@ -- | -- Module: EVM.Opcode.Positional --- Copyright: 2018-2024 Simon Shine +-- Copyright: 2018-2026 Simon Shine -- Maintainer: Simon Shine -- License: MIT -- diff --git a/src/EVM/Opcode/Traversal.hs b/src/EVM/Opcode/Traversal.hs --- a/src/EVM/Opcode/Traversal.hs +++ b/src/EVM/Opcode/Traversal.hs @@ -2,7 +2,7 @@ -- | -- Module: EVM.Opcode.Traversal --- Copyright: 2018-2024 Simon Shine +-- Copyright: 2018-2026 Simon Shine -- Maintainer: Simon Shine -- License: MIT -- @@ -98,6 +98,8 @@ CHAINID -> mapOnOther' CHAINID CHAINID SELFBALANCE -> mapOnOther' SELFBALANCE SELFBALANCE BASEFEE -> mapOnOther' BASEFEE BASEFEE + BLOBHASH -> mapOnOther' BLOBHASH BLOBHASH + BLOBBASEFEE -> mapOnOther' BLOBBASEFEE BLOBBASEFEE -- 50s: Stack, Memory, Storage and Flow Operations POP -> mapOnOther' POP POP @@ -109,8 +111,12 @@ PC -> mapOnOther' PC PC MSIZE -> mapOnOther' MSIZE MSIZE GAS -> mapOnOther' GAS GAS + TLOAD -> mapOnOther' TLOAD TLOAD + TSTORE -> mapOnOther' TSTORE TSTORE + MCOPY -> mapOnOther' MCOPY MCOPY - -- 60s & 70s: Push Operations + -- 5f, 60s & 70s: Push Operations + PUSH0 -> mapOnOther' PUSH0 PUSH0 PUSH n -> mapOnOther' (PUSH n) (PUSH n) -- 80s: Duplication Operations (DUP)