diff --git a/domain/consensus/processes/dagtraversalmanager/window_test.go b/domain/consensus/processes/dagtraversalmanager/window_test.go index b9a122836..39fd9d770 100644 --- a/domain/consensus/processes/dagtraversalmanager/window_test.go +++ b/domain/consensus/processes/dagtraversalmanager/window_test.go @@ -205,37 +205,37 @@ func TestBlockWindow(t *testing.T) { { parents: []string{"H", "F"}, id: "I", - expectedWindow: []string{"F", "C", "D", "H", "G", "B"}, + expectedWindow: []string{"F", "C", "H", "D", "B", "G"}, }, { parents: []string{"I"}, id: "J", - expectedWindow: []string{"I", "F", "C", "D", "H", "G", "B"}, + expectedWindow: []string{"I", "F", "C", "H", "D", "B", "G"}, }, { parents: []string{"J"}, id: "K", - expectedWindow: []string{"J", "I", "F", "C", "D", "H", "G", "B"}, + expectedWindow: []string{"J", "I", "F", "C", "H", "D", "B", "G"}, }, { parents: []string{"K"}, id: "L", - expectedWindow: []string{"K", "J", "I", "F", "C", "D", "H", "G", "B"}, + expectedWindow: []string{"K", "J", "I", "F", "C", "H", "D", "B", "G"}, }, { parents: []string{"L"}, id: "M", - expectedWindow: []string{"L", "K", "J", "I", "F", "C", "D", "H", "G", "B"}, + expectedWindow: []string{"L", "K", "J", "I", "F", "C", "H", "D", "B", "G"}, }, { parents: []string{"M"}, id: "N", - expectedWindow: []string{"M", "L", "K", "J", "I", "F", "C", "D", "H", "G"}, + expectedWindow: []string{"M", "L", "K", "J", "I", "F", "C", "H", "D", "B"}, }, { parents: []string{"N"}, id: "O", - expectedWindow: []string{"N", "M", "L", "K", "J", "I", "F", "C", "D", "H"}, + expectedWindow: []string{"N", "M", "L", "K", "J", "I", "F", "C", "H", "D"}, }, }, dagconfig.SimnetParams.Name: { diff --git a/domain/consensus/processes/difficultymanager/difficultymanager_test.go b/domain/consensus/processes/difficultymanager/difficultymanager_test.go index ad729c28a..fe6cb5882 100644 --- a/domain/consensus/processes/difficultymanager/difficultymanager_test.go +++ b/domain/consensus/processes/difficultymanager/difficultymanager_test.go @@ -132,7 +132,7 @@ func TestDifficulty(t *testing.T) { case dagconfig.TestnetParams.Name: expectedBits = uint32(0x1e7f1441) case dagconfig.DevnetParams.Name: - expectedBits = uint32(0x207f1441) + expectedBits = uint32(0x1f4e54ab) case dagconfig.MainnetParams.Name: expectedBits = uint32(0x1d02c50f) } diff --git a/domain/consensus/processes/pruningmanager/pruning_test.go b/domain/consensus/processes/pruningmanager/pruning_test.go index 0f74d6f10..389705153 100644 --- a/domain/consensus/processes/pruningmanager/pruning_test.go +++ b/domain/consensus/processes/pruningmanager/pruning_test.go @@ -38,7 +38,7 @@ func TestPruning(t *testing.T) { "dag-for-test-pruning.json": { dagconfig.MainnetParams.Name: "503", dagconfig.TestnetParams.Name: "503", - dagconfig.DevnetParams.Name: "503", + dagconfig.DevnetParams.Name: "502", dagconfig.SimnetParams.Name: "503", }, } diff --git a/domain/dagconfig/genesis.go b/domain/dagconfig/genesis.go index ccb66274b..40b4cee49 100644 --- a/domain/dagconfig/genesis.go +++ b/domain/dagconfig/genesis.go @@ -105,7 +105,7 @@ var devnetGenesisCoinbaseTx = transactionhelper.NewSubnetworkTransaction(0, // devGenesisHash is the hash of the first block in the block DAG for the development // network (genesis block). var devnetGenesisHash = externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{ - 0x4c, 0x64, 0x16, 0x35, 0xc8, 0x5d, 0xc8, 0x8d, 0x90, 0xbe, 0x2a, 0x42, 0xc1, 0xf6, 0x0f, 0xc4, 0xe9, 0xfc, 0xfc, 0xda, 0xdb, 0x53, 0x0d, 0x51, 0xe3, 0x02, 0x2b, 0x68, 0x65, 0xa6, 0x46, 0x7b, + 0xb3, 0x13, 0x87, 0x0a, 0x32, 0xc7, 0x04, 0xbd, 0xf1, 0x21, 0x4a, 0x3b, 0x27, 0x0c, 0xc4, 0x75, 0xd9, 0x42, 0xc2, 0x09, 0x2d, 0x37, 0x9b, 0xc8, 0x70, 0x0a, 0xb0, 0x43, 0x31, 0x9e, 0xf8, 0x46, }) // devnetGenesisMerkleRoot is the hash of the first transaction in the genesis block @@ -127,7 +127,7 @@ var devnetGenesisBlock = externalapi.DomainBlock{ &externalapi.DomainHash{}, externalapi.NewDomainHashFromByteArray(muhash.EmptyMuHashHash.AsArray()), 0x11e9db49828, - 0x207fffff, + 525264379, 0x48e5e, 0, 0, diff --git a/util/difficulty/difficulty_test.go b/util/difficulty/difficulty_test.go index 09c3315b1..075297e39 100644 --- a/util/difficulty/difficulty_test.go +++ b/util/difficulty/difficulty_test.go @@ -16,7 +16,7 @@ func TestGetHashrateString(t *testing.T) { var results = map[string]string{ dagconfig.MainnetParams.Name: "1.53 GH/s", dagconfig.TestnetParams.Name: "131.07 KH/s", - dagconfig.DevnetParams.Name: "2 H/s", + dagconfig.DevnetParams.Name: "830 H/s", dagconfig.SimnetParams.Name: "2.00 KH/s", } testutils.ForAllNets(t, false, func(t *testing.T, consensusConfig *consensus.Config) { diff --git a/version/version.go b/version/version.go index 8548c4c01..dcec2bd61 100644 --- a/version/version.go +++ b/version/version.go @@ -11,7 +11,7 @@ const validCharacters = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrs const ( appMajor uint = 0 appMinor uint = 12 - appPatch uint = 8 + appPatch uint = 10 ) // appBuild is defined as a variable so it can be overridden during the build