fix evm development versions

Author: larskuhtz

src/Chainweb/Chainweb/Configuration.hs

@@ -92,6 +92,7 @@ import Chainweb.Utils
 import Chainweb.Version
 import Chainweb.Version.Development
 import Chainweb.Version.EvmDevelopment
+import Chainweb.Version.EvmDevelopmentSingleton
 import Chainweb.Version.Mainnet
 import Chainweb.Version.RecapDevelopment
 import Chainweb.Version.Registry (findKnownVersion, knownVersions)
@@ -547,7 +548,10 @@ validateChainwebVersion v = do
             , sshow (_versionName v)
             ]
     where
-    isDevelopment = _versionCode v `elem` [_versionCode dv | dv <- [recapDevnet, devnet, evmDevnet]]
+    isDevelopment = _versionCode v `elem`
+        [_versionCode dv | dv <-
+            [recapDevnet, devnet, evmDevnet, evmDevnetSingleton, evmDevnetPair]
+        ]
 
 validateBackupConfig :: ConfigValidation BackupConfig []
 validateBackupConfig c =

src/Chainweb/PayloadProvider/EVM/Genesis.hs

@@ -16,6 +16,7 @@ module Chainweb.PayloadProvider.EVM.Genesis
 import Chainweb.Version
 import Chainweb.PayloadProvider.EVM.Header
 import Chainweb.Version.EvmDevelopment
+import Chainweb.Version.EvmDevelopmentSingleton
 import Chainweb.Utils
 import Chainweb.PayloadProvider.EVM.Utils (decodeRlpM)
 import Data.Text qualified as T
@@ -79,6 +80,14 @@ genesisBlocks
 genesisBlocks c = go (_versionCode implicitVersion) (_chainId c)
   where
     go v
+        | v == _versionCode EvmDevelopmentSingleton = \case
+            ChainId 0 -> f
+                "-QJfoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoB3MTejex116q4W1Z7bM1BrTEkUblIp0E_ChQv1A1JNHlAAAAAAAAAAAAAAAAAAAAAAAAAAAoGnV3kPaffv02pFz2XaK1abwEUqbp-L5K03hpucRJqlToFboHxcbzFWm_4NF5pLA-G5bSOAbmWytwAFiL7XjY7QhoFboHxcbzFWm_4NF5pLA-G5bSOAbmWytwAFiL7XjY7QhuQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAhAHJw4CAhGSQ_dKAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAAAAAhDuaygCgVugfFxvMVab_g0XmksD4bltI4BuZbK3AAWIvteNjtCGAgKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKDjsMRCmPwcFJr79MiZb7kkJ65B5GSbk0yklZkbeFK4VQ"
+            _ -> error $ "unsupported chain: " <> T.unpack (toText (_chainId c))
+        | v == _versionCode EvmDevelopmentPair = \case
+            ChainId 1 -> f
+                "-QJfoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoB3MTejex116q4W1Z7bM1BrTEkUblIp0E_ChQv1A1JNHlAAAAAAAAAAAAAAAAAAAAAAAAAAAoGnV3kPaffv02pFz2XaK1abwEUqbp-L5K03hpucRJqlToFboHxcbzFWm_4NF5pLA-G5bSOAbmWytwAFiL7XjY7QhoFboHxcbzFWm_4NF5pLA-G5bSOAbmWytwAFiL7XjY7QhuQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAhAHJw4CAhGSQ_dKAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAAAAAhDuaygCgVugfFxvMVab_g0XmksD4bltI4BuZbK3AAWIvteNjtCGAgKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKDjsMRCmPwcFJr79MiZb7kkJ65B5GSbk0yklZkbeFK4VQ"
+            _ -> error $ "unsupported chain: " <> T.unpack (toText (_chainId c))
         | v == _versionCode EvmDevelopment = \case
             ChainId 20 -> f
                 "-QJfoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoB3MTejex116q4W1Z7bM1BrTEkUblIp0E_ChQv1A1JNHlAAAAAAAAAAAAAAAAAAAAAAAAAAAoGnV3kPaffv02pFz2XaK1abwEUqbp-L5K03hpucRJqlToFboHxcbzFWm_4NF5pLA-G5bSOAbmWytwAFiL7XjY7QhoFboHxcbzFWm_4NF5pLA-G5bSOAbmWytwAFiL7XjY7QhuQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAhAHJw4CAhGSQ_dKAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAAAAAhDuaygCgVugfFxvMVab_g0XmksD4bltI4BuZbK3AAWIvteNjtCGAgKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKDjsMRCmPwcFJr79MiZb7kkJ65B5GSbk0yklZkbeFK4VQ"

src/Chainweb/Version/EvmDevelopmentSingleton.hs

@@ -8,6 +8,8 @@
 module Chainweb.Version.EvmDevelopmentSingleton
 ( evmDevnetSingleton
 , pattern EvmDevelopmentSingleton
+, evmDevnetPair
+, pattern EvmDevelopmentPair
 ) where
 
 import qualified Data.Set as Set
@@ -27,6 +29,10 @@ pattern EvmDevelopmentSingleton :: ChainwebVersion
 pattern EvmDevelopmentSingleton <- ((== evmDevnetSingleton) -> True) where
     EvmDevelopmentSingleton = evmDevnetSingleton
 
