Delete Pact5Devnet and upgrade devnet to use pact 5

chainweb.cabal

@@ -145,8 +145,6 @@ library
         , Chainweb.BlockHeader.Genesis.Pact5InstantTimedCPM1to9Payload
         , Chainweb.BlockHeader.Genesis.QuirkedGasPact5InstantTimedCPM0Payload
         , Chainweb.BlockHeader.Genesis.QuirkedGasPact5InstantTimedCPM1to9Payload
-        , Chainweb.BlockHeader.Genesis.Pact5Development0Payload
-        , Chainweb.BlockHeader.Genesis.Pact5Development1to19Payload
         , Chainweb.BlockHeader.Genesis.Testnet040Payload
         , Chainweb.BlockHeader.Genesis.Testnet041to19Payload
         , Chainweb.BlockHeader.Genesis.Testnet050Payload
@@ -270,7 +268,6 @@ library
         , Chainweb.Version.Development
         , Chainweb.Version.Guards
         , Chainweb.Version.Mainnet
-        , Chainweb.Version.Pact5Development
         , Chainweb.Version.RecapDevelopment
         , Chainweb.Version.Registry
         , Chainweb.Version.Testnet04

cwtools/ea/Ea.hs

@@ -44,7 +44,6 @@ import Chainweb.Time
 import Chainweb.Utils
 import Chainweb.Version
 import Chainweb.Version.Development (pattern Development)
-import Chainweb.Version.Pact5Development (pattern Pact5Development)
 import Chainweb.Version.RecapDevelopment (pattern RecapDevelopment)
 import Chainweb.Version.Registry (registerVersion)
 import Control.Concurrent.Async
@@ -75,12 +74,10 @@ main :: IO ()
 main = do
     registerVersion RecapDevelopment
     registerVersion Development
