kadena-io · edmundnoble · Mar 1, 2023 · Mar 1, 2023 · Mar 2, 2023 · Mar 2, 2023
diff --git a/bench/Bench.hs b/bench/Bench.hs
@@ -15,9 +15,14 @@ import qualified Chainweb.Pact.Backend.ForkingBench as ForkingBench
 import qualified JSONEncoding
 
 import Chainweb.Storage.Table.RocksDB
+import Chainweb.Version.Development
+import Chainweb.Version.FastDevelopment
+import Chainweb.Version.Registry
 
 main :: IO ()
 main = withTempRocksDb "benchmarks" $ \rdb -> do
+  registerVersion Development
+  registerVersion FastDevelopment
   defaultMain
     [ Checkpointer.bench
     , ForkingBench.bench rdb

diff --git a/bench/Chainweb/Pact/Backend/Bench.hs b/bench/Chainweb/Pact/Backend/Bench.hs
@@ -35,19 +35,21 @@ import qualified Pact.Types.SQLite as PSQL
 -- chainweb imports
 
 import Chainweb.BlockHash
+import Chainweb.BlockHeader
 import Chainweb.BlockHeight
 import Chainweb.Graph
 import Chainweb.MerkleLogHash
 import Chainweb.Pact.Backend.RelationalCheckpointer
 import Chainweb.Pact.Backend.Types
 import Chainweb.Pact.Backend.Utils
 import Chainweb.Pact.Types
+import Chainweb.Test.TestVersions
 import Chainweb.Utils.Bench
 import Chainweb.Utils (sshow)
 import Chainweb.Version
 
 v :: ChainwebVersion
-v = FastTimedCPM petersonChainGraph
+v = fastForkingCpmTestVersion petersonChainGraph
 
 bench :: C.Benchmark
 bench = C.bgroup "pact-backend" $

diff --git a/bench/Chainweb/Pact/Backend/ForkingBench.hs b/bench/Chainweb/Pact/Backend/ForkingBench.hs
@@ -71,7 +71,6 @@ import Pact.Types.Util hiding (unwrap)
 
 import Chainweb.BlockCreationTime
 import Chainweb.BlockHeader
-import Chainweb.BlockHeader.Genesis
 import Chainweb.BlockHeaderDB
 import Chainweb.BlockHeaderDB.Internal
 import Chainweb.ChainId
@@ -89,6 +88,7 @@ import Chainweb.Pact.Utils (toTxCreationTime)
 import Chainweb.Payload
 import Chainweb.Payload.PayloadStore
 import Chainweb.Payload.PayloadStore.InMemory
+import Chainweb.Test.TestVersions
 import Chainweb.Time
 import Chainweb.Transaction
 import Chainweb.Utils
@@ -379,7 +379,7 @@ cid :: ChainId
 cid = someChainId testVer
 
 testVer :: ChainwebVersion
-testVer = FastTimedCPM petersonChainGraph
+testVer = slowForkingCpmTestVersion petersonChainGraph
 
 assertNotLeft :: (MonadThrow m, Exception e) => Either e a -> m a
 assertNotLeft (Left l) = throwM l
@@ -397,7 +397,10 @@ createCoinAccount v meta name = do
     nameKeyset <- NEL.fromList <$> getKeyset name
     let attach = attachCaps "sender00" name 1000.0
     let theData = object [T.pack name .= fmap (formatB16PubKey . fst) (attach nameKeyset)]
-    res <- mkExec (T.pack theCode) theData meta (NEL.toList $ attach sender00Keyset) (Just $ Pact.NetworkId $ toText v) Nothing
+    res <- mkExec (T.pack theCode) theData meta
+      (NEL.toList $ attach sender00Keyset)
+      (Just $ Pact.NetworkId $ toText (_versionName v))
+      Nothing
     pure (nameKeyset, res)
   where
     theCode = printf "(coin.transfer-create \"sender00\" \"%s\" (read-keyset \"%s\") 1000.0)" name name
@@ -550,14 +553,20 @@ createCoinContractRequest v meta ks request =
               object
                 [ "create-account-guard" .= fmap (formatB16PubKey . fst) guardd
                 ]
-        mkExec (T.pack theCode) theData meta (NEL.toList ks) (Just $ Pact.NetworkId $ toText v) Nothing
+        mkExec (T.pack theCode) theData meta
+          (NEL.toList ks)
+          (Just $ Pact.NetworkId $ toText $ _versionName v)
+          Nothing
       CoinAccountBalance (Account account) -> do
         let theData = Null
             theCode =
               printf
               "(coin.get-balance \"%s\")"
               account
-        mkExec (T.pack theCode) theData meta (NEL.toList ks) (Just $ Pact.NetworkId $ toText v) Nothing
+        mkExec (T.pack theCode) theData meta
+          (NEL.toList ks)
+          (Just $ Pact.NetworkId $ toText $ _versionName v)
+          Nothing
       CoinTransferAndCreate (SenderName (Account sn)) (ReceiverName (Account rn)) (Guard guardd) (Amount amount) -> do
         let theCode =
               printf
@@ -570,7 +579,10 @@ createCoinContractRequest v meta ks request =
               object
                 [ "receiver-guard" .= fmap (formatB16PubKey . fst) guardd
                 ]
-        mkExec (T.pack theCode) theData meta (NEL.toList ks) (Just $ Pact.NetworkId $ toText v) Nothing
+        mkExec (T.pack theCode) theData meta
+          (NEL.toList ks)
+          (Just $ Pact.NetworkId $ toText $ _versionName v)
+          Nothing
 
       CoinTransfer (SenderName (Account sn)) (ReceiverName (Account rn)) (Amount amount) -> do
         let theCode =
@@ -581,7 +593,10 @@ createCoinContractRequest v meta ks request =
               -- Super janky, but gets the job done for now
               (fromRational @Double $ toRational amount)
             theData = object []
-        mkExec (T.pack theCode) theData meta (NEL.toList ks) (Just $ Pact.NetworkId $ toText v) Nothing
+        mkExec (T.pack theCode) theData meta
+          (NEL.toList ks)
+          (Just $ Pact.NetworkId $ toText $ _versionName v)
+          Nothing
 
 makeMetaWithSender :: String -> ChainId -> IO PublicMeta
 makeMetaWithSender sender c =

diff --git a/bench/JSONEncoding.hs b/bench/JSONEncoding.hs
@@ -44,7 +44,7 @@ import Chainweb.Payload
 import Chainweb.RestAPI.NodeInfo
 import Chainweb.Test.Orphans.Internal
 import Chainweb.Utils.Paging
-import Chainweb.Version
+import Chainweb.Version.Mainnet
 
 -- -------------------------------------------------------------------------- --
 -- Main

diff --git a/chainweb.cabal b/chainweb.cabal
@@ -121,14 +121,15 @@ library
         , Chainweb.BlockCreationTime
         , Chainweb.BlockHash
         , Chainweb.BlockHeader
-        , Chainweb.BlockHeader.Genesis
         , Chainweb.BlockHeader.Genesis.Development0Payload
-        , Chainweb.BlockHeader.Genesis.DevelopmentKADPayload
-        , Chainweb.BlockHeader.Genesis.DevelopmentNPayload
+        , Chainweb.BlockHeader.Genesis.Development1to9Payload
+        , Chainweb.BlockHeader.Genesis.Development10to19Payload
+        , Chainweb.BlockHeader.Genesis.FastDevelopment0Payload
+        , Chainweb.BlockHeader.Genesis.FastDevelopment1to19Payload
         , Chainweb.BlockHeader.Genesis.FastTimedCPM0Payload
-        , Chainweb.BlockHeader.Genesis.FastTimedCPMNPayload
+        , Chainweb.BlockHeader.Genesis.FastTimedCPM1to9Payload
         , Chainweb.BlockHeader.Genesis.Testnet0Payload
-        , Chainweb.BlockHeader.Genesis.TestnetNPayload
+        , Chainweb.BlockHeader.Genesis.Testnet1to19Payload
         , Chainweb.BlockHeader.Genesis.Mainnet0Payload
         , Chainweb.BlockHeader.Genesis.Mainnet1Payload
         , Chainweb.BlockHeader.Genesis.Mainnet2Payload
@@ -139,7 +140,7 @@ library
         , Chainweb.BlockHeader.Genesis.Mainnet7Payload
         , Chainweb.BlockHeader.Genesis.Mainnet8Payload
         , Chainweb.BlockHeader.Genesis.Mainnet9Payload
-        , Chainweb.BlockHeader.Genesis.MainnetKADPayload
+        , Chainweb.BlockHeader.Genesis.Mainnet10to19Payload
         , Chainweb.BlockHeader.Validation
         , Chainweb.BlockHeaderDB
         , Chainweb.BlockHeaderDB.Internal
@@ -234,14 +235,19 @@ library
         , Chainweb.Utils
         , Chainweb.Utils.Paging
         , Chainweb.Utils.RequestLog
+        , Chainweb.Utils.Rule
         , Chainweb.Utils.Serialization
         , Chainweb.Version
+        , Chainweb.Version.Development
+        , Chainweb.Version.FastDevelopment
+        , Chainweb.Version.Guards
+        , Chainweb.Version.Mainnet
+        , Chainweb.Version.Registry
+        , Chainweb.Version.Testnet
         , Chainweb.Version.Utils
         , Chainweb.WebBlockHeaderDB
         , Chainweb.WebPactExecutionService
 
-        , Control.Concurrent.FixedThreadPool
-
         , Data.IVar
         , Data.LogMessage
         , Data.PQueue
@@ -305,7 +311,6 @@ library
         , Chainweb.Pact.Transactions.Mainnet9Transactions
         , Chainweb.Pact.Transactions.MainnetKADTransactions
         , Chainweb.Pact.Transactions.OtherTransactions
-        , Chainweb.Pact.Transactions.UpgradeTransactions
         , Chainweb.Pact.Types
         , Chainweb.Pact.Utils
         , Chainweb.Pact.Validations
@@ -378,12 +383,12 @@ library
         , rosetta >= 1.0
         , safe-exceptions >= 0.1
         , scheduler >= 1.4
+        , semigroupoids >= 5.3.7
         , servant >= 0.18.2
         , servant-client >= 0.18.2
         , servant-client-core >= 0.18.2
         , servant-server >= 0.18.2
         , stm >= 2.4
-        , stm-chans
         , stopwatch >= 0.1
         , streaming >= 0.2
         , streaming-commons >= 0.2
@@ -479,13 +484,13 @@ test-suite chainweb-tests
         Chainweb.Test.SPV
         Chainweb.Test.SPV.EventProof
         Chainweb.Test.Sync.WebBlockHeaderStore
+        Chainweb.Test.TestVersions
         Chainweb.Test.TreeDB
         Chainweb.Test.TreeDB.RemoteDB
         Chainweb.Test.Utils
         Chainweb.Test.Version
         Chainweb.Test.Utils.BlockHeader
         Chainweb.Test.Utils.TestHeader
-        Chainweb.Test.Utils.ApiQueries
 
         -- Data
         Data.Test.PQueue
@@ -680,7 +685,6 @@ executable cwtool
         , digraph >= 0.2
         , direct-sqlite >= 2.3.27
         , directory >= 1.3
-        , errors >= 2.3
         , file-embed
         , filepath >= 1.4
         , exceptions >= 0.8
@@ -699,6 +703,7 @@ executable cwtool
         , process >= 1.5
         , quickcheck-instances >= 0.3
         , random >= 1.2
+        , retry >= 0.9
         , rocksdb-haskell-kadena >= 1.1.0
         , safe-exceptions >= 0.1
         , servant-client >= 0.18.2

diff --git a/docs/RecoveringFromDeepForks.md b/docs/RecoveringFromDeepForks.md
@@ -5,7 +5,7 @@ Help! My node has failed with the following fatal error:
 ```
 Fatal error: Requested rewind exceeds limit (4). Our previous cut block height: 1, fork ancestor's block height: 6.
 Offending new block:
-BlockHeader {_blockNonce = Nonce 0, _blockCreationTime = BlockCreationTime {_bct = Time (TimeSpan (Micros 1575672858613932))}, _blockParent = "ugAOff6YkKmvp_pJIHqx6HLTRPwyHEHD2c2Olm6L2Fg", _blockAdjacentHashes = BlockHashRecord {_getBlockHashRecord = fromList []}, _blockTarget = HashTarget (PowHashNat 115792089237316195423570985008687907853269984665640564039457584007913129639935), _blockPayloadHash = BlockPayloadHash (MerkleLogHash U-3paUKNKQUkggFmNOnGBEAJnjpy4K_-7t_dGyV0lhw), _blockChainId = ChainId 8, _blockWeight = BlockWeight (HashDifficulty (PowHashNat 1)), _blockHeight = 1, _blockChainwebVersion = fastTimedCPM-peterson, _blockEpochStart = EpochStartTime (Time (TimeSpan (Micros 0))), _blockFlags = FeatureFlags 0, _blockHash = "SKZ0mTWp08ooXsWz_yyT7v_MSrRdyKkmCyWJBTK8u3g"}
+BlockHeader {_blockNonce = Nonce 0, _blockCreationTime = BlockCreationTime {_bct = Time (TimeSpan (Micros 1575672858613932))}, _blockParent = "ugAOff6YkKmvp_pJIHqx6HLTRPwyHEHD2c2Olm6L2Fg", _blockAdjacentHashes = BlockHashRecord {_getBlockHashRecord = fromList []}, _blockTarget = HashTarget (PowHashNat 115792089237316195423570985008687907853269984665640564039457584007913129639935), _blockPayloadHash = BlockPayloadHash (MerkleLogHash U-3paUKNKQUkggFmNOnGBEAJnjpy4K_-7t_dGyV0lhw), _blockChainId = ChainId 8, _blockWeight = BlockWeight (HashDifficulty (PowHashNat 1)), _blockHeight = 1, _blockChainwebVersion = fastfork-CPM-peterson, _blockEpochStart = EpochStartTime (Time (TimeSpan (Micros 0))), _blockFlags = FeatureFlags 0, _blockHash = "SKZ0mTWp08ooXsWz_yyT7v_MSrRdyKkmCyWJBTK8u3g"}
 
 Your node is part of a losing fork longer than your reorg-limit, which
 is a situation that requires manual intervention.

diff --git a/node/ChainwebNode.hs b/node/ChainwebNode.hs
@@ -98,6 +98,8 @@ import Chainweb.Time
 import Chainweb.Utils
 import Chainweb.Utils.RequestLog
 import Chainweb.Version
+import Chainweb.Version.Mainnet
+import Chainweb.Version.Registry
 
 import Chainweb.Storage.Table
 import Chainweb.Storage.Table.RocksDB
@@ -128,18 +130,16 @@ data ChainwebNodeConfiguration = ChainwebNodeConfiguration
 
 makeLenses ''ChainwebNodeConfiguration
 
-defaultChainwebNodeConfiguration :: ChainwebVersion -> ChainwebNodeConfiguration
-defaultChainwebNodeConfiguration v = ChainwebNodeConfiguration
-    { _nodeConfigChainweb = defaultChainwebConfiguration v
+defaultChainwebNodeConfiguration :: ChainwebNodeConfiguration
+defaultChainwebNodeConfiguration = ChainwebNodeConfiguration
+    { _nodeConfigChainweb = defaultChainwebConfiguration Mainnet01
     , _nodeConfigLog = defaultLogConfig
         & logConfigLogger . L.loggerConfigThreshold .~ level
     , _nodeConfigDatabaseDirectory = Nothing
     , _nodeConfigResetChainDbs = False
     }
   where
-    level = case v of
-        Mainnet01 -> L.Info
-        _ -> L.Info
+    level = L.Info
 
 validateChainwebNodeConfiguration :: ConfigValidation ChainwebNodeConfiguration []
 validateChainwebNodeConfiguration o = do
@@ -185,7 +185,7 @@ getBackupsDir conf = (</> "backups") <$> getDbBaseDir conf
 getDbBaseDir :: HasCallStack => ChainwebNodeConfiguration -> IO FilePath
 getDbBaseDir conf = case _nodeConfigDatabaseDirectory conf of
     Nothing -> getXdgDirectory XdgData
-        $ "chainweb-node" </> sshow v
+        $ "chainweb-node" </> sshow (_versionName v)
     Just d -> return d
   where
     v = _configChainwebVersion $ _nodeConfigChainweb conf
@@ -431,7 +431,7 @@ withNodeLogger logConfig v f = runManaged $ do
 
     liftIO $ f
         $ maybe id (\x -> addLabel ("cluster", toText x)) (_logConfigClusterId logConfig)
-        $ addLabel ("chainwebVersion", sshow v)
+        $ addLabel ("chainwebVersion", sshow (_versionName v))
         $ logger
   where
     teleLogConfig = _logConfigTelemetryBackend logConfig
@@ -517,7 +517,7 @@ mainInfo :: ProgramInfo ChainwebNodeConfiguration
 mainInfo = programInfoValidate
     "Chainweb Node"
     pChainwebNodeConfiguration
-    (defaultChainwebNodeConfiguration Mainnet01)
+    defaultChainwebNodeConfiguration
     validateChainwebNodeConfiguration
 
 handles :: [Handler a] -> IO a -> IO a
@@ -529,6 +529,7 @@ main = do
     checkRLimits
     runWithPkgInfoConfiguration mainInfo pkgInfo $ \conf -> do
         let v = _configChainwebVersion $ _nodeConfigChainweb conf
+        registerVersion v
         hSetBuffering stderr LineBuffering
         withNodeLogger (_nodeConfigLog conf) v $ \logger -> do
             logFunctionJson logger Info ProcessStarted