Add a github action deploy script to build and publish releases

.github/workflows/go-deploy.yml

@@ -37,33 +37,24 @@ jobs:
         # `-extldflags=-static` - means static link everything, `-tags netgo,osusergo` means use pure go replacements for "os/user" and "net"
         # `-s -w` strips the binary to produce smaller size binaries
         run: |
-          go build -v -ldflags="-s -w -extldflags=-static" -tags netgo,osusergo -o ./bin/ ./...
-          archive="bin/kaspad-${{ github.event.release.tag_name }}-linux.zip"
-          asset_name="kaspad-${{ github.event.release.tag_name }}-linux.zip"
-          zip -r "${archive}" ./bin/*
-          echo "archive=${archive}" >> $GITHUB_ENV
-          echo "asset_name=${asset_name}" >> $GITHUB_ENV
+          binary="kaspad-${{ github.event.release.tag_name }}-linux"
+          echo "binary=${binary}" >> $GITHUB_ENV
+          go build -v -ldflags="-s -w -extldflags=-static" -tags netgo,osusergo -o "${binary}"
 
       - name: Build on Windows
         if: runner.os == 'Windows'
         shell: bash
         run: |
-          go build -v -ldflags="-s -w" -o bin/ ./...
-          archive="bin/kaspad-${{ github.event.release.tag_name }}-win64.zip"
-          asset_name="kaspad-${{ github.event.release.tag_name }}-win64.zip"
-          powershell "Compress-Archive bin/* \"${archive}\""
-          echo "archive=${archive}" >> $GITHUB_ENV
-          echo "asset_name=${asset_name}" >> $GITHUB_ENV
+          binary="kaspad-${{ github.event.release.tag_name }}-win64.exe"
+          echo "binary=${binary}" >> $GITHUB_ENV
+          go build -v -ldflags="-s -w" -o "${binary}"
 
       - name: Build on MacOS
         if: runner.os == 'macOS'
         run: |
-          go build -v -ldflags="-s -w" -o ./bin/ ./...
-          archive="bin/kaspad-${{ github.event.release.tag_name }}-osx.zip"
-          asset_name="kaspad-${{ github.event.release.tag_name }}-osx.zip"
-          zip -r "${archive}" ./bin/*
-          echo "archive=${archive}" >> $GITHUB_ENV
-          echo "asset_name=${asset_name}" >> $GITHUB_ENV
+          binary="kaspad-${{ github.event.release.tag_name }}-osx"
+          echo "binary=${binary}" >> $GITHUB_ENV
+          go build -v -ldflags="-s -w" -o "${binary}"
 
 
       - name: Upload Release Asset
@@ -72,6 +63,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: "./${{ env.archive }}"
-          asset_name: "${{ env.asset_name }}"
+          asset_path: "./${{ env.binary }}"
+          asset_name: "${{ env.binary }}"
           asset_content_type: application/zip

.github/workflows/go.yml

@@ -63,9 +63,6 @@ jobs:
         with:
           go-version: 1.16
 
-      - name: Delete the stability tests from coverage
-        run: rm -r stability-tests
-
       - name: Create coverage file
         run: go test -v -covermode=atomic -coverpkg=./... -coverprofile coverage.txt ./...
 

README.md

@@ -56,7 +56,7 @@ $ kaspad
 ```
 
 ## Discord
-Join our discord server using the following link: https://discord.gg/YNYnNN5Pf2
+Join our discord server using the following link: https://discord.gg/WmGhhzk
 
 ## Issue Tracker
 

app/app.go

@@ -171,7 +171,7 @@ func doUpgrades() error {
 
 // dbPath returns the path to the block database given a database type.
 func databasePath(cfg *config.Config) string {
-	return filepath.Join(cfg.AppDir, "data")
+	return filepath.Join(cfg.DataDir, "db")
 }
 
 func removeDatabase(cfg *config.Config) error {

app/appmessage/domainconverters.go

@@ -3,7 +3,6 @@ package appmessage
 import (
 	"encoding/hex"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/blockheader"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/hashes"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
 
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
@@ -84,6 +83,7 @@ func DomainTransactionToMsgTx(domainTransaction *externalapi.DomainTransaction)
 		LockTime:     domainTransaction.LockTime,
 		SubnetworkID: domainTransaction.SubnetworkID,
 		Gas:          domainTransaction.Gas,
+		PayloadHash:  domainTransaction.PayloadHash,
 		Payload:      domainTransaction.Payload,
 	}
 }
@@ -133,6 +133,7 @@ func MsgTxToDomainTransaction(msgTx *MsgTx) *externalapi.DomainTransaction {
 		LockTime:     msgTx.LockTime,
 		SubnetworkID: msgTx.SubnetworkID,
 		Gas:          msgTx.Gas,
+		PayloadHash:  msgTx.PayloadHash,
 		Payload:      payload,
 	}
 }
@@ -197,6 +198,10 @@ func RPCTransactionToDomainTransaction(rpcTransaction *RPCTransaction) (*externa
 	if err != nil {
 		return nil, err
 	}
+	payloadHash, err := externalapi.NewDomainHashFromString(rpcTransaction.PayloadHash)
+	if err != nil {
+		return nil, err
+	}
 	payload, err := hex.DecodeString(rpcTransaction.Payload)
 	if err != nil {
 		return nil, err
@@ -209,6 +214,7 @@ func RPCTransactionToDomainTransaction(rpcTransaction *RPCTransaction) (*externa
 		LockTime:     rpcTransaction.LockTime,
 		SubnetworkID: *subnetworkID,
 		Gas:          rpcTransaction.LockTime,
+		PayloadHash:  *payloadHash,
 		Payload:      payload,
 	}, nil
 }
@@ -238,6 +244,7 @@ func DomainTransactionToRPCTransaction(transaction *externalapi.DomainTransactio
 		}
 	}
 	subnetworkID := transaction.SubnetworkID.String()
+	payloadHash := transaction.PayloadHash.String()
 	payload := hex.EncodeToString(transaction.Payload)
 	return &RPCTransaction{
 		Version:      transaction.Version,
@@ -246,6 +253,7 @@ func DomainTransactionToRPCTransaction(transaction *externalapi.DomainTransactio
 		LockTime:     transaction.LockTime,
 		SubnetworkID: subnetworkID,
 		Gas:          transaction.LockTime,
+		PayloadHash:  payloadHash,
 		Payload:      payload,
 	}
 }
@@ -266,7 +274,7 @@ func OutpointAndUTXOEntryPairsToDomainOutpointAndUTXOEntryPairs(
 				outpointAndUTXOEntryPair.UTXOEntry.Amount,
 				outpointAndUTXOEntryPair.UTXOEntry.ScriptPublicKey,
 				outpointAndUTXOEntryPair.UTXOEntry.IsCoinbase,
-				outpointAndUTXOEntryPair.UTXOEntry.BlockDAAScore,
+				outpointAndUTXOEntryPair.UTXOEntry.BlockBlueScore,
 			),
 		}
 	}
@@ -289,76 +297,9 @@ func DomainOutpointAndUTXOEntryPairsToOutpointAndUTXOEntryPairs(
 				Amount:          outpointAndUTXOEntryPair.UTXOEntry.Amount(),
 				ScriptPublicKey: outpointAndUTXOEntryPair.UTXOEntry.ScriptPublicKey(),
 				IsCoinbase:      outpointAndUTXOEntryPair.UTXOEntry.IsCoinbase(),
-				BlockDAAScore:   outpointAndUTXOEntryPair.UTXOEntry.BlockDAAScore(),
+				BlockBlueScore:  outpointAndUTXOEntryPair.UTXOEntry.BlockBlueScore(),
 			},
 		}
 	}
 	return domainOutpointAndUTXOEntryPairs
 }
-
-// DomainBlockToRPCBlock converts DomainBlocks to RPCBlocks
-func DomainBlockToRPCBlock(block *externalapi.DomainBlock) *RPCBlock {
-	header := &RPCBlockHeader{
-		Version:              uint32(block.Header.Version()),
-		ParentHashes:         hashes.ToStrings(block.Header.ParentHashes()),
-		HashMerkleRoot:       block.Header.HashMerkleRoot().String(),
-		AcceptedIDMerkleRoot: block.Header.AcceptedIDMerkleRoot().String(),
-		UTXOCommitment:       block.Header.UTXOCommitment().String(),
-		Timestamp:            block.Header.TimeInMilliseconds(),
-		Bits:                 block.Header.Bits(),
-		Nonce:                block.Header.Nonce(),
-	}
-	transactions := make([]*RPCTransaction, len(block.Transactions))
-	for i, transaction := range block.Transactions {
-		transactions[i] = DomainTransactionToRPCTransaction(transaction)
-	}
-	return &RPCBlock{
-		Header:       header,
-		Transactions: transactions,
-	}
-}
-
-// RPCBlockToDomainBlock converts `block` into a DomainBlock
-func RPCBlockToDomainBlock(block *RPCBlock) (*externalapi.DomainBlock, error) {
-	parentHashes := make([]*externalapi.DomainHash, len(block.Header.ParentHashes))
-	for i, parentHash := range block.Header.ParentHashes {
-		domainParentHashes, err := externalapi.NewDomainHashFromString(parentHash)
-		if err != nil {
-			return nil, err
-		}
-		parentHashes[i] = domainParentHashes
-	}
-	hashMerkleRoot, err := externalapi.NewDomainHashFromString(block.Header.HashMerkleRoot)
-	if err != nil {
-		return nil, err
-	}
-	acceptedIDMerkleRoot, err := externalapi.NewDomainHashFromString(block.Header.AcceptedIDMerkleRoot)
-	if err != nil {
-		return nil, err
-	}
-	utxoCommitment, err := externalapi.NewDomainHashFromString(block.Header.UTXOCommitment)
-	if err != nil {
-		return nil, err
-	}
-	header := blockheader.NewImmutableBlockHeader(
-		uint16(block.Header.Version),
-		parentHashes,
-		hashMerkleRoot,
-		acceptedIDMerkleRoot,
-		utxoCommitment,
-		block.Header.Timestamp,
-		block.Header.Bits,
-		block.Header.Nonce)
-	transactions := make([]*externalapi.DomainTransaction, len(block.Transactions))
-	for i, transaction := range block.Transactions {
-		domainTransaction, err := RPCTransactionToDomainTransaction(transaction)
-		if err != nil {
-			return nil, err
-		}
-		transactions[i] = domainTransaction
-	}
-	return &externalapi.DomainBlock{
-		Header:       header,
-		Transactions: transactions,
-	}, nil
-}

app/appmessage/p2p_msgblock.go

@@ -15,6 +15,19 @@ import (
 // backing array multiple times.
 const defaultTransactionAlloc = 2048
 
+// MaxMassAcceptedByBlock is the maximum total transaction mass a block may accept.
+const MaxMassAcceptedByBlock = 10000000
+
+// MaxMassPerTx is the maximum total mass a transaction may have.
+const MaxMassPerTx = MaxMassAcceptedByBlock / 2
+
+// MaxTxPerBlock is the maximum number of transactions that could
+// possibly fit into a block.
+const MaxTxPerBlock = (MaxMassAcceptedByBlock / minTxPayload) + 1
+
+// MaxBlockParents is the maximum allowed number of parents for block.
+const MaxBlockParents = 10
+
 // TxLoc holds locator data for the offset and length of where a transaction is
 // located within a MsgBlock data buffer.
 type TxLoc struct {

app/appmessage/p2p_msgpruningpointutxosetchunk.go

@@ -31,6 +31,6 @@ type OutpointAndUTXOEntryPair struct {
 type UTXOEntry struct {
 	Amount          uint64
 	ScriptPublicKey *externalapi.ScriptPublicKey
-	BlockDAAScore   uint64
+	BlockBlueScore  uint64
 	IsCoinbase      bool
 }

app/appmessage/p2p_msgtx.go

@@ -6,6 +6,7 @@ package appmessage
 
 import (
 	"encoding/binary"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/hashes"
 	"strconv"
 
 	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
@@ -132,6 +133,7 @@ type MsgTx struct {
 	LockTime     uint64
 	SubnetworkID externalapi.DomainSubnetworkID
 	Gas          uint64
+	PayloadHash  externalapi.DomainHash
 	Payload      []byte
 }
 
@@ -177,6 +179,7 @@ func (msg *MsgTx) Copy() *MsgTx {
 		LockTime:     msg.LockTime,
 		SubnetworkID: msg.SubnetworkID,
 		Gas:          msg.Gas,
+		PayloadHash:  msg.PayloadHash,
 	}
 
 	if msg.Payload != nil {
@@ -277,12 +280,18 @@ func newMsgTx(version uint16, txIn []*TxIn, txOut []*TxOut, subnetworkID *extern
 		txOut = make([]*TxOut, 0, defaultTxInOutAlloc)
 	}
 
+	var payloadHash externalapi.DomainHash
+	if *subnetworkID != subnetworks.SubnetworkIDNative {
+		payloadHash = *hashes.PayloadHash(payload)
+	}
+
 	return &MsgTx{
 		Version:      version,
 		TxIn:         txIn,
 		TxOut:        txOut,
 		SubnetworkID: *subnetworkID,
 		Gas:          gas,
+		PayloadHash:  payloadHash,
 		Payload:      payload,
 		LockTime:     lockTime,
 	}

app/appmessage/p2p_msgtx_test.go

@@ -133,8 +133,8 @@ func TestTx(t *testing.T) {
 
 // TestTxHash tests the ability to generate the hash of a transaction accurately.
 func TestTxHashAndID(t *testing.T) {
-	txHash1Str := "93663e597f6c968d32d229002f76408edf30d6a0151ff679fc729812d8cb2acc"
-	txID1Str := "24079c6d2bdf602fc389cc307349054937744a9c8dc0f07c023e6af0e949a4e7"
+	txHash1Str := "4bee9ee495bd93a755de428376bd582a2bb6ec37c041753b711c0606d5745c13"
+	txID1Str := "f868bd20e816256b80eac976821be4589d24d21141bd1cec6e8005d0c16c6881"
 	wantTxID1, err := transactionid.FromString(txID1Str)
 	if err != nil {
 		t.Fatalf("NewTxIDFromStr: %v", err)
@@ -185,14 +185,14 @@ func TestTxHashAndID(t *testing.T) {
 			spew.Sprint(tx1ID), spew.Sprint(wantTxID1))
 	}
 
-	hash2Str := "8dafd1bec24527d8e3b443ceb0a3b92fffc0d60026317f890b2faf5e9afc177a"
+	hash2Str := "cb1bdb4a83d4885535fb3cceb5c96597b7df903db83f0ffcd779d703affd8efd"
 	wantHash2, err := externalapi.NewDomainHashFromString(hash2Str)
 	if err != nil {
 		t.Errorf("NewTxIDFromStr: %v", err)
 		return
 	}
 
-	id2Str := "89ffb49474637502d9059af38b8a95fc2f0d3baef5c801d7a9b9c8830671b711"
+	id2Str := "ca080073d4ddf5b84443a0964af633f3c70a5b290fd3bc35a7e6f93fd33f9330"
 	wantID2, err := transactionid.FromString(id2Str)
 	if err != nil {
 		t.Errorf("NewTxIDFromStr: %v", err)

app/appmessage/p2p_msgversion_test.go

@@ -19,7 +19,7 @@ func TestVersion(t *testing.T) {
 
 	// Create version message data.
 	tcpAddrMe := &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 16111}
-	me := NewNetAddress(tcpAddrMe)
+	me := NewNetAddress(tcpAddrMe, SFNodeNetwork)
 	generatedID, err := id.GenerateID()
 	if err != nil {
 		t.Fatalf("id.GenerateID: %s", err)

app/appmessage/p2p_netaddress.go

@@ -15,6 +15,9 @@ type NetAddress struct {
 	// Last time the address was seen.
 	Timestamp mstime.Time
 
+	// Bitfield which identifies the services supported by the address.
+	Services ServiceFlag
+
 	// IP address of the peer.
 	IP net.IP
 
@@ -23,6 +26,17 @@ type NetAddress struct {
 	Port uint16
 }
 
+// HasService returns whether the specified service is supported by the address.
+func (na *NetAddress) HasService(service ServiceFlag) bool {
+	return na.Services&service == service
+}
+
+// AddService adds service as a supported service by the peer generating the
+// message.
+func (na *NetAddress) AddService(service ServiceFlag) {
+	na.Services |= service
+}
+
 // TCPAddress converts the NetAddress to *net.TCPAddr
 func (na *NetAddress) TCPAddress() *net.TCPAddr {
 	return &net.TCPAddr{
@@ -33,19 +47,20 @@ func (na *NetAddress) TCPAddress() *net.TCPAddr {
 
 // NewNetAddressIPPort returns a new NetAddress using the provided IP, port, and
 // supported services with defaults for the remaining fields.
-func NewNetAddressIPPort(ip net.IP, port uint16) *NetAddress {
-	return NewNetAddressTimestamp(mstime.Now(), ip, port)
+func NewNetAddressIPPort(ip net.IP, port uint16, services ServiceFlag) *NetAddress {
+	return NewNetAddressTimestamp(mstime.Now(), services, ip, port)
 }
 
 // NewNetAddressTimestamp returns a new NetAddress using the provided
 // timestamp, IP, port, and supported services. The timestamp is rounded to
 // single millisecond precision.
 func NewNetAddressTimestamp(
-	timestamp mstime.Time, ip net.IP, port uint16) *NetAddress {
+	timestamp mstime.Time, services ServiceFlag, ip net.IP, port uint16) *NetAddress {
 	// Limit the timestamp to one millisecond precision since the protocol
 	// doesn't support better.
 	na := NetAddress{
 		Timestamp: timestamp,
+		Services:  services,
 		IP:        ip,
 		Port:      port,
 	}
@@ -54,6 +69,6 @@ func NewNetAddressTimestamp(
 
 // NewNetAddress returns a new NetAddress using the provided TCP address and
 // supported services with defaults for the remaining fields.
-func NewNetAddress(addr *net.TCPAddr) *NetAddress {
-	return NewNetAddressIPPort(addr.IP, uint16(addr.Port))
+func NewNetAddress(addr *net.TCPAddr, services ServiceFlag) *NetAddress {
+	return NewNetAddressIPPort(addr.IP, uint16(addr.Port), services)
 }

app/appmessage/p2p_netaddress_test.go

@@ -15,7 +15,7 @@ func TestNetAddress(t *testing.T) {
 	port := 16111
 
 	// Test NewNetAddress.
-	na := NewNetAddress(&net.TCPAddr{IP: ip, Port: port})
+	na := NewNetAddress(&net.TCPAddr{IP: ip, Port: port}, 0)
 
 	// Ensure we get the same ip, port, and services back out.
 	if !na.IP.Equal(ip) {
@@ -25,4 +25,21 @@ func TestNetAddress(t *testing.T) {
 		t.Errorf("NetNetAddress: wrong port - got %v, want %v", na.Port,
 			port)
 	}
+	if na.Services != 0 {
+		t.Errorf("NetNetAddress: wrong services - got %v, want %v",
+			na.Services, 0)
+	}
+	if na.HasService(SFNodeNetwork) {
+		t.Errorf("HasService: SFNodeNetwork service is set")
+	}
+
+	// Ensure adding the full service node flag works.
+	na.AddService(SFNodeNetwork)
+	if na.Services != SFNodeNetwork {
+		t.Errorf("AddService: wrong services - got %v, want %v",
+			na.Services, SFNodeNetwork)
+	}
+	if !na.HasService(SFNodeNetwork) {
+		t.Errorf("HasService: SFNodeNetwork service not set")
+	}
 }

app/appmessage/rpc_get_block.go

@@ -25,7 +25,7 @@ func NewGetBlockRequestMessage(hash string, includeTransactionVerboseData bool)
 // its respective RPC message
 type GetBlockResponseMessage struct {
 	baseMessage
-	Block *RPCBlock
+	BlockVerboseData *BlockVerboseData
 
 	Error *RPCError
 }
@@ -39,3 +39,71 @@ func (msg *GetBlockResponseMessage) Command() MessageCommand {
 func NewGetBlockResponseMessage() *GetBlockResponseMessage {
 	return &GetBlockResponseMessage{}
 }
+
+// BlockVerboseData holds verbose data about a block
+type BlockVerboseData struct {
+	Hash                   string
+	Version                uint16
+	VersionHex             string
+	HashMerkleRoot         string
+	AcceptedIDMerkleRoot   string
+	UTXOCommitment         string
+	TxIDs                  []string
+	TransactionVerboseData []*TransactionVerboseData
+	Time                   int64
+	Nonce                  uint64
+	Bits                   string
+	Difficulty             float64
+	ParentHashes           []string
+	ChildrenHashes         []string
+	SelectedParentHash     string
+	BlueScore              uint64
+	IsHeaderOnly           bool
+}
+
+// TransactionVerboseData holds verbose data about a transaction
+type TransactionVerboseData struct {
+	TxID                      string
+	Hash                      string
+	Size                      uint64
+	Version                   uint16
+	LockTime                  uint64
+	SubnetworkID              string
+	Gas                       uint64
+	PayloadHash               string
+	Payload                   string
+	TransactionVerboseInputs  []*TransactionVerboseInput
+	TransactionVerboseOutputs []*TransactionVerboseOutput
+	BlockHash                 string
+	Time                      uint64
+	BlockTime                 uint64
+}
+
+// TransactionVerboseInput holds data about a transaction input
+type TransactionVerboseInput struct {
+	TxID        string
+	OutputIndex uint32
+	ScriptSig   *ScriptSig
+	Sequence    uint64
+}
+
+// ScriptSig holds data about a script signature
+type ScriptSig struct {
+	Asm string
+	Hex string
+}
+
+// TransactionVerboseOutput holds data about a transaction output
+type TransactionVerboseOutput struct {
+	Value        uint64
+	Index        uint32
+	ScriptPubKey *ScriptPubKeyResult
+}
+
+// ScriptPubKeyResult holds data about a script public key
+type ScriptPubKeyResult struct {
+	Hex     string
+	Type    string
+	Address string
+	Version uint16
+}

app/appmessage/rpc_get_block_template.go

@@ -23,7 +23,7 @@ func NewGetBlockTemplateRequestMessage(payAddress string) *GetBlockTemplateReque
 // its respective RPC message
 type GetBlockTemplateResponseMessage struct {
 	baseMessage
-	Block    *RPCBlock
+	MsgBlock *MsgBlock
 	IsSynced bool
 
 	Error *RPCError
@@ -35,9 +35,9 @@ func (msg *GetBlockTemplateResponseMessage) Command() MessageCommand {
 }
 
 // NewGetBlockTemplateResponseMessage returns a instance of the message
-func NewGetBlockTemplateResponseMessage(block *RPCBlock, isSynced bool) *GetBlockTemplateResponseMessage {
+func NewGetBlockTemplateResponseMessage(msgBlock *MsgBlock, isSynced bool) *GetBlockTemplateResponseMessage {
 	return &GetBlockTemplateResponseMessage{
-		Block:    block,
+		MsgBlock: msgBlock,
 		IsSynced: isSynced,
 	}
 }

app/appmessage/rpc_get_blocks.go

@@ -5,7 +5,7 @@ package appmessage
 type GetBlocksRequestMessage struct {
 	baseMessage
 	LowHash                       string
-	IncludeBlocks                 bool
+	IncludeBlockVerboseData       bool
 	IncludeTransactionVerboseData bool
 }
 
@@ -15,11 +15,11 @@ func (msg *GetBlocksRequestMessage) Command() MessageCommand {
 }
 
 // NewGetBlocksRequestMessage returns a instance of the message
-func NewGetBlocksRequestMessage(lowHash string, includeBlocks bool,
+func NewGetBlocksRequestMessage(lowHash string, includeBlockVerboseData bool,
 	includeTransactionVerboseData bool) *GetBlocksRequestMessage {
 	return &GetBlocksRequestMessage{
 		LowHash:                       lowHash,
-		IncludeBlocks:                 includeBlocks,
+		IncludeBlockVerboseData:       includeBlockVerboseData,
 		IncludeTransactionVerboseData: includeTransactionVerboseData,
 	}
 }
@@ -28,8 +28,8 @@ func NewGetBlocksRequestMessage(lowHash string, includeBlocks bool,
 // its respective RPC message
 type GetBlocksResponseMessage struct {
 	baseMessage
-	BlockHashes []string
-	Blocks      []*RPCBlock
+	BlockHashes      []string
+	BlockVerboseData []*BlockVerboseData
 
 	Error *RPCError
 }
@@ -40,6 +40,11 @@ func (msg *GetBlocksResponseMessage) Command() MessageCommand {
 }
 
 // NewGetBlocksResponseMessage returns a instance of the message
-func NewGetBlocksResponseMessage() *GetBlocksResponseMessage {
-	return &GetBlocksResponseMessage{}
+func NewGetBlocksResponseMessage(blockHashes []string, blockHexes []string,
+	blockVerboseData []*BlockVerboseData) *GetBlocksResponseMessage {
+
+	return &GetBlocksResponseMessage{
+		BlockHashes:      blockHashes,
+		BlockVerboseData: blockVerboseData,
+	}
 }

app/appmessage/rpc_get_info.go

@@ -20,8 +20,7 @@ func NewGeInfoRequestMessage() *GetInfoRequestMessage {
 // its respective RPC message
 type GetInfoResponseMessage struct {
 	baseMessage
-	P2PID       string
-	MempoolSize uint64
+	P2PID string
 
 	Error *RPCError
 }
@@ -32,9 +31,8 @@ func (msg *GetInfoResponseMessage) Command() MessageCommand {
 }
 
 // NewGetInfoResponseMessage returns a instance of the message
-func NewGetInfoResponseMessage(p2pID string, mempoolSize uint64) *GetInfoResponseMessage {
+func NewGetInfoResponseMessage(p2pID string) *GetInfoResponseMessage {
 	return &GetInfoResponseMessage{
-		P2PID:       p2pID,
-		MempoolSize: mempoolSize,
+		P2PID: p2pID,
 	}
 }

app/appmessage/rpc_get_mempool_entry.go

@@ -28,8 +28,8 @@ type GetMempoolEntryResponseMessage struct {
 
 // MempoolEntry represents a transaction in the mempool.
 type MempoolEntry struct {
-	Fee         uint64
-	Transaction *RPCTransaction
+	Fee                    uint64
+	TransactionVerboseData *TransactionVerboseData
 }
 
 // Command returns the protocol command string for the message
@@ -38,11 +38,11 @@ func (msg *GetMempoolEntryResponseMessage) Command() MessageCommand {
 }
 
 // NewGetMempoolEntryResponseMessage returns a instance of the message
-func NewGetMempoolEntryResponseMessage(fee uint64, transaction *RPCTransaction) *GetMempoolEntryResponseMessage {
+func NewGetMempoolEntryResponseMessage(fee uint64, transactionVerboseData *TransactionVerboseData) *GetMempoolEntryResponseMessage {
 	return &GetMempoolEntryResponseMessage{
 		Entry: &MempoolEntry{
-			Fee:         fee,
-			Transaction: transaction,
+			Fee:                    fee,
+			TransactionVerboseData: transactionVerboseData,
 		},
 	}
 }

app/appmessage/rpc_notify_block_added.go

@@ -37,7 +37,8 @@ func NewNotifyBlockAddedResponseMessage() *NotifyBlockAddedResponseMessage {
 // its respective RPC message
 type BlockAddedNotificationMessage struct {
 	baseMessage
-	Block *RPCBlock
+	Block            *MsgBlock
+	BlockVerboseData *BlockVerboseData
 }
 
 // Command returns the protocol command string for the message
@@ -46,8 +47,9 @@ func (msg *BlockAddedNotificationMessage) Command() MessageCommand {
 }
 
 // NewBlockAddedNotificationMessage returns a instance of the message
-func NewBlockAddedNotificationMessage(block *RPCBlock) *BlockAddedNotificationMessage {
+func NewBlockAddedNotificationMessage(block *MsgBlock, blockVerboseData *BlockVerboseData) *BlockAddedNotificationMessage {
 	return &BlockAddedNotificationMessage{
-		Block: block,
+		Block:            block,
+		BlockVerboseData: blockVerboseData,
 	}
 }

app/appmessage/rpc_submit_block.go

@@ -4,7 +4,7 @@ package appmessage
 // its respective RPC message
 type SubmitBlockRequestMessage struct {
 	baseMessage
-	Block *RPCBlock
+	Block *MsgBlock
 }
 
 // Command returns the protocol command string for the message
@@ -13,7 +13,7 @@ func (msg *SubmitBlockRequestMessage) Command() MessageCommand {
 }
 
 // NewSubmitBlockRequestMessage returns a instance of the message
-func NewSubmitBlockRequestMessage(block *RPCBlock) *SubmitBlockRequestMessage {
+func NewSubmitBlockRequestMessage(block *MsgBlock) *SubmitBlockRequestMessage {
 	return &SubmitBlockRequestMessage{
 		Block: block,
 	}
@@ -57,35 +57,3 @@ func (msg *SubmitBlockResponseMessage) Command() MessageCommand {
 func NewSubmitBlockResponseMessage() *SubmitBlockResponseMessage {
 	return &SubmitBlockResponseMessage{}
 }
-
-// RPCBlock is a kaspad block representation meant to be
-// used over RPC
-type RPCBlock struct {
-	Header       *RPCBlockHeader
-	Transactions []*RPCTransaction
-	VerboseData  *RPCBlockVerboseData
-}
-
-// RPCBlockHeader is a kaspad block header representation meant to be
-// used over RPC
-type RPCBlockHeader struct {
-	Version              uint32
-	ParentHashes         []string
-	HashMerkleRoot       string
-	AcceptedIDMerkleRoot string
-	UTXOCommitment       string
-	Timestamp            int64
-	Bits                 uint32
-	Nonce                uint64
-}
-
-// RPCBlockVerboseData holds verbose data about a block
-type RPCBlockVerboseData struct {
-	Hash               string
-	Difficulty         float64
-	SelectedParentHash string
-	TransactionIDs     []string
-	IsHeaderOnly       bool
-	BlueScore          uint64
-	ChildrenHashes     []string
-}

app/appmessage/rpc_submit_transaction.go

@@ -49,8 +49,8 @@ type RPCTransaction struct {
 	LockTime     uint64
 	SubnetworkID string
 	Gas          uint64
+	PayloadHash  string
 	Payload      string
-	VerboseData  *RPCTransactionVerboseData
 }
 
 // RPCTransactionInput is a kaspad transaction input representation
@@ -59,7 +59,6 @@ type RPCTransactionInput struct {
 	PreviousOutpoint *RPCOutpoint
 	SignatureScript  string
 	Sequence         uint64
-	VerboseData      *RPCTransactionInputVerboseData
 }
 
 // RPCScriptPublicKey is a kaspad ScriptPublicKey representation
@@ -73,7 +72,6 @@ type RPCScriptPublicKey struct {
 type RPCTransactionOutput struct {
 	Amount          uint64
 	ScriptPublicKey *RPCScriptPublicKey
-	VerboseData     *RPCTransactionOutputVerboseData
 }
 
 // RPCOutpoint is a kaspad outpoint representation meant to be used
@@ -88,25 +86,6 @@ type RPCOutpoint struct {
 type RPCUTXOEntry struct {
 	Amount          uint64
 	ScriptPublicKey *RPCScriptPublicKey
-	BlockDAAScore   uint64
+	BlockBlueScore  uint64
 	IsCoinbase      bool
 }
-
-// RPCTransactionVerboseData holds verbose data about a transaction
-type RPCTransactionVerboseData struct {
-	TransactionID string
-	Hash          string
-	Size          uint64
-	BlockHash     string
-	BlockTime     uint64
-}
-
-// RPCTransactionInputVerboseData holds data about a transaction input
-type RPCTransactionInputVerboseData struct {
-}
-
-// RPCTransactionOutputVerboseData holds data about a transaction output
-type RPCTransactionOutputVerboseData struct {
-	ScriptPublicKeyType    string
-	ScriptPublicKeyAddress string
-}

app/component_manager.go

@@ -72,8 +72,6 @@ func (a *ComponentManager) Stop() {
 		log.Errorf("Error stopping the net adapter: %+v", err)
 	}
 
-	a.protocolManager.Close()
-
 	return
 }
 
@@ -157,7 +155,7 @@ func setupRPC(
 
 func (a *ComponentManager) maybeSeedFromDNS() {
 	if !a.cfg.DisableDNSSeed {
-		dnsseed.SeedFromDNS(a.cfg.NetParams(), a.cfg.DNSSeed, false, nil,
+		dnsseed.SeedFromDNS(a.cfg.NetParams(), a.cfg.DNSSeed, appmessage.SFNodeNetwork, false, nil,
 			a.cfg.Lookup, func(addresses []*appmessage.NetAddress) {
 				// Kaspad uses a lookup of the dns seeder here. Since seeder returns
 				// IPs of nodes and not its own IP, we can not know real IP of
@@ -165,7 +163,7 @@ func (a *ComponentManager) maybeSeedFromDNS() {
 				a.addressManager.AddAddresses(addresses...)
 			})
 
-		dnsseed.SeedFromGRPC(a.cfg.NetParams(), a.cfg.GRPCSeed, false, nil,
+		dnsseed.SeedFromGRPC(a.cfg.NetParams(), a.cfg.GRPCSeed, appmessage.SFNodeNetwork, false, nil,
 			func(addresses []*appmessage.NetAddress) {
 				a.addressManager.AddAddresses(addresses...)
 			})

app/protocol/flowcontext/blocks.go

@@ -37,14 +37,12 @@ func (f *FlowContext) OnNewBlock(block *externalapi.DomainBlock,
 		newBlockInsertionResults = append(newBlockInsertionResults, unorphaningResult.blockInsertionResult)
 	}
 
-	allAcceptedTransactions := make([]*externalapi.DomainTransaction, 0)
 	for i, newBlock := range newBlocks {
 		log.Debugf("OnNewBlock: passing block %s transactions to mining manager", hash)
-		acceptedTransactions, err := f.Domain().MiningManager().HandleNewBlockTransactions(newBlock.Transactions)
+		_, err = f.Domain().MiningManager().HandleNewBlockTransactions(newBlock.Transactions)
 		if err != nil {
 			return err
 		}
-		allAcceptedTransactions = append(allAcceptedTransactions, acceptedTransactions...)
 
 		if f.onBlockAddedToDAGHandler != nil {
 			log.Debugf("OnNewBlock: calling f.onBlockAddedToDAGHandler for block %s", hash)
@@ -56,7 +54,7 @@ func (f *FlowContext) OnNewBlock(block *externalapi.DomainBlock,
 		}
 	}
 
-	return f.broadcastTransactionsAfterBlockAdded(newBlocks, allAcceptedTransactions)
+	return nil
 }
 
 // OnPruningPointUTXOSetOverride calls the handler function whenever the UTXO set
@@ -69,9 +67,9 @@ func (f *FlowContext) OnPruningPointUTXOSetOverride() error {
 }
 
 func (f *FlowContext) broadcastTransactionsAfterBlockAdded(
-	addedBlocks []*externalapi.DomainBlock, transactionsAcceptedToMempool []*externalapi.DomainTransaction) error {
+	block *externalapi.DomainBlock, transactionsAcceptedToMempool []*externalapi.DomainTransaction) error {
 
-	f.updateTransactionsToRebroadcast(addedBlocks)
+	f.updateTransactionsToRebroadcast(block)
 
 	// Don't relay transactions when in IBD.
 	if f.IsIBDRunning() {

app/protocol/flowcontext/flow_context.go

@@ -61,8 +61,6 @@ type FlowContext struct {
 
 	orphans      map[externalapi.DomainHash]*externalapi.DomainBlock
 	orphansMutex sync.RWMutex
-
-	shutdownChan chan struct{}
 }
 
 // New returns a new instance of FlowContext.
@@ -81,21 +79,9 @@ func New(cfg *config.Config, domain domain.Domain, addressManager *addressmanage
 		transactionsToRebroadcast:   make(map[externalapi.DomainTransactionID]*externalapi.DomainTransaction),
 		orphans:                     make(map[externalapi.DomainHash]*externalapi.DomainBlock),
 		timeStarted:                 mstime.Now().UnixMilliseconds(),
-		shutdownChan:                make(chan struct{}),
 	}
 }
 
-// Close signals to all flows the the protocol manager is closed.
-func (f *FlowContext) Close() {
-	close(f.shutdownChan)
-}
-
-// ShutdownChan is a chan where flows can subscribe to shutdown
-// event.
-func (f *FlowContext) ShutdownChan() <-chan struct{} {
-	return f.shutdownChan
-}
-
 // SetOnBlockAddedToDAGHandler sets the onBlockAddedToDAG handler
 func (f *FlowContext) SetOnBlockAddedToDAGHandler(onBlockAddedToDAGHandler OnBlockAddedToDAGHandler) {
 	f.onBlockAddedToDAGHandler = onBlockAddedToDAGHandler

app/protocol/flowcontext/transactions.go

@@ -25,17 +25,14 @@ func (f *FlowContext) AddTransaction(tx *externalapi.DomainTransaction) error {
 	return f.Broadcast(inv)
 }
 
-func (f *FlowContext) updateTransactionsToRebroadcast(addedBlocks []*externalapi.DomainBlock) {
+func (f *FlowContext) updateTransactionsToRebroadcast(block *externalapi.DomainBlock) {
 	f.transactionsToRebroadcastLock.Lock()
 	defer f.transactionsToRebroadcastLock.Unlock()
-
-	for _, block := range addedBlocks {
-		// Note: if a transaction is included in the DAG but not accepted,
-		// it won't be rebroadcast anymore, although it is not included in
-		// the UTXO set
-		for _, tx := range block.Transactions {
-			delete(f.transactionsToRebroadcast, *consensushashing.TransactionID(tx))
-		}
+	// Note: if the block is red, its transactions won't be rebroadcasted
+	// anymore, although they are not included in the UTXO set.
+	// This is probably ok, since red blocks are quite rare.
+	for _, tx := range block.Transactions {
+		delete(f.transactionsToRebroadcast, *consensushashing.TransactionID(tx))
 	}
 }
 

app/protocol/flows/blockrelay/handle_request_headers.go

@@ -50,7 +50,7 @@ func (flow *handleRequestHeadersFlow) start() error {
 			// GetHashesBetween is a relatively heavy operation so we limit it
 			// in order to avoid locking the consensus for too long
 			const maxBlueScoreDifference = 1 << 10
-			blockHashes, _, err := flow.Domain().Consensus().GetHashesBetween(lowHash, highHash, maxBlueScoreDifference)
+			blockHashes, err := flow.Domain().Consensus().GetHashesBetween(lowHash, highHash, maxBlueScoreDifference)
 			if err != nil {
 				return err
 			}

app/protocol/flows/ping/send.go

@@ -13,7 +13,6 @@ import (
 
 // SendPingsContext is the interface for the context needed for the SendPings flow.
 type SendPingsContext interface {
-	ShutdownChan() <-chan struct{}
 }
 
 type sendPingsFlow struct {
@@ -40,13 +39,7 @@ func (flow *sendPingsFlow) start() error {
 	ticker := time.NewTicker(pingInterval)
 	defer ticker.Stop()
 
-	for {
-		select {
-		case <-flow.ShutdownChan():
-			return nil
-		case <-ticker.C:
-		}
-
+	for range ticker.C {
 		nonce, err := random.Uint64()
 		if err != nil {
 			return err
@@ -69,4 +62,5 @@ func (flow *sendPingsFlow) start() error {
 		}
 		flow.peer.SetPingIdle()
 	}
+	return nil
 }

app/protocol/flows/testing/handle_relay_invs_test.go

@@ -129,7 +129,7 @@ type fakeRelayInvsContext struct {
 	rwLock                                        sync.RWMutex
 }
 
-func (f *fakeRelayInvsContext) GetBlockRelations(blockHash *externalapi.DomainHash) ([]*externalapi.DomainHash, *externalapi.DomainHash, []*externalapi.DomainHash, error) {
+func (f *fakeRelayInvsContext) GetBlockChildren(blockHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
 	panic(errors.Errorf("called unimplemented function from test '%s'", f.testName))
 }
 
@@ -181,7 +181,7 @@ func (f *fakeRelayInvsContext) GetBlockAcceptanceData(blockHash *externalapi.Dom
 	panic(errors.Errorf("called unimplemented function from test '%s'", f.testName))
 }
 
-func (f *fakeRelayInvsContext) GetHashesBetween(lowHash, highHash *externalapi.DomainHash, maxBlueScoreDifference uint64) (hashes []*externalapi.DomainHash, actualHighHash *externalapi.DomainHash, err error) {
+func (f *fakeRelayInvsContext) GetHashesBetween(lowHash, highHash *externalapi.DomainHash, maxBlueScoreDifference uint64) ([]*externalapi.DomainHash, error) {
 	panic(errors.Errorf("called unimplemented function from test '%s'", f.testName))
 }
 

app/protocol/manager.go

@@ -2,9 +2,6 @@ package protocol
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
-	"sync"
-	"sync/atomic"
 
 	"github.com/kaspanet/kaspad/domain"
 
@@ -20,9 +17,7 @@ import (
 
 // Manager manages the p2p protocol
 type Manager struct {
-	context          *flowcontext.FlowContext
-	routersWaitGroup sync.WaitGroup
-	isClosed         uint32
+	context *flowcontext.FlowContext
 }
 
 // NewManager creates a new instance of the p2p protocol manager
@@ -37,18 +32,6 @@ func NewManager(cfg *config.Config, domain domain.Domain, netAdapter *netadapter
 	return &manager, nil
 }
 
-// Close closes the protocol manager and waits until all p2p flows
-// finish.
-func (m *Manager) Close() {
-	if !atomic.CompareAndSwapUint32(&m.isClosed, 0, 1) {
-		panic(errors.New("The protocol manager was already closed"))
-	}
-
-	atomic.StoreUint32(&m.isClosed, 1)
-	m.context.Close()
-	m.routersWaitGroup.Wait()
-}
-
 // Peers returns the currently active peers
 func (m *Manager) Peers() []*peerpkg.Peer {
 	return m.context.Peers()
@@ -70,13 +53,11 @@ func (m *Manager) AddBlock(block *externalapi.DomainBlock) error {
 	return m.context.AddBlock(block)
 }
 
-func (m *Manager) runFlows(flows []*flow, peer *peerpkg.Peer, errChan <-chan error, flowsWaitGroup *sync.WaitGroup) error {
-	flowsWaitGroup.Add(len(flows))
+func (m *Manager) runFlows(flows []*flow, peer *peerpkg.Peer, errChan <-chan error) error {
 	for _, flow := range flows {
 		executeFunc := flow.executeFunc // extract to new variable so that it's not overwritten
 		spawn(fmt.Sprintf("flow-%s", flow.name), func() {
 			executeFunc(peer)
-			flowsWaitGroup.Done()
 		})
 	}
 

app/protocol/protocol.go

@@ -1,10 +1,10 @@
 package protocol
 
 import (
+	"sync/atomic"
+
 	"github.com/kaspanet/kaspad/app/protocol/flows/rejects"
 	"github.com/kaspanet/kaspad/infrastructure/network/connmanager"
-	"sync"
-	"sync/atomic"
 
 	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/app/protocol/flows/addressexchange"
@@ -41,13 +41,6 @@ func (m *Manager) routerInitializer(router *routerpkg.Router, netConnection *net
 	// After flows were registered - spawn a new thread that will wait for connection to finish initializing
 	// and start receiving messages
 	spawn("routerInitializer-runFlows", func() {
-		m.routersWaitGroup.Add(1)
-		defer m.routersWaitGroup.Done()
-
-		if atomic.LoadUint32(&m.isClosed) == 1 {
-			panic(errors.Errorf("tried to initialize router when the protocol manager is closed"))
-		}
-
 		isBanned, err := m.context.ConnectionManager().IsBanned(netConnection)
 		if err != nil && !errors.Is(err, addressmanager.ErrAddressNotFound) {
 			panic(err)
@@ -86,17 +79,11 @@ func (m *Manager) routerInitializer(router *routerpkg.Router, netConnection *net
 
 		removeHandshakeRoutes(router)
 
-		flowsWaitGroup := &sync.WaitGroup{}
-		err = m.runFlows(flows, peer, errChan, flowsWaitGroup)
+		err = m.runFlows(flows, peer, errChan)
 		if err != nil {
 			m.handleError(err, netConnection, router.OutgoingRoute())
-			// We call `flowsWaitGroup.Wait()` in two places instead of deferring, because
-			// we already defer `m.routersWaitGroup.Done()`, so we try to avoid error prone
-			// and confusing use of multiple dependent defers.
-			flowsWaitGroup.Wait()
 			return
 		}
-		flowsWaitGroup.Wait()
 	})
 }
 
@@ -251,7 +238,7 @@ func (m *Manager) registerTransactionRelayFlow(router *routerpkg.Router, isStopp
 	outgoingRoute := router.OutgoingRoute()
 
 	return []*flow{
-		m.registerFlowWithCapacity("HandleRelayedTransactions", 10_000, router,
+		m.registerFlow("HandleRelayedTransactions", router,
 			[]appmessage.MessageCommand{appmessage.CmdInvTransaction, appmessage.CmdTx, appmessage.CmdTransactionNotFound}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return transactionrelay.HandleRelayedTransactions(m.context, incomingRoute, outgoingRoute)
@@ -287,24 +274,6 @@ func (m *Manager) registerFlow(name string, router *routerpkg.Router, messageTyp
 		panic(err)
 	}
 
-	return m.registerFlowForRoute(route, name, isStopping, errChan, initializeFunc)
-}
-
-func (m *Manager) registerFlowWithCapacity(name string, capacity int, router *routerpkg.Router,
-	messageTypes []appmessage.MessageCommand, isStopping *uint32,
-	errChan chan error, initializeFunc flowInitializeFunc) *flow {
-
-	route, err := router.AddIncomingRouteWithCapacity(capacity, messageTypes)
-	if err != nil {
-		panic(err)
-	}
-
-	return m.registerFlowForRoute(route, name, isStopping, errChan, initializeFunc)
-}
-
-func (m *Manager) registerFlowForRoute(route *routerpkg.Route, name string, isStopping *uint32,
-	errChan chan error, initializeFunc flowInitializeFunc) *flow {
-
 	return &flow{
 		name: name,
 		executeFunc: func(peer *peerpkg.Peer) {

app/rpc/manager.go

@@ -69,12 +69,12 @@ func (m *Manager) NotifyBlockAddedToDAG(block *externalapi.DomainBlock, blockIns
 		return err
 	}
 
-	rpcBlock := appmessage.DomainBlockToRPCBlock(block)
-	err = m.context.PopulateBlockWithVerboseData(rpcBlock, block.Header, block, false)
+	msgBlock := appmessage.DomainBlockToMsgBlock(block)
+	blockVerboseData, err := m.context.BuildBlockVerboseData(block.Header, block, false)
 	if err != nil {
 		return err
 	}
-	blockAddedNotification := appmessage.NewBlockAddedNotificationMessage(rpcBlock)
+	blockAddedNotification := appmessage.NewBlockAddedNotificationMessage(msgBlock, blockVerboseData)
 	return m.context.NotificationManager.NotifyBlockAdded(blockAddedNotification)
 }
 

app/rpc/rpccontext/utxos_by_addresses.go

@@ -24,7 +24,7 @@ func ConvertUTXOOutpointEntryPairsToUTXOsByAddressesEntries(address string, pair
 			UTXOEntry: &appmessage.RPCUTXOEntry{
 				Amount:          utxoEntry.Amount(),
 				ScriptPublicKey: &appmessage.RPCScriptPublicKey{Script: hex.EncodeToString(utxoEntry.ScriptPublicKey().Script), Version: utxoEntry.ScriptPublicKey().Version},
-				BlockDAAScore:   utxoEntry.BlockDAAScore(),
+				BlockBlueScore:  utxoEntry.BlockBlueScore(),
 				IsCoinbase:      utxoEntry.IsCoinbase(),
 			},
 		})

app/rpc/rpccontext/verbosedata.go

@@ -2,16 +2,23 @@ package rpccontext
 
 import (
 	"encoding/hex"
-	difficultyPackage "github.com/kaspanet/kaspad/util/difficulty"
-	"github.com/pkg/errors"
+	"fmt"
 	"math"
 	"math/big"
+	"strconv"
+
+	"github.com/kaspanet/kaspad/domain/consensus/utils/constants"
+	"github.com/kaspanet/kaspad/infrastructure/logger"
+	"github.com/kaspanet/kaspad/util/difficulty"
+	"github.com/pkg/errors"
 
 	"github.com/kaspanet/kaspad/domain/consensus/utils/hashes"
 
 	"github.com/kaspanet/kaspad/domain/consensus/utils/estimatedsize"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/txscript"
 
+	"github.com/kaspanet/kaspad/domain/consensus/utils/subnetworks"
+
 	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
@@ -21,6 +28,79 @@ import (
 // ErrBuildBlockVerboseDataInvalidBlock indicates that a block that was given to BuildBlockVerboseData is invalid.
 var ErrBuildBlockVerboseDataInvalidBlock = errors.New("ErrBuildBlockVerboseDataInvalidBlock")
 
+// BuildBlockVerboseData builds a BlockVerboseData from the given blockHeader.
+// A block may optionally also be given if it's available in the calling context.
+func (ctx *Context) BuildBlockVerboseData(blockHeader externalapi.BlockHeader, block *externalapi.DomainBlock,
+	includeTransactionVerboseData bool) (*appmessage.BlockVerboseData, error) {
+
+	onEnd := logger.LogAndMeasureExecutionTime(log, "BuildBlockVerboseData")
+	defer onEnd()
+
+	hash := consensushashing.HeaderHash(blockHeader)
+
+	blockInfo, err := ctx.Domain.Consensus().GetBlockInfo(hash)
+	if err != nil {
+		return nil, err
+	}
+
+	if blockInfo.BlockStatus == externalapi.StatusInvalid {
+		return nil, errors.Wrap(ErrBuildBlockVerboseDataInvalidBlock, "cannot build verbose data for "+
+			"invalid block")
+	}
+
+	childrenHashes, err := ctx.Domain.Consensus().GetBlockChildren(hash)
+	if err != nil {
+		return nil, err
+	}
+
+	result := &appmessage.BlockVerboseData{
+		Hash:                 hash.String(),
+		Version:              blockHeader.Version(),
+		VersionHex:           fmt.Sprintf("%08x", blockHeader.Version()),
+		HashMerkleRoot:       blockHeader.HashMerkleRoot().String(),
+		AcceptedIDMerkleRoot: blockHeader.AcceptedIDMerkleRoot().String(),
+		UTXOCommitment:       blockHeader.UTXOCommitment().String(),
+		ParentHashes:         hashes.ToStrings(blockHeader.ParentHashes()),
+		ChildrenHashes:       hashes.ToStrings(childrenHashes),
+		Nonce:                blockHeader.Nonce(),
+		Time:                 blockHeader.TimeInMilliseconds(),
+		Bits:                 strconv.FormatInt(int64(blockHeader.Bits()), 16),
+		Difficulty:           ctx.GetDifficultyRatio(blockHeader.Bits(), ctx.Config.ActiveNetParams),
+		BlueScore:            blockInfo.BlueScore,
+		IsHeaderOnly:         blockInfo.BlockStatus == externalapi.StatusHeaderOnly,
+	}
+
+	if blockInfo.BlockStatus != externalapi.StatusHeaderOnly {
+		if block == nil {
+			block, err = ctx.Domain.Consensus().GetBlock(hash)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		txIDs := make([]string, len(block.Transactions))
+		for i, tx := range block.Transactions {
+			txIDs[i] = consensushashing.TransactionID(tx).String()
+		}
+		result.TxIDs = txIDs
+
+		if includeTransactionVerboseData {
+			transactionVerboseData := make([]*appmessage.TransactionVerboseData, len(block.Transactions))
+			for i, tx := range block.Transactions {
+				txID := consensushashing.TransactionID(tx).String()
+				data, err := ctx.BuildTransactionVerboseData(tx, txID, blockHeader, hash.String())
+				if err != nil {
+					return nil, err
+				}
+				transactionVerboseData[i] = data
+			}
+			result.TransactionVerboseData = transactionVerboseData
+		}
+	}
+
+	return result, nil
+}
+
 // GetDifficultyRatio returns the proof-of-work difficulty as a multiple of the
 // minimum difficulty using the passed bits field from the header of a block.
 func (ctx *Context) GetDifficultyRatio(bits uint32, params *dagconfig.Params) float64 {
@@ -28,7 +108,7 @@ func (ctx *Context) GetDifficultyRatio(bits uint32, params *dagconfig.Params) fl
 	// converted back to a number. Note this is not the same as the proof of
 	// work limit directly because the block difficulty is encoded in a block
 	// with the compact form which loses precision.
-	target := difficultyPackage.CompactToBig(bits)
+	target := difficulty.CompactToBig(bits)
 
 	difficulty := new(big.Rat).SetFrac(params.PowMax, target)
 	diff, _ := difficulty.Float64()
@@ -39,125 +119,106 @@ func (ctx *Context) GetDifficultyRatio(bits uint32, params *dagconfig.Params) fl
 	return diff
 }
 
-// PopulateBlockWithVerboseData populates the given `block` with verbose
-// data from `domainBlockHeader` and optionally from `domainBlock`
-func (ctx *Context) PopulateBlockWithVerboseData(block *appmessage.RPCBlock, domainBlockHeader externalapi.BlockHeader,
-	domainBlock *externalapi.DomainBlock, includeTransactionVerboseData bool) error {
+// BuildTransactionVerboseData builds a TransactionVerboseData from
+// the given parameters
+func (ctx *Context) BuildTransactionVerboseData(tx *externalapi.DomainTransaction, txID string,
+	blockHeader externalapi.BlockHeader, blockHash string) (
+	*appmessage.TransactionVerboseData, error) {
 
-	blockHash := consensushashing.HeaderHash(domainBlockHeader)
+	onEnd := logger.LogAndMeasureExecutionTime(log, "BuildTransactionVerboseData")
+	defer onEnd()
 
-	blockInfo, err := ctx.Domain.Consensus().GetBlockInfo(blockHash)
-	if err != nil {
-		return err
+	var payloadHash string
+	if tx.SubnetworkID != subnetworks.SubnetworkIDNative {
+		payloadHash = tx.PayloadHash.String()
 	}
 
-	if blockInfo.BlockStatus == externalapi.StatusInvalid {
-		return errors.Wrap(ErrBuildBlockVerboseDataInvalidBlock, "cannot build verbose data for "+
-			"invalid block")
+	txReply := &appmessage.TransactionVerboseData{
+		TxID:                      txID,
+		Hash:                      consensushashing.TransactionHash(tx).String(),
+		Size:                      estimatedsize.TransactionEstimatedSerializedSize(tx),
+		TransactionVerboseInputs:  ctx.buildTransactionVerboseInputs(tx),
+		TransactionVerboseOutputs: ctx.buildTransactionVerboseOutputs(tx, nil),
+		Version:                   tx.Version,
+		LockTime:                  tx.LockTime,
+		SubnetworkID:              tx.SubnetworkID.String(),
+		Gas:                       tx.Gas,
+		PayloadHash:               payloadHash,
+		Payload:                   hex.EncodeToString(tx.Payload),
 	}
 
-	_, selectedParentHash, childrenHashes, err := ctx.Domain.Consensus().GetBlockRelations(blockHash)
-	if err != nil {
-		return err
+	if blockHeader != nil {
+		txReply.Time = uint64(blockHeader.TimeInMilliseconds())
+		txReply.BlockTime = uint64(blockHeader.TimeInMilliseconds())
+		txReply.BlockHash = blockHash
 	}
 
-	block.VerboseData = &appmessage.RPCBlockVerboseData{
-		Hash:               blockHash.String(),
-		Difficulty:         ctx.GetDifficultyRatio(domainBlockHeader.Bits(), ctx.Config.ActiveNetParams),
-		ChildrenHashes:     hashes.ToStrings(childrenHashes),
-		SelectedParentHash: selectedParentHash.String(),
-		IsHeaderOnly:       blockInfo.BlockStatus == externalapi.StatusHeaderOnly,
-		BlueScore:          blockInfo.BlueScore,
-	}
+	return txReply, nil
+}
 
-	if blockInfo.BlockStatus == externalapi.StatusHeaderOnly {
-		return nil
-	}
+func (ctx *Context) buildTransactionVerboseInputs(tx *externalapi.DomainTransaction) []*appmessage.TransactionVerboseInput {
+	inputs := make([]*appmessage.TransactionVerboseInput, len(tx.Inputs))
+	for i, transactionInput := range tx.Inputs {
+		// The disassembled string will contain [error] inline
+		// if the script doesn't fully parse, so ignore the
+		// error here.
+		disbuf, _ := txscript.DisasmString(constants.MaxScriptPublicKeyVersion, transactionInput.SignatureScript)
 
-	// Get the block if we didn't receive it previously
-	if domainBlock == nil {
-		domainBlock, err = ctx.Domain.Consensus().GetBlock(blockHash)
-		if err != nil {
-			return err
+		input := &appmessage.TransactionVerboseInput{}
+		input.TxID = transactionInput.PreviousOutpoint.TransactionID.String()
+		input.OutputIndex = transactionInput.PreviousOutpoint.Index
+		input.Sequence = transactionInput.Sequence
+		input.ScriptSig = &appmessage.ScriptSig{
+			Asm: disbuf,
+			Hex: hex.EncodeToString(transactionInput.SignatureScript),
 		}
+		inputs[i] = input
 	}
 
-	transactionIDs := make([]string, len(domainBlock.Transactions))
-	for i, transaction := range domainBlock.Transactions {
-		transactionIDs[i] = consensushashing.TransactionID(transaction).String()
-	}
-	block.VerboseData.TransactionIDs = transactionIDs
+	return inputs
+}
 
-	if includeTransactionVerboseData {
-		for _, transaction := range block.Transactions {
-			err := ctx.PopulateTransactionWithVerboseData(transaction, domainBlockHeader)
-			if err != nil {
-				return err
+// buildTransactionVerboseOutputs returns a slice of JSON objects for the outputs of the passed
+// transaction.
+func (ctx *Context) buildTransactionVerboseOutputs(tx *externalapi.DomainTransaction, filterAddrMap map[string]struct{}) []*appmessage.TransactionVerboseOutput {
+	outputs := make([]*appmessage.TransactionVerboseOutput, len(tx.Outputs))
+	for i, transactionOutput := range tx.Outputs {
+
+		// Ignore the error here since an error means the script
+		// couldn't parse and there is no additional information about
+		// it anyways.
+		scriptClass, addr, _ := txscript.ExtractScriptPubKeyAddress(
+			transactionOutput.ScriptPublicKey, ctx.Config.ActiveNetParams)
+
+		// Encode the addresses while checking if the address passes the
+		// filter when needed.
+		passesFilter := len(filterAddrMap) == 0
+		var encodedAddr string
+		if addr != nil {
+			encodedAddr = addr.EncodeAddress()
+
+			// If the filter doesn't already pass, make it pass if
+			// the address exists in the filter.
+			if _, exists := filterAddrMap[encodedAddr]; exists {
+				passesFilter = true
 			}
 		}
-	}
 
-	return nil
-}
-
-// PopulateTransactionWithVerboseData populates the given `transaction` with
-// verbose data from `domainTransaction`
-func (ctx *Context) PopulateTransactionWithVerboseData(
-	transaction *appmessage.RPCTransaction, domainBlockHeader externalapi.BlockHeader) error {
-
-	domainTransaction, err := appmessage.RPCTransactionToDomainTransaction(transaction)
-	if err != nil {
-		return err
-	}
-
-	transaction.VerboseData = &appmessage.RPCTransactionVerboseData{
-		TransactionID: consensushashing.TransactionID(domainTransaction).String(),
-		Hash:          consensushashing.TransactionHash(domainTransaction).String(),
-		Size:          estimatedsize.TransactionEstimatedSerializedSize(domainTransaction),
-	}
-	if domainBlockHeader != nil {
-		transaction.VerboseData.BlockHash = consensushashing.HeaderHash(domainBlockHeader).String()
-		transaction.VerboseData.BlockTime = uint64(domainBlockHeader.TimeInMilliseconds())
-	}
-	for _, input := range transaction.Inputs {
-		ctx.populateTransactionInputWithVerboseData(input)
-	}
-	for _, output := range transaction.Outputs {
-		err := ctx.populateTransactionOutputWithVerboseData(output)
-		if err != nil {
-			return err
+		if !passesFilter {
+			continue
 		}
+
+		output := &appmessage.TransactionVerboseOutput{}
+		output.Index = uint32(i)
+		output.Value = transactionOutput.Value
+		output.ScriptPubKey = &appmessage.ScriptPubKeyResult{
+			Version: transactionOutput.ScriptPublicKey.Version,
+			Address: encodedAddr,
+			Hex:     hex.EncodeToString(transactionOutput.ScriptPublicKey.Script),
+			Type:    scriptClass.String(),
+		}
+		outputs[i] = output
 	}
-	return nil
-}
-
-func (ctx *Context) populateTransactionInputWithVerboseData(transactionInput *appmessage.RPCTransactionInput) {
-	transactionInput.VerboseData = &appmessage.RPCTransactionInputVerboseData{}
-}
-
-func (ctx *Context) populateTransactionOutputWithVerboseData(transactionOutput *appmessage.RPCTransactionOutput) error {
-	scriptPublicKey, err := hex.DecodeString(transactionOutput.ScriptPublicKey.Script)
-	if err != nil {
-		return err
-	}
-	domainScriptPublicKey := &externalapi.ScriptPublicKey{
-		Script:  scriptPublicKey,
-		Version: transactionOutput.ScriptPublicKey.Version,
-	}
-
-	// Ignore the error here since an error means the script
-	// couldn't be parsed and there's no additional information about
-	// it anyways
-	scriptPublicKeyType, scriptPublicKeyAddress, _ := txscript.ExtractScriptPubKeyAddress(
-		domainScriptPublicKey, ctx.Config.ActiveNetParams)
-
-	var encodedScriptPublicKeyAddress string
-	if scriptPublicKeyAddress != nil {
-		encodedScriptPublicKeyAddress = scriptPublicKeyAddress.EncodeAddress()
-	}
-	transactionOutput.VerboseData = &appmessage.RPCTransactionOutputVerboseData{
-		ScriptPublicKeyType:    scriptPublicKeyType.String(),
-		ScriptPublicKeyAddress: encodedScriptPublicKeyAddress,
-	}
-	return nil
+
+	return outputs
 }

app/rpc/rpchandlers/get_block.go

@@ -26,12 +26,10 @@ func HandleGetBlock(context *rpccontext.Context, _ *router.Router, request appme
 		errorMessage.Error = appmessage.RPCErrorf("Block %s not found", hash)
 		return errorMessage, nil
 	}
-	block := &externalapi.DomainBlock{Header: header}
 
 	response := appmessage.NewGetBlockResponseMessage()
-	response.Block = appmessage.DomainBlockToRPCBlock(block)
 
-	err = context.PopulateBlockWithVerboseData(response.Block, header, nil, getBlockRequest.IncludeTransactionVerboseData)
+	blockVerboseData, err := context.BuildBlockVerboseData(header, nil, getBlockRequest.IncludeTransactionVerboseData)
 	if err != nil {
 		if errors.Is(err, rpccontext.ErrBuildBlockVerboseDataInvalidBlock) {
 			errorMessage := &appmessage.GetBlockResponseMessage{}
@@ -41,5 +39,7 @@ func HandleGetBlock(context *rpccontext.Context, _ *router.Router, request appme
 		return nil, err
 	}
 
+	response.BlockVerboseData = blockVerboseData
+
 	return response, nil
 }

app/rpc/rpchandlers/get_block_template.go

@@ -31,12 +31,12 @@ func HandleGetBlockTemplate(context *rpccontext.Context, _ *router.Router, reque
 	if err != nil {
 		return nil, err
 	}
-	rpcBlock := appmessage.DomainBlockToRPCBlock(templateBlock)
+	msgBlock := appmessage.DomainBlockToMsgBlock(templateBlock)
 
 	isSynced, err := context.ProtocolManager.ShouldMine()
 	if err != nil {
 		return nil, err
 	}
 
-	return appmessage.NewGetBlockTemplateResponseMessage(rpcBlock, isSynced), nil
+	return appmessage.NewGetBlockTemplateResponseMessage(msgBlock, isSynced), nil
 }

app/rpc/rpchandlers/get_blocks.go

@@ -18,8 +18,8 @@ const (
 func HandleGetBlocks(context *rpccontext.Context, _ *router.Router, request appmessage.Message) (appmessage.Message, error) {
 	getBlocksRequest := request.(*appmessage.GetBlocksRequestMessage)
 
-	// Validate that user didn't set IncludeTransactionVerboseData without setting IncludeBlocks
-	if !getBlocksRequest.IncludeBlocks && getBlocksRequest.IncludeTransactionVerboseData {
+	// Validate that user didn't set IncludeTransactionVerboseData without setting IncludeBlockVerboseData
+	if !getBlocksRequest.IncludeBlockVerboseData && getBlocksRequest.IncludeTransactionVerboseData {
 		return &appmessage.GetBlocksResponseMessage{
 			Error: appmessage.RPCErrorf(
 				"If includeTransactionVerboseData is set, then includeBlockVerboseData must be set as well"),
@@ -55,7 +55,8 @@ func HandleGetBlocks(context *rpccontext.Context, _ *router.Router, request appm
 	if err != nil {
 		return nil, err
 	}
-	blockHashes, highHash, err := context.Domain.Consensus().GetHashesBetween(lowHash, virtualSelectedParent, maxBlocksInGetBlocksResponse)
+	blockHashes, err := context.Domain.Consensus().GetHashesBetween(
+		lowHash, virtualSelectedParent, maxBlocksInGetBlocksResponse)
 	if err != nil {
 		return nil, err
 	}
@@ -63,10 +64,9 @@ func HandleGetBlocks(context *rpccontext.Context, _ *router.Router, request appm
 	// prepend low hash to make it inclusive
 	blockHashes = append([]*externalapi.DomainHash{lowHash}, blockHashes...)
 
-	// If the high hash is equal to virtualSelectedParent it means GetHashesBetween didn't skip any hashes, and
-	// there's space to add the virtualSelectedParent's anticone, otherwise you can't add the anticone because
-	// there's no guarantee that all of the anticone root ancestors will be present.
-	if highHash.Equal(virtualSelectedParent) {
+	// If there are no maxBlocksInGetBlocksResponse between lowHash and virtualSelectedParent -
+	// add virtualSelectedParent's anticone
+	if len(blockHashes) < maxBlocksInGetBlocksResponse {
 		virtualSelectedParentAnticone, err := context.Domain.Consensus().Anticone(virtualSelectedParent)
 		if err != nil {
 			return nil, err
@@ -81,23 +81,26 @@ func HandleGetBlocks(context *rpccontext.Context, _ *router.Router, request appm
 	}
 
 	// Prepare the response
-	response := appmessage.NewGetBlocksResponseMessage()
-	response.BlockHashes = hashes.ToStrings(blockHashes)
-	if getBlocksRequest.IncludeBlocks {
-		blocks := make([]*appmessage.RPCBlock, len(blockHashes))
+	response := &appmessage.GetBlocksResponseMessage{
+		BlockHashes: hashes.ToStrings(blockHashes),
+	}
+
+	// Retrieve all block data in case BlockVerboseData was requested
+	if getBlocksRequest.IncludeBlockVerboseData {
+		response.BlockVerboseData = make([]*appmessage.BlockVerboseData, len(blockHashes))
 		for i, blockHash := range blockHashes {
 			blockHeader, err := context.Domain.Consensus().GetBlockHeader(blockHash)
 			if err != nil {
 				return nil, err
 			}
-			block := &externalapi.DomainBlock{Header: blockHeader}
-			blocks[i] = appmessage.DomainBlockToRPCBlock(block)
-			err = context.PopulateBlockWithVerboseData(blocks[i], blockHeader, nil, getBlocksRequest.IncludeTransactionVerboseData)
+			blockVerboseData, err := context.BuildBlockVerboseData(blockHeader, nil,
+				getBlocksRequest.IncludeTransactionVerboseData)
 			if err != nil {
 				return nil, err
 			}
+
+			response.BlockVerboseData[i] = blockVerboseData
 		}
 	}
-
 	return response, nil
 }

app/rpc/rpchandlers/get_blocks_test.go

@@ -5,8 +5,6 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/kaspanet/kaspad/domain/consensus/model"
-
 	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/app/rpc/rpccontext"
 	"github.com/kaspanet/kaspad/app/rpc/rpchandlers"
@@ -29,8 +27,6 @@ func (d fakeDomain) MiningManager() miningmanager.MiningManager { return nil }
 
 func TestHandleGetBlocks(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) {
-		stagingArea := model.NewStagingArea()
-
 		factory := consensus.NewFactory()
 		tc, teardown, err := factory.NewTestConsensus(params, false, "TestHandleGetBlocks")
 		if err != nil {
@@ -59,7 +55,7 @@ func TestHandleGetBlocks(t *testing.T) {
 			antipast := make([]*externalapi.DomainHash, 0, len(slice))
 
 			for _, blockHash := range slice {
-				isInPastOfPovBlock, err := tc.DAGTopologyManager().IsAncestorOf(stagingArea, blockHash, povBlock)
+				isInPastOfPovBlock, err := tc.DAGTopologyManager().IsAncestorOf(blockHash, povBlock)
 				if err != nil {
 					t.Fatalf("Failed doing reachability check: '%v'", err)
 				}
@@ -91,7 +87,7 @@ func TestHandleGetBlocks(t *testing.T) {
 				}
 				splitBlocks = append(splitBlocks, blockHash)
 			}
-			sort.Sort(sort.Reverse(testutils.NewTestGhostDAGSorter(stagingArea, splitBlocks, tc, t)))
+			sort.Sort(sort.Reverse(testutils.NewTestGhostDAGSorter(splitBlocks, tc, t)))
 			restOfSplitBlocks, selectedParent := splitBlocks[:len(splitBlocks)-1], splitBlocks[len(splitBlocks)-1]
 			expectedOrder = append(expectedOrder, selectedParent)
 			expectedOrder = append(expectedOrder, restOfSplitBlocks...)

app/rpc/rpchandlers/get_info.go

@@ -8,10 +8,6 @@ import (
 
 // HandleGetInfo handles the respectively named RPC command
 func HandleGetInfo(context *rpccontext.Context, _ *router.Router, _ appmessage.Message) (appmessage.Message, error) {
-	response := appmessage.NewGetInfoResponseMessage(
-		context.NetAdapter.ID().String(),
-		uint64(context.Domain.MiningManager().TransactionCount()),
-	)
-
+	response := appmessage.NewGetInfoResponseMessage(context.NetAdapter.ID().String())
 	return response, nil
 }

app/rpc/rpchandlers/get_mempool_entries.go

@@ -3,22 +3,25 @@ package rpchandlers
 import (
 	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/app/rpc/rpccontext"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
 	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 )
 
 // HandleGetMempoolEntries handles the respectively named RPC command
 func HandleGetMempoolEntries(context *rpccontext.Context, _ *router.Router, _ appmessage.Message) (appmessage.Message, error) {
+
 	transactions := context.Domain.MiningManager().AllTransactions()
 	entries := make([]*appmessage.MempoolEntry, 0, len(transactions))
-	for _, transaction := range transactions {
-		rpcTransaction := appmessage.DomainTransactionToRPCTransaction(transaction)
-		err := context.PopulateTransactionWithVerboseData(rpcTransaction, nil)
+	for _, tx := range transactions {
+		transactionVerboseData, err := context.BuildTransactionVerboseData(
+			tx, consensushashing.TransactionID(tx).String(), nil, "")
 		if err != nil {
 			return nil, err
 		}
+
 		entries = append(entries, &appmessage.MempoolEntry{
-			Fee:         transaction.Fee,
-			Transaction: rpcTransaction,
+			Fee:                    tx.Fee,
+			TransactionVerboseData: transactionVerboseData,
 		})
 	}
 

app/rpc/rpchandlers/get_mempool_entry.go

@@ -24,11 +24,12 @@ func HandleGetMempoolEntry(context *rpccontext.Context, _ *router.Router, reques
 		errorMessage.Error = appmessage.RPCErrorf("Transaction %s was not found", transactionID)
 		return errorMessage, nil
 	}
-	rpcTransaction := appmessage.DomainTransactionToRPCTransaction(transaction)
-	err = context.PopulateTransactionWithVerboseData(rpcTransaction, nil)
+
+	transactionVerboseData, err := context.BuildTransactionVerboseData(
+		transaction, getMempoolEntryRequest.TxID, nil, "")
 	if err != nil {
 		return nil, err
 	}
 
-	return appmessage.NewGetMempoolEntryResponseMessage(transaction.Fee, rpcTransaction), nil
+	return appmessage.NewGetMempoolEntryResponseMessage(transaction.Fee, transactionVerboseData), nil
 }

app/rpc/rpchandlers/submit_block.go

@@ -14,6 +14,9 @@ import (
 func HandleSubmitBlock(context *rpccontext.Context, _ *router.Router, request appmessage.Message) (appmessage.Message, error) {
 	submitBlockRequest := request.(*appmessage.SubmitBlockRequestMessage)
 
+	msgBlock := submitBlockRequest.Block
+	domainBlock := appmessage.MsgBlockToDomainBlock(msgBlock)
+
 	if context.ProtocolManager.IsIBDRunning() {
 		return &appmessage.SubmitBlockResponseMessage{
 			Error:        appmessage.RPCErrorf("Block not submitted - IBD is running"),
@@ -21,15 +24,7 @@ func HandleSubmitBlock(context *rpccontext.Context, _ *router.Router, request ap
 		}, nil
 	}
 
-	domainBlock, err := appmessage.RPCBlockToDomainBlock(submitBlockRequest.Block)
-	if err != nil {
-		return &appmessage.SubmitBlockResponseMessage{
-			Error:        appmessage.RPCErrorf("Could not parse block: %s", err),
-			RejectReason: appmessage.RejectReasonBlockInvalid,
-		}, nil
-	}
-
-	err = context.ProtocolManager.AddBlock(domainBlock)
+	err := context.ProtocolManager.AddBlock(domainBlock)
 	if err != nil {
 		isProtocolOrRuleError := errors.As(err, &ruleerrors.RuleError{}) || errors.As(err, &protocolerrors.ProtocolError{})
 		if !isProtocolOrRuleError {

app/rpc/rpchandlers/unban.go

@@ -16,7 +16,7 @@ func HandleUnban(context *rpccontext.Context, _ *router.Router, request appmessa
 		errorMessage.Error = appmessage.RPCErrorf("Could not parse IP %s", unbanRequest.IP)
 		return errorMessage, nil
 	}
-	err := context.AddressManager.Unban(appmessage.NewNetAddressIPPort(ip, 0))
+	err := context.AddressManager.Unban(appmessage.NewNetAddressIPPort(ip, 0, 0))
 	if err != nil {
 		errorMessage := &appmessage.UnbanResponseMessage{}
 		errorMessage.Error = appmessage.RPCErrorf("Could not unban IP: %s", err)

changelog.txt

@@ -1,11 +1,31 @@
+
+Kaspad v0.9.0 - 2021-03-04
+===========================
+
+* Merge big subdags in pick virtual parents (#1574)
+* Write in the reject message the tx rejection reason (#1573)
+* Add nil checks for protowire (#1570)
+* Increase getBlocks limit to 1000 (#1572)
+* Return RPC error if getBlock's lowHash doesn't exist (#1569)
+* Add default dns-seeder to testnet (#1568)
+* Fix utxoindex deserialization (#1566)
+* Add pruning point hash to GetBlockDagInfo response (#1565)
+* Use EmitUnpopulated so that kaspactl prints all fields, even the default ones (#1561)
+* Stop logging an error whenever an RPC/P2P connection is canceled  (#1562)
+* Cleanup the logger and make it asynchronous (#1524)
+* Close all iterators (#1542)
+* Add childrenHashes to GetBlock/s RPC commands (#1560)
+* Add ScriptPublicKey.Version to RPC (#1559)
+* Fix the target block rate to create less bursty mining (#1554)
+
 Kaspad v0.8.10 - 2021-02-25
 ===========================
 
-[*] Fix bug where invalid mempool transactions were not removed (#1551)
-[*] Add RPC reconnection to the miner (#1552)
-[*] Remove virtual diff parents - only selectedTip is virtualDiffParent now (#1550)
-[*] Fix UTXO index (#1548)
-[*] Prevent fast failing (#1545)
-[*] Increase the sleep time in kaspaminer when the node is not synced (#1544)
-[*] Disallow header only blocks on RPC, relay and when requesting IBD full blocks (#1537)
-[*] Make templateManager hold a DomainBlock and isSynced bool instead of a GetBlockTemplateResponseMessage (#1538)
+* Fix bug where invalid mempool transactions were not removed (#1551)
+* Add RPC reconnection to the miner (#1552)
+* Remove virtual diff parents - only selectedTip is virtualDiffParent now (#1550)
+* Fix UTXO index (#1548)
+* Prevent fast failing (#1545)
+* Increase the sleep time in kaspaminer when the node is not synced (#1544)
+* Disallow header only blocks on RPC, relay and when requesting IBD full blocks (#1537)
+* Make templateManager hold a DomainBlock and isSynced bool instead of a GetBlockTemplateResponseMessage (#1538)

cmd/genkeypair/README.md

@@ -1,9 +0,0 @@
-genkeypair
-========
-
-A tool for generating private-key-address pairs.
-
-Note: This tool prints unencrypted private keys and is not recommended for day
-to day use, and is intended mainly for tests.
-
-In order to manage your funds it's recommended to use [kaspawallet](../kaspawallet)

cmd/genkeypair/config.go

@@ -1,26 +0,0 @@
-package main
-
-import (
-	"github.com/jessevdk/go-flags"
-	"github.com/kaspanet/kaspad/infrastructure/config"
-)
-
-type configFlags struct {
-	config.NetworkFlags
-}
-
-func parseConfig() (*configFlags, error) {
-	cfg := &configFlags{}
-	parser := flags.NewParser(cfg, flags.PrintErrors|flags.HelpFlag)
-	_, err := parser.Parse()
-	if err != nil {
-		return nil, err
-	}
-
-	err = cfg.ResolveNetwork(parser)
-	if err != nil {
-		return nil, err
-	}
-
-	return cfg, nil
-}

cmd/genkeypair/main.go

@@ -1,27 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
-	"github.com/kaspanet/kaspad/util"
-)
-
-func main() {
-	cfg, err := parseConfig()
-	if err != nil {
-		panic(err)
-	}
-
-	privateKey, publicKey, err := libkaspawallet.CreateKeyPair(false)
-	if err != nil {
-		panic(err)
-	}
-
-	addr, err := util.NewAddressPublicKey(publicKey, cfg.NetParams().Prefix)
-	if err != nil {
-		panic(err)
-	}
-
-	fmt.Printf("Private key: %x\n", privateKey)
-	fmt.Printf("Address: %s\n", addr)
-}

cmd/kaspaminer/client.go

@@ -5,32 +5,72 @@ import (
 	"github.com/kaspanet/kaspad/infrastructure/logger"
 	"github.com/kaspanet/kaspad/infrastructure/network/rpcclient"
 	"github.com/pkg/errors"
+	"sync"
+	"sync/atomic"
 	"time"
 )
 
 const minerTimeout = 10 * time.Second
 
 type minerClient struct {
-	*rpcclient.RPCClient
+	isReconnecting uint32
+	clientLock     sync.RWMutex
+	rpcClient      *rpcclient.RPCClient
 
 	cfg                        *configFlags
 	blockAddedNotificationChan chan struct{}
 }
 
+func (mc *minerClient) safeRPCClient() *rpcclient.RPCClient {
+	mc.clientLock.RLock()
+	defer mc.clientLock.RUnlock()
+	return mc.rpcClient
+}
+
+func (mc *minerClient) reconnect() {
+	swapped := atomic.CompareAndSwapUint32(&mc.isReconnecting, 0, 1)
+	if !swapped {
+		return
+	}
+
+	defer atomic.StoreUint32(&mc.isReconnecting, 0)
+
+	mc.clientLock.Lock()
+	defer mc.clientLock.Unlock()
+
+	retryDuration := time.Second
+	const maxRetryDuration = time.Minute
+	log.Infof("Reconnecting RPC connection")
+	for {
+		err := mc.connect()
+		if err == nil {
+			return
+		}
+
+		if retryDuration < time.Minute {
+			retryDuration *= 2
+		} else {
+			retryDuration = maxRetryDuration
+		}
+
+		log.Errorf("Got error '%s' while reconnecting. Trying again in %s", err, retryDuration)
+		time.Sleep(retryDuration)
+	}
+}
+
 func (mc *minerClient) connect() error {
 	rpcAddress, err := mc.cfg.NetParams().NormalizeRPCServerAddress(mc.cfg.RPCServer)
 	if err != nil {
 		return err
 	}
-	rpcClient, err := rpcclient.NewRPCClient(rpcAddress)
+	mc.rpcClient, err = rpcclient.NewRPCClient(rpcAddress)
 	if err != nil {
 		return err
 	}
-	mc.RPCClient = rpcClient
-	mc.SetTimeout(minerTimeout)
-	mc.SetLogger(backendLog, logger.LevelTrace)
+	mc.rpcClient.SetTimeout(minerTimeout)
+	mc.rpcClient.SetLogger(backendLog, logger.LevelTrace)
 
-	err = mc.RegisterForBlockAddedNotifications(func(_ *appmessage.BlockAddedNotificationMessage) {
+	err = mc.rpcClient.RegisterForBlockAddedNotifications(func(_ *appmessage.BlockAddedNotificationMessage) {
 		select {
 		case mc.blockAddedNotificationChan <- struct{}{}:
 		default:

cmd/kaspaminer/config.go

@@ -24,9 +24,9 @@ const (
 
 var (
 	// Default configuration options
-	defaultAppDir     = util.AppDir("kaspaminer", false)
-	defaultLogFile    = filepath.Join(defaultAppDir, defaultLogFilename)
-	defaultErrLogFile = filepath.Join(defaultAppDir, defaultErrLogFilename)
+	defaultHomeDir    = util.AppDataDir("kaspaminer", false)
+	defaultLogFile    = filepath.Join(defaultHomeDir, defaultLogFilename)
+	defaultErrLogFile = filepath.Join(defaultHomeDir, defaultErrLogFilename)
 	defaultRPCServer  = "localhost"
 )
 

cmd/kaspaminer/main.go

@@ -40,7 +40,7 @@ func main() {
 	if err != nil {
 		panic(errors.Wrap(err, "error connecting to the RPC server"))
 	}
-	defer client.Disconnect()
+	defer client.safeRPCClient().Disconnect()
 
 	miningAddr, err := util.DecodeAddress(cfg.MiningAddr, cfg.ActiveNetParams.Prefix)
 	if err != nil {

cmd/kaspaminer/mineloop.go

@@ -44,32 +44,34 @@ func mineLoop(client *minerClient, numberOfBlocks uint64, targetBlocksPerSecond
 
 	spawn("blocksLoop", func() {
 		const windowSize = 10
+		var expectedDurationForWindow time.Duration
+		var windowExpectedEndTime time.Time
 		hasBlockRateTarget := targetBlocksPerSecond != 0
-		var windowTicker, blockTicker *time.Ticker
-		// We use tickers to limit the block rate:
-		// 1. windowTicker -> makes sure that the last windowSize blocks take at least windowSize*targetBlocksPerSecond.
-		// 2. blockTicker -> makes sure that each block takes at least targetBlocksPerSecond/windowSize.
-		// that way we both allow for fluctuation in block rate but also make sure they're not too big (by an order of magnitude)
 		if hasBlockRateTarget {
-			windowRate := time.Duration(float64(time.Second) / (targetBlocksPerSecond / windowSize))
-			blockRate := time.Duration(float64(time.Second) / (targetBlocksPerSecond * windowSize))
-			log.Infof("Minimum average time per %d blocks: %s, smaller minimum time per block: %s", windowSize, windowRate, blockRate)
-			windowTicker = time.NewTicker(windowRate)
-			blockTicker = time.NewTicker(blockRate)
-			defer windowTicker.Stop()
-			defer blockTicker.Stop()
+			expectedDurationForWindow = time.Duration(float64(windowSize)/targetBlocksPerSecond) * time.Second
+			windowExpectedEndTime = time.Now().Add(expectedDurationForWindow)
 		}
-		windowStart := time.Now()
-		for blockIndex := 1; ; blockIndex++ {
+		blockInWindowIndex := 0
+
+		sleepTime := 0 * time.Second
+
+		for {
 			foundBlockChan <- mineNextBlock(mineWhenNotSynced)
+
 			if hasBlockRateTarget {
-				<-blockTicker.C
-				if (blockIndex % windowSize) == 0 {
-					tickerStart := time.Now()
-					<-windowTicker.C
-					log.Infof("Finished mining %d blocks in: %s. slept for: %s", windowSize, time.Since(windowStart), time.Since(tickerStart))
-					windowStart = time.Now()
+				blockInWindowIndex++
+				if blockInWindowIndex == windowSize-1 {
+					deviation := windowExpectedEndTime.Sub(time.Now())
+					if deviation > 0 {
+						sleepTime = deviation / windowSize
+						log.Infof("Finished to mine %d blocks %s earlier than expected. Setting the miner "+
+							"to sleep %s between blocks to compensate",
+							windowSize, deviation, sleepTime)
+					}
+					blockInWindowIndex = 0
+					windowExpectedEndTime = time.Now().Add(expectedDurationForWindow)
 				}
+				time.Sleep(sleepTime)
 			}
 		}
 	})
@@ -114,17 +116,13 @@ func logHashRate() {
 
 func handleFoundBlock(client *minerClient, block *externalapi.DomainBlock) error {
 	blockHash := consensushashing.BlockHash(block)
-	log.Infof("Submitting block %s to %s", blockHash, client.Address())
+	log.Infof("Submitting block %s to %s", blockHash, client.safeRPCClient().Address())
 
-	rejectReason, err := client.SubmitBlock(block)
+	rejectReason, err := client.safeRPCClient().SubmitBlock(block)
 	if err != nil {
 		if nativeerrors.Is(err, router.ErrTimeout) {
-			log.Warnf("Got timeout while submitting block %s to %s: %s", blockHash, client.Address(), err)
-			return client.Reconnect()
-		}
-		if nativeerrors.Is(err, router.ErrRouteClosed) {
-			log.Debugf("Got route is closed while requesting block template from %s. "+
-				"The client is most likely reconnecting", client.Address())
+			log.Warnf("Got timeout while submitting block %s to %s: %s", blockHash, client.safeRPCClient().Address(), err)
+			client.reconnect()
 			return nil
 		}
 		if rejectReason == appmessage.RejectReasonIsInIBD {
@@ -133,7 +131,7 @@ func handleFoundBlock(client *minerClient, block *externalapi.DomainBlock) error
 			time.Sleep(waitTime)
 			return nil
 		}
-		return errors.Wrapf(err, "Error submitting block %s to %s", blockHash, client.Address())
+		return errors.Wrapf(err, "Error submitting block %s to %s", blockHash, client.safeRPCClient().Address())
 	}
 	return nil
 }
@@ -192,29 +190,17 @@ func getBlockForMining(mineWhenNotSynced bool) *externalapi.DomainBlock {
 
 func templatesLoop(client *minerClient, miningAddr util.Address, errChan chan error) {
 	getBlockTemplate := func() {
-		template, err := client.GetBlockTemplate(miningAddr.String())
+		template, err := client.safeRPCClient().GetBlockTemplate(miningAddr.String())
 		if nativeerrors.Is(err, router.ErrTimeout) {
-			log.Warnf("Got timeout while requesting block template from %s: %s", client.Address(), err)
-			reconnectErr := client.Reconnect()
-			if reconnectErr != nil {
-				errChan <- reconnectErr
-			}
-			return
-		}
-		if nativeerrors.Is(err, router.ErrRouteClosed) {
-			log.Debugf("Got route is closed while requesting block template from %s. "+
-				"The client is most likely reconnecting", client.Address())
+			log.Warnf("Got timeout while requesting block template from %s: %s", client.safeRPCClient().Address(), err)
+			client.reconnect()
 			return
 		}
 		if err != nil {
-			errChan <- errors.Wrapf(err, "Error getting block template from %s", client.Address())
-			return
-		}
-		err = templatemanager.Set(template)
-		if err != nil {
-			errChan <- errors.Wrapf(err, "Error setting block template from %s", client.Address())
+			errChan <- errors.Wrapf(err, "Error getting block template from %s", client.safeRPCClient().Address())
 			return
 		}
+		templatemanager.Set(template)
 	}
 
 	getBlockTemplate()

cmd/kaspaminer/templatemanager/templatemanager.go

@@ -23,14 +23,10 @@ func Get() (*externalapi.DomainBlock, bool) {
 }
 
 // Set sets the current template to work on
-func Set(template *appmessage.GetBlockTemplateResponseMessage) error {
-	block, err := appmessage.RPCBlockToDomainBlock(template.Block)
-	if err != nil {
-		return err
-	}
+func Set(template *appmessage.GetBlockTemplateResponseMessage) {
+	block := appmessage.MsgBlockToDomainBlock(template.MsgBlock)
 	lock.Lock()
 	defer lock.Unlock()
 	currentTemplate = block
 	isSynced = template.IsSynced
-	return nil
 }

cmd/kaspawallet/broadcast.go

@@ -1,34 +0,0 @@
-package main
-
-import (
-	"encoding/hex"
-	"fmt"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
-)
-
-func broadcast(conf *broadcastConfig) error {
-	client, err := connectToRPC(conf.NetParams(), conf.RPCServer)
-	if err != nil {
-		return err
-	}
-
-	psTxBytes, err := hex.DecodeString(conf.Transaction)
-	if err != nil {
-		return err
-	}
-
-	tx, err := libkaspawallet.ExtractTransaction(psTxBytes)
-	if err != nil {
-		return err
-	}
-
-	transactionID, err := sendTransaction(client, tx)
-	if err != nil {
-		return err
-	}
-
-	fmt.Println("Transaction was sent successfully")
-	fmt.Printf("Transaction ID: \t%s\n", transactionID)
-
-	return nil
-}

cmd/kaspawallet/common.go

@@ -1,32 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/domain/dagconfig"
-	"github.com/kaspanet/kaspad/infrastructure/network/rpcclient"
-	"os"
-)
-
-func isUTXOSpendable(entry *appmessage.UTXOsByAddressesEntry, virtualSelectedParentBlueScore uint64, coinbaseMaturity uint64) bool {
-	if !entry.UTXOEntry.IsCoinbase {
-		return true
-	}
-	blockBlueScore := entry.UTXOEntry.BlockDAAScore
-	// TODO: Check for a better alternative than virtualSelectedParentBlueScore
-	return blockBlueScore+coinbaseMaturity < virtualSelectedParentBlueScore
-}
-
-func printErrorAndExit(err error) {
-	fmt.Fprintf(os.Stderr, "%s\n", err)
-	os.Exit(1)
-}
-
-func connectToRPC(params *dagconfig.Params, rpcServer string) (*rpcclient.RPCClient, error) {
-	rpcAddress, err := params.NormalizeRPCServerAddress(rpcServer)
-	if err != nil {
-		return nil, err
-	}
-
-	return rpcclient.NewRPCClient(rpcAddress)
-}

cmd/kaspawallet/config.go

@@ -1,198 +0,0 @@
-package main
-
-import (
-	"github.com/kaspanet/kaspad/infrastructure/config"
-	"github.com/pkg/errors"
-	"os"
-
-	"github.com/jessevdk/go-flags"
-)
-
-const (
-	createSubCmd                    = "create"
-	balanceSubCmd                   = "balance"
-	sendSubCmd                      = "send"
-	createUnsignedTransactionSubCmd = "create-unsigned-transaction"
-	signSubCmd                      = "sign"
-	broadcastSubCmd                 = "broadcast"
-	showAddressSubCmd               = "show-address"
-	dumpUnencryptedDataSubCmd       = "dump-unencrypted-data"
-)
-
-type configFlags struct {
-	config.NetworkFlags
-}
-
-type createConfig struct {
-	KeysFile          string `long:"keys-file" short:"f" description:"Keys file location (default: ~/.kaspawallet/keys.json (*nix), %USERPROFILE%\\AppData\\Local\\Kaspawallet\\key.json (Windows))"`
-	MinimumSignatures uint32 `long:"min-signatures" short:"m" description:"Minimum required signatures" default:"1"`
-	NumPrivateKeys    uint32 `long:"num-private-keys" short:"k" description:"Number of private keys" default:"1"`
-	NumPublicKeys     uint32 `long:"num-public-keys" short:"n" description:"Total number of keys" default:"1"`
-	ECDSA             bool   `long:"ecdsa" description:"Create an ECDSA wallet"`
-	Import            bool   `long:"import" short:"i" description:"Import private keys (as opposed to generating them)"`
-	config.NetworkFlags
-}
-
-type balanceConfig struct {
-	KeysFile  string `long:"keys-file" short:"f" description:"Keys file location (default: ~/.kaspawallet/keys.json (*nix), %USERPROFILE%\\AppData\\Local\\Kaspawallet\\key.json (Windows))"`
-	RPCServer string `long:"rpcserver" short:"s" description:"RPC server to connect to"`
-	config.NetworkFlags
-}
-
-type sendConfig struct {
-	KeysFile   string  `long:"keys-file" short:"f" description:"Keys file location (default: ~/.kaspawallet/keys.json (*nix), %USERPROFILE%\\AppData\\Local\\Kaspawallet\\key.json (Windows))"`
-	RPCServer  string  `long:"rpcserver" short:"s" description:"RPC server to connect to"`
-	ToAddress  string  `long:"to-address" short:"t" description:"The public address to send Kaspa to" required:"true"`
-	SendAmount float64 `long:"send-amount" short:"v" description:"An amount to send in Kaspa (e.g. 1234.12345678)" required:"true"`
-	config.NetworkFlags
-}
-
-type createUnsignedTransactionConfig struct {
-	KeysFile   string  `long:"keys-file" short:"f" description:"Keys file location (default: ~/.kaspawallet/keys.json (*nix), %USERPROFILE%\\AppData\\Local\\Kaspawallet\\key.json (Windows))"`
-	RPCServer  string  `long:"rpcserver" short:"s" description:"RPC server to connect to"`
-	ToAddress  string  `long:"to-address" short:"t" description:"The public address to send Kaspa to" required:"true"`
-	SendAmount float64 `long:"send-amount" short:"v" description:"An amount to send in Kaspa (e.g. 1234.12345678)" required:"true"`
-	config.NetworkFlags
-}
-
-type signConfig struct {
-	KeysFile    string `long:"keys-file" short:"f" description:"Keys file location (default: ~/.kaspawallet/keys.json (*nix), %USERPROFILE%\\AppData\\Local\\Kaspawallet\\key.json (Windows))"`
-	Transaction string `long:"transaction" short:"t" description:"The unsigned transaction to sign on (encoded in hex)" required:"true"`
-	config.NetworkFlags
-}
-
-type broadcastConfig struct {
-	RPCServer   string `long:"rpcserver" short:"s" description:"RPC server to connect to"`
-	Transaction string `long:"transaction" short:"t" description:"The signed transaction to broadcast (encoded in hex)" required:"true"`
-	config.NetworkFlags
-}
-
-type showAddressConfig struct {
-	KeysFile string `long:"keys-file" short:"f" description:"Keys file location (default: ~/.kaspawallet/keys.json (*nix), %USERPROFILE%\\AppData\\Local\\Kaspawallet\\key.json (Windows))"`
-	config.NetworkFlags
-}
-
-type dumpUnencryptedDataConfig struct {
-	KeysFile string `long:"keys-file" short:"f" description:"Keys file location (default: ~/.kaspawallet/keys.json (*nix), %USERPROFILE%\\AppData\\Local\\Kaspawallet\\key.json (Windows))"`
-	config.NetworkFlags
-}
-
-func parseCommandLine() (subCommand string, config interface{}) {
-	cfg := &configFlags{}
-	parser := flags.NewParser(cfg, flags.PrintErrors|flags.HelpFlag)
-
-	createConf := &createConfig{}
-	parser.AddCommand(createSubCmd, "Creates a new wallet",
-		"Creates a private key and 3 public addresses, one for each of MainNet, TestNet and DevNet", createConf)
-
-	balanceConf := &balanceConfig{}
-	parser.AddCommand(balanceSubCmd, "Shows the balance of a public address",
-		"Shows the balance for a public address in Kaspa", balanceConf)
-
-	sendConf := &sendConfig{}
-	parser.AddCommand(sendSubCmd, "Sends a Kaspa transaction to a public address",
-		"Sends a Kaspa transaction to a public address", sendConf)
-
-	createUnsignedTransactionConf := &createUnsignedTransactionConfig{}
-	parser.AddCommand(createUnsignedTransactionSubCmd, "Create an unsigned Kaspa transaction",
-		"Create an unsigned Kaspa transaction", createUnsignedTransactionConf)
-
-	signConf := &signConfig{}
-	parser.AddCommand(signSubCmd, "Sign the given partially signed transaction",
-		"Sign the given partially signed transaction", signConf)
-
-	broadcastConf := &broadcastConfig{}
-	parser.AddCommand(broadcastSubCmd, "Broadcast the given transaction",
-		"Broadcast the given transaction", broadcastConf)
-
-	showAddressConf := &showAddressConfig{}
-	parser.AddCommand(showAddressSubCmd, "Shows the public address of the current wallet",
-		"Shows the public address of the current wallet", showAddressConf)
-
-	dumpUnencryptedDataConf := &dumpUnencryptedDataConfig{}
-	parser.AddCommand(dumpUnencryptedDataSubCmd, "Prints the unencrypted wallet data",
-		"Prints the unencrypted wallet data including its private keys. Anyone that sees it can access "+
-			"the funds. Use only on safe environment.", dumpUnencryptedDataConf)
-
-	_, err := parser.Parse()
-
-	if err != nil {
-		var flagsErr *flags.Error
-		if ok := errors.As(err, &flagsErr); ok && flagsErr.Type == flags.ErrHelp {
-			os.Exit(0)
-		} else {
-			os.Exit(1)
-		}
-		return "", nil
-	}
-
-	switch parser.Command.Active.Name {
-	case createSubCmd:
-		combineNetworkFlags(&createConf.NetworkFlags, &cfg.NetworkFlags)
-		err := createConf.ResolveNetwork(parser)
-		if err != nil {
-			printErrorAndExit(err)
-		}
-		config = createConf
-	case balanceSubCmd:
-		combineNetworkFlags(&balanceConf.NetworkFlags, &cfg.NetworkFlags)
-		err := balanceConf.ResolveNetwork(parser)
-		if err != nil {
-			printErrorAndExit(err)
-		}
-		config = balanceConf
-	case sendSubCmd:
-		combineNetworkFlags(&sendConf.NetworkFlags, &cfg.NetworkFlags)
-		err := sendConf.ResolveNetwork(parser)
-		if err != nil {
-			printErrorAndExit(err)
-		}
-		config = sendConf
-	case createUnsignedTransactionSubCmd:
-		combineNetworkFlags(&createUnsignedTransactionConf.NetworkFlags, &cfg.NetworkFlags)
-		err := createUnsignedTransactionConf.ResolveNetwork(parser)
-		if err != nil {
-			printErrorAndExit(err)
-		}
-		config = createUnsignedTransactionConf
-	case signSubCmd:
-		combineNetworkFlags(&signConf.NetworkFlags, &cfg.NetworkFlags)
-		err := signConf.ResolveNetwork(parser)
-		if err != nil {
-			printErrorAndExit(err)
-		}
-		config = signConf
-	case broadcastSubCmd:
-		combineNetworkFlags(&broadcastConf.NetworkFlags, &cfg.NetworkFlags)
-		err := broadcastConf.ResolveNetwork(parser)
-		if err != nil {
-			printErrorAndExit(err)
-		}
-		config = broadcastConf
-	case showAddressSubCmd:
-		combineNetworkFlags(&showAddressConf.NetworkFlags, &cfg.NetworkFlags)
-		err := showAddressConf.ResolveNetwork(parser)
-		if err != nil {
-			printErrorAndExit(err)
-		}
-		config = showAddressConf
-	case dumpUnencryptedDataSubCmd:
-		combineNetworkFlags(&dumpUnencryptedDataConf.NetworkFlags, &cfg.NetworkFlags)
-		err := dumpUnencryptedDataConf.ResolveNetwork(parser)
-		if err != nil {
-			printErrorAndExit(err)
-		}
-		config = dumpUnencryptedDataConf
-	}
-
-	return parser.Command.Active.Name, config
-}
-
-func combineNetworkFlags(dst, src *config.NetworkFlags) {
-	dst.Testnet = dst.Testnet || src.Testnet
-	dst.Simnet = dst.Simnet || src.Simnet
-	dst.Devnet = dst.Devnet || src.Devnet
-	if dst.OverrideDAGParamsFile == "" {
-		dst.OverrideDAGParamsFile = src.OverrideDAGParamsFile
-	}
-}

cmd/kaspawallet/create.go

@@ -1,69 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"encoding/hex"
-	"fmt"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/keys"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
-	"github.com/pkg/errors"
-	"os"
-)
-
-func create(conf *createConfig) error {
-	var encryptedPrivateKeys []*keys.EncryptedPrivateKey
-	var publicKeys [][]byte
-	var err error
-	if !conf.Import {
-		encryptedPrivateKeys, publicKeys, err = keys.CreateKeyPairs(conf.NumPrivateKeys, conf.ECDSA)
-	} else {
-		encryptedPrivateKeys, publicKeys, err = keys.ImportKeyPairs(conf.NumPrivateKeys)
-	}
-	if err != nil {
-		return err
-	}
-
-	for i, publicKey := range publicKeys {
-		fmt.Printf("Public key of private key #%d:\n%x\n\n", i+1, publicKey)
-	}
-
-	reader := bufio.NewReader(os.Stdin)
-	for i := conf.NumPrivateKeys; i < conf.NumPublicKeys; i++ {
-		fmt.Printf("Enter public key #%d here:\n", i+1)
-		line, isPrefix, err := reader.ReadLine()
-		if err != nil {
-			return err
-		}
-
-		fmt.Println()
-
-		if isPrefix {
-			return errors.Errorf("Public key is too long")
-		}
-
-		publicKey, err := hex.DecodeString(string(line))
-		if err != nil {
-			return err
-		}
-
-		publicKeys = append(publicKeys, publicKey)
-	}
-
-	err = keys.WriteKeysFile(conf.KeysFile, encryptedPrivateKeys, publicKeys, conf.MinimumSignatures, conf.ECDSA)
-	if err != nil {
-		return err
-	}
-
-	keysFile, err := keys.ReadKeysFile(conf.KeysFile)
-	if err != nil {
-		return err
-	}
-
-	addr, err := libkaspawallet.Address(conf.NetParams(), keysFile.PublicKeys, keysFile.MinimumSignatures, keysFile.ECDSA)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("The wallet address is:\n%s\n", addr)
-	return nil
-}

cmd/kaspawallet/create_unsigned_tx.go

@@ -1,61 +0,0 @@
-package main
-
-import (
-	"encoding/hex"
-	"fmt"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/keys"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
-	"github.com/kaspanet/kaspad/util"
-)
-
-func createUnsignedTransaction(conf *createUnsignedTransactionConfig) error {
-	keysFile, err := keys.ReadKeysFile(conf.KeysFile)
-	if err != nil {
-		return err
-	}
-
-	toAddress, err := util.DecodeAddress(conf.ToAddress, conf.NetParams().Prefix)
-	if err != nil {
-		return err
-	}
-
-	fromAddress, err := libkaspawallet.Address(conf.NetParams(), keysFile.PublicKeys, keysFile.MinimumSignatures, keysFile.ECDSA)
-	if err != nil {
-		return err
-	}
-
-	client, err := connectToRPC(conf.NetParams(), conf.RPCServer)
-	if err != nil {
-		return err
-	}
-	utxos, err := fetchSpendableUTXOs(conf.NetParams(), client, fromAddress.String())
-	if err != nil {
-		return err
-	}
-
-	sendAmountSompi := uint64(conf.SendAmount * util.SompiPerKaspa)
-
-	const feePerInput = 1000
-	selectedUTXOs, changeSompi, err := selectUTXOs(utxos, sendAmountSompi, feePerInput)
-	if err != nil {
-		return err
-	}
-
-	psTx, err := libkaspawallet.CreateUnsignedTransaction(keysFile.PublicKeys,
-		keysFile.MinimumSignatures,
-		keysFile.ECDSA,
-		[]*libkaspawallet.Payment{{
-			Address: toAddress,
-			Amount:  sendAmountSompi,
-		}, {
-			Address: fromAddress,
-			Amount:  changeSompi,
-		}}, selectedUTXOs)
-	if err != nil {
-		return err
-	}
-
-	fmt.Println("Created unsigned transaction")
-	fmt.Println(hex.EncodeToString(psTx))
-	return nil
-}

cmd/kaspawallet/dump_unencrypted_data.go

@@ -1,69 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/keys"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
-	"github.com/pkg/errors"
-	"os"
-)
-
-func dumpUnencryptedData(conf *dumpUnencryptedDataConfig) error {
-	err := confirmDump()
-	if err != nil {
-		return err
-	}
-
-	keysFile, err := keys.ReadKeysFile(conf.KeysFile)
-	if err != nil {
-		return err
-	}
-
-	privateKeys, err := keysFile.DecryptPrivateKeys()
-	if err != nil {
-		return err
-	}
-
-	privateKeysPublicKeys := make(map[string]struct{})
-	for i, privateKey := range privateKeys {
-		fmt.Printf("Private key #%d:\n%x\n\n", i+1, privateKey)
-		publicKey, err := libkaspawallet.PublicKeyFromPrivateKey(privateKey)
-		if err != nil {
-			return err
-		}
-
-		privateKeysPublicKeys[string(publicKey)] = struct{}{}
-	}
-
-	i := 1
-	for _, publicKey := range keysFile.PublicKeys {
-		if _, exists := privateKeysPublicKeys[string(publicKey)]; exists {
-			continue
-		}
-
-		fmt.Printf("Public key #%d:\n%x\n\n", i, publicKey)
-		i++
-	}
-
-	fmt.Printf("Minimum number of signatures: %d\n", keysFile.MinimumSignatures)
-	return nil
-}
-
-func confirmDump() error {
-	reader := bufio.NewReader(os.Stdin)
-	fmt.Printf("This operation will print your unencrypted keys on the screen. Anyone that sees this information " +
-		"will be able to steal your funds. Are you sure you want to proceed (y/N)? ")
-	line, isPrefix, err := reader.ReadLine()
-	if err != nil {
-		return err
-	}
-
-	fmt.Println()
-
-	if isPrefix || string(line) != "y" {
-		return errors.Errorf("Dump aborted by user")
-	}
-
-	return nil
-}

cmd/kaspawallet/keys/create.go

@@ -1,110 +0,0 @@
-package keys
-
-import (
-	"bufio"
-	"crypto/rand"
-	"crypto/subtle"
-	"encoding/hex"
-	"fmt"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
-	"github.com/pkg/errors"
-	"os"
-)
-
-// CreateKeyPairs generates `numKeys` number of key pairs.
-func CreateKeyPairs(numKeys uint32, ecdsa bool) (encryptedPrivateKeys []*EncryptedPrivateKey, publicKeys [][]byte, err error) {
-	return createKeyPairsFromFunction(numKeys, func(_ uint32) ([]byte, []byte, error) {
-		return libkaspawallet.CreateKeyPair(ecdsa)
-	})
-}
-
-// ImportKeyPairs imports a `numKeys` of private keys and generates key pairs out of them.
-func ImportKeyPairs(numKeys uint32) (encryptedPrivateKeys []*EncryptedPrivateKey, publicKeys [][]byte, err error) {
-	return createKeyPairsFromFunction(numKeys, func(keyIndex uint32) ([]byte, []byte, error) {
-		fmt.Printf("Enter private key #%d here:\n", keyIndex+1)
-		reader := bufio.NewReader(os.Stdin)
-		line, isPrefix, err := reader.ReadLine()
-		if err != nil {
-			return nil, nil, err
-		}
-		if isPrefix {
-			return nil, nil, errors.Errorf("Private key is too long")
-		}
-		privateKey, err := hex.DecodeString(string(line))
-		if err != nil {
-			return nil, nil, err
-		}
-
-		publicKey, err := libkaspawallet.PublicKeyFromPrivateKey(privateKey)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		return privateKey, publicKey, nil
-	})
-}
-
-func createKeyPairsFromFunction(numKeys uint32, keyPairFunction func(keyIndex uint32) ([]byte, []byte, error)) (
-	encryptedPrivateKeys []*EncryptedPrivateKey, publicKeys [][]byte, err error) {
-
-	password := getPassword("Enter password for the key file:")
-	confirmPassword := getPassword("Confirm password:")
-
-	if subtle.ConstantTimeCompare(password, confirmPassword) != 1 {
-		return nil, nil, errors.New("Passwords are not identical")
-	}
-
-	encryptedPrivateKeys = make([]*EncryptedPrivateKey, 0, numKeys)
-	for i := uint32(0); i < numKeys; i++ {
-		privateKey, publicKey, err := keyPairFunction(i)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		publicKeys = append(publicKeys, publicKey)
-
-		encryptedPrivateKey, err := encryptPrivateKey(privateKey, password)
-		if err != nil {
-			return nil, nil, err
-		}
-		encryptedPrivateKeys = append(encryptedPrivateKeys, encryptedPrivateKey)
-	}
-
-	return encryptedPrivateKeys, publicKeys, nil
-}
-
-func generateSalt() ([]byte, error) {
-	salt := make([]byte, 16)
-	_, err := rand.Read(salt)
-	if err != nil {
-		return nil, err
-	}
-
-	return salt, nil
-}
-
-func encryptPrivateKey(privateKey []byte, password []byte) (*EncryptedPrivateKey, error) {
-	salt, err := generateSalt()
-	if err != nil {
-		return nil, err
-	}
-
-	aead, err := getAEAD(password, salt)
-	if err != nil {
-		return nil, err
-	}
-
-	// Select a random nonce, and leave capacity for the ciphertext.
-	nonce := make([]byte, aead.NonceSize(), aead.NonceSize()+len(privateKey)+aead.Overhead())
-	if _, err := rand.Read(nonce); err != nil {
-		return nil, err
-	}
-
-	// Encrypt the message and append the ciphertext to the nonce.
-	cipher := aead.Seal(nonce, nonce, privateKey, nil)
-
-	return &EncryptedPrivateKey{
-		cipher: cipher,
-		salt:   salt,
-	}, nil
-}

cmd/kaspawallet/keys/get_password.go

@@ -1,41 +0,0 @@
-package keys
-
-import (
-	"fmt"
-	"golang.org/x/term"
-	"os"
-	"os/signal"
-	"syscall"
-)
-
-// getPassword was adapted from https://gist.github.com/jlinoff/e8e26b4ffa38d379c7f1891fd174a6d0#file-getpassword2-go
-func getPassword(prompt string) []byte {
-	// Get the initial state of the terminal.
-	initialTermState, e1 := term.GetState(syscall.Stdin)
-	if e1 != nil {
-		panic(e1)
-	}
-
-	// Restore it in the event of an interrupt.
-	// CITATION: Konstantin Shaposhnikov - https://groups.google.com/forum/#!topic/golang-nuts/kTVAbtee9UA
-	c := make(chan os.Signal)
-	signal.Notify(c, os.Interrupt, os.Kill)
-	go func() {
-		<-c
-		_ = term.Restore(syscall.Stdin, initialTermState)
-		os.Exit(1)
-	}()
-
-	// Now get the password.
-	fmt.Print(prompt)
-	p, err := term.ReadPassword(syscall.Stdin)
-	fmt.Println()
-	if err != nil {
-		panic(err)
-	}
-
-	// Stop looking for ^C on the channel.
-	signal.Stop(c)
-
-	return p
-}

cmd/kaspawallet/keys/keys.go

@@ -1,254 +0,0 @@
-package keys
-
-import (
-	"bufio"
-	"crypto/cipher"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"github.com/kaspanet/kaspad/util"
-	"github.com/pkg/errors"
-	"golang.org/x/crypto/argon2"
-	"golang.org/x/crypto/chacha20poly1305"
-	"os"
-	"path/filepath"
-	"runtime"
-)
-
-var (
-	defaultAppDir   = util.AppDir("kaspawallet", false)
-	defaultKeysFile = filepath.Join(defaultAppDir, "keys.json")
-)
-
-type encryptedPrivateKeyJSON struct {
-	Cipher string `json:"cipher"`
-	Salt   string `json:"salt"`
-}
-
-type keysFileJSON struct {
-	EncryptedPrivateKeys []*encryptedPrivateKeyJSON `json:"encryptedPrivateKeys"`
-	PublicKeys           []string                   `json:"publicKeys"`
-	MinimumSignatures    uint32                     `json:"minimumSignatures"`
-	ECDSA                bool                       `json:"ecdsa"`
-}
-
-// EncryptedPrivateKey represents an encrypted private key
-type EncryptedPrivateKey struct {
-	cipher []byte
-	salt   []byte
-}
-
-// Data holds all the data related to the wallet keys
-type Data struct {
-	encryptedPrivateKeys []*EncryptedPrivateKey
-	PublicKeys           [][]byte
-	MinimumSignatures    uint32
-	ECDSA                bool
-}
-
-func (d *Data) toJSON() *keysFileJSON {
-	encryptedPrivateKeysJSON := make([]*encryptedPrivateKeyJSON, len(d.encryptedPrivateKeys))
-	for i, encryptedPrivateKey := range d.encryptedPrivateKeys {
-		encryptedPrivateKeysJSON[i] = &encryptedPrivateKeyJSON{
-			Cipher: hex.EncodeToString(encryptedPrivateKey.cipher),
-			Salt:   hex.EncodeToString(encryptedPrivateKey.salt),
-		}
-	}
-
-	publicKeysHex := make([]string, len(d.PublicKeys))
-	for i, publicKey := range d.PublicKeys {
-		publicKeysHex[i] = hex.EncodeToString(publicKey)
-	}
-
-	return &keysFileJSON{
-		EncryptedPrivateKeys: encryptedPrivateKeysJSON,
-		PublicKeys:           publicKeysHex,
-		MinimumSignatures:    d.MinimumSignatures,
-		ECDSA:                d.ECDSA,
-	}
-}
-
-func (d *Data) fromJSON(fileJSON *keysFileJSON) error {
-	d.MinimumSignatures = fileJSON.MinimumSignatures
-	d.ECDSA = fileJSON.ECDSA
-
-	d.encryptedPrivateKeys = make([]*EncryptedPrivateKey, len(fileJSON.EncryptedPrivateKeys))
-	for i, encryptedPrivateKeyJSON := range fileJSON.EncryptedPrivateKeys {
-		cipher, err := hex.DecodeString(encryptedPrivateKeyJSON.Cipher)
-		if err != nil {
-			return err
-		}
-
-		salt, err := hex.DecodeString(encryptedPrivateKeyJSON.Salt)
-		if err != nil {
-			return err
-		}
-
-		d.encryptedPrivateKeys[i] = &EncryptedPrivateKey{
-			cipher: cipher,
-			salt:   salt,
-		}
-	}
-
-	d.PublicKeys = make([][]byte, len(fileJSON.PublicKeys))
-	for i, publicKey := range fileJSON.PublicKeys {
-		var err error
-		d.PublicKeys[i], err = hex.DecodeString(publicKey)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// DecryptPrivateKeys asks the user to enter the password for the private keys and
-// returns the decrypted private keys.
-func (d *Data) DecryptPrivateKeys() ([][]byte, error) {
-	password := getPassword("Password:")
-	privateKeys := make([][]byte, len(d.encryptedPrivateKeys))
-	for i, encryptedPrivateKey := range d.encryptedPrivateKeys {
-		var err error
-		privateKeys[i], err = decryptPrivateKey(encryptedPrivateKey, password)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return privateKeys, nil
-}
-
-// ReadKeysFile returns the data related to the keys file
-func ReadKeysFile(path string) (*Data, error) {
-	if path == "" {
-		path = defaultKeysFile
-	}
-
-	file, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-
-	decoder := json.NewDecoder(file)
-	decoder.DisallowUnknownFields()
-	decodedFile := &keysFileJSON{}
-	err = decoder.Decode(&decodedFile)
-	if err != nil {
-		return nil, err
-	}
-
-	keysFile := &Data{}
-	err = keysFile.fromJSON(decodedFile)
-	if err != nil {
-		return nil, err
-	}
-
-	return keysFile, nil
-}
-
-func createFileDirectoryIfDoesntExist(path string) error {
-	dir := filepath.Dir(path)
-	exists, err := pathExists(dir)
-	if err != nil {
-		return err
-	}
-
-	if exists {
-		return nil
-	}
-
-	return os.MkdirAll(dir, 0600)
-}
-
-func pathExists(path string) (bool, error) {
-	_, err := os.Stat(path)
-
-	if err == nil {
-		return true, nil
-	}
-
-	if os.IsNotExist(err) {
-		return false, nil
-
-	}
-
-	return false, err
-}
-
-// WriteKeysFile writes a keys file with the given data
-func WriteKeysFile(path string,
-	encryptedPrivateKeys []*EncryptedPrivateKey,
-	publicKeys [][]byte,
-	minimumSignatures uint32,
-	ecdsa bool) error {
-	if path == "" {
-		path = defaultKeysFile
-	}
-
-	exists, err := pathExists(path)
-	if err != nil {
-		return err
-	}
-
-	if exists {
-		reader := bufio.NewReader(os.Stdin)
-		fmt.Printf("The file %s already exists. Are you sure you want to override it (type 'y' to approve)? ", path)
-		line, _, err := reader.ReadLine()
-		if err != nil {
-			return err
-		}
-
-		if string(line) != "y" {
-			return errors.Errorf("aborted keys file creation")
-		}
-	}
-
-	err = createFileDirectoryIfDoesntExist(path)
-	if err != nil {
-		return err
-	}
-
-	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0600)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	keysFile := &Data{
-		encryptedPrivateKeys: encryptedPrivateKeys,
-		PublicKeys:           publicKeys,
-		MinimumSignatures:    minimumSignatures,
-		ECDSA:                ecdsa,
-	}
-
-	encoder := json.NewEncoder(file)
-	err = encoder.Encode(keysFile.toJSON())
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("Wrote the keys into %s\n", path)
-	return nil
-}
-
-func getAEAD(password, salt []byte) (cipher.AEAD, error) {
-	key := argon2.IDKey(password, salt, 1, 64*1024, uint8(runtime.NumCPU()), 32)
-	return chacha20poly1305.NewX(key)
-}
-
-func decryptPrivateKey(encryptedPrivateKey *EncryptedPrivateKey, password []byte) ([]byte, error) {
-	aead, err := getAEAD(password, encryptedPrivateKey.salt)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(encryptedPrivateKey.cipher) < aead.NonceSize() {
-		return nil, errors.New("ciphertext too short")
-	}
-
-	// Split nonce and ciphertext.
-	nonce, ciphertext := encryptedPrivateKey.cipher[:aead.NonceSize()], encryptedPrivateKey.cipher[aead.NonceSize():]
-
-	// Decrypt the message and check it wasn't tampered with.
-	return aead.Open(nil, nonce, ciphertext, nil)
-}

cmd/kaspawallet/libkaspawallet/keypair.go

@@ -1,93 +0,0 @@
-package libkaspawallet
-
-import (
-	"github.com/kaspanet/go-secp256k1"
-	"github.com/kaspanet/kaspad/domain/dagconfig"
-	"github.com/kaspanet/kaspad/util"
-	"github.com/pkg/errors"
-)
-
-// CreateKeyPair generates a private-public key pair
-func CreateKeyPair(ecdsa bool) ([]byte, []byte, error) {
-	if ecdsa {
-		return createKeyPairECDSA()
-	}
-
-	return createKeyPair()
-}
-
-func createKeyPair() ([]byte, []byte, error) {
-	keyPair, err := secp256k1.GenerateSchnorrKeyPair()
-	if err != nil {
-		return nil, nil, errors.Wrap(err, "Failed to generate private key")
-	}
-	publicKey, err := keyPair.SchnorrPublicKey()
-	if err != nil {
-		return nil, nil, errors.Wrap(err, "Failed to generate public key")
-	}
-	publicKeySerialized, err := publicKey.Serialize()
-	if err != nil {
-		return nil, nil, errors.Wrap(err, "Failed to serialize public key")
-	}
-
-	return keyPair.SerializePrivateKey()[:], publicKeySerialized[:], nil
-}
-
-func createKeyPairECDSA() ([]byte, []byte, error) {
-	keyPair, err := secp256k1.GenerateECDSAPrivateKey()
-	if err != nil {
-		return nil, nil, errors.Wrap(err, "Failed to generate private key")
-	}
-	publicKey, err := keyPair.ECDSAPublicKey()
-	if err != nil {
-		return nil, nil, errors.Wrap(err, "Failed to generate public key")
-	}
-	publicKeySerialized, err := publicKey.Serialize()
-	if err != nil {
-		return nil, nil, errors.Wrap(err, "Failed to serialize public key")
-	}
-
-	return keyPair.Serialize()[:], publicKeySerialized[:], nil
-}
-
-// PublicKeyFromPrivateKey returns the public key associated with a private key
-func PublicKeyFromPrivateKey(privateKeyBytes []byte) ([]byte, error) {
-	keyPair, err := secp256k1.DeserializeSchnorrPrivateKeyFromSlice(privateKeyBytes)
-	if err != nil {
-		return nil, errors.Wrap(err, "Failed to deserialize private key")
-	}
-
-	publicKey, err := keyPair.SchnorrPublicKey()
-	if err != nil {
-		return nil, errors.Wrap(err, "Failed to generate public key")
-	}
-
-	publicKeySerialized, err := publicKey.Serialize()
-	if err != nil {
-		return nil, errors.Wrap(err, "Failed to serialize public key")
-	}
-
-	return publicKeySerialized[:], nil
-}
-
-// Address returns the address associated with the given public keys and minimum signatures parameters.
-func Address(params *dagconfig.Params, pubKeys [][]byte, minimumSignatures uint32, ecdsa bool) (util.Address, error) {
-	sortPublicKeys(pubKeys)
-	if uint32(len(pubKeys)) < minimumSignatures {
-		return nil, errors.Errorf("The minimum amount of signatures (%d) is greater than the amount of "+
-			"provided public keys (%d)", minimumSignatures, len(pubKeys))
-	}
-	if len(pubKeys) == 1 {
-		if ecdsa {
-			return util.NewAddressPublicKeyECDSA(pubKeys[0][:], params.Prefix)
-		}
-		return util.NewAddressPublicKey(pubKeys[0][:], params.Prefix)
-	}
-
-	redeemScript, err := multiSigRedeemScript(pubKeys, minimumSignatures, ecdsa)
-	if err != nil {
-		return nil, err
-	}
-
-	return util.NewAddressScriptHash(redeemScript, params.Prefix)
-}

cmd/kaspawallet/libkaspawallet/serialization/protoserialization/generate.go

@@ -1,3 +0,0 @@
-//go:generate protoc --go_out=. --go-grpc_out=. --go_opt=paths=source_relative --go-grpc_opt=paths=source_relative wallet.proto
-
-package protoserialization

cmd/kaspawallet/libkaspawallet/serialization/protoserialization/wallet.pb.go

@@ -1,915 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
-// source: wallet.proto
-
-package protoserialization
-
-import (
-	proto "github.com/golang/protobuf/proto"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
-type PartiallySignedTransaction struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Tx                    *TransactionMessage     `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"`
-	PartiallySignedInputs []*PartiallySignedInput `protobuf:"bytes,2,rep,name=partiallySignedInputs,proto3" json:"partiallySignedInputs,omitempty"`
-}
-
-func (x *PartiallySignedTransaction) Reset() {
-	*x = PartiallySignedTransaction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wallet_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PartiallySignedTransaction) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PartiallySignedTransaction) ProtoMessage() {}
-
-func (x *PartiallySignedTransaction) ProtoReflect() protoreflect.Message {
-	mi := &file_wallet_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PartiallySignedTransaction.ProtoReflect.Descriptor instead.
-func (*PartiallySignedTransaction) Descriptor() ([]byte, []int) {
-	return file_wallet_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *PartiallySignedTransaction) GetTx() *TransactionMessage {
-	if x != nil {
-		return x.Tx
-	}
-	return nil
-}
-
-func (x *PartiallySignedTransaction) GetPartiallySignedInputs() []*PartiallySignedInput {
-	if x != nil {
-		return x.PartiallySignedInputs
-	}
-	return nil
-}
-
-type PartiallySignedInput struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RedeemScript         []byte                 `protobuf:"bytes,1,opt,name=redeemScript,proto3" json:"redeemScript,omitempty"`
-	PrevOutput           *TransactionOutput     `protobuf:"bytes,2,opt,name=prevOutput,proto3" json:"prevOutput,omitempty"`
-	MinimumSignatures    uint32                 `protobuf:"varint,3,opt,name=minimumSignatures,proto3" json:"minimumSignatures,omitempty"`
-	PubKeySignaturePairs []*PubKeySignaturePair `protobuf:"bytes,4,rep,name=pubKeySignaturePairs,proto3" json:"pubKeySignaturePairs,omitempty"`
-}
-
-func (x *PartiallySignedInput) Reset() {
-	*x = PartiallySignedInput{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wallet_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PartiallySignedInput) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PartiallySignedInput) ProtoMessage() {}
-
-func (x *PartiallySignedInput) ProtoReflect() protoreflect.Message {
-	mi := &file_wallet_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PartiallySignedInput.ProtoReflect.Descriptor instead.
-func (*PartiallySignedInput) Descriptor() ([]byte, []int) {
-	return file_wallet_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *PartiallySignedInput) GetRedeemScript() []byte {
-	if x != nil {
-		return x.RedeemScript
-	}
-	return nil
-}
-
-func (x *PartiallySignedInput) GetPrevOutput() *TransactionOutput {
-	if x != nil {
-		return x.PrevOutput
-	}
-	return nil
-}
-
-func (x *PartiallySignedInput) GetMinimumSignatures() uint32 {
-	if x != nil {
-		return x.MinimumSignatures
-	}
-	return 0
-}
-
-func (x *PartiallySignedInput) GetPubKeySignaturePairs() []*PubKeySignaturePair {
-	if x != nil {
-		return x.PubKeySignaturePairs
-	}
-	return nil
-}
-
-type PubKeySignaturePair struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PubKey    []byte `protobuf:"bytes,1,opt,name=pubKey,proto3" json:"pubKey,omitempty"`
-	Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
-}
-
-func (x *PubKeySignaturePair) Reset() {
-	*x = PubKeySignaturePair{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wallet_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PubKeySignaturePair) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PubKeySignaturePair) ProtoMessage() {}
-
-func (x *PubKeySignaturePair) ProtoReflect() protoreflect.Message {
-	mi := &file_wallet_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PubKeySignaturePair.ProtoReflect.Descriptor instead.
-func (*PubKeySignaturePair) Descriptor() ([]byte, []int) {
-	return file_wallet_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *PubKeySignaturePair) GetPubKey() []byte {
-	if x != nil {
-		return x.PubKey
-	}
-	return nil
-}
-
-func (x *PubKeySignaturePair) GetSignature() []byte {
-	if x != nil {
-		return x.Signature
-	}
-	return nil
-}
-
-type SubnetworkId struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Bytes []byte `protobuf:"bytes,1,opt,name=bytes,proto3" json:"bytes,omitempty"`
-}
-
-func (x *SubnetworkId) Reset() {
-	*x = SubnetworkId{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wallet_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SubnetworkId) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SubnetworkId) ProtoMessage() {}
-
-func (x *SubnetworkId) ProtoReflect() protoreflect.Message {
-	mi := &file_wallet_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SubnetworkId.ProtoReflect.Descriptor instead.
-func (*SubnetworkId) Descriptor() ([]byte, []int) {
-	return file_wallet_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *SubnetworkId) GetBytes() []byte {
-	if x != nil {
-		return x.Bytes
-	}
-	return nil
-}
-
-type TransactionMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Version      uint32               `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"`
-	Inputs       []*TransactionInput  `protobuf:"bytes,2,rep,name=inputs,proto3" json:"inputs,omitempty"`
-	Outputs      []*TransactionOutput `protobuf:"bytes,3,rep,name=outputs,proto3" json:"outputs,omitempty"`
-	LockTime     uint64               `protobuf:"varint,4,opt,name=lockTime,proto3" json:"lockTime,omitempty"`
-	SubnetworkId *SubnetworkId        `protobuf:"bytes,5,opt,name=subnetworkId,proto3" json:"subnetworkId,omitempty"`
-	Gas          uint64               `protobuf:"varint,6,opt,name=gas,proto3" json:"gas,omitempty"`
-	Payload      []byte               `protobuf:"bytes,8,opt,name=payload,proto3" json:"payload,omitempty"`
-}
-
-func (x *TransactionMessage) Reset() {
-	*x = TransactionMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wallet_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TransactionMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransactionMessage) ProtoMessage() {}
-
-func (x *TransactionMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_wallet_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TransactionMessage.ProtoReflect.Descriptor instead.
-func (*TransactionMessage) Descriptor() ([]byte, []int) {
-	return file_wallet_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *TransactionMessage) GetVersion() uint32 {
-	if x != nil {
-		return x.Version
-	}
-	return 0
-}
-
-func (x *TransactionMessage) GetInputs() []*TransactionInput {
-	if x != nil {
-		return x.Inputs
-	}
-	return nil
-}
-
-func (x *TransactionMessage) GetOutputs() []*TransactionOutput {
-	if x != nil {
-		return x.Outputs
-	}
-	return nil
-}
-
-func (x *TransactionMessage) GetLockTime() uint64 {
-	if x != nil {
-		return x.LockTime
-	}
-	return 0
-}
-
-func (x *TransactionMessage) GetSubnetworkId() *SubnetworkId {
-	if x != nil {
-		return x.SubnetworkId
-	}
-	return nil
-}
-
-func (x *TransactionMessage) GetGas() uint64 {
-	if x != nil {
-		return x.Gas
-	}
-	return 0
-}
-
-func (x *TransactionMessage) GetPayload() []byte {
-	if x != nil {
-		return x.Payload
-	}
-	return nil
-}
-
-type TransactionInput struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PreviousOutpoint *Outpoint `protobuf:"bytes,1,opt,name=previousOutpoint,proto3" json:"previousOutpoint,omitempty"`
-	SignatureScript  []byte    `protobuf:"bytes,2,opt,name=signatureScript,proto3" json:"signatureScript,omitempty"`
-	Sequence         uint64    `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
-}
-
-func (x *TransactionInput) Reset() {
-	*x = TransactionInput{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wallet_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TransactionInput) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransactionInput) ProtoMessage() {}
-
-func (x *TransactionInput) ProtoReflect() protoreflect.Message {
-	mi := &file_wallet_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TransactionInput.ProtoReflect.Descriptor instead.
-func (*TransactionInput) Descriptor() ([]byte, []int) {
-	return file_wallet_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *TransactionInput) GetPreviousOutpoint() *Outpoint {
-	if x != nil {
-		return x.PreviousOutpoint
-	}
-	return nil
-}
-
-func (x *TransactionInput) GetSignatureScript() []byte {
-	if x != nil {
-		return x.SignatureScript
-	}
-	return nil
-}
-
-func (x *TransactionInput) GetSequence() uint64 {
-	if x != nil {
-		return x.Sequence
-	}
-	return 0
-}
-
-type Outpoint struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TransactionId *TransactionId `protobuf:"bytes,1,opt,name=transactionId,proto3" json:"transactionId,omitempty"`
-	Index         uint32         `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"`
-}
-
-func (x *Outpoint) Reset() {
-	*x = Outpoint{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wallet_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Outpoint) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Outpoint) ProtoMessage() {}
-
-func (x *Outpoint) ProtoReflect() protoreflect.Message {
-	mi := &file_wallet_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Outpoint.ProtoReflect.Descriptor instead.
-func (*Outpoint) Descriptor() ([]byte, []int) {
-	return file_wallet_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *Outpoint) GetTransactionId() *TransactionId {
-	if x != nil {
-		return x.TransactionId
-	}
-	return nil
-}
-
-func (x *Outpoint) GetIndex() uint32 {
-	if x != nil {
-		return x.Index
-	}
-	return 0
-}
-
-type TransactionId struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Bytes []byte `protobuf:"bytes,1,opt,name=bytes,proto3" json:"bytes,omitempty"`
-}
-
-func (x *TransactionId) Reset() {
-	*x = TransactionId{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wallet_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TransactionId) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransactionId) ProtoMessage() {}
-
-func (x *TransactionId) ProtoReflect() protoreflect.Message {
-	mi := &file_wallet_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TransactionId.ProtoReflect.Descriptor instead.
-func (*TransactionId) Descriptor() ([]byte, []int) {
-	return file_wallet_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *TransactionId) GetBytes() []byte {
-	if x != nil {
-		return x.Bytes
-	}
-	return nil
-}
-
-type ScriptPublicKey struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Script  []byte `protobuf:"bytes,1,opt,name=script,proto3" json:"script,omitempty"`
-	Version uint32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"`
-}
-
-func (x *ScriptPublicKey) Reset() {
-	*x = ScriptPublicKey{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wallet_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ScriptPublicKey) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ScriptPublicKey) ProtoMessage() {}
-
-func (x *ScriptPublicKey) ProtoReflect() protoreflect.Message {
-	mi := &file_wallet_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ScriptPublicKey.ProtoReflect.Descriptor instead.
-func (*ScriptPublicKey) Descriptor() ([]byte, []int) {
-	return file_wallet_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *ScriptPublicKey) GetScript() []byte {
-	if x != nil {
-		return x.Script
-	}
-	return nil
-}
-
-func (x *ScriptPublicKey) GetVersion() uint32 {
-	if x != nil {
-		return x.Version
-	}
-	return 0
-}
-
-type TransactionOutput struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Value           uint64           `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
-	ScriptPublicKey *ScriptPublicKey `protobuf:"bytes,2,opt,name=scriptPublicKey,proto3" json:"scriptPublicKey,omitempty"`
-}
-
-func (x *TransactionOutput) Reset() {
-	*x = TransactionOutput{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_wallet_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TransactionOutput) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransactionOutput) ProtoMessage() {}
-
-func (x *TransactionOutput) ProtoReflect() protoreflect.Message {
-	mi := &file_wallet_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TransactionOutput.ProtoReflect.Descriptor instead.
-func (*TransactionOutput) Descriptor() ([]byte, []int) {
-	return file_wallet_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *TransactionOutput) GetValue() uint64 {
-	if x != nil {
-		return x.Value
-	}
-	return 0
-}
-
-func (x *TransactionOutput) GetScriptPublicKey() *ScriptPublicKey {
-	if x != nil {
-		return x.ScriptPublicKey
-	}
-	return nil
-}
-
-var File_wallet_proto protoreflect.FileDescriptor
-
-var file_wallet_proto_rawDesc = []byte{
-	0x0a, 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x22, 0xb4, 0x01, 0x0a, 0x1a, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x6c, 0x79,
-	0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x36, 0x0a, 0x02, 0x74, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x02, 0x74, 0x78, 0x12, 0x5e, 0x0a, 0x15, 0x70, 0x61, 0x72,
-	0x74, 0x69, 0x61, 0x6c, 0x6c, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x49, 0x6e, 0x70, 0x75,
-	0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61,
-	0x72, 0x74, 0x69, 0x61, 0x6c, 0x6c, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x49, 0x6e, 0x70,
-	0x75, 0x74, 0x52, 0x15, 0x70, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x6c, 0x79, 0x53, 0x69, 0x67,
-	0x6e, 0x65, 0x64, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x22, 0x8c, 0x02, 0x0a, 0x14, 0x50, 0x61,
-	0x72, 0x74, 0x69, 0x61, 0x6c, 0x6c, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x49, 0x6e, 0x70,
-	0x75, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x64, 0x65, 0x65, 0x6d, 0x53, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x72, 0x65, 0x64, 0x65, 0x65, 0x6d,
-	0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x45, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x76, 0x4f, 0x75,
-	0x74, 0x70, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-	0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x75, 0x74, 0x70, 0x75,
-	0x74, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x76, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, 0x2c, 0x0a,
-	0x11, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
-	0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x11, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75,
-	0x6d, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x5b, 0x0a, 0x14, 0x70,
-	0x75, 0x62, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x50, 0x61,
-	0x69, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50,
-	0x75, 0x62, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x50, 0x61,
-	0x69, 0x72, 0x52, 0x14, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74,
-	0x75, 0x72, 0x65, 0x50, 0x61, 0x69, 0x72, 0x73, 0x22, 0x4b, 0x0a, 0x13, 0x50, 0x75, 0x62, 0x4b,
-	0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x50, 0x61, 0x69, 0x72, 0x12,
-	0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
-	0x06, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61,
-	0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e,
-	0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x24, 0x0a, 0x0c, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x77,
-	0x6f, 0x72, 0x6b, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x22, 0xbb, 0x02, 0x0a, 0x12,
-	0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x06,
-	0x69, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x70,
-	0x75, 0x74, 0x52, 0x06, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x12, 0x3f, 0x0a, 0x07, 0x6f, 0x75,
-	0x74, 0x70, 0x75, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x75, 0x74, 0x70,
-	0x75, 0x74, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6c,
-	0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x6c,
-	0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x44, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x6e, 0x65,
-	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x52,
-	0x0c, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x12, 0x10, 0x0a,
-	0x03, 0x67, 0x61, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x67, 0x61, 0x73, 0x12,
-	0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c,
-	0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0xa2, 0x01, 0x0a, 0x10, 0x54, 0x72,
-	0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x48,
-	0x0a, 0x10, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4f, 0x75,
-	0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x10, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73,
-	0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x69, 0x67, 0x6e,
-	0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0c, 0x52, 0x0f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x22, 0x69,
-	0x0a, 0x08, 0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x47, 0x0a, 0x0d, 0x74, 0x72,
-	0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x21, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x49, 0x64, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x25, 0x0a, 0x0d, 0x54, 0x72, 0x61,
-	0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x79,
-	0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73,
-	0x22, 0x43, 0x0a, 0x0f, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x4b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x76,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x78, 0x0a, 0x11, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x12, 0x4d, 0x0a, 0x0f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x0f,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x42,
-	0x5c, 0x5a, 0x5a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x61,
-	0x73, 0x70, 0x61, 0x6e, 0x65, 0x74, 0x2f, 0x6b, 0x61, 0x73, 0x70, 0x61, 0x64, 0x2f, 0x63, 0x6d,
-	0x64, 0x2f, 0x6b, 0x61, 0x73, 0x70, 0x61, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x2f, 0x6c, 0x69,
-	0x62, 0x6b, 0x61, 0x73, 0x70, 0x61, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x2f, 0x73, 0x65, 0x72,
-	0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_wallet_proto_rawDescOnce sync.Once
-	file_wallet_proto_rawDescData = file_wallet_proto_rawDesc
-)
-
-func file_wallet_proto_rawDescGZIP() []byte {
-	file_wallet_proto_rawDescOnce.Do(func() {
-		file_wallet_proto_rawDescData = protoimpl.X.CompressGZIP(file_wallet_proto_rawDescData)
-	})
-	return file_wallet_proto_rawDescData
-}
-
-var file_wallet_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-var file_wallet_proto_goTypes = []interface{}{
-	(*PartiallySignedTransaction)(nil), // 0: protoserialization.PartiallySignedTransaction
-	(*PartiallySignedInput)(nil),       // 1: protoserialization.PartiallySignedInput
-	(*PubKeySignaturePair)(nil),        // 2: protoserialization.PubKeySignaturePair
-	(*SubnetworkId)(nil),               // 3: protoserialization.SubnetworkId
-	(*TransactionMessage)(nil),         // 4: protoserialization.TransactionMessage
-	(*TransactionInput)(nil),           // 5: protoserialization.TransactionInput
-	(*Outpoint)(nil),                   // 6: protoserialization.Outpoint
-	(*TransactionId)(nil),              // 7: protoserialization.TransactionId
-	(*ScriptPublicKey)(nil),            // 8: protoserialization.ScriptPublicKey
-	(*TransactionOutput)(nil),          // 9: protoserialization.TransactionOutput
-}
-var file_wallet_proto_depIdxs = []int32{
-	4,  // 0: protoserialization.PartiallySignedTransaction.tx:type_name -> protoserialization.TransactionMessage
-	1,  // 1: protoserialization.PartiallySignedTransaction.partiallySignedInputs:type_name -> protoserialization.PartiallySignedInput
-	9,  // 2: protoserialization.PartiallySignedInput.prevOutput:type_name -> protoserialization.TransactionOutput
-	2,  // 3: protoserialization.PartiallySignedInput.pubKeySignaturePairs:type_name -> protoserialization.PubKeySignaturePair
-	5,  // 4: protoserialization.TransactionMessage.inputs:type_name -> protoserialization.TransactionInput
-	9,  // 5: protoserialization.TransactionMessage.outputs:type_name -> protoserialization.TransactionOutput
-	3,  // 6: protoserialization.TransactionMessage.subnetworkId:type_name -> protoserialization.SubnetworkId
-	6,  // 7: protoserialization.TransactionInput.previousOutpoint:type_name -> protoserialization.Outpoint
-	7,  // 8: protoserialization.Outpoint.transactionId:type_name -> protoserialization.TransactionId
-	8,  // 9: protoserialization.TransactionOutput.scriptPublicKey:type_name -> protoserialization.ScriptPublicKey
-	10, // [10:10] is the sub-list for method output_type
-	10, // [10:10] is the sub-list for method input_type
-	10, // [10:10] is the sub-list for extension type_name
-	10, // [10:10] is the sub-list for extension extendee
-	0,  // [0:10] is the sub-list for field type_name
-}
-
-func init() { file_wallet_proto_init() }
-func file_wallet_proto_init() {
-	if File_wallet_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_wallet_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PartiallySignedTransaction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_wallet_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PartiallySignedInput); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_wallet_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PubKeySignaturePair); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_wallet_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SubnetworkId); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_wallet_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TransactionMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_wallet_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TransactionInput); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_wallet_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Outpoint); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_wallet_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TransactionId); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_wallet_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ScriptPublicKey); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_wallet_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TransactionOutput); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_wallet_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   10,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_wallet_proto_goTypes,
-		DependencyIndexes: file_wallet_proto_depIdxs,
-		MessageInfos:      file_wallet_proto_msgTypes,
-	}.Build()
-	File_wallet_proto = out.File
-	file_wallet_proto_rawDesc = nil
-	file_wallet_proto_goTypes = nil
-	file_wallet_proto_depIdxs = nil
-}

cmd/kaspawallet/libkaspawallet/serialization/protoserialization/wallet.proto

@@ -1,59 +0,0 @@
-syntax = "proto3";
-package protoserialization;
-
-option go_package = "github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet/serialization/protoserialization";
-
-message PartiallySignedTransaction{
-  TransactionMessage tx = 1;
-  repeated PartiallySignedInput partiallySignedInputs = 2;
-}
-
-message PartiallySignedInput{
-  bytes redeemScript = 1;
-  TransactionOutput prevOutput = 2;
-  uint32 minimumSignatures = 3;
-  repeated PubKeySignaturePair pubKeySignaturePairs = 4;
-}
-
-message PubKeySignaturePair{
-  bytes pubKey = 1;
-  bytes signature = 2;
-}
-
-message SubnetworkId{
-  bytes bytes = 1;
-}
-
-message TransactionMessage{
-  uint32 version = 1;
-  repeated TransactionInput inputs = 2;
-  repeated TransactionOutput outputs = 3;
-  uint64 lockTime = 4;
-  SubnetworkId subnetworkId = 5;
-  uint64 gas = 6;
-  bytes payload = 8;
-}
-
-message TransactionInput{
-  Outpoint previousOutpoint = 1;
-  bytes signatureScript = 2;
-  uint64 sequence = 3;
-}
-
-message Outpoint{
-  TransactionId transactionId = 1;
-  uint32 index = 2;
-}
-
-message TransactionId{
-  bytes bytes = 1;
-}
-message ScriptPublicKey {
-  bytes script = 1;
-  uint32 version = 2;
-}
-
-message TransactionOutput{
-  uint64 value = 1;
-  ScriptPublicKey scriptPublicKey = 2;
-}

cmd/kaspawallet/libkaspawallet/serialization/serialization.go

@@ -1,273 +0,0 @@
-package serialization
-
-import (
-	"github.com/golang/protobuf/proto"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet/serialization/protoserialization"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/subnetworks"
-	"github.com/pkg/errors"
-	"math"
-)
-
-// PartiallySignedTransaction is a type that is intended
-// to be transferred between multiple parties so each
-// party will be able to sign the transaction before
-// it's fully signed.
-type PartiallySignedTransaction struct {
-	Tx                    *externalapi.DomainTransaction
-	PartiallySignedInputs []*PartiallySignedInput
-}
-
-// PartiallySignedInput represents an input signed
-// only by some of the relevant parties.
-type PartiallySignedInput struct {
-	RedeeemScript        []byte
-	PrevOutput           *externalapi.DomainTransactionOutput
-	MinimumSignatures    uint32
-	PubKeySignaturePairs []*PubKeySignaturePair
-}
-
-// PubKeySignaturePair is a pair of public key and (potentially) its associated signature
-type PubKeySignaturePair struct {
-	PubKey    []byte
-	Signature []byte
-}
-
-// DeserializePartiallySignedTransaction deserializes a byte slice into PartiallySignedTransaction.
-func DeserializePartiallySignedTransaction(serializedPartiallySignedTransaction []byte) (*PartiallySignedTransaction, error) {
-	protoPartiallySignedTransaction := &protoserialization.PartiallySignedTransaction{}
-	err := proto.Unmarshal(serializedPartiallySignedTransaction, protoPartiallySignedTransaction)
-	if err != nil {
-		return nil, err
-	}
-
-	return partiallySignedTransactionFromProto(protoPartiallySignedTransaction)
-}
-
-// SerializePartiallySignedTransaction serializes a PartiallySignedTransaction.
-func SerializePartiallySignedTransaction(partiallySignedTransaction *PartiallySignedTransaction) ([]byte, error) {
-	return proto.Marshal(partiallySignedTransactionToProto(partiallySignedTransaction))
-}
-
-func partiallySignedTransactionFromProto(protoPartiallySignedTransaction *protoserialization.PartiallySignedTransaction) (*PartiallySignedTransaction, error) {
-	tx, err := transactionFromProto(protoPartiallySignedTransaction.Tx)
-	if err != nil {
-		return nil, err
-	}
-
-	inputs := make([]*PartiallySignedInput, len(protoPartiallySignedTransaction.PartiallySignedInputs))
-	for i, protoInput := range protoPartiallySignedTransaction.PartiallySignedInputs {
-		inputs[i], err = partiallySignedInputFromProto(protoInput)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return &PartiallySignedTransaction{
-		Tx:                    tx,
-		PartiallySignedInputs: inputs,
-	}, nil
-}
-
-func partiallySignedTransactionToProto(partiallySignedTransaction *PartiallySignedTransaction) *protoserialization.PartiallySignedTransaction {
-	protoInputs := make([]*protoserialization.PartiallySignedInput, len(partiallySignedTransaction.PartiallySignedInputs))
-	for i, input := range partiallySignedTransaction.PartiallySignedInputs {
-		protoInputs[i] = partiallySignedInputToProto(input)
-	}
-
-	return &protoserialization.PartiallySignedTransaction{
-		Tx:                    transactionToProto(partiallySignedTransaction.Tx),
-		PartiallySignedInputs: protoInputs,
-	}
-}
-
-func partiallySignedInputFromProto(protoPartiallySignedInput *protoserialization.PartiallySignedInput) (*PartiallySignedInput, error) {
-	output, err := transactionOutputFromProto(protoPartiallySignedInput.PrevOutput)
-	if err != nil {
-		return nil, err
-	}
-
-	pubKeySignaturePairs := make([]*PubKeySignaturePair, len(protoPartiallySignedInput.PubKeySignaturePairs))
-	for i, protoPair := range protoPartiallySignedInput.PubKeySignaturePairs {
-		pubKeySignaturePairs[i] = pubKeySignaturePairFromProto(protoPair)
-	}
-
-	return &PartiallySignedInput{
-		RedeeemScript:        protoPartiallySignedInput.RedeemScript,
-		PrevOutput:           output,
-		MinimumSignatures:    protoPartiallySignedInput.MinimumSignatures,
-		PubKeySignaturePairs: pubKeySignaturePairs,
-	}, nil
-}
-
-func partiallySignedInputToProto(partiallySignedInput *PartiallySignedInput) *protoserialization.PartiallySignedInput {
-	protoPairs := make([]*protoserialization.PubKeySignaturePair, len(partiallySignedInput.PubKeySignaturePairs))
-	for i, pair := range partiallySignedInput.PubKeySignaturePairs {
-		protoPairs[i] = pubKeySignaturePairToProto(pair)
-	}
-
-	return &protoserialization.PartiallySignedInput{
-		RedeemScript:         partiallySignedInput.RedeeemScript,
-		PrevOutput:           transactionOutputToProto(partiallySignedInput.PrevOutput),
-		MinimumSignatures:    partiallySignedInput.MinimumSignatures,
-		PubKeySignaturePairs: protoPairs,
-	}
-}
-
-func pubKeySignaturePairFromProto(protoPubKeySignaturePair *protoserialization.PubKeySignaturePair) *PubKeySignaturePair {
-	return &PubKeySignaturePair{
-		PubKey:    protoPubKeySignaturePair.PubKey,
-		Signature: protoPubKeySignaturePair.Signature,
-	}
-}
-
-func pubKeySignaturePairToProto(pubKeySignaturePair *PubKeySignaturePair) *protoserialization.PubKeySignaturePair {
-	return &protoserialization.PubKeySignaturePair{
-		PubKey:    pubKeySignaturePair.PubKey,
-		Signature: pubKeySignaturePair.Signature,
-	}
-}
-
-func transactionFromProto(protoTransaction *protoserialization.TransactionMessage) (*externalapi.DomainTransaction, error) {
-	if protoTransaction.Version > math.MaxUint16 {
-		return nil, errors.Errorf("protoTransaction.Version is %d and is too big to be a uint16", protoTransaction.Version)
-	}
-
-	inputs := make([]*externalapi.DomainTransactionInput, len(protoTransaction.Inputs))
-	for i, protoInput := range protoTransaction.Inputs {
-		var err error
-		inputs[i], err = transactionInputFromProto(protoInput)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	outputs := make([]*externalapi.DomainTransactionOutput, len(protoTransaction.Outputs))
-	for i, protoOutput := range protoTransaction.Outputs {
-		var err error
-		outputs[i], err = transactionOutputFromProto(protoOutput)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	subnetworkID, err := subnetworks.FromBytes(protoTransaction.SubnetworkId.Bytes)
-	if err != nil {
-		return nil, err
-	}
-
-	return &externalapi.DomainTransaction{
-		Version:      uint16(protoTransaction.Version),
-		Inputs:       inputs,
-		Outputs:      outputs,
-		LockTime:     protoTransaction.LockTime,
-		SubnetworkID: *subnetworkID,
-		Gas:          protoTransaction.Gas,
-		Payload:      protoTransaction.Payload,
-	}, nil
-}
-
-func transactionToProto(tx *externalapi.DomainTransaction) *protoserialization.TransactionMessage {
-	protoInputs := make([]*protoserialization.TransactionInput, len(tx.Inputs))
-	for i, input := range tx.Inputs {
-		protoInputs[i] = transactionInputToProto(input)
-	}
-
-	protoOutputs := make([]*protoserialization.TransactionOutput, len(tx.Outputs))
-	for i, output := range tx.Outputs {
-		protoOutputs[i] = transactionOutputToProto(output)
-	}
-
-	return &protoserialization.TransactionMessage{
-		Version:      uint32(tx.Version),
-		Inputs:       protoInputs,
-		Outputs:      protoOutputs,
-		LockTime:     tx.LockTime,
-		SubnetworkId: &protoserialization.SubnetworkId{Bytes: tx.SubnetworkID[:]},
-		Gas:          tx.Gas,
-		Payload:      tx.Payload,
-	}
-}
-
-func transactionInputFromProto(protoInput *protoserialization.TransactionInput) (*externalapi.DomainTransactionInput, error) {
-	outpoint, err := outpointFromProto(protoInput.PreviousOutpoint)
-	if err != nil {
-		return nil, err
-	}
-
-	return &externalapi.DomainTransactionInput{
-		PreviousOutpoint: *outpoint,
-		SignatureScript:  protoInput.SignatureScript,
-		Sequence:         protoInput.Sequence,
-	}, nil
-}
-
-func transactionInputToProto(input *externalapi.DomainTransactionInput) *protoserialization.TransactionInput {
-	return &protoserialization.TransactionInput{
-		PreviousOutpoint: outpointToProto(&input.PreviousOutpoint),
-		SignatureScript:  input.SignatureScript,
-		Sequence:         input.Sequence,
-	}
-}
-
-func outpointFromProto(protoOutpoint *protoserialization.Outpoint) (*externalapi.DomainOutpoint, error) {
-	txID, err := transactionIDFromProto(protoOutpoint.TransactionId)
-	if err != nil {
-		return nil, err
-	}
-	return &externalapi.DomainOutpoint{
-		TransactionID: *txID,
-		Index:         protoOutpoint.Index,
-	}, nil
-}
-
-func outpointToProto(outpoint *externalapi.DomainOutpoint) *protoserialization.Outpoint {
-	return &protoserialization.Outpoint{
-		TransactionId: &protoserialization.TransactionId{Bytes: outpoint.TransactionID.ByteSlice()},
-		Index:         outpoint.Index,
-	}
-}
-
-func transactionIDFromProto(protoTxID *protoserialization.TransactionId) (*externalapi.DomainTransactionID, error) {
-	if protoTxID == nil {
-		return nil, errors.Errorf("protoTxID is nil")
-	}
-
-	return externalapi.NewDomainTransactionIDFromByteSlice(protoTxID.Bytes)
-}
-
-func transactionOutputFromProto(protoOutput *protoserialization.TransactionOutput) (*externalapi.DomainTransactionOutput, error) {
-	scriptPublicKey, err := scriptPublicKeyFromProto(protoOutput.ScriptPublicKey)
-	if err != nil {
-		return nil, err
-	}
-
-	return &externalapi.DomainTransactionOutput{
-		Value:           protoOutput.Value,
-		ScriptPublicKey: scriptPublicKey,
-	}, nil
-}
-
-func transactionOutputToProto(output *externalapi.DomainTransactionOutput) *protoserialization.TransactionOutput {
-	return &protoserialization.TransactionOutput{
-		Value:           output.Value,
-		ScriptPublicKey: scriptPublicKeyToProto(output.ScriptPublicKey),
-	}
-}
-
-func scriptPublicKeyFromProto(protoScriptPublicKey *protoserialization.ScriptPublicKey) (*externalapi.ScriptPublicKey, error) {
-	if protoScriptPublicKey.Version > math.MaxUint16 {
-		return nil, errors.Errorf("protoOutput.ScriptPublicKey.Version is %d and is too big to be a uint16", protoScriptPublicKey.Version)
-	}
-	return &externalapi.ScriptPublicKey{
-		Script:  protoScriptPublicKey.Script,
-		Version: uint16(protoScriptPublicKey.Version),
-	}, nil
-}
-
-func scriptPublicKeyToProto(scriptPublicKey *externalapi.ScriptPublicKey) *protoserialization.ScriptPublicKey {
-	return &protoserialization.ScriptPublicKey{
-		Script:  scriptPublicKey.Script,
-		Version: uint32(scriptPublicKey.Version),
-	}
-}

cmd/kaspawallet/libkaspawallet/sign.go

@@ -1,146 +0,0 @@
-package libkaspawallet
-
-import (
-	"bytes"
-	"github.com/kaspanet/go-secp256k1"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet/serialization"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/txscript"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
-	"github.com/pkg/errors"
-)
-
-type signer interface {
-	rawTxInSignature(tx *externalapi.DomainTransaction, idx int, hashType consensushashing.SigHashType,
-		sighashReusedValues *consensushashing.SighashReusedValues) ([]byte, error)
-	serializedPublicKey() ([]byte, error)
-}
-
-type schnorrSigner secp256k1.SchnorrKeyPair
-
-func (s *schnorrSigner) rawTxInSignature(tx *externalapi.DomainTransaction, idx int, hashType consensushashing.SigHashType,
-	sighashReusedValues *consensushashing.SighashReusedValues) ([]byte, error) {
-	return txscript.RawTxInSignature(tx, idx, hashType, (*secp256k1.SchnorrKeyPair)(s), sighashReusedValues)
-}
-
-func (s *schnorrSigner) serializedPublicKey() ([]byte, error) {
-	publicKey, err := (*secp256k1.SchnorrKeyPair)(s).SchnorrPublicKey()
-	if err != nil {
-		return nil, err
-	}
-
-	serializedPublicKey, err := publicKey.Serialize()
-	if err != nil {
-		return nil, err
-	}
-
-	return serializedPublicKey[:], nil
-}
-
-type ecdsaSigner secp256k1.ECDSAPrivateKey
-
-func (e *ecdsaSigner) rawTxInSignature(tx *externalapi.DomainTransaction, idx int, hashType consensushashing.SigHashType,
-	sighashReusedValues *consensushashing.SighashReusedValues) ([]byte, error) {
-	return txscript.RawTxInSignatureECDSA(tx, idx, hashType, (*secp256k1.ECDSAPrivateKey)(e), sighashReusedValues)
-}
-
-func (e *ecdsaSigner) serializedPublicKey() ([]byte, error) {
-	publicKey, err := (*secp256k1.ECDSAPrivateKey)(e).ECDSAPublicKey()
-	if err != nil {
-		return nil, err
-	}
-
-	serializedPublicKey, err := publicKey.Serialize()
-	if err != nil {
-		return nil, err
-	}
-
-	return serializedPublicKey[:], nil
-}
-
-func deserializeECDSAPrivateKey(privateKey []byte, ecdsa bool) (signer, error) {
-	if ecdsa {
-		keyPair, err := secp256k1.DeserializeECDSAPrivateKeyFromSlice(privateKey)
-		if err != nil {
-			return nil, errors.Wrap(err, "Error deserializing private key")
-		}
-
-		return (*ecdsaSigner)(keyPair), nil
-	}
-
-	keyPair, err := secp256k1.DeserializeSchnorrPrivateKeyFromSlice(privateKey)
-	if err != nil {
-		return nil, errors.Wrap(err, "Error deserializing private key")
-	}
-
-	return (*schnorrSigner)(keyPair), nil
-}
-
-// Sign signs the transaction with the given private keys
-func Sign(privateKeys [][]byte, serializedPSTx []byte, ecdsa bool) ([]byte, error) {
-	keyPairs := make([]signer, len(privateKeys))
-	for i, privateKey := range privateKeys {
-		var err error
-		keyPairs[i], err = deserializeECDSAPrivateKey(privateKey, ecdsa)
-		if err != nil {
-			return nil, errors.Wrap(err, "Error deserializing private key")
-		}
-	}
-
-	partiallySignedTransaction, err := serialization.DeserializePartiallySignedTransaction(serializedPSTx)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, keyPair := range keyPairs {
-		err = sign(keyPair, partiallySignedTransaction)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return serialization.SerializePartiallySignedTransaction(partiallySignedTransaction)
-}
-
-func sign(keyPair signer, psTx *serialization.PartiallySignedTransaction) error {
-	if isTransactionFullySigned(psTx) {
-		return nil
-	}
-
-	serializedPublicKey, err := keyPair.serializedPublicKey()
-	if err != nil {
-		return err
-	}
-
-	sighashReusedValues := &consensushashing.SighashReusedValues{}
-	for i, partiallySignedInput := range psTx.PartiallySignedInputs {
-		prevOut := partiallySignedInput.PrevOutput
-		psTx.Tx.Inputs[i].UTXOEntry = utxo.NewUTXOEntry(
-			prevOut.Value,
-			prevOut.ScriptPublicKey,
-			false, // This is a fake value, because it's irrelevant for the signature
-			0,     // This is a fake value, because it's irrelevant for the signature
-		)
-	}
-
-	signed := false
-	for i, partiallySignedInput := range psTx.PartiallySignedInputs {
-		for _, pair := range partiallySignedInput.PubKeySignaturePairs {
-			if bytes.Equal(pair.PubKey, serializedPublicKey[:]) {
-				pair.Signature, err = keyPair.rawTxInSignature(psTx.Tx, i, consensushashing.SigHashAll, sighashReusedValues)
-				if err != nil {
-					return err
-				}
-
-				signed = true
-			}
-		}
-	}
-
-	if !signed {
-		return errors.Errorf("Public key doesn't match any of the transaction public keys")
-	}
-
-	return nil
-}

cmd/kaspawallet/libkaspawallet/transaction.go

@@ -1,206 +0,0 @@
-package libkaspawallet
-
-import (
-	"bytes"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet/serialization"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/constants"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/subnetworks"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/txscript"
-	"github.com/kaspanet/kaspad/util"
-	"github.com/pkg/errors"
-	"sort"
-)
-
-// Payment contains a recipient payment details
-type Payment struct {
-	Address util.Address
-	Amount  uint64
-}
-
-func sortPublicKeys(publicKeys [][]byte) {
-	sort.Slice(publicKeys, func(i, j int) bool {
-		return bytes.Compare(publicKeys[i], publicKeys[j]) < 0
-	})
-}
-
-// CreateUnsignedTransaction creates an unsigned transaction
-func CreateUnsignedTransaction(
-	pubKeys [][]byte,
-	minimumSignatures uint32,
-	ecdsa bool,
-	payments []*Payment,
-	selectedUTXOs []*externalapi.OutpointAndUTXOEntryPair) ([]byte, error) {
-
-	sortPublicKeys(pubKeys)
-	unsignedTransaction, err := createUnsignedTransaction(pubKeys, minimumSignatures, ecdsa, payments, selectedUTXOs)
-	if err != nil {
-		return nil, err
-	}
-
-	return serialization.SerializePartiallySignedTransaction(unsignedTransaction)
-}
-
-func multiSigRedeemScript(pubKeys [][]byte, minimumSignatures uint32, ecdsa bool) ([]byte, error) {
-	scriptBuilder := txscript.NewScriptBuilder()
-	scriptBuilder.AddInt64(int64(minimumSignatures))
-	for _, key := range pubKeys {
-		scriptBuilder.AddData(key)
-	}
-	scriptBuilder.AddInt64(int64(len(pubKeys)))
-
-	if ecdsa {
-		scriptBuilder.AddOp(txscript.OpCheckMultiSigECDSA)
-	} else {
-		scriptBuilder.AddOp(txscript.OpCheckMultiSig)
-	}
-
-	return scriptBuilder.Script()
-}
-
-func createUnsignedTransaction(
-	pubKeys [][]byte,
-	minimumSignatures uint32,
-	ecdsa bool,
-	payments []*Payment,
-	selectedUTXOs []*externalapi.OutpointAndUTXOEntryPair) (*serialization.PartiallySignedTransaction, error) {
-
-	var redeemScript []byte
-	if len(pubKeys) > 1 {
-		var err error
-		redeemScript, err = multiSigRedeemScript(pubKeys, minimumSignatures, ecdsa)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	inputs := make([]*externalapi.DomainTransactionInput, len(selectedUTXOs))
-	partiallySignedInputs := make([]*serialization.PartiallySignedInput, len(selectedUTXOs))
-	for i, utxo := range selectedUTXOs {
-		emptyPubKeySignaturePairs := make([]*serialization.PubKeySignaturePair, len(pubKeys))
-		for i, pubKey := range pubKeys {
-			emptyPubKeySignaturePairs[i] = &serialization.PubKeySignaturePair{
-				PubKey: pubKey,
-			}
-		}
-
-		inputs[i] = &externalapi.DomainTransactionInput{PreviousOutpoint: *utxo.Outpoint}
-		partiallySignedInputs[i] = &serialization.PartiallySignedInput{
-			RedeeemScript: redeemScript,
-			PrevOutput: &externalapi.DomainTransactionOutput{
-				Value:           utxo.UTXOEntry.Amount(),
-				ScriptPublicKey: utxo.UTXOEntry.ScriptPublicKey(),
-			},
-			MinimumSignatures:    minimumSignatures,
-			PubKeySignaturePairs: emptyPubKeySignaturePairs,
-		}
-	}
-
-	outputs := make([]*externalapi.DomainTransactionOutput, len(payments))
-	for i, payment := range payments {
-		scriptPublicKey, err := txscript.PayToAddrScript(payment.Address)
-		if err != nil {
-			return nil, err
-		}
-
-		outputs[i] = &externalapi.DomainTransactionOutput{
-			Value:           payment.Amount,
-			ScriptPublicKey: scriptPublicKey,
-		}
-	}
-
-	domainTransaction := &externalapi.DomainTransaction{
-		Version:      constants.MaxTransactionVersion,
-		Inputs:       inputs,
-		Outputs:      outputs,
-		LockTime:     0,
-		SubnetworkID: subnetworks.SubnetworkIDNative,
-		Gas:          0,
-		Payload:      nil,
-	}
-
-	return &serialization.PartiallySignedTransaction{
-		Tx:                    domainTransaction,
-		PartiallySignedInputs: partiallySignedInputs,
-	}, nil
-}
-
-// IsTransactionFullySigned returns whether the transaction is fully signed and ready to broadcast.
-func IsTransactionFullySigned(psTxBytes []byte) (bool, error) {
-	partiallySignedTransaction, err := serialization.DeserializePartiallySignedTransaction(psTxBytes)
-	if err != nil {
-		return false, err
-	}
-
-	return isTransactionFullySigned(partiallySignedTransaction), nil
-}
-
-func isTransactionFullySigned(psTx *serialization.PartiallySignedTransaction) bool {
-	for _, input := range psTx.PartiallySignedInputs {
-		numSignatures := 0
-		for _, pair := range input.PubKeySignaturePairs {
-			if pair.Signature != nil {
-				numSignatures++
-			}
-		}
-		if uint32(numSignatures) < input.MinimumSignatures {
-			return false
-		}
-	}
-	return true
-}
-
-// ExtractTransaction extracts a domain transaction from partially signed transaction after all of the
-// relevant parties have signed it.
-func ExtractTransaction(psTxBytes []byte) (*externalapi.DomainTransaction, error) {
-	partiallySignedTransaction, err := serialization.DeserializePartiallySignedTransaction(psTxBytes)
-	if err != nil {
-		return nil, err
-	}
-
-	return extractTransaction(partiallySignedTransaction)
-}
-
-func extractTransaction(psTx *serialization.PartiallySignedTransaction) (*externalapi.DomainTransaction, error) {
-	for i, input := range psTx.PartiallySignedInputs {
-		isMultisig := input.RedeeemScript != nil
-		scriptBuilder := txscript.NewScriptBuilder()
-		if isMultisig {
-			signatureCount := 0
-			for _, pair := range input.PubKeySignaturePairs {
-				if pair.Signature != nil {
-					scriptBuilder.AddData(pair.Signature)
-					signatureCount++
-				}
-			}
-			if uint32(signatureCount) < input.MinimumSignatures {
-				return nil, errors.Errorf("missing %d signatures", input.MinimumSignatures-uint32(signatureCount))
-			}
-
-			scriptBuilder.AddData(input.RedeeemScript)
-			sigScript, err := scriptBuilder.Script()
-			if err != nil {
-				return nil, err
-			}
-
-			psTx.Tx.Inputs[i].SignatureScript = sigScript
-		} else {
-			if len(input.PubKeySignaturePairs) > 1 {
-				return nil, errors.Errorf("Cannot sign on P2PK when len(input.PubKeySignaturePairs) > 1")
-			}
-
-			if input.PubKeySignaturePairs[0].Signature == nil {
-				return nil, errors.Errorf("missing signature")
-			}
-
-			sigScript, err := txscript.NewScriptBuilder().
-				AddData(input.PubKeySignaturePairs[0].Signature).
-				Script()
-			if err != nil {
-				return nil, err
-			}
-			psTx.Tx.Inputs[i].SignatureScript = sigScript
-		}
-	}
-	return psTx.Tx, nil
-}

cmd/kaspawallet/libkaspawallet/transaction_test.go

@@ -1,291 +0,0 @@
-package libkaspawallet_test
-
-import (
-	"fmt"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
-	"github.com/kaspanet/kaspad/domain/consensus"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/testutils"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/txscript"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
-	"github.com/kaspanet/kaspad/domain/dagconfig"
-	"github.com/kaspanet/kaspad/util"
-	"strings"
-	"testing"
-)
-
-func forSchnorrAndECDSA(t *testing.T, testFunc func(t *testing.T, ecdsa bool)) {
-	t.Run("schnorr", func(t *testing.T) {
-		testFunc(t, false)
-	})
-
-	t.Run("ecdsa", func(t *testing.T) {
-		testFunc(t, true)
-	})
-}
-
-func TestMultisig(t *testing.T) {
-	testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) {
-		forSchnorrAndECDSA(t, func(t *testing.T, ecdsa bool) {
-			params.BlockCoinbaseMaturity = 0
-			tc, teardown, err := consensus.NewFactory().NewTestConsensus(params, false, "TestMultisig")
-			if err != nil {
-				t.Fatalf("Error setting up tc: %+v", err)
-			}
-			defer teardown(false)
-
-			const numKeys = 3
-			privateKeys := make([][]byte, numKeys)
-			publicKeys := make([][]byte, numKeys)
-			for i := 0; i < numKeys; i++ {
-				privateKeys[i], publicKeys[i], err = libkaspawallet.CreateKeyPair(ecdsa)
-				if err != nil {
-					t.Fatalf("CreateKeyPair: %+v", err)
-				}
-			}
-
-			const minimumSignatures = 2
-			address, err := libkaspawallet.Address(params, publicKeys, minimumSignatures, ecdsa)
-			if err != nil {
-				t.Fatalf("Address: %+v", err)
-			}
-
-			if _, ok := address.(*util.AddressScriptHash); !ok {
-				t.Fatalf("The address is of unexpected type")
-			}
-
-			scriptPublicKey, err := txscript.PayToAddrScript(address)
-			if err != nil {
-				t.Fatalf("PayToAddrScript: %+v", err)
-			}
-
-			coinbaseData := &externalapi.DomainCoinbaseData{
-				ScriptPublicKey: scriptPublicKey,
-				ExtraData:       nil,
-			}
-
-			fundingBlockHash, _, err := tc.AddBlock([]*externalapi.DomainHash{params.GenesisHash}, coinbaseData, nil)
-			if err != nil {
-				t.Fatalf("AddBlock: %+v", err)
-			}
-
-			block1Hash, _, err := tc.AddBlock([]*externalapi.DomainHash{fundingBlockHash}, nil, nil)
-			if err != nil {
-				t.Fatalf("AddBlock: %+v", err)
-			}
-
-			block1, err := tc.GetBlock(block1Hash)
-			if err != nil {
-				t.Fatalf("GetBlock: %+v", err)
-			}
-
-			block1Tx := block1.Transactions[0]
-			block1TxOut := block1Tx.Outputs[0]
-			selectedUTXOs := []*externalapi.OutpointAndUTXOEntryPair{{
-				Outpoint: &externalapi.DomainOutpoint{
-					TransactionID: *consensushashing.TransactionID(block1.Transactions[0]),
-					Index:         0,
-				},
-				UTXOEntry: utxo.NewUTXOEntry(block1TxOut.Value, block1TxOut.ScriptPublicKey, true, 0),
-			}}
-
-			unsignedTransaction, err := libkaspawallet.CreateUnsignedTransaction(publicKeys, minimumSignatures, ecdsa,
-				[]*libkaspawallet.Payment{{
-					Address: address,
-					Amount:  10,
-				}}, selectedUTXOs)
-			if err != nil {
-				t.Fatalf("CreateUnsignedTransaction: %+v", err)
-			}
-
-			isFullySigned, err := libkaspawallet.IsTransactionFullySigned(unsignedTransaction)
-			if err != nil {
-				t.Fatalf("IsTransactionFullySigned: %+v", err)
-			}
-
-			if isFullySigned {
-				t.Fatalf("Transaction is not expected to be signed")
-			}
-
-			_, err = libkaspawallet.ExtractTransaction(unsignedTransaction)
-			if err == nil || !strings.Contains(err.Error(), fmt.Sprintf("missing %d signatures", minimumSignatures)) {
-				t.Fatal("Unexpectedly succeed to extract a valid transaction out of unsigned transaction")
-			}
-
-			signedTxStep1, err := libkaspawallet.Sign(privateKeys[:1], unsignedTransaction, ecdsa)
-			if err != nil {
-				t.Fatalf("IsTransactionFullySigned: %+v", err)
-			}
-
-			isFullySigned, err = libkaspawallet.IsTransactionFullySigned(signedTxStep1)
-			if err != nil {
-				t.Fatalf("IsTransactionFullySigned: %+v", err)
-			}
-
-			if isFullySigned {
-				t.Fatalf("Transaction is not expected to be fully signed")
-			}
-
-			signedTxStep2, err := libkaspawallet.Sign(privateKeys[1:2], signedTxStep1, ecdsa)
-			if err != nil {
-				t.Fatalf("Sign: %+v", err)
-			}
-
-			extractedSignedTxStep2, err := libkaspawallet.ExtractTransaction(signedTxStep2)
-			if err != nil {
-				t.Fatalf("ExtractTransaction: %+v", err)
-			}
-
-			signedTxOneStep, err := libkaspawallet.Sign(privateKeys[:2], unsignedTransaction, ecdsa)
-			if err != nil {
-				t.Fatalf("Sign: %+v", err)
-			}
-
-			extractedSignedTxOneStep, err := libkaspawallet.ExtractTransaction(signedTxOneStep)
-			if err != nil {
-				t.Fatalf("ExtractTransaction: %+v", err)
-			}
-
-			// We check IDs instead of comparing the actual transactions because the actual transactions have different
-			// signature scripts due to non deterministic signature scheme.
-			if !consensushashing.TransactionID(extractedSignedTxStep2).Equal(consensushashing.TransactionID(extractedSignedTxOneStep)) {
-				t.Fatalf("Expected extractedSignedTxOneStep and extractedSignedTxStep2 IDs to be equal")
-			}
-
-			_, insertionResult, err := tc.AddBlock([]*externalapi.DomainHash{block1Hash}, nil, []*externalapi.DomainTransaction{extractedSignedTxStep2})
-			if err != nil {
-				t.Fatalf("AddBlock: %+v", err)
-			}
-
-			addedUTXO := &externalapi.DomainOutpoint{
-				TransactionID: *consensushashing.TransactionID(extractedSignedTxStep2),
-				Index:         0,
-			}
-			if !insertionResult.VirtualUTXODiff.ToAdd().Contains(addedUTXO) {
-				t.Fatalf("Transaction wasn't accepted in the DAG")
-			}
-		})
-	})
-}
-
-func TestP2PK(t *testing.T) {
-	testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) {
-		forSchnorrAndECDSA(t, func(t *testing.T, ecdsa bool) {
-			params.BlockCoinbaseMaturity = 0
-			tc, teardown, err := consensus.NewFactory().NewTestConsensus(params, false, "TestMultisig")
-			if err != nil {
-				t.Fatalf("Error setting up tc: %+v", err)
-			}
-			defer teardown(false)
-
-			const numKeys = 1
-			privateKeys := make([][]byte, numKeys)
-			publicKeys := make([][]byte, numKeys)
-			for i := 0; i < numKeys; i++ {
-				privateKeys[i], publicKeys[i], err = libkaspawallet.CreateKeyPair(ecdsa)
-				if err != nil {
-					t.Fatalf("CreateKeyPair: %+v", err)
-				}
-			}
-
-			const minimumSignatures = 1
-			address, err := libkaspawallet.Address(params, publicKeys, minimumSignatures, ecdsa)
-			if err != nil {
-				t.Fatalf("Address: %+v", err)
-			}
-
-			if ecdsa {
-				if _, ok := address.(*util.AddressPublicKeyECDSA); !ok {
-					t.Fatalf("The address is of unexpected type")
-				}
-			} else {
-				if _, ok := address.(*util.AddressPublicKey); !ok {
-					t.Fatalf("The address is of unexpected type")
-				}
-			}
-
-			scriptPublicKey, err := txscript.PayToAddrScript(address)
-			if err != nil {
-				t.Fatalf("PayToAddrScript: %+v", err)
-			}
-
-			coinbaseData := &externalapi.DomainCoinbaseData{
-				ScriptPublicKey: scriptPublicKey,
-				ExtraData:       nil,
-			}
-
-			fundingBlockHash, _, err := tc.AddBlock([]*externalapi.DomainHash{params.GenesisHash}, coinbaseData, nil)
-			if err != nil {
-				t.Fatalf("AddBlock: %+v", err)
-			}
-
-			block1Hash, _, err := tc.AddBlock([]*externalapi.DomainHash{fundingBlockHash}, nil, nil)
-			if err != nil {
-				t.Fatalf("AddBlock: %+v", err)
-			}
-
-			block1, err := tc.GetBlock(block1Hash)
-			if err != nil {
-				t.Fatalf("GetBlock: %+v", err)
-			}
-
-			block1Tx := block1.Transactions[0]
-			block1TxOut := block1Tx.Outputs[0]
-			selectedUTXOs := []*externalapi.OutpointAndUTXOEntryPair{{
-				Outpoint: &externalapi.DomainOutpoint{
-					TransactionID: *consensushashing.TransactionID(block1.Transactions[0]),
-					Index:         0,
-				},
-				UTXOEntry: utxo.NewUTXOEntry(block1TxOut.Value, block1TxOut.ScriptPublicKey, true, 0),
-			}}
-
-			unsignedTransaction, err := libkaspawallet.CreateUnsignedTransaction(publicKeys, minimumSignatures,
-				ecdsa,
-				[]*libkaspawallet.Payment{{
-					Address: address,
-					Amount:  10,
-				}}, selectedUTXOs)
-			if err != nil {
-				t.Fatalf("CreateUnsignedTransaction: %+v", err)
-			}
-
-			isFullySigned, err := libkaspawallet.IsTransactionFullySigned(unsignedTransaction)
-			if err != nil {
-				t.Fatalf("IsTransactionFullySigned: %+v", err)
-			}
-
-			if isFullySigned {
-				t.Fatalf("Transaction is not expected to be signed")
-			}
-
-			_, err = libkaspawallet.ExtractTransaction(unsignedTransaction)
-			if err == nil || !strings.Contains(err.Error(), "missing signature") {
-				t.Fatal("Unexpectedly succeed to extract a valid transaction out of unsigned transaction")
-			}
-
-			signedTx, err := libkaspawallet.Sign(privateKeys, unsignedTransaction, ecdsa)
-			if err != nil {
-				t.Fatalf("IsTransactionFullySigned: %+v", err)
-			}
-
-			tx, err := libkaspawallet.ExtractTransaction(signedTx)
-			if err != nil {
-				t.Fatalf("ExtractTransaction: %+v", err)
-			}
-
-			_, insertionResult, err := tc.AddBlock([]*externalapi.DomainHash{block1Hash}, nil, []*externalapi.DomainTransaction{tx})
-			if err != nil {
-				t.Fatalf("AddBlock: %+v", err)
-			}
-
-			addedUTXO := &externalapi.DomainOutpoint{
-				TransactionID: *consensushashing.TransactionID(tx),
-				Index:         0,
-			}
-			if !insertionResult.VirtualUTXODiff.ToAdd().Contains(addedUTXO) {
-				t.Fatalf("Transaction wasn't accepted in the DAG")
-			}
-		})
-	})
-}

cmd/kaspawallet/main.go

@@ -1,33 +0,0 @@
-package main
-
-import "github.com/pkg/errors"
-
-func main() {
-	subCmd, config := parseCommandLine()
-
-	var err error
-	switch subCmd {
-	case createSubCmd:
-		err = create(config.(*createConfig))
-	case balanceSubCmd:
-		err = balance(config.(*balanceConfig))
-	case sendSubCmd:
-		err = send(config.(*sendConfig))
-	case createUnsignedTransactionSubCmd:
-		err = createUnsignedTransaction(config.(*createUnsignedTransactionConfig))
-	case signSubCmd:
-		err = sign(config.(*signConfig))
-	case broadcastSubCmd:
-		err = broadcast(config.(*broadcastConfig))
-	case showAddressSubCmd:
-		err = showAddress(config.(*showAddressConfig))
-	case dumpUnencryptedDataSubCmd:
-		err = dumpUnencryptedData(config.(*dumpUnencryptedDataConfig))
-	default:
-		err = errors.Errorf("Unknown sub-command '%s'\n", subCmd)
-	}
-
-	if err != nil {
-		printErrorAndExit(err)
-	}
-}

cmd/kaspawallet/send.go

@@ -1,170 +0,0 @@
-package main
-
-import (
-	"encoding/hex"
-	"fmt"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/keys"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
-	utxopkg "github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
-	"github.com/kaspanet/kaspad/domain/dagconfig"
-
-	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/transactionid"
-	"github.com/kaspanet/kaspad/infrastructure/network/rpcclient"
-	"github.com/kaspanet/kaspad/util"
-	"github.com/pkg/errors"
-)
-
-func send(conf *sendConfig) error {
-	keysFile, err := keys.ReadKeysFile(conf.KeysFile)
-	if err != nil {
-		return err
-	}
-
-	toAddress, err := util.DecodeAddress(conf.ToAddress, conf.ActiveNetParams.Prefix)
-	if err != nil {
-		return err
-	}
-
-	fromAddress, err := libkaspawallet.Address(conf.NetParams(), keysFile.PublicKeys, keysFile.MinimumSignatures, keysFile.ECDSA)
-	if err != nil {
-		return err
-	}
-
-	client, err := connectToRPC(conf.NetParams(), conf.RPCServer)
-	if err != nil {
-		return err
-	}
-	utxos, err := fetchSpendableUTXOs(conf.NetParams(), client, fromAddress.String())
-	if err != nil {
-		return err
-	}
-
-	sendAmountSompi := uint64(conf.SendAmount * util.SompiPerKaspa)
-
-	const feePerInput = 1000
-	selectedUTXOs, changeSompi, err := selectUTXOs(utxos, sendAmountSompi, feePerInput)
-	if err != nil {
-		return err
-	}
-
-	psTx, err := libkaspawallet.CreateUnsignedTransaction(keysFile.PublicKeys,
-		keysFile.MinimumSignatures,
-		keysFile.ECDSA,
-		[]*libkaspawallet.Payment{{
-			Address: toAddress,
-			Amount:  sendAmountSompi,
-		}, {
-			Address: fromAddress,
-			Amount:  changeSompi,
-		}},
-		selectedUTXOs)
-	if err != nil {
-		return err
-	}
-
-	privateKeys, err := keysFile.DecryptPrivateKeys()
-	if err != nil {
-		return err
-	}
-
-	updatedPSTx, err := libkaspawallet.Sign(privateKeys, psTx, keysFile.ECDSA)
-	if err != nil {
-		return err
-	}
-
-	tx, err := libkaspawallet.ExtractTransaction(updatedPSTx)
-	if err != nil {
-		return err
-	}
-
-	transactionID, err := sendTransaction(client, tx)
-	if err != nil {
-		return err
-	}
-
-	fmt.Println("Transaction was sent successfully")
-	fmt.Printf("Transaction ID: \t%s\n", transactionID)
-
-	return nil
-}
-
-func fetchSpendableUTXOs(params *dagconfig.Params, client *rpcclient.RPCClient, address string) ([]*appmessage.UTXOsByAddressesEntry, error) {
-	getUTXOsByAddressesResponse, err := client.GetUTXOsByAddresses([]string{address})
-	if err != nil {
-		return nil, err
-	}
-	virtualSelectedParentBlueScoreResponse, err := client.GetVirtualSelectedParentBlueScore()
-	if err != nil {
-		return nil, err
-	}
-	virtualSelectedParentBlueScore := virtualSelectedParentBlueScoreResponse.BlueScore
-
-	spendableUTXOs := make([]*appmessage.UTXOsByAddressesEntry, 0)
-	for _, entry := range getUTXOsByAddressesResponse.Entries {
-		if !isUTXOSpendable(entry, virtualSelectedParentBlueScore, params.BlockCoinbaseMaturity) {
-			continue
-		}
-		spendableUTXOs = append(spendableUTXOs, entry)
-	}
-	return spendableUTXOs, nil
-}
-
-func selectUTXOs(utxos []*appmessage.UTXOsByAddressesEntry, spendAmount uint64, feePerInput uint64) (
-	selectedUTXOs []*externalapi.OutpointAndUTXOEntryPair, changeSompi uint64, err error) {
-
-	selectedUTXOs = []*externalapi.OutpointAndUTXOEntryPair{}
-	totalValue := uint64(0)
-
-	for _, utxo := range utxos {
-		txID, err := transactionid.FromString(utxo.Outpoint.TransactionID)
-		if err != nil {
-			return nil, 0, err
-		}
-
-		rpcUTXOEntry := utxo.UTXOEntry
-		scriptPublicKeyScript, err := hex.DecodeString(rpcUTXOEntry.ScriptPublicKey.Script)
-		if err != nil {
-			return nil, 0, err
-		}
-
-		scriptPublicKey := &externalapi.ScriptPublicKey{
-			Script:  scriptPublicKeyScript,
-			Version: rpcUTXOEntry.ScriptPublicKey.Version,
-		}
-
-		utxoEntry := utxopkg.NewUTXOEntry(rpcUTXOEntry.Amount, scriptPublicKey, rpcUTXOEntry.IsCoinbase, rpcUTXOEntry.BlockDAAScore)
-		selectedUTXOs = append(selectedUTXOs, &externalapi.OutpointAndUTXOEntryPair{
-			Outpoint: &externalapi.DomainOutpoint{
-				TransactionID: *txID,
-				Index:         utxo.Outpoint.Index,
-			},
-			UTXOEntry: utxoEntry,
-		})
-		totalValue += utxo.UTXOEntry.Amount
-
-		fee := feePerInput * uint64(len(selectedUTXOs))
-		totalSpend := spendAmount + fee
-		if totalValue >= totalSpend {
-			break
-		}
-	}
-
-	fee := feePerInput * uint64(len(selectedUTXOs))
-	totalSpend := spendAmount + fee
-	if totalValue < totalSpend {
-		return nil, 0, errors.Errorf("Insufficient funds for send: %f required, while only %f available",
-			float64(totalSpend)/util.SompiPerKaspa, float64(totalValue)/util.SompiPerKaspa)
-	}
-
-	return selectedUTXOs, totalValue - totalSpend, nil
-}
-
-func sendTransaction(client *rpcclient.RPCClient, tx *externalapi.DomainTransaction) (string, error) {
-	submitTransactionResponse, err := client.SubmitTransaction(appmessage.DomainTransactionToRPCTransaction(tx))
-	if err != nil {
-		return "", errors.Wrapf(err, "error submitting transaction")
-	}
-	return submitTransactionResponse.TransactionID, nil
-}

cmd/kaspawallet/show_address.go

@@ -1,22 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/keys"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
-)
-
-func showAddress(conf *showAddressConfig) error {
-	keysFile, err := keys.ReadKeysFile(conf.KeysFile)
-	if err != nil {
-		return err
-	}
-
-	address, err := libkaspawallet.Address(conf.NetParams(), keysFile.PublicKeys, keysFile.MinimumSignatures, keysFile.ECDSA)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("The wallet address is:\n%s\n", address)
-	return nil
-}

cmd/kaspawallet/sign.go

@@ -1,44 +0,0 @@
-package main
-
-import (
-	"encoding/hex"
-	"fmt"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/keys"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
-)
-
-func sign(conf *signConfig) error {
-	keysFile, err := keys.ReadKeysFile(conf.KeysFile)
-	if err != nil {
-		return err
-	}
-
-	psTxBytes, err := hex.DecodeString(conf.Transaction)
-	if err != nil {
-		return err
-	}
-
-	privateKeys, err := keysFile.DecryptPrivateKeys()
-	if err != nil {
-		return err
-	}
-
-	updatedPSTxBytes, err := libkaspawallet.Sign(privateKeys, psTxBytes, keysFile.ECDSA)
-	if err != nil {
-		return err
-	}
-
-	isFullySigned, err := libkaspawallet.IsTransactionFullySigned(updatedPSTxBytes)
-	if err != nil {
-		return err
-	}
-
-	if isFullySigned {
-		fmt.Println("The transaction is signed and ready to broadcast")
-	} else {
-		fmt.Println("Successfully signed transaction")
-	}
-
-	fmt.Printf("Transaction: %x\n", updatedPSTxBytes)
-	return nil
-}

cmd/wallet/README.md

@@ -0,0 +1,48 @@
+WALLET
+======
+
+## IMPORTANT:
+
+### This software is for TESTING ONLY. Do NOT use it for handling real money.
+
+`wallet` is a simple, no-frills wallet software operated via the command line.\
+It is capable of generating wallet key-pairs, printing a wallet's current balance, and sending simple transactions.
+
+## Requirements
+
+Go 1.16 or later.
+
+## Installation
+
+#### Build from Source
+
+- Install Go according to the installation instructions here:
+  http://golang.org/doc/install
+
+- Ensure Go was installed properly and is a supported version:
+
+```bash
+$ go version
+```
+
+- Run the following commands to obtain and install kaspad including all dependencies:
+
+```bash
+$ git clone https://github.com/kaspanet/kaspad
+$ cd kaspad/cmd/wallet
+$ go install .
+```
+
+- Wallet should now be installed in `$(go env GOPATH)/bin`. If you did
+  not already add the bin directory to your system path during Go installation,
+  you are encouraged to do so now.
+
+
+Usage
+-----
+
+* Create a new wallet key-pair: `wallet create --testnet`
+* Print a wallet's current balance:
+  `wallet balance --testnet --address=kaspatest:000000000000000000000000000000000000000000`
+* Send funds to another wallet:
+  `wallet send --testnet --private-key=0000000000000000000000000000000000000000000000000000000000000000 --send-amount=50 --to-address=kaspatest:000000000000000000000000000000000000000000`

cmd/wallet/balance.go

@@ -2,28 +2,17 @@ package main
 
 import (
 	"fmt"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/keys"
-	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
+	"github.com/kaspanet/kaspad/infrastructure/network/rpcclient"
+
 	"github.com/kaspanet/kaspad/util"
 )
 
 func balance(conf *balanceConfig) error {
-	client, err := connectToRPC(conf.NetParams(), conf.RPCServer)
+	client, err := rpcclient.NewRPCClient(conf.RPCServer)
 	if err != nil {
 		return err
 	}
-
-	keysFile, err := keys.ReadKeysFile(conf.KeysFile)
-	if err != nil {
-		return err
-	}
-
-	addr, err := libkaspawallet.Address(conf.NetParams(), keysFile.PublicKeys, keysFile.MinimumSignatures, keysFile.ECDSA)
-	if err != nil {
-		return err
-	}
-
-	getUTXOsByAddressesResponse, err := client.GetUTXOsByAddresses([]string{addr.String()})
+	getUTXOsByAddressesResponse, err := client.GetUTXOsByAddresses([]string{conf.Address})
 	if err != nil {
 		return err
 	}

cmd/wallet/common.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"os"
+)
+
+func isUTXOSpendable(entry *appmessage.UTXOsByAddressesEntry, virtualSelectedParentBlueScore uint64, coinbaseMaturity uint64) bool {
+	if !entry.UTXOEntry.IsCoinbase {
+		return true
+	}
+	blockBlueScore := entry.UTXOEntry.BlockBlueScore
+	return blockBlueScore+coinbaseMaturity < virtualSelectedParentBlueScore
+}
+
+func printErrorAndExit(err error) {
+	fmt.Fprintf(os.Stderr, "%s\n", err)
+	os.Exit(1)
+}

cmd/wallet/config.go

@@ -0,0 +1,85 @@
+package main
+
+import (
+	"github.com/kaspanet/kaspad/infrastructure/config"
+	"github.com/pkg/errors"
+	"os"
+
+	"github.com/jessevdk/go-flags"
+)
+
+const (
+	createSubCmd  = "create"
+	balanceSubCmd = "balance"
+	sendSubCmd    = "send"
+)
+
+type createConfig struct {
+	config.NetworkFlags
+}
+
+type balanceConfig struct {
+	RPCServer string `long:"rpcserver" short:"s" description:"RPC server to connect to"`
+	Address   string `long:"address" short:"d" description:"The public address to check the balance of" required:"true"`
+	config.NetworkFlags
+}
+
+type sendConfig struct {
+	RPCServer  string  `long:"rpcserver" short:"s" description:"RPC server to connect to"`
+	PrivateKey string  `long:"private-key" short:"k" description:"The private key of the sender (encoded in hex)" required:"true"`
+	ToAddress  string  `long:"to-address" short:"t" description:"The public address to send Kaspa to" required:"true"`
+	SendAmount float64 `long:"send-amount" short:"v" description:"An amount to send in Kaspa (e.g. 1234.12345678)" required:"true"`
+	config.NetworkFlags
+}
+
+func parseCommandLine() (subCommand string, config interface{}) {
+	cfg := &struct{}{}
+	parser := flags.NewParser(cfg, flags.PrintErrors|flags.HelpFlag)
+
+	createConf := &createConfig{}
+	parser.AddCommand(createSubCmd, "Creates a new wallet",
+		"Creates a private key and 3 public addresses, one for each of MainNet, TestNet and DevNet", createConf)
+
+	balanceConf := &balanceConfig{}
+	parser.AddCommand(balanceSubCmd, "Shows the balance of a public address",
+		"Shows the balance for a public address in Kaspa", balanceConf)
+
+	sendConf := &sendConfig{}
+	parser.AddCommand(sendSubCmd, "Sends a Kaspa transaction to a public address",
+		"Sends a Kaspa transaction to a public address", sendConf)
+
+	_, err := parser.Parse()
+
+	if err != nil {
+		var flagsErr *flags.Error
+		if ok := errors.As(err, &flagsErr); ok && flagsErr.Type == flags.ErrHelp {
+			os.Exit(0)
+		} else {
+			os.Exit(1)
+		}
+		return "", nil
+	}
+
+	switch parser.Command.Active.Name {
+	case createSubCmd:
+		err := createConf.ResolveNetwork(parser)
+		if err != nil {
+			printErrorAndExit(err)
+		}
+		config = createConf
+	case balanceSubCmd:
+		err := balanceConf.ResolveNetwork(parser)
+		if err != nil {
+			printErrorAndExit(err)
+		}
+		config = balanceConf
+	case sendSubCmd:
+		err := sendConf.ResolveNetwork(parser)
+		if err != nil {
+			printErrorAndExit(err)
+		}
+		config = sendConf
+	}
+
+	return parser.Command.Active.Name, config
+}

cmd/wallet/create.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/kaspanet/go-secp256k1"
+	"github.com/kaspanet/kaspad/util"
+	"github.com/pkg/errors"
+)
+
+func create(conf *createConfig) error {
+	privateKey, err := secp256k1.GeneratePrivateKey()
+	if err != nil {
+		return errors.Wrap(err, "Failed to generate private key")
+	}
+
+	fmt.Println("This is your private key, granting access to all wallet funds. Keep it safe. Use it only when sending Kaspa.")
+	fmt.Printf("Private key (hex):\t%s\n\n", privateKey.SerializePrivateKey())
+
+	fmt.Println("This is your public address, where money is to be sent.")
+	publicKey, err := privateKey.SchnorrPublicKey()
+	if err != nil {
+		return errors.Wrap(err, "Failed to generate public key")
+	}
+	publicKeySerialized, err := publicKey.Serialize()
+	if err != nil {
+		return errors.Wrap(err, "Failed to serialize public key")
+	}
+
+	addr, err := util.NewAddressPubKeyHashFromPublicKey(publicKeySerialized[:], conf.ActiveNetParams.Prefix)
+	if err != nil {
+		return errors.Wrap(err, "Failed to generate p2pkh address")
+	}
+	fmt.Printf("Address (%s):\t%s\n", conf.ActiveNetParams.Name, addr)
+
+	return nil
+}

cmd/wallet/main.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"github.com/pkg/errors"
+)
+
+func main() {
+	subCmd, config := parseCommandLine()
+
+	var err error
+	switch subCmd {
+	case createSubCmd:
+		err = create(config.(*createConfig))
+	case balanceSubCmd:
+		err = balance(config.(*balanceConfig))
+	case sendSubCmd:
+		err = send(config.(*sendConfig))
+	default:
+		err = errors.Errorf("Unknown sub-command '%s'\n", subCmd)
+	}
+
+	if err != nil {
+		printErrorAndExit(err)
+	}
+}

cmd/wallet/send.go

@@ -0,0 +1,201 @@
+package main
+
+import (
+	"encoding/hex"
+	"fmt"
+	"github.com/kaspanet/go-secp256k1"
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/constants"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/subnetworks"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/transactionid"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/txscript"
+	"github.com/kaspanet/kaspad/infrastructure/network/rpcclient"
+	"github.com/kaspanet/kaspad/util"
+	"github.com/pkg/errors"
+)
+
+const feeSompis uint64 = 1000
+
+func send(conf *sendConfig) error {
+	toAddress, err := util.DecodeAddress(conf.ToAddress, conf.ActiveNetParams.Prefix)
+	if err != nil {
+		return err
+	}
+
+	keyPair, publicKey, err := parsePrivateKey(conf.PrivateKey)
+	if err != nil {
+		return err
+	}
+
+	serializedPublicKey, err := publicKey.Serialize()
+	if err != nil {
+		return err
+	}
+	fromAddress, err := util.NewAddressPubKeyHashFromPublicKey(serializedPublicKey[:], conf.ActiveNetParams.Prefix)
+	if err != nil {
+		return err
+	}
+
+	client, err := rpcclient.NewRPCClient(conf.RPCServer)
+	if err != nil {
+		return err
+	}
+	utxos, err := fetchSpendableUTXOs(conf, client, fromAddress.String())
+	if err != nil {
+		return err
+	}
+
+	sendAmountSompi := uint64(conf.SendAmount * util.SompiPerKaspa)
+	totalToSend := sendAmountSompi + feeSompis
+
+	selectedUTXOs, changeSompi, err := selectUTXOs(utxos, totalToSend)
+	if err != nil {
+		return err
+	}
+
+	rpcTransaction, err := generateTransaction(keyPair, selectedUTXOs, sendAmountSompi, changeSompi, toAddress, fromAddress)
+	if err != nil {
+		return err
+	}
+
+	transactionID, err := sendTransaction(client, rpcTransaction)
+	if err != nil {
+		return err
+	}
+
+	fmt.Println("Transaction was sent successfully")
+	fmt.Printf("Transaction ID: \t%s\n", transactionID)
+
+	return nil
+}
+
+func parsePrivateKey(privateKeyHex string) (*secp256k1.SchnorrKeyPair, *secp256k1.SchnorrPublicKey, error) {
+	privateKeyBytes, err := hex.DecodeString(privateKeyHex)
+	if err != nil {
+		return nil, nil, errors.Wrap(err, "Error parsing private key hex")
+	}
+	keyPair, err := secp256k1.DeserializePrivateKeyFromSlice(privateKeyBytes)
+	if err != nil {
+		return nil, nil, errors.Wrap(err, "Error deserializing private key")
+	}
+	publicKey, err := keyPair.SchnorrPublicKey()
+	if err != nil {
+		return nil, nil, errors.Wrap(err, "Error generating public key")
+	}
+	return keyPair, publicKey, nil
+}
+
+func fetchSpendableUTXOs(conf *sendConfig, client *rpcclient.RPCClient, address string) ([]*appmessage.UTXOsByAddressesEntry, error) {
+	getUTXOsByAddressesResponse, err := client.GetUTXOsByAddresses([]string{address})
+	if err != nil {
+		return nil, err
+	}
+	virtualSelectedParentBlueScoreResponse, err := client.GetVirtualSelectedParentBlueScore()
+	if err != nil {
+		return nil, err
+	}
+	virtualSelectedParentBlueScore := virtualSelectedParentBlueScoreResponse.BlueScore
+
+	spendableUTXOs := make([]*appmessage.UTXOsByAddressesEntry, 0)
+	for _, entry := range getUTXOsByAddressesResponse.Entries {
+		if !isUTXOSpendable(entry, virtualSelectedParentBlueScore, conf.ActiveNetParams.BlockCoinbaseMaturity) {
+			continue
+		}
+		spendableUTXOs = append(spendableUTXOs, entry)
+	}
+	return spendableUTXOs, nil
+}
+
+func selectUTXOs(utxos []*appmessage.UTXOsByAddressesEntry, totalToSpend uint64) (
+	selectedUTXOs []*appmessage.UTXOsByAddressesEntry, changeSompi uint64, err error) {
+
+	selectedUTXOs = []*appmessage.UTXOsByAddressesEntry{}
+	totalValue := uint64(0)
+
+	for _, utxo := range utxos {
+		selectedUTXOs = append(selectedUTXOs, utxo)
+		totalValue += utxo.UTXOEntry.Amount
+
+		if totalValue >= totalToSpend {
+			break
+		}
+	}
+
+	if totalValue < totalToSpend {
+		return nil, 0, errors.Errorf("Insufficient funds for send: %f required, while only %f available",
+			float64(totalToSpend)/util.SompiPerKaspa, float64(totalValue)/util.SompiPerKaspa)
+	}
+
+	return selectedUTXOs, totalValue - totalToSpend, nil
+}
+
+func generateTransaction(keyPair *secp256k1.SchnorrKeyPair, selectedUTXOs []*appmessage.UTXOsByAddressesEntry,
+	sompisToSend uint64, change uint64, toAddress util.Address,
+	fromAddress util.Address) (*appmessage.RPCTransaction, error) {
+
+	inputs := make([]*externalapi.DomainTransactionInput, len(selectedUTXOs))
+	for i, utxo := range selectedUTXOs {
+		outpointTransactionIDBytes, err := hex.DecodeString(utxo.Outpoint.TransactionID)
+		if err != nil {
+			return nil, err
+		}
+		outpointTransactionID, err := transactionid.FromBytes(outpointTransactionIDBytes)
+		if err != nil {
+			return nil, err
+		}
+		outpoint := externalapi.DomainOutpoint{
+			TransactionID: *outpointTransactionID,
+			Index:         utxo.Outpoint.Index,
+		}
+		inputs[i] = &externalapi.DomainTransactionInput{PreviousOutpoint: outpoint}
+	}
+
+	toScript, err := txscript.PayToAddrScript(toAddress)
+	if err != nil {
+		return nil, err
+	}
+	mainOutput := &externalapi.DomainTransactionOutput{
+		Value:           sompisToSend,
+		ScriptPublicKey: toScript,
+	}
+	fromScript, err := txscript.PayToAddrScript(fromAddress)
+	if err != nil {
+		return nil, err
+	}
+	changeOutput := &externalapi.DomainTransactionOutput{
+		Value:           change,
+		ScriptPublicKey: fromScript,
+	}
+	outputs := []*externalapi.DomainTransactionOutput{mainOutput, changeOutput}
+
+	domainTransaction := &externalapi.DomainTransaction{
+		Version:      constants.MaxTransactionVersion,
+		Inputs:       inputs,
+		Outputs:      outputs,
+		LockTime:     0,
+		SubnetworkID: subnetworks.SubnetworkIDNative,
+		Gas:          0,
+		Payload:      nil,
+		PayloadHash:  externalapi.DomainHash{},
+	}
+
+	for i, input := range domainTransaction.Inputs {
+		signatureScript, err := txscript.SignatureScript(domainTransaction, i, fromScript, txscript.SigHashAll, keyPair)
+		if err != nil {
+			return nil, err
+		}
+		input.SignatureScript = signatureScript
+	}
+
+	rpcTransaction := appmessage.DomainTransactionToRPCTransaction(domainTransaction)
+	return rpcTransaction, nil
+}
+
+func sendTransaction(client *rpcclient.RPCClient, rpcTransaction *appmessage.RPCTransaction) (string, error) {
+	submitTransactionResponse, err := client.SubmitTransaction(rpcTransaction)
+	if err != nil {
+		return "", errors.Wrapf(err, "error submitting transaction")
+	}
+	return submitTransactionResponse.TransactionID, nil
+}

domain/consensus/consensus.go

@@ -46,7 +46,6 @@ type consensus struct {
 	utxoDiffStore             model.UTXODiffStore
 	finalityStore             model.FinalityStore
 	headersSelectedChainStore model.HeadersSelectedChainStore
-	daaBlocksStore            model.DAABlocksStore
 }
 
 // BuildBlock builds a block over the current state, with the transactions
@@ -75,34 +74,30 @@ func (s *consensus) ValidateTransactionAndPopulateWithConsensusData(transaction
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
 	err := s.transactionValidator.ValidateTransactionInIsolation(transaction)
 	if err != nil {
 		return err
 	}
 
-	err = s.consensusStateManager.PopulateTransactionWithUTXOEntries(stagingArea, transaction)
+	err = s.consensusStateManager.PopulateTransactionWithUTXOEntries(transaction)
 	if err != nil {
 		return err
 	}
 
-	virtualSelectedParentMedianTime, err := s.pastMedianTimeManager.PastMedianTime(stagingArea, model.VirtualBlockHash)
+	virtualSelectedParentMedianTime, err := s.pastMedianTimeManager.PastMedianTime(model.VirtualBlockHash)
 	if err != nil {
 		return err
 	}
 
-	return s.transactionValidator.ValidateTransactionInContextAndPopulateMassAndFee(
-		stagingArea, transaction, model.VirtualBlockHash, virtualSelectedParentMedianTime)
+	return s.transactionValidator.ValidateTransactionInContextAndPopulateMassAndFee(transaction,
+		model.VirtualBlockHash, virtualSelectedParentMedianTime)
 }
 
 func (s *consensus) GetBlock(blockHash *externalapi.DomainHash) (*externalapi.DomainBlock, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	block, err := s.blockStore.Block(s.databaseContext, stagingArea, blockHash)
+	block, err := s.blockStore.Block(s.databaseContext, blockHash)
 	if err != nil {
 		if errors.Is(err, database.ErrNotFound) {
 			return nil, errors.Wrapf(err, "block %s does not exist", blockHash)
@@ -116,9 +111,7 @@ func (s *consensus) GetBlockHeader(blockHash *externalapi.DomainHash) (externala
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	blockHeader, err := s.blockHeaderStore.BlockHeader(s.databaseContext, stagingArea, blockHash)
+	blockHeader, err := s.blockHeaderStore.BlockHeader(s.databaseContext, blockHash)
 	if err != nil {
 		if errors.Is(err, database.ErrNotFound) {
 			return nil, errors.Wrapf(err, "block header %s does not exist", blockHash)
@@ -132,11 +125,9 @@ func (s *consensus) GetBlockInfo(blockHash *externalapi.DomainHash) (*externalap
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
 	blockInfo := &externalapi.BlockInfo{}
 
-	exists, err := s.blockStatusStore.Exists(s.databaseContext, stagingArea, blockHash)
+	exists, err := s.blockStatusStore.Exists(s.databaseContext, blockHash)
 	if err != nil {
 		return nil, err
 	}
@@ -145,7 +136,7 @@ func (s *consensus) GetBlockInfo(blockHash *externalapi.DomainHash) (*externalap
 		return blockInfo, nil
 	}
 
-	blockStatus, err := s.blockStatusStore.Get(s.databaseContext, stagingArea, blockHash)
+	blockStatus, err := s.blockStatusStore.Get(s.databaseContext, blockHash)
 	if err != nil {
 		return nil, err
 	}
@@ -156,7 +147,7 @@ func (s *consensus) GetBlockInfo(blockHash *externalapi.DomainHash) (*externalap
 		return blockInfo, nil
 	}
 
-	ghostdagData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, blockHash)
+	ghostdagData, err := s.ghostdagDataStore.Get(s.databaseContext, blockHash)
 	if err != nil {
 		return nil, err
 	}
@@ -166,74 +157,55 @@ func (s *consensus) GetBlockInfo(blockHash *externalapi.DomainHash) (*externalap
 	return blockInfo, nil
 }
 
-func (s *consensus) GetBlockRelations(blockHash *externalapi.DomainHash) (
-	parents []*externalapi.DomainHash, selectedParent *externalapi.DomainHash,
-	children []*externalapi.DomainHash, err error) {
-
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	stagingArea := model.NewStagingArea()
-
-	blockRelation, err := s.blockRelationStore.BlockRelation(s.databaseContext, stagingArea, blockHash)
+func (s *consensus) GetBlockChildren(blockHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
+	blockRelation, err := s.blockRelationStore.BlockRelation(s.databaseContext, blockHash)
 	if err != nil {
-		return nil, nil, nil, err
+		return nil, err
 	}
 
-	blockGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, blockHash)
-	if err != nil {
-		return nil, nil, nil, err
-	}
-
-	return blockRelation.Parents, blockGHOSTDAGData.SelectedParent(), blockRelation.Children, nil
+	return blockRelation.Children, nil
 }
 
 func (s *consensus) GetBlockAcceptanceData(blockHash *externalapi.DomainHash) (externalapi.AcceptanceData, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	err := s.validateBlockHashExists(stagingArea, blockHash)
+	err := s.validateBlockHashExists(blockHash)
 	if err != nil {
 		return nil, err
 	}
 
-	return s.acceptanceDataStore.Get(s.databaseContext, stagingArea, blockHash)
+	return s.acceptanceDataStore.Get(s.databaseContext, blockHash)
 }
 
-func (s *consensus) GetHashesBetween(lowHash, highHash *externalapi.DomainHash, maxBlueScoreDifference uint64) (
-	hashes []*externalapi.DomainHash, actualHighHash *externalapi.DomainHash, err error) {
+func (s *consensus) GetHashesBetween(lowHash, highHash *externalapi.DomainHash,
+	maxBlueScoreDifference uint64) ([]*externalapi.DomainHash, error) {
 
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	err = s.validateBlockHashExists(stagingArea, lowHash)
+	err := s.validateBlockHashExists(lowHash)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
-	err = s.validateBlockHashExists(stagingArea, highHash)
+	err = s.validateBlockHashExists(highHash)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
-	return s.syncManager.GetHashesBetween(stagingArea, lowHash, highHash, maxBlueScoreDifference)
+	return s.syncManager.GetHashesBetween(lowHash, highHash, maxBlueScoreDifference)
 }
 
 func (s *consensus) GetMissingBlockBodyHashes(highHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	err := s.validateBlockHashExists(stagingArea, highHash)
+	err := s.validateBlockHashExists(highHash)
 	if err != nil {
 		return nil, err
 	}
 
-	return s.syncManager.GetMissingBlockBodyHashes(stagingArea, highHash)
+	return s.syncManager.GetMissingBlockBodyHashes(highHash)
 }
 
 func (s *consensus) GetPruningPointUTXOs(expectedPruningPointHash *externalapi.DomainHash,
@@ -242,9 +214,7 @@ func (s *consensus) GetPruningPointUTXOs(expectedPruningPointHash *externalapi.D
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	pruningPointHash, err := s.pruningStore.PruningPoint(s.databaseContext, stagingArea)
+	pruningPointHash, err := s.pruningStore.PruningPoint(s.databaseContext)
 	if err != nil {
 		return nil, err
 	}
@@ -268,9 +238,7 @@ func (s *consensus) GetVirtualUTXOs(expectedVirtualParents []*externalapi.Domain
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	virtualParents, err := s.dagTopologyManager.Parents(stagingArea, model.VirtualBlockHash)
+	virtualParents, err := s.dagTopologyManager.Parents(model.VirtualBlockHash)
 	if err != nil {
 		return nil, err
 	}
@@ -292,9 +260,7 @@ func (s *consensus) PruningPoint() (*externalapi.DomainHash, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	return s.pruningStore.PruningPoint(s.databaseContext, stagingArea)
+	return s.pruningStore.PruningPoint(s.databaseContext)
 }
 
 func (s *consensus) ClearImportedPruningPointData() error {
@@ -322,9 +288,7 @@ func (s *consensus) GetVirtualSelectedParent() (*externalapi.DomainHash, error)
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	virtualGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, model.VirtualBlockHash)
+	virtualGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, model.VirtualBlockHash)
 	if err != nil {
 		return nil, err
 	}
@@ -335,30 +299,26 @@ func (s *consensus) Tips() ([]*externalapi.DomainHash, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	return s.consensusStateStore.Tips(stagingArea, s.databaseContext)
+	return s.consensusStateStore.Tips(s.databaseContext)
 }
 
 func (s *consensus) GetVirtualInfo() (*externalapi.VirtualInfo, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	blockRelations, err := s.blockRelationStore.BlockRelation(s.databaseContext, stagingArea, model.VirtualBlockHash)
+	blockRelations, err := s.blockRelationStore.BlockRelation(s.databaseContext, model.VirtualBlockHash)
 	if err != nil {
 		return nil, err
 	}
-	bits, err := s.difficultyManager.RequiredDifficulty(stagingArea, model.VirtualBlockHash)
+	bits, err := s.difficultyManager.RequiredDifficulty(model.VirtualBlockHash)
 	if err != nil {
 		return nil, err
 	}
-	pastMedianTime, err := s.pastMedianTimeManager.PastMedianTime(stagingArea, model.VirtualBlockHash)
+	pastMedianTime, err := s.pastMedianTimeManager.PastMedianTime(model.VirtualBlockHash)
 	if err != nil {
 		return nil, err
 	}
-	virtualGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, model.VirtualBlockHash)
+	virtualGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, model.VirtualBlockHash)
 	if err != nil {
 		return nil, err
 	}
@@ -375,87 +335,76 @@ func (s *consensus) CreateBlockLocator(lowHash, highHash *externalapi.DomainHash
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	err := s.validateBlockHashExists(stagingArea, lowHash)
+	err := s.validateBlockHashExists(lowHash)
 	if err != nil {
 		return nil, err
 	}
-	err = s.validateBlockHashExists(stagingArea, highHash)
+	err = s.validateBlockHashExists(highHash)
 	if err != nil {
 		return nil, err
 	}
 
-	return s.syncManager.CreateBlockLocator(stagingArea, lowHash, highHash, limit)
+	return s.syncManager.CreateBlockLocator(lowHash, highHash, limit)
 }
 
 func (s *consensus) CreateFullHeadersSelectedChainBlockLocator() (externalapi.BlockLocator, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	lowHash, err := s.pruningStore.PruningPoint(s.databaseContext, stagingArea)
+	lowHash, err := s.pruningStore.PruningPoint(s.databaseContext)
 	if err != nil {
 		return nil, err
 	}
 
-	highHash, err := s.headersSelectedTipStore.HeadersSelectedTip(s.databaseContext, stagingArea)
+	highHash, err := s.headersSelectedTipStore.HeadersSelectedTip(s.databaseContext)
 	if err != nil {
 		return nil, err
 	}
 
-	return s.syncManager.CreateHeadersSelectedChainBlockLocator(stagingArea, lowHash, highHash)
+	return s.syncManager.CreateHeadersSelectedChainBlockLocator(lowHash, highHash)
 }
 
-func (s *consensus) CreateHeadersSelectedChainBlockLocator(lowHash, highHash *externalapi.DomainHash) (externalapi.BlockLocator, error) {
+func (s *consensus) CreateHeadersSelectedChainBlockLocator(lowHash,
+	highHash *externalapi.DomainHash) (externalapi.BlockLocator, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	return s.syncManager.CreateHeadersSelectedChainBlockLocator(stagingArea, lowHash, highHash)
+	return s.syncManager.CreateHeadersSelectedChainBlockLocator(lowHash, highHash)
 }
 
 func (s *consensus) GetSyncInfo() (*externalapi.SyncInfo, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	return s.syncManager.GetSyncInfo(stagingArea)
+	return s.syncManager.GetSyncInfo()
 }
 
 func (s *consensus) IsValidPruningPoint(blockHash *externalapi.DomainHash) (bool, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	err := s.validateBlockHashExists(stagingArea, blockHash)
+	err := s.validateBlockHashExists(blockHash)
 	if err != nil {
 		return false, err
 	}
 
-	return s.pruningManager.IsValidPruningPoint(stagingArea, blockHash)
+	return s.pruningManager.IsValidPruningPoint(blockHash)
 }
 
 func (s *consensus) GetVirtualSelectedParentChainFromBlock(blockHash *externalapi.DomainHash) (*externalapi.SelectedChainPath, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	err := s.validateBlockHashExists(stagingArea, blockHash)
+	err := s.validateBlockHashExists(blockHash)
 	if err != nil {
 		return nil, err
 	}
 
-	return s.consensusStateManager.GetVirtualSelectedParentChainFromBlock(stagingArea, blockHash)
+	return s.consensusStateManager.GetVirtualSelectedParentChainFromBlock(blockHash)
 }
 
-func (s *consensus) validateBlockHashExists(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) error {
-	exists, err := s.blockStatusStore.Exists(s.databaseContext, stagingArea, blockHash)
+func (s *consensus) validateBlockHashExists(blockHash *externalapi.DomainHash) error {
+	exists, err := s.blockStatusStore.Exists(s.databaseContext, blockHash)
 	if err != nil {
 		return err
 	}
@@ -469,39 +418,33 @@ func (s *consensus) IsInSelectedParentChainOf(blockHashA *externalapi.DomainHash
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	err := s.validateBlockHashExists(stagingArea, blockHashA)
+	err := s.validateBlockHashExists(blockHashA)
 	if err != nil {
 		return false, err
 	}
-	err = s.validateBlockHashExists(stagingArea, blockHashB)
+	err = s.validateBlockHashExists(blockHashB)
 	if err != nil {
 		return false, err
 	}
 
-	return s.dagTopologyManager.IsInSelectedParentChainOf(stagingArea, blockHashA, blockHashB)
+	return s.dagTopologyManager.IsInSelectedParentChainOf(blockHashA, blockHashB)
 }
 
 func (s *consensus) GetHeadersSelectedTip() (*externalapi.DomainHash, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	return s.headersSelectedTipStore.HeadersSelectedTip(s.databaseContext, stagingArea)
+	return s.headersSelectedTipStore.HeadersSelectedTip(s.databaseContext)
 }
 
 func (s *consensus) Anticone(blockHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	stagingArea := model.NewStagingArea()
-
-	err := s.validateBlockHashExists(stagingArea, blockHash)
+	err := s.validateBlockHashExists(blockHash)
 	if err != nil {
 		return nil, err
 	}
 
-	return s.dagTraversalManager.Anticone(stagingArea, blockHash)
+	return s.dagTraversalManager.Anticone(blockHash)
 }

domain/consensus/constructors.go

@@ -13,9 +13,9 @@ type GHOSTDAGManagerConstructor func(model.DBReader, model.DAGTopologyManager,
 
 // DifficultyManagerConstructor is the function signature for a constructor of a type implementing model.DifficultyManager
 type DifficultyManagerConstructor func(model.DBReader, model.GHOSTDAGManager, model.GHOSTDAGDataStore,
-	model.BlockHeaderStore, model.DAABlocksStore, model.DAGTopologyManager, model.DAGTraversalManager, *big.Int, int, bool, time.Duration,
+	model.BlockHeaderStore, model.DAGTopologyManager, model.DAGTraversalManager, *big.Int, int, bool, time.Duration,
 	*externalapi.DomainHash) model.DifficultyManager
 
 // PastMedianTimeManagerConstructor is the function signature for a constructor of a type implementing model.PastMedianTimeManager
 type PastMedianTimeManagerConstructor func(int, model.DBReader, model.DAGTraversalManager, model.BlockHeaderStore,
-	model.GHOSTDAGDataStore, *externalapi.DomainHash) model.PastMedianTimeManager
+	model.GHOSTDAGDataStore) model.PastMedianTimeManager

domain/consensus/database/binaryserialization/common.go

@@ -1,24 +0,0 @@
-package binaryserialization
-
-import (
-	"encoding/binary"
-	"github.com/pkg/errors"
-)
-
-const uint64Length = 8
-
-// SerializeUint64 serializes a uint64
-func SerializeUint64(value uint64) []byte {
-	var keyBytes [uint64Length]byte
-	binary.LittleEndian.PutUint64(keyBytes[:], value)
-	return keyBytes[:]
-}
-
-// DeserializeUint64 deserializes bytes to uint64
-func DeserializeUint64(valueBytes []byte) (uint64, error) {
-	if len(valueBytes) != uint64Length {
-		return 0, errors.Errorf("the given value is %d bytes so it cannot be deserialized into uint64",
-			len(valueBytes))
-	}
-	return binary.LittleEndian.Uint64(valueBytes), nil
-}

domain/consensus/database/binaryserialization/hash.go

@@ -1,47 +1,13 @@
 package binaryserialization
 
-import (
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-	"github.com/pkg/errors"
-)
+import "github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 
 // SerializeHash serializes hash to a slice of bytes
 func SerializeHash(hash *externalapi.DomainHash) []byte {
 	return hash.ByteSlice()
 }
 
-// DeserializeHash deserializes a slice of bytes to a hash
+// DeserializeHash a slice of bytes to a hash
 func DeserializeHash(hashBytes []byte) (*externalapi.DomainHash, error) {
 	return externalapi.NewDomainHashFromByteSlice(hashBytes)
 }
-
-// SerializeHashes serializes a slice of hashes to a slice of bytes
-func SerializeHashes(hashes []*externalapi.DomainHash) []byte {
-	buff := make([]byte, len(hashes)*externalapi.DomainHashSize)
-	for i, hash := range hashes {
-		copy(buff[externalapi.DomainHashSize*i:], hash.ByteSlice())
-	}
-
-	return buff
-}
-
-// DeserializeHashes deserializes a slice of bytes to a slice of hashes
-func DeserializeHashes(hashesBytes []byte) ([]*externalapi.DomainHash, error) {
-	if len(hashesBytes)%externalapi.DomainHashSize != 0 {
-		return nil, errors.Errorf("The length of hashBytes is not divisible by externalapi.DomainHashSize (%d)",
-			externalapi.DomainHashSize)
-	}
-
-	numHashes := len(hashesBytes) / externalapi.DomainHashSize
-	hashes := make([]*externalapi.DomainHash, numHashes)
-	for i := 0; i < numHashes; i++ {
-		var err error
-		start := i * externalapi.DomainHashSize
-		end := i*externalapi.DomainHashSize + externalapi.DomainHashSize
-		hashes[i], err = externalapi.NewDomainHashFromByteSlice(hashesBytes[start:end])
-		if err != nil {
-			return nil, err
-		}
-	}
-	return hashes, nil
-}

domain/consensus/database/binaryserialization/selected_chain.go

@@ -0,0 +1,15 @@
+package binaryserialization
+
+import "encoding/binary"
+
+// SerializeChainBlockIndex serializes chain block index
+func SerializeChainBlockIndex(index uint64) []byte {
+	var keyBytes [8]byte
+	binary.LittleEndian.PutUint64(keyBytes[:], index)
+	return keyBytes[:]
+}
+
+// DeserializeChainBlockIndex deserializes chain block index to uint64
+func DeserializeChainBlockIndex(indexBytes []byte) uint64 {
+	return binary.LittleEndian.Uint64(indexBytes)
+}

domain/consensus/database/serialization/dbobjects.pb.go

@@ -241,6 +241,7 @@ type DbTransaction struct {
 	LockTime     uint64                 `protobuf:"varint,4,opt,name=lockTime,proto3" json:"lockTime,omitempty"`
 	SubnetworkID *DbSubnetworkId        `protobuf:"bytes,5,opt,name=subnetworkID,proto3" json:"subnetworkID,omitempty"`
 	Gas          uint64                 `protobuf:"varint,6,opt,name=gas,proto3" json:"gas,omitempty"`
+	PayloadHash  *DbHash                `protobuf:"bytes,7,opt,name=payloadHash,proto3" json:"payloadHash,omitempty"`
 	Payload      []byte                 `protobuf:"bytes,8,opt,name=payload,proto3" json:"payload,omitempty"`
 }
 
@@ -318,6 +319,13 @@ func (x *DbTransaction) GetGas() uint64 {
 	return 0
 }
 
+func (x *DbTransaction) GetPayloadHash() *DbHash {
+	if x != nil {
+		return x.PayloadHash
+	}
+	return nil
+}
+
 func (x *DbTransaction) GetPayload() []byte {
 	if x != nil {
 		return x.Payload
@@ -1220,7 +1228,7 @@ type DbUtxoEntry struct {
 
 	Amount          uint64             `protobuf:"varint,1,opt,name=amount,proto3" json:"amount,omitempty"`
 	ScriptPublicKey *DbScriptPublicKey `protobuf:"bytes,2,opt,name=scriptPublicKey,proto3" json:"scriptPublicKey,omitempty"`
-	BlockDaaScore   uint64             `protobuf:"varint,3,opt,name=blockDaaScore,proto3" json:"blockDaaScore,omitempty"`
+	BlockBlueScore  uint64             `protobuf:"varint,3,opt,name=blockBlueScore,proto3" json:"blockBlueScore,omitempty"`
 	IsCoinbase      bool               `protobuf:"varint,4,opt,name=isCoinbase,proto3" json:"isCoinbase,omitempty"`
 }
 
@@ -1270,9 +1278,9 @@ func (x *DbUtxoEntry) GetScriptPublicKey() *DbScriptPublicKey {
 	return nil
 }
 
-func (x *DbUtxoEntry) GetBlockDaaScore() uint64 {
+func (x *DbUtxoEntry) GetBlockBlueScore() uint64 {
 	if x != nil {
-		return x.BlockDaaScore
+		return x.BlockBlueScore
 	}
 	return 0
 }
@@ -1645,7 +1653,7 @@ var file_dbobjects_proto_rawDesc = []byte{
 	0x28, 0x0d, 0x52, 0x04, 0x62, 0x69, 0x74, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x6e, 0x63,
 	0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x22, 0x1c,
 	0x0a, 0x06, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x22, 0xad, 0x02, 0x0a,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x22, 0xe6, 0x02, 0x0a,
 	0x0d, 0x44, 0x62, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18,
 	0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
 	0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x06, 0x69, 0x6e, 0x70, 0x75,
@@ -1663,184 +1671,188 @@ var file_dbobjects_proto_rawDesc = []byte{
 	0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b,
 	0x49, 0x64, 0x52, 0x0c, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x44,
 	0x12, 0x10, 0x0a, 0x03, 0x67, 0x61, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x67,
-	0x61, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x08, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0xa1, 0x01, 0x0a,
-	0x12, 0x44, 0x62, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e,
-	0x70, 0x75, 0x74, 0x12, 0x45, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x4f,
-	0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
-	0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62,
-	0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x10, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f,
-	0x75, 0x73, 0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x69,
-	0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x0f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65,
-	0x22, 0x68, 0x0a, 0x0a, 0x44, 0x62, 0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x44,
-	0x0a, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a,
+	0x61, 0x73, 0x12, 0x37, 0x0a, 0x0b, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x61, 0x73,
+	0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x0b,
+	0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x61, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x70,
+	0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61,
+	0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0xa1, 0x01, 0x0a, 0x12, 0x44, 0x62, 0x54, 0x72, 0x61, 0x6e,
+	0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x45, 0x0a, 0x10,
+	0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e,
+	0x74, 0x52, 0x10, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x4f, 0x75, 0x74, 0x70, 0x6f,
+	0x69, 0x6e, 0x74, 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
+	0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x73, 0x69,
+	0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x1a, 0x0a,
+	0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x22, 0x68, 0x0a, 0x0a, 0x44, 0x62, 0x4f,
+	0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x44, 0x0a, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e,
+	0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44,
+	0x62, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x52, 0x0d,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x14, 0x0a,
+	0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e,
+	0x64, 0x65, 0x78, 0x22, 0x37, 0x0a, 0x0f, 0x44, 0x62, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x77, 0x0a, 0x13,
+	0x44, 0x62, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x75, 0x74,
+	0x70, 0x75, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x4a, 0x0a, 0x0f, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69,
+	0x63, 0x4b, 0x65, 0x79, 0x52, 0x0f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c,
+	0x69, 0x63, 0x4b, 0x65, 0x79, 0x22, 0x34, 0x0a, 0x0e, 0x44, 0x62, 0x53, 0x75, 0x62, 0x6e, 0x65,
+	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x6e, 0x65,
+	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73,
+	0x75, 0x62, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x22, 0x6a, 0x0a, 0x10, 0x44,
+	0x62, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12,
+	0x56, 0x0a, 0x13, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x73,
+	0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x42,
+	0x6c, 0x6f, 0x63, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x61,
+	0x74, 0x61, 0x52, 0x13, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x22, 0xb6, 0x01, 0x0a, 0x15, 0x44, 0x62, 0x42, 0x6c,
+	0x6f, 0x63, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x61, 0x74,
+	0x61, 0x12, 0x68, 0x0a, 0x19, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61,
+	0x52, 0x19, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x63,
+	0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x33, 0x0a, 0x09, 0x62,
+	0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15,
+	0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44,
+	0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68,
+	0x22, 0xed, 0x01, 0x0a, 0x1b, 0x44, 0x62, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61,
+	0x12, 0x3e, 0x0a, 0x0b, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x37, 0x0a, 0x0f, 0x44, 0x62,
-	0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x24, 0x0a,
-	0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x49, 0x64, 0x22, 0x77, 0x0a, 0x13, 0x44, 0x62, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x12, 0x4a, 0x0a, 0x0f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x73, 0x65, 0x72, 0x69,
-	0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x53, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x0f, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x22, 0x34, 0x0a, 0x0e,
-	0x44, 0x62, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x12, 0x22,
-	0x0a, 0x0c, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b,
-	0x49, 0x64, 0x22, 0x6a, 0x0a, 0x10, 0x44, 0x62, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x56, 0x0a, 0x13, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x41,
-	0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x13, 0x62, 0x6c, 0x6f, 0x63, 0x6b,
-	0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x22, 0xb6,
-	0x01, 0x0a, 0x15, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x68, 0x0a, 0x19, 0x74, 0x72, 0x61, 0x6e,
-	0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x73, 0x65,
-	0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x54, 0x72,
-	0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x19, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x61,
-	0x74, 0x61, 0x12, 0x33, 0x0a, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x09, 0x62, 0x6c,
-	0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x22, 0xed, 0x01, 0x0a, 0x1b, 0x44, 0x62, 0x54, 0x72,
-	0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61,
-	0x6e, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x3e, 0x0a, 0x0b, 0x74, 0x72, 0x61, 0x6e, 0x73,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x73,
-	0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x54,
-	0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x74, 0x72, 0x61, 0x6e,
-	0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x66, 0x65, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x66, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x41,
-	0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69,
-	0x73, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x12, 0x5c, 0x0a, 0x1b, 0x74, 0x72, 0x61,
-	0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x55, 0x74, 0x78,
-	0x6f, 0x45, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a,
-	0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44,
-	0x62, 0x55, 0x74, 0x78, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x1b, 0x74, 0x72, 0x61, 0x6e,
-	0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x55, 0x74, 0x78, 0x6f,
-	0x45, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x22, 0x76, 0x0a, 0x10, 0x44, 0x62, 0x42, 0x6c, 0x6f,
-	0x63, 0x6b, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2f, 0x0a, 0x07, 0x70,
-	0x61, 0x72, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73,
-	0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48,
-	0x61, 0x73, 0x68, 0x52, 0x07, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x31, 0x0a, 0x08,
-	0x63, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15,
-	0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44,
-	0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x08, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x22,
-	0x27, 0x0a, 0x0d, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xdb, 0x02, 0x0a, 0x13, 0x44, 0x62, 0x42,
-	0x6c, 0x6f, 0x63, 0x6b, 0x47, 0x68, 0x6f, 0x73, 0x74, 0x64, 0x61, 0x67, 0x44, 0x61, 0x74, 0x61,
-	0x12, 0x1c, 0x0a, 0x09, 0x62, 0x6c, 0x75, 0x65, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x04, 0x52, 0x09, 0x62, 0x6c, 0x75, 0x65, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a,
-	0x0a, 0x08, 0x62, 0x6c, 0x75, 0x65, 0x57, 0x6f, 0x72, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c,
-	0x52, 0x08, 0x62, 0x6c, 0x75, 0x65, 0x57, 0x6f, 0x72, 0x6b, 0x12, 0x3d, 0x0a, 0x0e, 0x73, 0x65,
-	0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x0e, 0x73, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x65, 0x64, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x12, 0x3b, 0x0a, 0x0d, 0x6d, 0x65, 0x72,
-	0x67, 0x65, 0x53, 0x65, 0x74, 0x42, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x53, 0x65,
-	0x74, 0x42, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x39, 0x0a, 0x0c, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x53,
-	0x65, 0x74, 0x52, 0x65, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73,
-	0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48,
-	0x61, 0x73, 0x68, 0x52, 0x0c, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x64,
-	0x73, 0x12, 0x53, 0x0a, 0x12, 0x62, 0x6c, 0x75, 0x65, 0x73, 0x41, 0x6e, 0x74, 0x69, 0x63, 0x6f,
-	0x6e, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e,
-	0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62,
-	0x42, 0x6c, 0x75, 0x65, 0x73, 0x41, 0x6e, 0x74, 0x69, 0x63, 0x6f, 0x6e, 0x65, 0x53, 0x69, 0x7a,
-	0x65, 0x73, 0x52, 0x12, 0x62, 0x6c, 0x75, 0x65, 0x73, 0x41, 0x6e, 0x74, 0x69, 0x63, 0x6f, 0x6e,
-	0x65, 0x53, 0x69, 0x7a, 0x65, 0x73, 0x22, 0x6d, 0x0a, 0x14, 0x44, 0x62, 0x42, 0x6c, 0x75, 0x65,
-	0x73, 0x41, 0x6e, 0x74, 0x69, 0x63, 0x6f, 0x6e, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x73, 0x12, 0x31,
-	0x0a, 0x08, 0x62, 0x6c, 0x75, 0x65, 0x48, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x08, 0x62, 0x6c, 0x75, 0x65, 0x48, 0x61, 0x73,
-	0x68, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x6f, 0x6e, 0x65, 0x53, 0x69, 0x7a,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x6f, 0x6e,
-	0x65, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x28, 0x0a, 0x0a, 0x44, 0x62, 0x4d, 0x75, 0x6c, 0x74, 0x69,
-	0x73, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x65, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x65, 0x74, 0x22,
-	0x46, 0x0a, 0x09, 0x44, 0x62, 0x55, 0x74, 0x78, 0x6f, 0x53, 0x65, 0x74, 0x12, 0x39, 0x0a, 0x05,
-	0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x73, 0x65,
-	0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x55, 0x74,
-	0x78, 0x6f, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d,
-	0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x87, 0x01, 0x0a, 0x14, 0x44, 0x62, 0x55, 0x74,
-	0x78, 0x6f, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d,
-	0x12, 0x35, 0x0a, 0x08, 0x6f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x08, 0x6f,
-	0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x75, 0x74, 0x78, 0x6f, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x65, 0x72,
-	0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x55, 0x74, 0x78,
-	0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x75, 0x74, 0x78, 0x6f, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x22, 0x45, 0x0a, 0x11, 0x44, 0x62, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62,
-	0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x18,
-	0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xb7, 0x01, 0x0a, 0x0b, 0x44, 0x62, 0x55,
-	0x74, 0x78, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75,
-	0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
-	0x12, 0x4a, 0x0a, 0x0f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x73, 0x65, 0x72, 0x69,
-	0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x53, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x0f, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0d,
-	0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x44, 0x61, 0x61, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x04, 0x52, 0x0d, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x44, 0x61, 0x61, 0x53, 0x63, 0x6f,
-	0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x43, 0x6f, 0x69, 0x6e, 0x62, 0x61, 0x73, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x43, 0x6f, 0x69, 0x6e, 0x62, 0x61,
-	0x73, 0x65, 0x22, 0xfe, 0x01, 0x0a, 0x12, 0x44, 0x62, 0x52, 0x65, 0x61, 0x63, 0x68, 0x61, 0x62,
-	0x69, 0x6c, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 0x12, 0x31, 0x0a, 0x08, 0x63, 0x68, 0x69,
-	0x6c, 0x64, 0x72, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65,
+	0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x10, 0x0a, 0x03, 0x66, 0x65, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x66,
+	0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74,
+	0x65, 0x64, 0x12, 0x5c, 0x0a, 0x1b, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x55, 0x74, 0x78, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x69, 0x65,
+	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x55, 0x74, 0x78, 0x6f, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x52, 0x1b, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x49, 0x6e, 0x70, 0x75, 0x74, 0x55, 0x74, 0x78, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73,
+	0x22, 0x76, 0x0a, 0x10, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x6c, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2f, 0x0a, 0x07, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x07, 0x70, 0x61,
+	0x72, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x31, 0x0a, 0x08, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65,
+	0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x08,
+	0x63, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x22, 0x27, 0x0a, 0x0d, 0x44, 0x62, 0x42, 0x6c,
+	0x6f, 0x63, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x22, 0xdb, 0x02, 0x0a, 0x13, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x47, 0x68, 0x6f,
+	0x73, 0x74, 0x64, 0x61, 0x67, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x6c, 0x75,
+	0x65, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x62, 0x6c,
+	0x75, 0x65, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6c, 0x75, 0x65, 0x57,
+	0x6f, 0x72, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x62, 0x6c, 0x75, 0x65, 0x57,
+	0x6f, 0x72, 0x6b, 0x12, 0x3d, 0x0a, 0x0e, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x50,
+	0x61, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65,
 	0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61,
-	0x73, 0x68, 0x52, 0x08, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x12, 0x2d, 0x0a, 0x06,
-	0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73,
-	0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48,
-	0x61, 0x73, 0x68, 0x52, 0x06, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x12, 0x41, 0x0a, 0x08, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e,
-	0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62,
-	0x52, 0x65, 0x61, 0x63, 0x68, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x74, 0x65,
-	0x72, 0x76, 0x61, 0x6c, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x43,
-	0x0a, 0x11, 0x66, 0x75, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x76, 0x65, 0x72, 0x69, 0x6e, 0x67,
-	0x53, 0x65, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69,
+	0x73, 0x68, 0x52, 0x0e, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x50, 0x61, 0x72, 0x65,
+	0x6e, 0x74, 0x12, 0x3b, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x53, 0x65, 0x74, 0x42, 0x6c,
+	0x75, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69,
 	0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68,
-	0x52, 0x11, 0x66, 0x75, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x76, 0x65, 0x72, 0x69, 0x6e, 0x67,
-	0x53, 0x65, 0x74, 0x22, 0x40, 0x0a, 0x16, 0x44, 0x62, 0x52, 0x65, 0x61, 0x63, 0x68, 0x61, 0x62,
-	0x69, 0x6c, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x14, 0x0a,
-	0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x73, 0x74,
-	0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04,
-	0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x88, 0x01, 0x0a, 0x0a, 0x44, 0x62, 0x55, 0x74, 0x78, 0x6f,
-	0x44, 0x69, 0x66, 0x66, 0x12, 0x39, 0x0a, 0x05, 0x74, 0x6f, 0x41, 0x64, 0x64, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x55, 0x74, 0x78, 0x6f, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x74, 0x6f, 0x41, 0x64, 0x64, 0x12,
-	0x3f, 0x0a, 0x08, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x23, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x44, 0x62, 0x55, 0x74, 0x78, 0x6f, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x08, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65,
-	0x22, 0x33, 0x0a, 0x06, 0x44, 0x62, 0x54, 0x69, 0x70, 0x73, 0x12, 0x29, 0x0a, 0x04, 0x74, 0x69,
-	0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61,
-	0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52,
-	0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x24, 0x0a, 0x0c, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
-	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2a, 0x0a, 0x12, 0x44,
-	0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e,
-	0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04,
-	0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x2a, 0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x61, 0x73, 0x70, 0x61, 0x6e, 0x65, 0x74, 0x2f, 0x6b,
-	0x61, 0x73, 0x70, 0x61, 0x64, 0x2f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x0d, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x53, 0x65, 0x74, 0x42, 0x6c, 0x75, 0x65, 0x73, 0x12,
+	0x39, 0x0a, 0x0c, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x64, 0x73, 0x18,
+	0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x0c, 0x6d, 0x65,
+	0x72, 0x67, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x64, 0x73, 0x12, 0x53, 0x0a, 0x12, 0x62, 0x6c,
+	0x75, 0x65, 0x73, 0x41, 0x6e, 0x74, 0x69, 0x63, 0x6f, 0x6e, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x73,
+	0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x42, 0x6c, 0x75, 0x65, 0x73, 0x41, 0x6e,
+	0x74, 0x69, 0x63, 0x6f, 0x6e, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x73, 0x52, 0x12, 0x62, 0x6c, 0x75,
+	0x65, 0x73, 0x41, 0x6e, 0x74, 0x69, 0x63, 0x6f, 0x6e, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x73, 0x22,
+	0x6d, 0x0a, 0x14, 0x44, 0x62, 0x42, 0x6c, 0x75, 0x65, 0x73, 0x41, 0x6e, 0x74, 0x69, 0x63, 0x6f,
+	0x6e, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x73, 0x12, 0x31, 0x0a, 0x08, 0x62, 0x6c, 0x75, 0x65, 0x48,
+	0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69,
+	0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68,
+	0x52, 0x08, 0x62, 0x6c, 0x75, 0x65, 0x48, 0x61, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x6e,
+	0x74, 0x69, 0x63, 0x6f, 0x6e, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x0c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x6f, 0x6e, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x28,
+	0x0a, 0x0a, 0x44, 0x62, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08,
+	0x6d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08,
+	0x6d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x65, 0x74, 0x22, 0x46, 0x0a, 0x09, 0x44, 0x62, 0x55, 0x74,
+	0x78, 0x6f, 0x53, 0x65, 0x74, 0x12, 0x39, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x55, 0x74, 0x78, 0x6f, 0x43, 0x6f, 0x6c, 0x6c, 0x65,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
+	0x22, 0x87, 0x01, 0x0a, 0x14, 0x44, 0x62, 0x55, 0x74, 0x78, 0x6f, 0x43, 0x6f, 0x6c, 0x6c, 0x65,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x35, 0x0a, 0x08, 0x6f, 0x75, 0x74,
+	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, 0x65,
+	0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x4f, 0x75,
+	0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x08, 0x6f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74,
+	0x12, 0x38, 0x0a, 0x09, 0x75, 0x74, 0x78, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x55, 0x74, 0x78, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+	0x09, 0x75, 0x74, 0x78, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x45, 0x0a, 0x11, 0x44, 0x62,
+	0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12,
+	0x16, 0x0a, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f,
+	0x6e, 0x22, 0xb9, 0x01, 0x0a, 0x0b, 0x44, 0x62, 0x55, 0x74, 0x78, 0x6f, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x4a, 0x0a, 0x0f, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69,
+	0x63, 0x4b, 0x65, 0x79, 0x52, 0x0f, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x50, 0x75, 0x62, 0x6c,
+	0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x0e, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x6c,
+	0x75, 0x65, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0e, 0x62,
+	0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x6c, 0x75, 0x65, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a,
+	0x0a, 0x69, 0x73, 0x43, 0x6f, 0x69, 0x6e, 0x62, 0x61, 0x73, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x0a, 0x69, 0x73, 0x43, 0x6f, 0x69, 0x6e, 0x62, 0x61, 0x73, 0x65, 0x22, 0xfe, 0x01,
+	0x0a, 0x12, 0x44, 0x62, 0x52, 0x65, 0x61, 0x63, 0x68, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79,
+	0x44, 0x61, 0x74, 0x61, 0x12, 0x31, 0x0a, 0x08, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69,
+	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x08, 0x63,
+	0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x12, 0x2d, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x65, 0x6e,
+	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c,
+	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x06,
+	0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x12, 0x41, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76,
+	0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61,
+	0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x52, 0x65, 0x61, 0x63, 0x68,
+	0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x52,
+	0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x43, 0x0a, 0x11, 0x66, 0x75, 0x74,
+	0x75, 0x72, 0x65, 0x43, 0x6f, 0x76, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x74, 0x18, 0x04,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x11, 0x66, 0x75, 0x74,
+	0x75, 0x72, 0x65, 0x43, 0x6f, 0x76, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x74, 0x22, 0x40,
+	0x0a, 0x16, 0x44, 0x62, 0x52, 0x65, 0x61, 0x63, 0x68, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79,
+	0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72,
+	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10,
+	0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x65, 0x6e, 0x64,
+	0x22, 0x88, 0x01, 0x0a, 0x0a, 0x44, 0x62, 0x55, 0x74, 0x78, 0x6f, 0x44, 0x69, 0x66, 0x66, 0x12,
+	0x39, 0x0a, 0x05, 0x74, 0x6f, 0x41, 0x64, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23,
+	0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44,
+	0x62, 0x55, 0x74, 0x78, 0x6f, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49,
+	0x74, 0x65, 0x6d, 0x52, 0x05, 0x74, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x3f, 0x0a, 0x08, 0x74, 0x6f,
+	0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x73,
+	0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x55,
+	0x74, 0x78, 0x6f, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65,
+	0x6d, 0x52, 0x08, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x22, 0x33, 0x0a, 0x06, 0x44,
+	0x62, 0x54, 0x69, 0x70, 0x73, 0x12, 0x29, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73,
+	0x22, 0x24, 0x0a, 0x0c, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74,
+	0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2a, 0x0a, 0x12, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63,
+	0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x42, 0x2a, 0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x6b, 0x61, 0x73, 0x70, 0x61, 0x6e, 0x65, 0x74, 0x2f, 0x6b, 0x61, 0x73, 0x70, 0x61, 0x64,
+	0x2f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1895,37 +1907,38 @@ var file_dbobjects_proto_depIdxs = []int32{
 	4,  // 6: serialization.DbTransaction.inputs:type_name -> serialization.DbTransactionInput
 	7,  // 7: serialization.DbTransaction.outputs:type_name -> serialization.DbTransactionOutput
 	8,  // 8: serialization.DbTransaction.subnetworkID:type_name -> serialization.DbSubnetworkId
-	5,  // 9: serialization.DbTransactionInput.previousOutpoint:type_name -> serialization.DbOutpoint
-	6,  // 10: serialization.DbOutpoint.transactionID:type_name -> serialization.DbTransactionId
-	19, // 11: serialization.DbTransactionOutput.scriptPublicKey:type_name -> serialization.DbScriptPublicKey
-	10, // 12: serialization.DbAcceptanceData.blockAcceptanceData:type_name -> serialization.DbBlockAcceptanceData
-	11, // 13: serialization.DbBlockAcceptanceData.transactionAcceptanceData:type_name -> serialization.DbTransactionAcceptanceData
-	2,  // 14: serialization.DbBlockAcceptanceData.blockHash:type_name -> serialization.DbHash
-	3,  // 15: serialization.DbTransactionAcceptanceData.transaction:type_name -> serialization.DbTransaction
-	20, // 16: serialization.DbTransactionAcceptanceData.transactionInputUtxoEntries:type_name -> serialization.DbUtxoEntry
-	2,  // 17: serialization.DbBlockRelations.parents:type_name -> serialization.DbHash
-	2,  // 18: serialization.DbBlockRelations.children:type_name -> serialization.DbHash
-	2,  // 19: serialization.DbBlockGhostdagData.selectedParent:type_name -> serialization.DbHash
-	2,  // 20: serialization.DbBlockGhostdagData.mergeSetBlues:type_name -> serialization.DbHash
-	2,  // 21: serialization.DbBlockGhostdagData.mergeSetReds:type_name -> serialization.DbHash
-	15, // 22: serialization.DbBlockGhostdagData.bluesAnticoneSizes:type_name -> serialization.DbBluesAnticoneSizes
-	2,  // 23: serialization.DbBluesAnticoneSizes.blueHash:type_name -> serialization.DbHash
-	18, // 24: serialization.DbUtxoSet.items:type_name -> serialization.DbUtxoCollectionItem
-	5,  // 25: serialization.DbUtxoCollectionItem.outpoint:type_name -> serialization.DbOutpoint
-	20, // 26: serialization.DbUtxoCollectionItem.utxoEntry:type_name -> serialization.DbUtxoEntry
-	19, // 27: serialization.DbUtxoEntry.scriptPublicKey:type_name -> serialization.DbScriptPublicKey
-	2,  // 28: serialization.DbReachabilityData.children:type_name -> serialization.DbHash
-	2,  // 29: serialization.DbReachabilityData.parent:type_name -> serialization.DbHash
-	22, // 30: serialization.DbReachabilityData.interval:type_name -> serialization.DbReachabilityInterval
-	2,  // 31: serialization.DbReachabilityData.futureCoveringSet:type_name -> serialization.DbHash
-	18, // 32: serialization.DbUtxoDiff.toAdd:type_name -> serialization.DbUtxoCollectionItem
-	18, // 33: serialization.DbUtxoDiff.toRemove:type_name -> serialization.DbUtxoCollectionItem
-	2,  // 34: serialization.DbTips.tips:type_name -> serialization.DbHash
-	35, // [35:35] is the sub-list for method output_type
-	35, // [35:35] is the sub-list for method input_type
-	35, // [35:35] is the sub-list for extension type_name
-	35, // [35:35] is the sub-list for extension extendee
-	0,  // [0:35] is the sub-list for field type_name
+	2,  // 9: serialization.DbTransaction.payloadHash:type_name -> serialization.DbHash
+	5,  // 10: serialization.DbTransactionInput.previousOutpoint:type_name -> serialization.DbOutpoint
+	6,  // 11: serialization.DbOutpoint.transactionID:type_name -> serialization.DbTransactionId
+	19, // 12: serialization.DbTransactionOutput.scriptPublicKey:type_name -> serialization.DbScriptPublicKey
+	10, // 13: serialization.DbAcceptanceData.blockAcceptanceData:type_name -> serialization.DbBlockAcceptanceData
+	11, // 14: serialization.DbBlockAcceptanceData.transactionAcceptanceData:type_name -> serialization.DbTransactionAcceptanceData
+	2,  // 15: serialization.DbBlockAcceptanceData.blockHash:type_name -> serialization.DbHash
+	3,  // 16: serialization.DbTransactionAcceptanceData.transaction:type_name -> serialization.DbTransaction
+	20, // 17: serialization.DbTransactionAcceptanceData.transactionInputUtxoEntries:type_name -> serialization.DbUtxoEntry
+	2,  // 18: serialization.DbBlockRelations.parents:type_name -> serialization.DbHash
+	2,  // 19: serialization.DbBlockRelations.children:type_name -> serialization.DbHash
+	2,  // 20: serialization.DbBlockGhostdagData.selectedParent:type_name -> serialization.DbHash
+	2,  // 21: serialization.DbBlockGhostdagData.mergeSetBlues:type_name -> serialization.DbHash
+	2,  // 22: serialization.DbBlockGhostdagData.mergeSetReds:type_name -> serialization.DbHash
+	15, // 23: serialization.DbBlockGhostdagData.bluesAnticoneSizes:type_name -> serialization.DbBluesAnticoneSizes
+	2,  // 24: serialization.DbBluesAnticoneSizes.blueHash:type_name -> serialization.DbHash
+	18, // 25: serialization.DbUtxoSet.items:type_name -> serialization.DbUtxoCollectionItem
+	5,  // 26: serialization.DbUtxoCollectionItem.outpoint:type_name -> serialization.DbOutpoint
+	20, // 27: serialization.DbUtxoCollectionItem.utxoEntry:type_name -> serialization.DbUtxoEntry
+	19, // 28: serialization.DbUtxoEntry.scriptPublicKey:type_name -> serialization.DbScriptPublicKey
+	2,  // 29: serialization.DbReachabilityData.children:type_name -> serialization.DbHash
+	2,  // 30: serialization.DbReachabilityData.parent:type_name -> serialization.DbHash
+	22, // 31: serialization.DbReachabilityData.interval:type_name -> serialization.DbReachabilityInterval
+	2,  // 32: serialization.DbReachabilityData.futureCoveringSet:type_name -> serialization.DbHash
+	18, // 33: serialization.DbUtxoDiff.toAdd:type_name -> serialization.DbUtxoCollectionItem
+	18, // 34: serialization.DbUtxoDiff.toRemove:type_name -> serialization.DbUtxoCollectionItem
+	2,  // 35: serialization.DbTips.tips:type_name -> serialization.DbHash
+	36, // [36:36] is the sub-list for method output_type
+	36, // [36:36] is the sub-list for method input_type
+	36, // [36:36] is the sub-list for extension type_name
+	36, // [36:36] is the sub-list for extension extendee
+	0,  // [0:36] is the sub-list for field type_name
 }
 
 func init() { file_dbobjects_proto_init() }

domain/consensus/database/serialization/dbobjects.proto

@@ -30,6 +30,7 @@ message DbTransaction {
   uint64 lockTime = 4;
   DbSubnetworkId subnetworkID = 5;
   uint64 gas = 6;
+  DbHash payloadHash = 7;
   bytes payload = 8;
 }
 
@@ -117,7 +118,7 @@ message DbScriptPublicKey {
 message DbUtxoEntry {
   uint64 amount = 1;
   DbScriptPublicKey scriptPublicKey = 2;
-  uint64 blockDaaScore = 3;
+  uint64 blockBlueScore = 3;
   bool isCoinbase = 4;
 }
 

domain/consensus/database/serialization/transaction.go

@@ -33,6 +33,7 @@ func DomainTransactionToDbTransaction(domainTransaction *externalapi.DomainTrans
 		LockTime:     domainTransaction.LockTime,
 		SubnetworkID: DomainSubnetworkIDToDbSubnetworkID(&domainTransaction.SubnetworkID),
 		Gas:          domainTransaction.Gas,
+		PayloadHash:  DomainHashToDbHash(&domainTransaction.PayloadHash),
 		Payload:      domainTransaction.Payload,
 	}
 }
@@ -43,6 +44,10 @@ func DbTransactionToDomainTransaction(dbTransaction *DbTransaction) (*externalap
 	if err != nil {
 		return nil, err
 	}
+	domainPayloadHash, err := DbHashToDomainHash(dbTransaction.PayloadHash)
+	if err != nil {
+		return nil, err
+	}
 
 	domainInputs := make([]*externalapi.DomainTransactionInput, len(dbTransaction.Inputs))
 	for i, dbTransactionInput := range dbTransaction.Inputs {
@@ -79,6 +84,7 @@ func DbTransactionToDomainTransaction(dbTransaction *DbTransaction) (*externalap
 		LockTime:     dbTransaction.LockTime,
 		SubnetworkID: *domainSubnetworkID,
 		Gas:          dbTransaction.Gas,
+		PayloadHash:  *domainPayloadHash,
 		Payload:      dbTransaction.Payload,
 	}, nil
 }

domain/consensus/database/serialization/utxo_entry.go

@@ -26,7 +26,7 @@ func UTXOEntryToDBUTXOEntry(utxoEntry externalapi.UTXOEntry) *DbUtxoEntry {
 	return &DbUtxoEntry{
 		Amount:          utxoEntry.Amount(),
 		ScriptPublicKey: dbScriptPublicKey,
-		BlockDaaScore:   utxoEntry.BlockDAAScore(),
+		BlockBlueScore:  utxoEntry.BlockBlueScore(),
 		IsCoinbase:      utxoEntry.IsCoinbase(),
 	}
 }
@@ -37,5 +37,5 @@ func DBUTXOEntryToUTXOEntry(dbUtxoEntry *DbUtxoEntry) (externalapi.UTXOEntry, er
 	if err != nil {
 		return nil, err
 	}
-	return utxo.NewUTXOEntry(dbUtxoEntry.Amount, scriptPublicKey, dbUtxoEntry.IsCoinbase, dbUtxoEntry.BlockDaaScore), nil
+	return utxo.NewUTXOEntry(dbUtxoEntry.Amount, scriptPublicKey, dbUtxoEntry.IsCoinbase, dbUtxoEntry.BlockBlueScore), nil
 }

domain/consensus/datastructures/acceptancedatastore/acceptance_data_staging_shard.go

@@ -1,50 +0,0 @@
-package acceptancedatastore
-
-import (
-	"github.com/kaspanet/kaspad/domain/consensus/model"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-)
-
-type acceptanceDataStagingShard struct {
-	store    *acceptanceDataStore
-	toAdd    map[externalapi.DomainHash]externalapi.AcceptanceData
-	toDelete map[externalapi.DomainHash]struct{}
-}
-
-func (ads *acceptanceDataStore) stagingShard(stagingArea *model.StagingArea) *acceptanceDataStagingShard {
-	return stagingArea.GetOrCreateShard(model.StagingShardIDAcceptanceData, func() model.StagingShard {
-		return &acceptanceDataStagingShard{
-			store:    ads,
-			toAdd:    make(map[externalapi.DomainHash]externalapi.AcceptanceData),
-			toDelete: make(map[externalapi.DomainHash]struct{}),
-		}
-	}).(*acceptanceDataStagingShard)
-}
-
-func (adss *acceptanceDataStagingShard) Commit(dbTx model.DBTransaction) error {
-	for hash, acceptanceData := range adss.toAdd {
-		acceptanceDataBytes, err := adss.store.serializeAcceptanceData(acceptanceData)
-		if err != nil {
-			return err
-		}
-		err = dbTx.Put(adss.store.hashAsKey(&hash), acceptanceDataBytes)
-		if err != nil {
-			return err
-		}
-		adss.store.cache.Add(&hash, acceptanceData)
-	}
-
-	for hash := range adss.toDelete {
-		err := dbTx.Delete(adss.store.hashAsKey(&hash))
-		if err != nil {
-			return err
-		}
-		adss.store.cache.Remove(&hash)
-	}
-
-	return nil
-}
-
-func (adss *acceptanceDataStagingShard) isStaged() bool {
-	return len(adss.toAdd) != 0 || len(adss.toDelete) != 0
-}

domain/consensus/datastructures/acceptancedatastore/acceptancedatastore.go

@@ -13,31 +13,62 @@ var bucket = database.MakeBucket([]byte("acceptance-data"))
 
 // acceptanceDataStore represents a store of AcceptanceData
 type acceptanceDataStore struct {
-	cache *lrucache.LRUCache
+	staging  map[externalapi.DomainHash]externalapi.AcceptanceData
+	toDelete map[externalapi.DomainHash]struct{}
+	cache    *lrucache.LRUCache
 }
 
 // New instantiates a new AcceptanceDataStore
 func New(cacheSize int, preallocate bool) model.AcceptanceDataStore {
 	return &acceptanceDataStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		staging:  make(map[externalapi.DomainHash]externalapi.AcceptanceData),
+		toDelete: make(map[externalapi.DomainHash]struct{}),
+		cache:    lrucache.New(cacheSize, preallocate),
 	}
 }
 
 // Stage stages the given acceptanceData for the given blockHash
-func (ads *acceptanceDataStore) Stage(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash, acceptanceData externalapi.AcceptanceData) {
-	stagingShard := ads.stagingShard(stagingArea)
-	stagingShard.toAdd[*blockHash] = acceptanceData.Clone()
+func (ads *acceptanceDataStore) Stage(blockHash *externalapi.DomainHash, acceptanceData externalapi.AcceptanceData) {
+	ads.staging[*blockHash] = acceptanceData.Clone()
 }
 
-func (ads *acceptanceDataStore) IsStaged(stagingArea *model.StagingArea) bool {
-	return ads.stagingShard(stagingArea).isStaged()
+func (ads *acceptanceDataStore) IsStaged() bool {
+	return len(ads.staging) != 0 || len(ads.toDelete) != 0
+}
+
+func (ads *acceptanceDataStore) Discard() {
+	ads.staging = make(map[externalapi.DomainHash]externalapi.AcceptanceData)
+	ads.toDelete = make(map[externalapi.DomainHash]struct{})
+}
+
+func (ads *acceptanceDataStore) Commit(dbTx model.DBTransaction) error {
+	for hash, acceptanceData := range ads.staging {
+		acceptanceDataBytes, err := ads.serializeAcceptanceData(acceptanceData)
+		if err != nil {
+			return err
+		}
+		err = dbTx.Put(ads.hashAsKey(&hash), acceptanceDataBytes)
+		if err != nil {
+			return err
+		}
+		ads.cache.Add(&hash, acceptanceData)
+	}
+
+	for hash := range ads.toDelete {
+		err := dbTx.Delete(ads.hashAsKey(&hash))
+		if err != nil {
+			return err
+		}
+		ads.cache.Remove(&hash)
+	}
+
+	ads.Discard()
+	return nil
 }
 
 // Get gets the acceptanceData associated with the given blockHash
-func (ads *acceptanceDataStore) Get(dbContext model.DBReader, stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (externalapi.AcceptanceData, error) {
-	stagingShard := ads.stagingShard(stagingArea)
-
-	if acceptanceData, ok := stagingShard.toAdd[*blockHash]; ok {
+func (ads *acceptanceDataStore) Get(dbContext model.DBReader, blockHash *externalapi.DomainHash) (externalapi.AcceptanceData, error) {
+	if acceptanceData, ok := ads.staging[*blockHash]; ok {
 		return acceptanceData.Clone(), nil
 	}
 
@@ -59,14 +90,12 @@ func (ads *acceptanceDataStore) Get(dbContext model.DBReader, stagingArea *model
 }
 
 // Delete deletes the acceptanceData associated with the given blockHash
-func (ads *acceptanceDataStore) Delete(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) {
-	stagingShard := ads.stagingShard(stagingArea)
-
-	if _, ok := stagingShard.toAdd[*blockHash]; ok {
-		delete(stagingShard.toAdd, *blockHash)
+func (ads *acceptanceDataStore) Delete(blockHash *externalapi.DomainHash) {
+	if _, ok := ads.staging[*blockHash]; ok {
+		delete(ads.staging, *blockHash)
 		return
 	}
-	stagingShard.toDelete[*blockHash] = struct{}{}
+	ads.toDelete[*blockHash] = struct{}{}
 }
 
 func (ads *acceptanceDataStore) serializeAcceptanceData(acceptanceData externalapi.AcceptanceData) ([]byte, error) {

domain/consensus/datastructures/blockheaderstore/block_header_staging_shard.go

@@ -1,69 +0,0 @@
-package blockheaderstore
-
-import (
-	"github.com/kaspanet/kaspad/domain/consensus/model"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-)
-
-type blockHeaderStagingShard struct {
-	store    *blockHeaderStore
-	toAdd    map[externalapi.DomainHash]externalapi.BlockHeader
-	toDelete map[externalapi.DomainHash]struct{}
-}
-
-func (bhs *blockHeaderStore) stagingShard(stagingArea *model.StagingArea) *blockHeaderStagingShard {
-	return stagingArea.GetOrCreateShard(model.StagingShardIDBlockHeader, func() model.StagingShard {
-		return &blockHeaderStagingShard{
-			store:    bhs,
-			toAdd:    make(map[externalapi.DomainHash]externalapi.BlockHeader),
-			toDelete: make(map[externalapi.DomainHash]struct{}),
-		}
-	}).(*blockHeaderStagingShard)
-}
-
-func (bhss *blockHeaderStagingShard) Commit(dbTx model.DBTransaction) error {
-	for hash, header := range bhss.toAdd {
-		headerBytes, err := bhss.store.serializeHeader(header)
-		if err != nil {
-			return err
-		}
-		err = dbTx.Put(bhss.store.hashAsKey(&hash), headerBytes)
-		if err != nil {
-			return err
-		}
-		bhss.store.cache.Add(&hash, header)
-	}
-
-	for hash := range bhss.toDelete {
-		err := dbTx.Delete(bhss.store.hashAsKey(&hash))
-		if err != nil {
-			return err
-		}
-		bhss.store.cache.Remove(&hash)
-	}
-
-	err := bhss.commitCount(dbTx)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (bhss *blockHeaderStagingShard) commitCount(dbTx model.DBTransaction) error {
-	count := bhss.store.count(bhss)
-	countBytes, err := bhss.store.serializeHeaderCount(count)
-	if err != nil {
-		return err
-	}
-	err = dbTx.Put(countKey, countBytes)
-	if err != nil {
-		return err
-	}
-	bhss.store.countCached = count
-	return nil
-}
-
-func (bhss *blockHeaderStagingShard) isStaged() bool {
-	return len(bhss.toAdd) != 0 || len(bhss.toDelete) != 0
-}

domain/consensus/datastructures/blockheaderstore/blockheaderstore.go

@@ -14,14 +14,18 @@ var countKey = database.MakeBucket(nil).Key([]byte("block-headers-count"))
 
 // blockHeaderStore represents a store of blocks
 type blockHeaderStore struct {
-	cache       *lrucache.LRUCache
-	countCached uint64
+	staging  map[externalapi.DomainHash]externalapi.BlockHeader
+	toDelete map[externalapi.DomainHash]struct{}
+	cache    *lrucache.LRUCache
+	count    uint64
 }
 
 // New instantiates a new BlockHeaderStore
 func New(dbContext model.DBReader, cacheSize int, preallocate bool) (model.BlockHeaderStore, error) {
 	blockHeaderStore := &blockHeaderStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		staging:  make(map[externalapi.DomainHash]externalapi.BlockHeader),
+		toDelete: make(map[externalapi.DomainHash]struct{}),
+		cache:    lrucache.New(cacheSize, preallocate),
 	}
 
 	err := blockHeaderStore.initializeCount(dbContext)
@@ -48,33 +52,57 @@ func (bhs *blockHeaderStore) initializeCount(dbContext model.DBReader) error {
 			return err
 		}
 	}
-	bhs.countCached = count
+	bhs.count = count
 	return nil
 }
 
 // Stage stages the given block header for the given blockHash
-func (bhs *blockHeaderStore) Stage(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash, blockHeader externalapi.BlockHeader) {
-	stagingShard := bhs.stagingShard(stagingArea)
-	stagingShard.toAdd[*blockHash] = blockHeader
+func (bhs *blockHeaderStore) Stage(blockHash *externalapi.DomainHash, blockHeader externalapi.BlockHeader) {
+	bhs.staging[*blockHash] = blockHeader
 }
 
-func (bhs *blockHeaderStore) IsStaged(stagingArea *model.StagingArea) bool {
-	return bhs.stagingShard(stagingArea).isStaged()
+func (bhs *blockHeaderStore) IsStaged() bool {
+	return len(bhs.staging) != 0 || len(bhs.toDelete) != 0
+}
+
+func (bhs *blockHeaderStore) Discard() {
+	bhs.staging = make(map[externalapi.DomainHash]externalapi.BlockHeader)
+	bhs.toDelete = make(map[externalapi.DomainHash]struct{})
+}
+
+func (bhs *blockHeaderStore) Commit(dbTx model.DBTransaction) error {
+	for hash, header := range bhs.staging {
+		headerBytes, err := bhs.serializeHeader(header)
+		if err != nil {
+			return err
+		}
+		err = dbTx.Put(bhs.hashAsKey(&hash), headerBytes)
+		if err != nil {
+			return err
+		}
+		bhs.cache.Add(&hash, header)
+	}
+
+	for hash := range bhs.toDelete {
+		err := dbTx.Delete(bhs.hashAsKey(&hash))
+		if err != nil {
+			return err
+		}
+		bhs.cache.Remove(&hash)
+	}
+
+	err := bhs.commitCount(dbTx)
+	if err != nil {
+		return err
+	}
+
+	bhs.Discard()
+	return nil
 }
 
 // BlockHeader gets the block header associated with the given blockHash
-func (bhs *blockHeaderStore) BlockHeader(dbContext model.DBReader, stagingArea *model.StagingArea,
-	blockHash *externalapi.DomainHash) (externalapi.BlockHeader, error) {
-
-	stagingShard := bhs.stagingShard(stagingArea)
-
-	return bhs.blockHeader(dbContext, stagingShard, blockHash)
-}
-
-func (bhs *blockHeaderStore) blockHeader(dbContext model.DBReader, stagingShard *blockHeaderStagingShard,
-	blockHash *externalapi.DomainHash) (externalapi.BlockHeader, error) {
-
-	if header, ok := stagingShard.toAdd[*blockHash]; ok {
+func (bhs *blockHeaderStore) BlockHeader(dbContext model.DBReader, blockHash *externalapi.DomainHash) (externalapi.BlockHeader, error) {
+	if header, ok := bhs.staging[*blockHash]; ok {
 		return header, nil
 	}
 
@@ -96,10 +124,8 @@ func (bhs *blockHeaderStore) blockHeader(dbContext model.DBReader, stagingShard
 }
 
 // HasBlock returns whether a block header with a given hash exists in the store.
-func (bhs *blockHeaderStore) HasBlockHeader(dbContext model.DBReader, stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (bool, error) {
-	stagingShard := bhs.stagingShard(stagingArea)
-
-	if _, ok := stagingShard.toAdd[*blockHash]; ok {
+func (bhs *blockHeaderStore) HasBlockHeader(dbContext model.DBReader, blockHash *externalapi.DomainHash) (bool, error) {
+	if _, ok := bhs.staging[*blockHash]; ok {
 		return true, nil
 	}
 
@@ -116,15 +142,11 @@ func (bhs *blockHeaderStore) HasBlockHeader(dbContext model.DBReader, stagingAre
 }
 
 // BlockHeaders gets the block headers associated with the given blockHashes
-func (bhs *blockHeaderStore) BlockHeaders(dbContext model.DBReader, stagingArea *model.StagingArea,
-	blockHashes []*externalapi.DomainHash) ([]externalapi.BlockHeader, error) {
-
-	stagingShard := bhs.stagingShard(stagingArea)
-
+func (bhs *blockHeaderStore) BlockHeaders(dbContext model.DBReader, blockHashes []*externalapi.DomainHash) ([]externalapi.BlockHeader, error) {
 	headers := make([]externalapi.BlockHeader, len(blockHashes))
 	for i, hash := range blockHashes {
 		var err error
-		headers[i], err = bhs.blockHeader(dbContext, stagingShard, hash)
+		headers[i], err = bhs.BlockHeader(dbContext, hash)
 		if err != nil {
 			return nil, err
 		}
@@ -133,14 +155,12 @@ func (bhs *blockHeaderStore) BlockHeaders(dbContext model.DBReader, stagingArea
 }
 
 // Delete deletes the block associated with the given blockHash
-func (bhs *blockHeaderStore) Delete(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) {
-	stagingShard := bhs.stagingShard(stagingArea)
-
-	if _, ok := stagingShard.toAdd[*blockHash]; ok {
-		delete(stagingShard.toAdd, *blockHash)
+func (bhs *blockHeaderStore) Delete(blockHash *externalapi.DomainHash) {
+	if _, ok := bhs.staging[*blockHash]; ok {
+		delete(bhs.staging, *blockHash)
 		return
 	}
-	stagingShard.toDelete[*blockHash] = struct{}{}
+	bhs.toDelete[*blockHash] = struct{}{}
 }
 
 func (bhs *blockHeaderStore) hashAsKey(hash *externalapi.DomainHash) model.DBKey {
@@ -161,14 +181,8 @@ func (bhs *blockHeaderStore) deserializeHeader(headerBytes []byte) (externalapi.
 	return serialization.DbBlockHeaderToDomainBlockHeader(dbBlockHeader)
 }
 
-func (bhs *blockHeaderStore) Count(stagingArea *model.StagingArea) uint64 {
-	stagingShard := bhs.stagingShard(stagingArea)
-
-	return bhs.count(stagingShard)
-}
-
-func (bhs *blockHeaderStore) count(stagingShard *blockHeaderStagingShard) uint64 {
-	return bhs.countCached + uint64(len(stagingShard.toAdd)) - uint64(len(stagingShard.toDelete))
+func (bhs *blockHeaderStore) Count() uint64 {
+	return bhs.count + uint64(len(bhs.staging)) - uint64(len(bhs.toDelete))
 }
 
 func (bhs *blockHeaderStore) deserializeHeaderCount(countBytes []byte) (uint64, error) {
@@ -180,6 +194,20 @@ func (bhs *blockHeaderStore) deserializeHeaderCount(countBytes []byte) (uint64,
 	return dbBlockHeaderCount.Count, nil
 }
 
+func (bhs *blockHeaderStore) commitCount(dbTx model.DBTransaction) error {
+	count := bhs.Count()
+	countBytes, err := bhs.serializeHeaderCount(count)
+	if err != nil {
+		return err
+	}
+	err = dbTx.Put(countKey, countBytes)
+	if err != nil {
+		return err
+	}
+	bhs.count = count
+	return nil
+}
+
 func (bhs *blockHeaderStore) serializeHeaderCount(count uint64) ([]byte, error) {
 	dbBlockHeaderCount := &serialization.DbBlockHeaderCount{Count: count}
 	return proto.Marshal(dbBlockHeaderCount)

domain/consensus/datastructures/blockrelationstore/block_relation_staging_shard.go

@@ -1,40 +0,0 @@
-package blockrelationstore
-
-import (
-	"github.com/kaspanet/kaspad/domain/consensus/model"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-)
-
-type blockRelationStagingShard struct {
-	store *blockRelationStore
-	toAdd map[externalapi.DomainHash]*model.BlockRelations
-}
-
-func (brs *blockRelationStore) stagingShard(stagingArea *model.StagingArea) *blockRelationStagingShard {
-	return stagingArea.GetOrCreateShard(model.StagingShardIDBlockRelation, func() model.StagingShard {
-		return &blockRelationStagingShard{
-			store: brs,
-			toAdd: make(map[externalapi.DomainHash]*model.BlockRelations),
-		}
-	}).(*blockRelationStagingShard)
-}
-
-func (brss *blockRelationStagingShard) Commit(dbTx model.DBTransaction) error {
-	for hash, blockRelations := range brss.toAdd {
-		blockRelationBytes, err := brss.store.serializeBlockRelations(blockRelations)
-		if err != nil {
-			return err
-		}
-		err = dbTx.Put(brss.store.hashAsKey(&hash), blockRelationBytes)
-		if err != nil {
-			return err
-		}
-		brss.store.cache.Add(&hash, blockRelations)
-	}
-
-	return nil
-}
-
-func (brss *blockRelationStagingShard) isStaged() bool {
-	return len(brss.toAdd) != 0
-}

domain/consensus/datastructures/blockrelationstore/blockrelationstore.go

@@ -13,30 +13,49 @@ var bucket = database.MakeBucket([]byte("block-relations"))
 
 // blockRelationStore represents a store of BlockRelations
 type blockRelationStore struct {
-	cache *lrucache.LRUCache
+	staging map[externalapi.DomainHash]*model.BlockRelations
+	cache   *lrucache.LRUCache
 }
 
 // New instantiates a new BlockRelationStore
 func New(cacheSize int, preallocate bool) model.BlockRelationStore {
 	return &blockRelationStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		staging: make(map[externalapi.DomainHash]*model.BlockRelations),
+		cache:   lrucache.New(cacheSize, preallocate),
 	}
 }
 
-func (brs *blockRelationStore) StageBlockRelation(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash, blockRelations *model.BlockRelations) {
-	stagingShard := brs.stagingShard(stagingArea)
-
-	stagingShard.toAdd[*blockHash] = blockRelations.Clone()
+func (brs *blockRelationStore) StageBlockRelation(blockHash *externalapi.DomainHash, blockRelations *model.BlockRelations) {
+	brs.staging[*blockHash] = blockRelations.Clone()
 }
 
-func (brs *blockRelationStore) IsStaged(stagingArea *model.StagingArea) bool {
-	return brs.stagingShard(stagingArea).isStaged()
+func (brs *blockRelationStore) IsStaged() bool {
+	return len(brs.staging) != 0
 }
 
-func (brs *blockRelationStore) BlockRelation(dbContext model.DBReader, stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (*model.BlockRelations, error) {
-	stagingShard := brs.stagingShard(stagingArea)
+func (brs *blockRelationStore) Discard() {
+	brs.staging = make(map[externalapi.DomainHash]*model.BlockRelations)
+}
 
-	if blockRelations, ok := stagingShard.toAdd[*blockHash]; ok {
+func (brs *blockRelationStore) Commit(dbTx model.DBTransaction) error {
+	for hash, blockRelations := range brs.staging {
+		blockRelationBytes, err := brs.serializeBlockRelations(blockRelations)
+		if err != nil {
+			return err
+		}
+		err = dbTx.Put(brs.hashAsKey(&hash), blockRelationBytes)
+		if err != nil {
+			return err
+		}
+		brs.cache.Add(&hash, blockRelations)
+	}
+
+	brs.Discard()
+	return nil
+}
+
+func (brs *blockRelationStore) BlockRelation(dbContext model.DBReader, blockHash *externalapi.DomainHash) (*model.BlockRelations, error) {
+	if blockRelations, ok := brs.staging[*blockHash]; ok {
 		return blockRelations.Clone(), nil
 	}
 
@@ -57,10 +76,8 @@ func (brs *blockRelationStore) BlockRelation(dbContext model.DBReader, stagingAr
 	return blockRelations.Clone(), nil
 }
 
-func (brs *blockRelationStore) Has(dbContext model.DBReader, stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (bool, error) {
-	stagingShard := brs.stagingShard(stagingArea)
-
-	if _, ok := stagingShard.toAdd[*blockHash]; ok {
+func (brs *blockRelationStore) Has(dbContext model.DBReader, blockHash *externalapi.DomainHash) (bool, error) {
+	if _, ok := brs.staging[*blockHash]; ok {
 		return true, nil
 	}
 

domain/consensus/datastructures/blockstatusstore/block_status_staging_shard.go

@@ -1,40 +0,0 @@
-package blockstatusstore
-
-import (
-	"github.com/kaspanet/kaspad/domain/consensus/model"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-)
-
-type blockStatusStagingShard struct {
-	store *blockStatusStore
-	toAdd map[externalapi.DomainHash]externalapi.BlockStatus
-}
-
-func (bss *blockStatusStore) stagingShard(stagingArea *model.StagingArea) *blockStatusStagingShard {
-	return stagingArea.GetOrCreateShard(model.StagingShardIDBlockStatus, func() model.StagingShard {
-		return &blockStatusStagingShard{
-			store: bss,
-			toAdd: make(map[externalapi.DomainHash]externalapi.BlockStatus),
-		}
-	}).(*blockStatusStagingShard)
-}
-
-func (bsss *blockStatusStagingShard) Commit(dbTx model.DBTransaction) error {
-	for hash, status := range bsss.toAdd {
-		blockStatusBytes, err := bsss.store.serializeBlockStatus(status)
-		if err != nil {
-			return err
-		}
-		err = dbTx.Put(bsss.store.hashAsKey(&hash), blockStatusBytes)
-		if err != nil {
-			return err
-		}
-		bsss.store.cache.Add(&hash, status)
-	}
-
-	return nil
-}
-
-func (bsss *blockStatusStagingShard) isStaged() bool {
-	return len(bsss.toAdd) != 0
-}

domain/consensus/datastructures/blockstatusstore/blockstatusstore.go

@@ -13,31 +13,51 @@ var bucket = database.MakeBucket([]byte("block-statuses"))
 
 // blockStatusStore represents a store of BlockStatuses
 type blockStatusStore struct {
-	cache *lrucache.LRUCache
+	staging map[externalapi.DomainHash]externalapi.BlockStatus
+	cache   *lrucache.LRUCache
 }
 
 // New instantiates a new BlockStatusStore
 func New(cacheSize int, preallocate bool) model.BlockStatusStore {
 	return &blockStatusStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		staging: make(map[externalapi.DomainHash]externalapi.BlockStatus),
+		cache:   lrucache.New(cacheSize, preallocate),
 	}
 }
 
 // Stage stages the given blockStatus for the given blockHash
-func (bss *blockStatusStore) Stage(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash, blockStatus externalapi.BlockStatus) {
-	stagingShard := bss.stagingShard(stagingArea)
-	stagingShard.toAdd[*blockHash] = blockStatus.Clone()
+func (bss *blockStatusStore) Stage(blockHash *externalapi.DomainHash, blockStatus externalapi.BlockStatus) {
+	bss.staging[*blockHash] = blockStatus.Clone()
 }
 
-func (bss *blockStatusStore) IsStaged(stagingArea *model.StagingArea) bool {
-	return bss.stagingShard(stagingArea).isStaged()
+func (bss *blockStatusStore) IsStaged() bool {
+	return len(bss.staging) != 0
+}
+
+func (bss *blockStatusStore) Discard() {
+	bss.staging = make(map[externalapi.DomainHash]externalapi.BlockStatus)
+}
+
+func (bss *blockStatusStore) Commit(dbTx model.DBTransaction) error {
+	for hash, status := range bss.staging {
+		blockStatusBytes, err := bss.serializeBlockStatus(status)
+		if err != nil {
+			return err
+		}
+		err = dbTx.Put(bss.hashAsKey(&hash), blockStatusBytes)
+		if err != nil {
+			return err
+		}
+		bss.cache.Add(&hash, status)
+	}
+
+	bss.Discard()
+	return nil
 }
 
 // Get gets the blockStatus associated with the given blockHash
-func (bss *blockStatusStore) Get(dbContext model.DBReader, stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (externalapi.BlockStatus, error) {
-	stagingShard := bss.stagingShard(stagingArea)
-
-	if status, ok := stagingShard.toAdd[*blockHash]; ok {
+func (bss *blockStatusStore) Get(dbContext model.DBReader, blockHash *externalapi.DomainHash) (externalapi.BlockStatus, error) {
+	if status, ok := bss.staging[*blockHash]; ok {
 		return status, nil
 	}
 
@@ -59,10 +79,8 @@ func (bss *blockStatusStore) Get(dbContext model.DBReader, stagingArea *model.St
 }
 
 // Exists returns true if the blockStatus for the given blockHash exists
-func (bss *blockStatusStore) Exists(dbContext model.DBReader, stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (bool, error) {
-	stagingShard := bss.stagingShard(stagingArea)
-
-	if _, ok := stagingShard.toAdd[*blockHash]; ok {
+func (bss *blockStatusStore) Exists(dbContext model.DBReader, blockHash *externalapi.DomainHash) (bool, error) {
+	if _, ok := bss.staging[*blockHash]; ok {
 		return true, nil
 	}
 

domain/consensus/datastructures/blockstore/block_staging_shard.go

@@ -1,69 +0,0 @@
-package blockstore
-
-import (
-	"github.com/kaspanet/kaspad/domain/consensus/model"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-)
-
-type blockStagingShard struct {
-	store    *blockStore
-	toAdd    map[externalapi.DomainHash]*externalapi.DomainBlock
-	toDelete map[externalapi.DomainHash]struct{}
-}
-
-func (bs *blockStore) stagingShard(stagingArea *model.StagingArea) *blockStagingShard {
-	return stagingArea.GetOrCreateShard(model.StagingShardIDBlock, func() model.StagingShard {
-		return &blockStagingShard{
-			store:    bs,
-			toAdd:    make(map[externalapi.DomainHash]*externalapi.DomainBlock),
-			toDelete: make(map[externalapi.DomainHash]struct{}),
-		}
-	}).(*blockStagingShard)
-}
-
-func (bss *blockStagingShard) Commit(dbTx model.DBTransaction) error {
-	for hash, block := range bss.toAdd {
-		blockBytes, err := bss.store.serializeBlock(block)
-		if err != nil {
-			return err
-		}
-		err = dbTx.Put(bss.store.hashAsKey(&hash), blockBytes)
-		if err != nil {
-			return err
-		}
-		bss.store.cache.Add(&hash, block)
-	}
-
-	for hash := range bss.toDelete {
-		err := dbTx.Delete(bss.store.hashAsKey(&hash))
-		if err != nil {
-			return err
-		}
-		bss.store.cache.Remove(&hash)
-	}
-
-	err := bss.commitCount(dbTx)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (bss *blockStagingShard) commitCount(dbTx model.DBTransaction) error {
-	count := bss.store.count(bss)
-	countBytes, err := bss.store.serializeBlockCount(count)
-	if err != nil {
-		return err
-	}
-	err = dbTx.Put(countKey, countBytes)
-	if err != nil {
-		return err
-	}
-	bss.store.countCached = count
-	return nil
-}
-
-func (bss *blockStagingShard) isStaged() bool {
-	return len(bss.toAdd) != 0 || len(bss.toDelete) != 0
-}

domain/consensus/datastructures/blockstore/blockstore.go

@@ -15,14 +15,18 @@ var countKey = database.MakeBucket(nil).Key([]byte("blocks-count"))
 
 // blockStore represents a store of blocks
 type blockStore struct {
-	cache       *lrucache.LRUCache
-	countCached uint64
+	staging  map[externalapi.DomainHash]*externalapi.DomainBlock
+	toDelete map[externalapi.DomainHash]struct{}
+	cache    *lrucache.LRUCache
+	count    uint64
 }
 
 // New instantiates a new BlockStore
 func New(dbContext model.DBReader, cacheSize int, preallocate bool) (model.BlockStore, error) {
 	blockStore := &blockStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		staging:  make(map[externalapi.DomainHash]*externalapi.DomainBlock),
+		toDelete: make(map[externalapi.DomainHash]struct{}),
+		cache:    lrucache.New(cacheSize, preallocate),
 	}
 
 	err := blockStore.initializeCount(dbContext)
@@ -49,29 +53,57 @@ func (bs *blockStore) initializeCount(dbContext model.DBReader) error {
 			return err
 		}
 	}
-	bs.countCached = count
+	bs.count = count
 	return nil
 }
 
 // Stage stages the given block for the given blockHash
-func (bs *blockStore) Stage(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash, block *externalapi.DomainBlock) {
-	stagingShard := bs.stagingShard(stagingArea)
-	stagingShard.toAdd[*blockHash] = block.Clone()
+func (bs *blockStore) Stage(blockHash *externalapi.DomainHash, block *externalapi.DomainBlock) {
+	bs.staging[*blockHash] = block.Clone()
 }
 
-func (bs *blockStore) IsStaged(stagingArea *model.StagingArea) bool {
-	return bs.stagingShard(stagingArea).isStaged()
+func (bs *blockStore) IsStaged() bool {
+	return len(bs.staging) != 0 || len(bs.toDelete) != 0
+}
+
+func (bs *blockStore) Discard() {
+	bs.staging = make(map[externalapi.DomainHash]*externalapi.DomainBlock)
+	bs.toDelete = make(map[externalapi.DomainHash]struct{})
+}
+
+func (bs *blockStore) Commit(dbTx model.DBTransaction) error {
+	for hash, block := range bs.staging {
+		blockBytes, err := bs.serializeBlock(block)
+		if err != nil {
+			return err
+		}
+		err = dbTx.Put(bs.hashAsKey(&hash), blockBytes)
+		if err != nil {
+			return err
+		}
+		bs.cache.Add(&hash, block)
+	}
+
+	for hash := range bs.toDelete {
+		err := dbTx.Delete(bs.hashAsKey(&hash))
+		if err != nil {
+			return err
+		}
+		bs.cache.Remove(&hash)
+	}
+
+	err := bs.commitCount(dbTx)
+	if err != nil {
+		return err
+	}
+
+	bs.Discard()
+	return nil
 }
 
 // Block gets the block associated with the given blockHash
-func (bs *blockStore) Block(dbContext model.DBReader, stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (*externalapi.DomainBlock, error) {
-	stagingShard := bs.stagingShard(stagingArea)
-
-	return bs.block(dbContext, stagingShard, blockHash)
-}
-
-func (bs *blockStore) block(dbContext model.DBReader, stagingShard *blockStagingShard, blockHash *externalapi.DomainHash) (*externalapi.DomainBlock, error) {
-	if block, ok := stagingShard.toAdd[*blockHash]; ok {
+func (bs *blockStore) Block(dbContext model.DBReader, blockHash *externalapi.DomainHash) (*externalapi.DomainBlock, error) {
+	if block, ok := bs.staging[*blockHash]; ok {
 		return block.Clone(), nil
 	}
 
@@ -93,10 +125,8 @@ func (bs *blockStore) block(dbContext model.DBReader, stagingShard *blockStaging
 }
 
 // HasBlock returns whether a block with a given hash exists in the store.
-func (bs *blockStore) HasBlock(dbContext model.DBReader, stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (bool, error) {
-	stagingShard := bs.stagingShard(stagingArea)
-
-	if _, ok := stagingShard.toAdd[*blockHash]; ok {
+func (bs *blockStore) HasBlock(dbContext model.DBReader, blockHash *externalapi.DomainHash) (bool, error) {
+	if _, ok := bs.staging[*blockHash]; ok {
 		return true, nil
 	}
 
@@ -113,13 +143,11 @@ func (bs *blockStore) HasBlock(dbContext model.DBReader, stagingArea *model.Stag
 }
 
 // Blocks gets the blocks associated with the given blockHashes
-func (bs *blockStore) Blocks(dbContext model.DBReader, stagingArea *model.StagingArea, blockHashes []*externalapi.DomainHash) ([]*externalapi.DomainBlock, error) {
-	stagingShard := bs.stagingShard(stagingArea)
-
+func (bs *blockStore) Blocks(dbContext model.DBReader, blockHashes []*externalapi.DomainHash) ([]*externalapi.DomainBlock, error) {
 	blocks := make([]*externalapi.DomainBlock, len(blockHashes))
 	for i, hash := range blockHashes {
 		var err error
-		blocks[i], err = bs.block(dbContext, stagingShard, hash)
+		blocks[i], err = bs.Block(dbContext, hash)
 		if err != nil {
 			return nil, err
 		}
@@ -128,14 +156,12 @@ func (bs *blockStore) Blocks(dbContext model.DBReader, stagingArea *model.Stagin
 }
 
 // Delete deletes the block associated with the given blockHash
-func (bs *blockStore) Delete(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) {
-	stagingShard := bs.stagingShard(stagingArea)
-
-	if _, ok := stagingShard.toAdd[*blockHash]; ok {
-		delete(stagingShard.toAdd, *blockHash)
+func (bs *blockStore) Delete(blockHash *externalapi.DomainHash) {
+	if _, ok := bs.staging[*blockHash]; ok {
+		delete(bs.staging, *blockHash)
 		return
 	}
-	stagingShard.toDelete[*blockHash] = struct{}{}
+	bs.toDelete[*blockHash] = struct{}{}
 }
 
 func (bs *blockStore) serializeBlock(block *externalapi.DomainBlock) ([]byte, error) {
@@ -156,13 +182,8 @@ func (bs *blockStore) hashAsKey(hash *externalapi.DomainHash) model.DBKey {
 	return bucket.Key(hash.ByteSlice())
 }
 
-func (bs *blockStore) Count(stagingArea *model.StagingArea) uint64 {
-	stagingShard := bs.stagingShard(stagingArea)
-	return bs.count(stagingShard)
-}
-
-func (bs *blockStore) count(stagingShard *blockStagingShard) uint64 {
-	return bs.countCached + uint64(len(stagingShard.toAdd)) - uint64(len(stagingShard.toDelete))
+func (bs *blockStore) Count() uint64 {
+	return bs.count + uint64(len(bs.staging)) - uint64(len(bs.toDelete))
 }
 
 func (bs *blockStore) deserializeBlockCount(countBytes []byte) (uint64, error) {
@@ -174,6 +195,20 @@ func (bs *blockStore) deserializeBlockCount(countBytes []byte) (uint64, error) {
 	return dbBlockCount.Count, nil
 }
 
+func (bs *blockStore) commitCount(dbTx model.DBTransaction) error {
+	count := bs.Count()
+	countBytes, err := bs.serializeBlockCount(count)
+	if err != nil {
+		return err
+	}
+	err = dbTx.Put(countKey, countBytes)
+	if err != nil {
+		return err
+	}
+	bs.count = count
+	return nil
+}
+
 func (bs *blockStore) serializeBlockCount(count uint64) ([]byte, error) {
 	dbBlockCount := &serialization.DbBlockCount{Count: count}
 	return proto.Marshal(dbBlockCount)

domain/consensus/datastructures/consensusstatestore/consensus_state_staging_shard.go

@@ -1,40 +0,0 @@
-package consensusstatestore
-
-import (
-	"github.com/kaspanet/kaspad/domain/consensus/model"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-)
-
-type consensusStateStagingShard struct {
-	store                  *consensusStateStore
-	tipsStaging            []*externalapi.DomainHash
-	virtualUTXODiffStaging externalapi.UTXODiff
-}
-
-func (bs *consensusStateStore) stagingShard(stagingArea *model.StagingArea) *consensusStateStagingShard {
-	return stagingArea.GetOrCreateShard(model.StagingShardIDConsensusState, func() model.StagingShard {
-		return &consensusStateStagingShard{
-			store:                  bs,
-			tipsStaging:            nil,
-			virtualUTXODiffStaging: nil,
-		}
-	}).(*consensusStateStagingShard)
-}
-
-func (csss *consensusStateStagingShard) Commit(dbTx model.DBTransaction) error {
-	err := csss.commitTips(dbTx)
-	if err != nil {
-		return err
-	}
-
-	err = csss.commitVirtualUTXODiff(dbTx)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (csss *consensusStateStagingShard) isStaged() bool {
-	return csss.tipsStaging != nil || csss.virtualUTXODiffStaging != nil
-}

domain/consensus/datastructures/consensusstatestore/consensusstatestore.go

@@ -8,6 +8,9 @@ import (
 
 // consensusStateStore represents a store for the current consensus state
 type consensusStateStore struct {
+	tipsStaging            []*externalapi.DomainHash
+	virtualUTXODiffStaging externalapi.UTXODiff
+
 	virtualUTXOSetCache *utxolrucache.LRUCache
 
 	tipsCache []*externalapi.DomainHash
@@ -20,6 +23,28 @@ func New(utxoSetCacheSize int, preallocate bool) model.ConsensusStateStore {
 	}
 }
 
-func (css *consensusStateStore) IsStaged(stagingArea *model.StagingArea) bool {
-	return css.stagingShard(stagingArea).isStaged()
+func (css *consensusStateStore) Discard() {
+	css.tipsStaging = nil
+	css.virtualUTXODiffStaging = nil
+}
+
+func (css *consensusStateStore) Commit(dbTx model.DBTransaction) error {
+	err := css.commitTips(dbTx)
+	if err != nil {
+		return err
+	}
+
+	err = css.commitVirtualUTXODiff(dbTx)
+	if err != nil {
+		return err
+	}
+
+	css.Discard()
+
+	return nil
+}
+
+func (css *consensusStateStore) IsStaged() bool {
+	return css.tipsStaging != nil ||
+		css.virtualUTXODiffStaging != nil
 }

domain/consensus/datastructures/consensusstatestore/tips.go

@@ -10,11 +10,9 @@ import (
 
 var tipsKey = database.MakeBucket(nil).Key([]byte("tips"))
 
-func (css *consensusStateStore) Tips(stagingArea *model.StagingArea, dbContext model.DBReader) ([]*externalapi.DomainHash, error) {
-	stagingShard := css.stagingShard(stagingArea)
-
-	if stagingShard.tipsStaging != nil {
-		return externalapi.CloneHashes(stagingShard.tipsStaging), nil
+func (css *consensusStateStore) Tips(dbContext model.DBReader) ([]*externalapi.DomainHash, error) {
+	if css.tipsStaging != nil {
+		return externalapi.CloneHashes(css.tipsStaging), nil
 	}
 
 	if css.tipsCache != nil {
@@ -34,10 +32,28 @@ func (css *consensusStateStore) Tips(stagingArea *model.StagingArea, dbContext m
 	return externalapi.CloneHashes(tips), nil
 }
 
-func (css *consensusStateStore) StageTips(stagingArea *model.StagingArea, tipHashes []*externalapi.DomainHash) {
-	stagingShard := css.stagingShard(stagingArea)
+func (css *consensusStateStore) StageTips(tipHashes []*externalapi.DomainHash) {
+	css.tipsStaging = externalapi.CloneHashes(tipHashes)
+}
 
-	stagingShard.tipsStaging = externalapi.CloneHashes(tipHashes)
+func (css *consensusStateStore) commitTips(dbTx model.DBTransaction) error {
+	if css.tipsStaging == nil {
+		return nil
+	}
+
+	tipsBytes, err := css.serializeTips(css.tipsStaging)
+	if err != nil {
+		return err
+	}
+	err = dbTx.Put(tipsKey, tipsBytes)
+	if err != nil {
+		return err
+	}
+	css.tipsCache = css.tipsStaging
+
+	// Note: we don't discard the staging here since that's
+	// being done at the end of Commit()
+	return nil
 }
 
 func (css *consensusStateStore) serializeTips(tips []*externalapi.DomainHash) ([]byte, error) {
@@ -56,21 +72,3 @@ func (css *consensusStateStore) deserializeTips(tipsBytes []byte) ([]*externalap
 
 	return serialization.DBTipsToTips(dbTips)
 }
-
-func (csss *consensusStateStagingShard) commitTips(dbTx model.DBTransaction) error {
-	if csss.tipsStaging == nil {
-		return nil
-	}
-
-	tipsBytes, err := csss.store.serializeTips(csss.tipsStaging)
-	if err != nil {
-		return err
-	}
-	err = dbTx.Put(tipsKey, tipsBytes)
-	if err != nil {
-		return err
-	}
-	csss.store.tipsCache = csss.tipsStaging
-
-	return nil
-}