-    registerVersion Pact5Development
 
     mapConcurrently_ id
       [ recapDevnet
       , devnet
-      , pact5Devnet
       , fastnet
       , instantnet
       , pact5Instantnet
@@ -105,10 +102,6 @@ main = do
       [ fastDevelopment0
       , fastDevelopmentN
       ]
-    pact5Devnet = mkPayloads
-      [ pact5Development0
-      , pact5DevelopmentN
-      ]
     fastnet = mkPayloads [fastTimedCPM0, fastTimedCPMN]
     instantnet = mkPayloads [instantCPM0, instantCPMN]
     pact5Instantnet = mkPayloads [pact5InstantCPM0, pact5InstantCPMN]

cwtools/ea/Ea/Genesis.hs

@@ -18,8 +18,6 @@ module Ea.Genesis
 , recapDevelopmentKAD
 , fastDevelopment0
 , fastDevelopmentN
-, pact5Development0
-, pact5DevelopmentN
 
   -- * Testing Genesis Txs
 , fastTimedCPM0
@@ -75,7 +73,6 @@ import Chainweb.Graph
 import Chainweb.Test.TestVersions
 import Chainweb.Version
 import Chainweb.Version.Development
-import Chainweb.Version.Pact5Development
 import Chainweb.Version.RecapDevelopment
 import Chainweb.Version.Mainnet
 import Chainweb.Version.Testnet04
@@ -217,23 +214,6 @@ fastDevelopmentN = fastDevelopment0
     & txChainIds .~ mkChainIdRange 1 19
     & coinbase ?~ devNGrants
 
-pact5Development0 :: Genesis
-pact5Development0 = Genesis
-    { _version = Pact5Development
-    , _tag = "Pact5Development"
-    , _txChainIds = onlyChainId 0
-    , _coinbase = Just dev0Grants
-    , _keysets = Just devKeysets
-    , _allocations = Just devAllocations
-    , _namespaces = Just devNs2
-    , _coinContract = [fungibleAssetV1, fungibleXChainV1, fungibleAssetV2, installCoinContractV6, gasPayer]
-    }
-
-pact5DevelopmentN :: Genesis
-pact5DevelopmentN = pact5Development0
-    & txChainIds .~ mkChainIdRange 1 19
-    & coinbase ?~ devNGrants
-
 devNs2 :: FilePath
 devNs2 = "pact/genesis/ns-v2.yaml"
 

src/Chainweb/Chainweb/Configuration.hs

@@ -117,7 +117,6 @@ import Chainweb.Payload.RestAPI (PayloadBatchLimit(..), defaultServicePayloadBat
 import Chainweb.Utils
 import Chainweb.Version
 import Chainweb.Version.Development
-import Chainweb.Version.Pact5Development
 import Chainweb.Version.RecapDevelopment
 import Chainweb.Version.Mainnet
 import Chainweb.Version.Registry
@@ -441,7 +440,7 @@ validateChainwebVersion v = do
             , "just yet."
             ]
     where
-    isDevelopment = _versionCode v `elem` [_versionCode dv | dv <- [recapDevnet, devnet, pact5Devnet]]
+    isDevelopment = _versionCode v `elem` [_versionCode dv | dv <- [recapDevnet, devnet]]
 
 validateBackupConfig :: ConfigValidation BackupConfig []
 validateBackupConfig c =

src/Chainweb/Version/Development.hs

@@ -32,9 +32,6 @@ devnet = ChainwebVersion
     { _versionCode = ChainwebVersionCode 0x00000002
     , _versionName = ChainwebVersionName "development"
     , _versionForks = tabulateHashMap $ \case
-        -- TODO: for now, Pact 5 is never enabled on devnet.
-        -- this will change as it stabilizes.
-        Pact5Fork -> AllChains ForkNever
         _ -> AllChains ForkAtGenesis
     , _versionUpgrades = AllChains mempty
     , _versionGraphs = Bottom (minBound, twentyChainGraph)

src/Chainweb/Version/RecapDevelopment.hs

@@ -44,39 +44,39 @@ recapDevnet = ChainwebVersion
     , _versionName = ChainwebVersionName "recap-development"
 
     , _versionForks = tabulateHashMap $ \case
-            SlowEpoch -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
-            Vuln797Fix -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
-            CoinV2 -> onChains $ [(unsafeChainId 0, ForkAtBlockHeight $ BlockHeight 3)] <> [(unsafeChainId i, ForkAtBlockHeight $ BlockHeight 4) | i <- [1..19]]
-            PactBackCompat_v16 -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
-            SkipTxTimingValidation -> AllChains $ ForkAtBlockHeight $ BlockHeight 2
-            OldTargetGuard -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
-            SkipFeatureFlagValidation -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
-            ModuleNameFix -> AllChains $ ForkAtBlockHeight $ BlockHeight 2
-            ModuleNameFix2 -> AllChains $ ForkAtBlockHeight $ BlockHeight 2
-            OldDAGuard -> AllChains $ ForkAtBlockHeight $ BlockHeight 13
-            PactEvents -> AllChains $ ForkAtBlockHeight $ BlockHeight 40
-            SPVBridge -> AllChains $ ForkAtBlockHeight $ BlockHeight 50
-            Pact4Coin3 -> AllChains $ ForkAtBlockHeight $ BlockHeight 80
-            EnforceKeysetFormats -> AllChains $ ForkAtBlockHeight $ BlockHeight 100
-            Pact42 -> AllChains $ ForkAtBlockHeight $ BlockHeight 90
-            CheckTxHash -> AllChains $ ForkAtBlockHeight $ BlockHeight 110
-            Chainweb213Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 95
-            Chainweb214Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 115
-            Chainweb215Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 165
-            Pact44NewTrans -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
-            Chainweb216Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 215
-            Chainweb217Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 470
-            Chainweb218Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 500
-            Chainweb219Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 550
-            Chainweb220Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 560
-            Chainweb221Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 580
-            Chainweb222Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 590
-            Chainweb223Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 600
-            Chainweb224Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 610
-            Chainweb225Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 620
-            Chainweb226Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 630
-            Chainweb227Pact -> AllChains ForkNever
-            Pact5Fork -> AllChains ForkNever
+        SlowEpoch -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
+        Vuln797Fix -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
+        CoinV2 -> onChains $ [(unsafeChainId 0, ForkAtBlockHeight $ BlockHeight 3)] <> [(unsafeChainId i, ForkAtBlockHeight $ BlockHeight 4) | i <- [1..19]]
+        PactBackCompat_v16 -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
+        SkipTxTimingValidation -> AllChains $ ForkAtBlockHeight $ BlockHeight 2
+        OldTargetGuard -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
+        SkipFeatureFlagValidation -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
+        ModuleNameFix -> AllChains $ ForkAtBlockHeight $ BlockHeight 2
+        ModuleNameFix2 -> AllChains $ ForkAtBlockHeight $ BlockHeight 2
+        OldDAGuard -> AllChains $ ForkAtBlockHeight $ BlockHeight 13
+        PactEvents -> AllChains $ ForkAtBlockHeight $ BlockHeight 40
+        SPVBridge -> AllChains $ ForkAtBlockHeight $ BlockHeight 50
+        Pact4Coin3 -> AllChains $ ForkAtBlockHeight $ BlockHeight 80
+        EnforceKeysetFormats -> AllChains $ ForkAtBlockHeight $ BlockHeight 100
+        Pact42 -> AllChains $ ForkAtBlockHeight $ BlockHeight 90
+        CheckTxHash -> AllChains $ ForkAtBlockHeight $ BlockHeight 110
+        Chainweb213Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 95
+        Chainweb214Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 115
+        Chainweb215Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 165
+        Pact44NewTrans -> AllChains $ ForkAtBlockHeight $ BlockHeight 0
+        Chainweb216Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 215
+        Chainweb217Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 470
+        Chainweb218Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 500
+        Chainweb219Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 550
+        Chainweb220Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 560
+        Chainweb221Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 580
+        Chainweb222Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 590
+        Chainweb223Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 600
+        Chainweb224Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 610
+        Chainweb225Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 620
+        Chainweb226Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 630
+        Chainweb227Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 640
+        Pact5Fork -> AllChains $ ForkAtBlockHeight $ BlockHeight 650
 
     , _versionUpgrades = foldr (chainZip HM.union) (AllChains mempty)
         [ indexByForkHeights recapDevnet

src/Chainweb/Version/Registry.hs

@@ -46,7 +46,6 @@ import GHC.Stack
 
 import Chainweb.Version
 import Chainweb.Version.Development
-import Chainweb.Version.Pact5Development
 import Chainweb.Version.RecapDevelopment
 import Chainweb.Version.Mainnet
 import Chainweb.Version.Testnet04
@@ -139,7 +138,6 @@ lookupVersionByCode code
     notRegistered
         | code == _versionCode recapDevnet = "recapDevnet version used but not registered, remember to do so after it's configured. " <> perhaps
         | code == _versionCode devnet = "devnet version used but not registered, remember to do so after it's configured. " <> perhaps
-        | code == _versionCode pact5Devnet = "Pact 5 devnet version used but not registered, remember to do so after it's configured. " <> perhaps
         | otherwise = "version not registered with code " <> show code <> ", have you seen Chainweb.Test.TestVersions.testVersions?"
 
     perhaps = "Perhaps you are attempting to run a different devnet version than a previous run, and you need to delete your db directory before restarting devnet with the new version?"
@@ -160,7 +158,6 @@ lookupVersionByName name
     notRegistered
       | name == _versionName recapDevnet = "recapDevnet version used but not registered, remember to do so after it's configured"
       | name == _versionName devnet = "devnet version used but not registered, remember to do so after it's configured"
-      | name == _versionName pact5Devnet = "Pact 5 devnet version used but not registered, remember to do so after it's configured"
       | otherwise = "version not registered with name " <> show name <> ", have you seen Chainweb.Test.TestVersions.testVersions?"
 
 fabricateVersionWithName :: HasCallStack => ChainwebVersionName -> ChainwebVersion
@@ -169,7 +166,7 @@ fabricateVersionWithName name =
 
 -- | Versions known to us by name.
 knownVersions :: [ChainwebVersion]
-knownVersions = [mainnet, testnet04, testnet05, recapDevnet, devnet, pact5Devnet]
+knownVersions = [mainnet, testnet04, testnet05, recapDevnet, devnet]
 
 -- | Look up a known version by name, usually with `m` instantiated to some
 -- configuration parser monad.

test/unit/ChainwebTests.hs

@@ -30,7 +30,6 @@ import Chainweb.BlockHeader
 import Chainweb.BlockHeaderDB
 import Chainweb.Storage.Table.RocksDB
 import Chainweb.Version.Development
-import Chainweb.Version.Pact5Development
 import Chainweb.Version.RecapDevelopment
 import Chainweb.Version.Registry
 
@@ -100,7 +99,6 @@ main :: IO ()
 main = do
     registerVersion RecapDevelopment
     registerVersion Development
-    registerVersion Pact5Development
     withTempRocksDb "chainweb-tests" $ \rdb ->
         runResourceT $ do
             (h0, db) <- withToyDB rdb toyChainId