+pattern EvmDevelopmentPair :: ChainwebVersion
+pattern EvmDevelopmentPair <- ((== evmDevnetPair) -> True) where
+    EvmDevelopmentPair = evmDevnetPair
+
 -- How to compute the hashes:
 --
 -- Mininal Payload Provider:
@@ -49,10 +55,10 @@ pattern EvmDevelopmentSingleton <- ((== evmDevnetSingleton) -> True) where
 --
 -- TODO (use ea?)
 
-evmDevnetSingleton :: ChainwebVersion
-evmDevnetSingleton = withVersion evmDevnetSingleton $ ChainwebVersion
+evmDevnetPair :: ChainwebVersion
+evmDevnetPair = withVersion evmDevnetPair $ ChainwebVersion
     { _versionCode = ChainwebVersionCode 0x0000_000b
-    , _versionName = ChainwebVersionName "evm-development-singleton"
+    , _versionName = ChainwebVersionName "evm-development-pair"
     , _versionForks = tabulateHashMap $ const $ onAllChains ForkAtGenesis
     , _versionUpgrades = onAllChains mempty
     , _versionGraphs = Bottom (minBound, pairChainGraph)
@@ -61,7 +67,7 @@ evmDevnetSingleton = withVersion evmDevnetSingleton $ ChainwebVersion
     , _versionHeaderBaseSizeBytes = 318 - 110
     , _versionBootstraps = []
     , _versionGenesis = VersionGenesis
-        { _genesisBlockTarget = onAllChains $ HashTarget (maxBound `div` 100_000)
+        { _genesisBlockTarget = onAllChains $ HashTarget (maxBound `div` 10_000)
         , _genesisTime = onChains
             -- FIXME: is the creation time for the pact headers correct?
             $ [ (unsafeChainId i, BlockCreationTime [timeMicrosQQ| 2025-01-01T00:00:00.000000 |]) | i <- [0] ]
@@ -94,5 +100,47 @@ evmDevnetSingleton = withVersion evmDevnetSingleton $ ChainwebVersion
     -- FIXME make this safe for graph changes
     , _versionPayloadProviderTypes = onChains
         $ [ (unsafeChainId i, PactProvider) | i <- [0] ]
-        <> [ (unsafeChainId i, EvmProvider (1789 - 20 + int i)) | i <- [1] ]
+        <> [ (unsafeChainId i, EvmProvider (1789 - 1 + int i)) | i <- [1] ]
+    }
+
+evmDevnetSingleton :: ChainwebVersion
+evmDevnetSingleton = withVersion evmDevnetSingleton $ ChainwebVersion
+    { _versionCode = ChainwebVersionCode 0x0000_000c
+    , _versionName = ChainwebVersionName "evm-development-singleton"
+    , _versionForks = tabulateHashMap $ const $ onAllChains ForkAtGenesis
+    , _versionUpgrades = onAllChains mempty
+    , _versionGraphs = Bottom (minBound, pairChainGraph)
+    , _versionBlockDelay = BlockDelay 30_000_000
+    , _versionWindow = WindowWidth 120
+    , _versionHeaderBaseSizeBytes = 318 - 110
+    , _versionBootstraps = []
+    , _versionGenesis = VersionGenesis
+        { _genesisBlockTarget = onAllChains $ HashTarget (maxBound `div` 10_000)
+        , _genesisTime = onChains
+            [ (unsafeChainId 0, BlockCreationTime (Time (secondsToTimeSpan 1687223762))) ]
+        , _genesisBlockPayload = onChains $
+            -- EVM Payload Provider
+            [ (unsafeChainId 1, unsafeFromText "FAxLDjtb8r_0S0Rfr8rD47EQwO-Ma-fmEynZccHvn5o") ]
+        }
+
+    -- still the *default* block gas limit is set, see
+    -- defaultChainwebConfiguration._configBlockGasLimit
+    , _versionMaxBlockGasLimit = Bottom (minBound, Nothing)
+    , _versionCheats = VersionCheats
+        { _disablePow = True
+        , _fakeFirstEpochStart = True
+        , _disablePact = False
+        }
+    , _versionDefaults = VersionDefaults
+        { _disablePeerValidation = True
+        , _disableMempoolSync = False
+        }
+    , _versionVerifierPluginNames = onAllChains $ Bottom
+        (minBound, Set.fromList $ map VerifierName ["hyperlane_v3_message", "allow"])
+    , _versionQuirks = noQuirks
+    , _versionServiceDate = Nothing
+
+    -- FIXME make this safe for graph changes
+    , _versionPayloadProviderTypes = onChains
+        [ (unsafeChainId 0, EvmProvider 1789) ]
     }

src/Chainweb/Version/Registry.hs

@@ -81,7 +81,7 @@ validateVersion v = do
 
 -- | Versions known to us by name.
 knownVersions :: [ChainwebVersion]
-knownVersions = [mainnet, testnet04, recapDevnet, devnet, evmDevnet, evmDevnetSingleton]
+knownVersions = [mainnet, testnet04, recapDevnet, devnet, evmDevnet, evmDevnetSingleton, evmDevnetPair]
 
 -- | Look up a known version by name, usually with `m` instantiated to some
 -- configuration parser monad.