made all current tests work, fixed cpuminer

BrannonKing · BrannonKing · commit 4dd8db9d8bb4 · 2021-10-14T14:52:39.000-04:00
diff --git a/blockchain/fullblocktests/generate.go b/blockchain/fullblocktests/generate.go
@@ -342,10 +342,8 @@ func solveBlock(header *wire.BlockHeader) bool {
 				return
 			default:
 				hdr.Nonce = i
-				hash := hdr.BlockHash()
-				if blockchain.HashToBig(&hash).Cmp(
-					targetDifficulty) <= 0 {
-
+				hash := hdr.BlockPoWHash()
+				if blockchain.HashToBig(&hash).Cmp(targetDifficulty) <= 0 {
 					results <- sbResult{true, i}
 					return
 				}
@@ -1444,7 +1442,7 @@ func Generate(includeLargeReorg bool) (tests [][]TestInstance, err error) {
 			// Keep incrementing the nonce until the hash treated as
 			// a uint256 is higher than the limit.
 			b46.Header.Nonce++
-			blockHash := b46.BlockHash()
+			blockHash := b46.Header.BlockPoWHash()
 			hashNum := blockchain.HashToBig(&blockHash)
 			if hashNum.Cmp(g.params.PowLimit) >= 0 {
 				break
diff --git a/btcjson/chainsvrresults.go b/btcjson/chainsvrresults.go
@@ -25,7 +25,7 @@ type GetBlockHeaderVerboseResult struct {
 	Version       int32   `json:"version"`
 	VersionHex    string  `json:"versionHex"`
 	MerkleRoot    string  `json:"merkleroot"`
-	ClaimTrie     string  `json:"claimtrie,omitempty"`
+	ClaimTrie     string  `json:"nameclaimroot,omitempty"`
 	Time          int64   `json:"time"`
 	Nonce         uint64  `json:"nonce"`
 	Bits          string  `json:"bits"`
@@ -83,7 +83,7 @@ type GetBlockVerboseResultBase struct {
 	PreviousHash  string  `json:"previousblockhash,omitempty"`
 	NextHash      string  `json:"nextblockhash,omitempty"`
 
-	ClaimTrie string `json:"claimTrie,omitempty"`
+	ClaimTrie string `json:"nameclaimroot,omitempty"`
 	TxCount   int    `json:"nTx"` // For backwards compatibility only
 }
 
diff --git a/btcjson/help.go b/btcjson/help.go
@@ -547,6 +547,12 @@ func GenerateHelp(method string, descs map[string]string, resultTypes ...interfa
 			return desc
 		}
 
+		if strings.Contains(key, "base-") {
+			if desc, ok := descs[strings.ReplaceAll(key, "base-", "-")]; ok {
+				return desc
+			}
+		}
+
 		missingKey = key
 		return key
 	}
diff --git a/claimtrie/claimtrie_test.go b/claimtrie/claimtrie_test.go
@@ -70,6 +70,22 @@ func TestFixedHashes(t *testing.T) {
 	r.Equal(expected[:], ct.MerkleHash()[:])
 }
 
+func TestEmptyHashFork(t *testing.T) {
+	r := require.New(t)
+
+	setup(t)
+	param.ActiveParams.AllClaimsInMerkleForkHeight = 2
+	ct, err := New(cfg)
+	r.NoError(err)
+	r.NotNil(ct)
+	defer ct.Close()
+
+	for i := 0; i < 5; i++ {
+		err := ct.AppendBlock()
+		r.NoError(err)
+	}
+}
+
 func TestNormalizationFork(t *testing.T) {
 	r := require.New(t)
 
diff --git a/claimtrie/merkletrie/ramtrie.go b/claimtrie/merkletrie/ramtrie.go
@@ -30,7 +30,7 @@ func NewRamTrie() *RamTrie {
 				return new(bytes.Buffer)
 			},
 		},
-		collapsedTrie: collapsedTrie{Root: &collapsedVertex{}},
+		collapsedTrie: collapsedTrie{Root: &collapsedVertex{merkleHash: EmptyTrieHash}},
 	}
 }
 
diff --git a/integration/bip0009_test.go b/integration/bip0009_test.go
@@ -130,7 +130,7 @@ func assertSoftForkStatus(r *rpctest.Harness, t *testing.T, forkKey string, stat
 // specific soft fork deployment to test.
 func testBIP0009(t *testing.T, forkKey string, deploymentID uint32) {
 	// Initialize the primary mining node with only the genesis block.
-	r, err := rpctest.New(&chaincfg.RegressionNetParams, nil, nil, "")
+	r, err := rpctest.New(&chaincfg.SimNetParams, nil, nil, "")
 	if err != nil {
 		t.Fatalf("unable to create primary harness: %v", err)
 	}
@@ -321,7 +321,7 @@ func TestBIP0009Mining(t *testing.T) {
 	t.Parallel()
 
 	// Initialize the primary mining node with only the genesis block.
-	r, err := rpctest.New(&chaincfg.SimNetParams, nil, nil, "")
+	r, err := rpctest.New(&chaincfg.RegressionNetParams, nil, nil, "")
 	if err != nil {
 		t.Fatalf("unable to create primary harness: %v", err)
 	}
diff --git a/integration/csv_fork_test.go b/integration/csv_fork_test.go
@@ -110,17 +110,17 @@ func TestBIP0113Activation(t *testing.T) {
 	t.Parallel()
 
 	btcdCfg := []string{"--rejectnonstd"}
-	r, err := rpctest.New(&chaincfg.RegressionNetParams, nil, btcdCfg, "")
+	r, err := rpctest.New(&chaincfg.SimNetParams, nil, btcdCfg, "")
 	if err != nil {
 		t.Fatal("unable to create primary harness: ", err)
 	}
-	if err := r.SetUp(true, 110); err != nil {
+	if err := r.SetUp(true, 10); err != nil {
 		t.Fatalf("unable to setup test chain: %v", err)
 	}
 	defer r.TearDown()
 
 	// Create a fresh output for usage within the test below.
-	const outputValue = btcutil.SatoshiPerBitcoin
+	const outputValue = btcutil.SatoshiPerBitcoin / 50
 	outputKey, testOutput, testPkScript, err := makeTestOutput(r, t,
 		outputValue)
 	if err != nil {
@@ -190,7 +190,7 @@ func TestBIP0113Activation(t *testing.T) {
 	// to create a single mature output, then an additional block to create
 	// a new output, and then mined a single block above to include our
 	// transaction.
-	assertChainHeight(r, t, 103)
+	assertChainHeight(r, t, 112)
 
 	// Next, mine enough blocks to ensure that the soft-fork becomes
 	// activated. Assert that the block version of the second-to-last block
@@ -206,7 +206,7 @@ func TestBIP0113Activation(t *testing.T) {
 		t.Fatalf("unable to generate blocks: %v", err)
 	}
 
-	assertChainHeight(r, t, 299)
+	assertChainHeight(r, t, 308)
 	assertSoftForkStatus(r, t, csvKey, blockchain.ThresholdActive)
 
 	// The timeLockDeltas slice represents a series of deviations from the
@@ -427,7 +427,7 @@ func TestBIP0068AndBIP0112Activation(t *testing.T) {
 	}
 
 	const (
-		outputAmt         = btcutil.SatoshiPerBitcoin
+		outputAmt         = btcutil.SatoshiPerBitcoin / 50
 		relativeBlockLock = 10
 	)
 
diff --git a/integration/rpctest/blockgen.go b/integration/rpctest/blockgen.go
@@ -44,7 +44,7 @@ func solveBlock(header *wire.BlockHeader, targetDifficulty *big.Int) bool {
 				return
 			default:
 				hdr.Nonce = i
-				hash := hdr.BlockHash()
+				hash := hdr.BlockPoWHash()
 				if blockchain.HashToBig(&hash).Cmp(targetDifficulty) <= 0 {
 					select {
 					case results <- sbResult{true, i}:
diff --git a/integration/rpctest/rpc_harness_test.go b/integration/rpctest/rpc_harness_test.go
@@ -64,7 +64,7 @@ func testSendOutputs(r *Harness, t *testing.T) {
 
 	// First, generate a small spend which will require only a single
 	// input.
-	txid := genSpend(btcutil.Amount(5 * btcutil.SatoshiPerBitcoin))
+	txid := genSpend(btcutil.Amount(btcutil.SatoshiPerBitcoin))
 
 	// Generate a single block, the transaction the wallet created should
 	// be found in this block.
@@ -76,7 +76,7 @@ func testSendOutputs(r *Harness, t *testing.T) {
 
 	// Next, generate a spend much greater than the block reward. This
 	// transaction should also have been mined properly.
-	txid = genSpend(btcutil.Amount(500 * btcutil.SatoshiPerBitcoin))
+	txid = genSpend(btcutil.Amount(10 * btcutil.SatoshiPerBitcoin))
 	blockHashes, err = r.Client.Generate(1)
 	if err != nil {
 		t.Fatalf("unable to generate single block: %v", err)
@@ -154,7 +154,7 @@ func testActiveHarnesses(r *Harness, t *testing.T) {
 	numInitialHarnesses := len(ActiveHarnesses())
 
 	// Create a single test harness.
-	harness1, err := New(&chaincfg.SimNetParams, nil, nil, "")
+	harness1, err := New(&chaincfg.RegressionNetParams, nil, nil, "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -182,7 +182,7 @@ func testJoinMempools(r *Harness, t *testing.T) {
 	// Create a local test harness with only the genesis block.  The nodes
 	// will be synced below so the same transaction can be sent to both
 	// nodes without it being an orphan.
-	harness, err := New(&chaincfg.SimNetParams, nil, nil, "")
+	harness, err := New(&chaincfg.RegressionNetParams, nil, nil, "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -282,7 +282,7 @@ func testJoinMempools(r *Harness, t *testing.T) {
 func testJoinBlocks(r *Harness, t *testing.T) {
 	// Create a second harness with only the genesis block so it is behind
 	// the main harness.
-	harness, err := New(&chaincfg.SimNetParams, nil, nil, "")
+	harness, err := New(&chaincfg.RegressionNetParams, nil, nil, "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -336,7 +336,7 @@ func testGenerateAndSubmitBlock(r *Harness, t *testing.T) {
 	if err != nil {
 		t.Fatalf("unable to create script: %v", err)
 	}
-	output := wire.NewTxOut(btcutil.SatoshiPerBitcoin, pkScript)
+	output := wire.NewTxOut(btcutil.SatoshiPerBitcoin/50, pkScript)
 
 	const numTxns = 5
 	txns := make([]*btcutil.Tx, 0, numTxns)
@@ -470,7 +470,7 @@ func testGenerateAndSubmitBlockWithCustomCoinbaseOutputs(r *Harness,
 func testMemWalletReorg(r *Harness, t *testing.T) {
 	// Create a fresh harness, we'll be using the main harness to force a
 	// re-org on this local harness.
-	harness, err := New(&chaincfg.SimNetParams, nil, nil, "")
+	harness, err := New(&chaincfg.RegressionNetParams, nil, nil, "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -479,8 +479,8 @@ func testMemWalletReorg(r *Harness, t *testing.T) {
 	}
 	defer harness.TearDown()
 
-	// The internal wallet of this harness should now have 250 BTC.
-	expectedBalance := btcutil.Amount(250 * btcutil.SatoshiPerBitcoin)
+	// The internal wallet of this harness should now have 250 BTC, but BTC is 50x LBC per generated coin.
+	expectedBalance := btcutil.Amount(5 * btcutil.SatoshiPerBitcoin)
 	walletBalance := harness.ConfirmedBalance()
 	if expectedBalance != walletBalance {
 		t.Fatalf("wallet balance incorrect: expected %v, got %v",
@@ -521,7 +521,7 @@ func testMemWalletLockedOutputs(r *Harness, t *testing.T) {
 	if err != nil {
 		t.Fatalf("unable to create script: %v", err)
 	}
-	outputAmt := btcutil.Amount(50 * btcutil.SatoshiPerBitcoin)
+	outputAmt := btcutil.Amount(btcutil.SatoshiPerBitcoin)
 	output := wire.NewTxOut(int64(outputAmt), pkScript)
 	tx, err := r.CreateTransaction([]*wire.TxOut{output}, 10, true)
 	if err != nil {
@@ -567,7 +567,7 @@ const (
 
 func TestMain(m *testing.M) {
 	var err error
-	mainHarness, err = New(&chaincfg.SimNetParams, nil, nil, "")
+	mainHarness, err = New(&chaincfg.RegressionNetParams, nil, nil, "")
 	if err != nil {
 		fmt.Println("unable to create main harness: ", err)
 		os.Exit(1)
diff --git a/mining/cpuminer/cpuminer.go b/mining/cpuminer/cpuminer.go
@@ -274,7 +274,7 @@ func (m *CPUMiner) solveBlock(msgBlock *wire.MsgBlock, blockHeight int32,
 			// increment the number of hashes completed for each
 			// attempt accordingly.
 			header.Nonce = i
-			hash := header.BlockHash()
+			hash := header.BlockPoWHash()
 			hashesCompleted += 2
 
 			// The block is solved when the new block hash is less
diff --git a/rpcserverhelp.go b/rpcserverhelp.go
@@ -247,8 +247,9 @@ var helpDescsEnUS = map[string]string{
 	"getblockverboseresult-version":           "The block version",
 	"getblockverboseresult-versionHex":        "The block version in hexadecimal",
 	"getblockverboseresult-merkleroot":        "Root hash of the merkle tree",
+	"getblockverboseresult-nameclaimroot":     "Root hash of the claim trie",
 	"getblockverboseresult-tx":                "The transaction hashes (only when verbosity=1)",
-	"getblockverboseresult-rawtx":             "The transactions as JSON objects (only when verbosity=2)",
+	"getblockverboseresult-nTx":               "The number of transactions (aka, count of TX)",
 	"getblockverboseresult-time":              "The block time in seconds since 1 Jan 1970 GMT",
 	"getblockverboseresult-nonce":             "The block nonce",
 	"getblockverboseresult-bits":              "The bits which represent the block difficulty",
@@ -288,7 +289,7 @@ var helpDescsEnUS = map[string]string{
 	"getblockheaderverboseresult-difficulty":        "The proof-of-work difficulty as a multiple of the minimum difficulty",
 	"getblockheaderverboseresult-previousblockhash": "The hash of the previous block",
 	"getblockheaderverboseresult-nextblockhash":     "The hash of the next block (only if there is one)",
-	"getblockheaderverboseresult-claimtrie":         "The hash of the root of the claim trie",
+	"getblockheaderverboseresult-nameclaimroot":     "The hash of the root of the claim trie",
 
 	// TemplateRequest help.
 	"templaterequest-mode":         "This is 'template', 'proposal', or omitted",
@@ -712,13 +713,76 @@ var helpDescsEnUS = map[string]string{
 	"versionresult-prerelease":    "Prerelease info about the current build",
 	"versionresult-buildmetadata": "Metadata about the current build",
 
-	"getclaimsfornameresult-claims":  "All the active claims on the given name",
+	"getclaimsforname--synopsis":      "Look up claims for the given name as they stand at a give block",
+	"getclaimsfornamebyid--synopsis":  "Look up claims for the given name as they stand at a give block",
+	"getclaimsfornamebybid--synopsis": "Look up claims for the given name as they stand at a give block",
+	"getclaimsfornamebyseq--synopsis": "Look up claims for the given name as they stand at a give block",
+
+	"getclaimsforname-hashorheight":      "Requested block hash or height; default to tip",
+	"getclaimsfornamebyid-hashorheight":  "Requested block hash or height; default to tip",
+	"getclaimsfornamebybid-hashorheight": "Requested block hash or height; default to tip",
+	"getclaimsfornamebyseq-hashorheight": "Requested block hash or height; default to tip",
+
+	"getclaimsforname-name":      "Requested name for lookup",
+	"getclaimsfornamebyid-name":  "Requested name for lookup",
+	"getclaimsfornamebybid-name": "Requested name for lookup",
+	"getclaimsfornamebyseq-name": "Requested name for lookup",
+
+	"getclaimsfornamebyid-partialclaimids": "Limit the returned claims to those with matching (partial) claimIDs in this list",
+	"getclaimsfornamebybid-bids":           "Limit the returned claims to those with bids to this list",
+	"getclaimsfornamebyseq-sequences":      "Limit the returned claims to those with bids to this list",
+
+	"getclaimsforname-includevalues":      "Return the metadata and address",
+	"getclaimsfornamebyseq-includevalues": "Return the metadata and address",
+	"getclaimsfornamebybid-includevalues": "Return the metadata and address",
+	"getclaimsfornamebyid-includevalues":  "Return the metadata and address",
+
+	"getclaimsfornameresult-claims":         "All the active claims on the given name",
+	"getclaimsfornameresult-normalizedname": "Lower-case version of the passed-in name",
+	"getclaimsfornameresult-height":         "Height of the requested block",
+	"getclaimsfornameresult-hash":           "Hash of the requested block",
+
+	"getchangesinblock--synopsis":    "Returns a list of names affected by a given block",
 	"getchangesinblockresult-names":  "Names that changed (or were at least checked for change) on the given height",
 	"getchangesinblockresult-height": "Height that was requested",
 	"getchangesinblockresult-hash":   "Hash of the block at the height requested",
-	"scriptpubkeyresult-subtype":     "Claims return Non-standard address types, but they use standard address types internally exposed here",
-	"claimresult-value":              "This is the metadata given as part of the claim",
-	"claimresult-address":            "The destination address for the claim",
+
+	"scriptpubkeyresult-subtype": "Claims return Non-standard address types, but they use standard address types internally exposed here",
+
+	"supportresult-value":         "This is the metadata given as part of the support",
+	"supportresult-txid":          "The hash of the transaction",
+	"supportresult-n":             "The output (TXO) index",
+	"supportresult-address":       "The destination address for the support",
+	"supportresult-amount":        "LBC staked",
+	"supportresult-height":        "The height when the stake was created or updated",
+	"supportresult-validatheight": "The height when the stake becomes valid",
+	"claimresult-value":           "This is the metadata given as part of the claim",
+	"claimresult-txid":            "The hash of the transaction",
+	"claimresult-n":               "The output (TXO) index",
+	"claimresult-address":         "The destination address for the claim",
+	"claimresult-supports":        "The list of supports active on the claim",
+	"claimresult-amount":          "LBC staked",
+	"claimresult-validatheight":   "The height when the stake becomes valid",
+	"claimresult-height":          "The height when the stake was created or updated",
+	"claimresult-effectiveamount": "The stake amount plus the active supports' amounts",
+	"claimresult-sequence":        "The order this claim was created compared to other claims on this name",
+	"claimresult-bid":             "Bid of 0 means that this claim currently owns the name",
+	"claimresult-claimid":         "20-byte hash of TXID:N, often used in indexes for the claims",
+
+	"generatetoaddress--synopsis":    "Mine blocks and send their reward to a given address",
+	"generatetoaddress--result0":     "The list of generated blocks' hashes",
+	"generatetoaddress-maxtries":     "The maximum number of hashes to attempt",
+	"generatetoaddress-address":      "The destination -- the place where the LBC will be sent",
+	"generatetoaddress-numblocks":    "The number of blocks to mine",
+	"getchangesinblock-hashorheight": "The requested height or block hash whose changes are of interest",
+
+	"normalize--synopsis": "Used to show how lbcd will normalize a string",
+	"normalize--result0":  "The normalized name",
+	"normalize-name":      "The string to be normalized",
+
+	"getblockverboseresult-getblockverboseresultbase": "",
+	"prevout-issupport": "Previous output created a support",
+	"prevout-isclaim":   "Previous output created or updated a claim",
 }
 
 // rpcResultTypes specifies the result types that each RPC command can return.
diff --git a/wire/blockheader.go b/wire/blockheader.go
@@ -14,7 +14,7 @@ import (
 
 // MaxBlockHeaderPayload is the maximum number of bytes a block header can be.
 // Version 4 bytes + Timestamp 4 bytes + Bits 4 bytes + Nonce 4 bytes +
-// PrevBlock and MerkleRoot hashes.
+// PrevBlock, ClaimTrie, and MerkleRoot hashes.
 const MaxBlockHeaderPayload = 16 + (chainhash.HashSize * 3)
 
 // BlockHeader defines information about a block and is used in the bitcoin

Original file line number	Diff line number	Diff line change
`@@ -547,6 +547,12 @@ func GenerateHelp(method string, descs map[string]string, resultTypes ...interfa`
`547`	`547`	`return desc`
`548`	`548`	`}`
`549`	`549`
	`550`	`+ if strings.Contains(key, "base-") {`
	`551`	`+ if desc, ok := descs[strings.ReplaceAll(key, "base-", "-")]; ok {`
	`552`	`+ return desc`
	`553`	`+ }`
	`554`	`+ }`
	`555`	`+`
`550`	`556`	`missingKey = key`
`551`	`557`	`return key`
`552`	`558`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func NewRamTrie() *RamTrie {`
`30`	`30`	`return new(bytes.Buffer)`
`31`	`31`	`},`
`32`	`32`	`},`
`33`		`- collapsedTrie: collapsedTrie{Root: &collapsedVertex{}},`
	`33`	`+ collapsedTrie: collapsedTrie{Root: &collapsedVertex{merkleHash: EmptyTrieHash}},`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`