Skip to content

Commit 078c279

Browse files
author
jguyet
committed
1.11.1 stable
1 parent f0bdc4e commit 078c279

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

consensus/clique/clique.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ var (
6969
diffNoTurn = big.NewInt(1) // Block difficulty for out-of-turn signatures
7070

7171
FrontierBlockReward = big.NewInt(5e+18)
72-
proofOfAuthorityMaster = common.HexToAddress("0x1616fce40c7e3d10cf2da01df46386c68e7eb150")
7372
)
7473

7574
// Some weird constants to avoid constant memory allocs for them.
@@ -576,11 +575,11 @@ func (c *Clique) Prepare(chain consensus.ChainHeaderReader, header *types.Header
576575

577576
// Finalize implements consensus.Engine, ensuring no uncles are set
578577
func (c *Clique) Finalize(chain consensus.ChainHeaderReader, header *types.Header, state *state.StateDB, txs []*types.Transaction, uncles []*types.Header, withdrawals []*types.Withdrawal) {
579-
578+
580579
// Select the block reward for the ProofOfAuthorityMaster
581580
blockReward := FrontierBlockReward
582581
reward := new(big.Int).Set(blockReward)
583-
state.AddBalance(proofOfAuthorityMaster, reward)
582+
state.AddBalance(c.signer, reward)
584583
header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
585584
header.UncleHash = types.CalcUncleHash(nil)
586585
}
@@ -594,7 +593,6 @@ func (c *Clique) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header *
594593

595594
// Finalize block
596595
c.Finalize(chain, header, state, txs, uncles, nil)
597-
598596
// Assemble and return the final block for sealing
599597
return types.NewBlock(header, txs, nil, receipts, trie.NewStackTrie(nil)), nil
600598
}

params/version.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
const (
2424
VersionMajor = 1 // Major version component of the current release
2525
VersionMinor = 11 // Minor version component of the current release
26-
VersionPatch = 0 // Patch version component of the current release
27-
VersionMeta = "unstable" // Version metadata to append to the version string
26+
VersionPatch = 1 // Patch version component of the current release
27+
VersionMeta = "stable" // Version metadata to append to the version string
2828
)
2929

3030
// Version holds the textual version string.

0 commit comments

Comments
 (0)