Skip to content

Commit

Permalink
keep existing order, even though "unreleased"
Browse files Browse the repository at this point in the history
  • Loading branch information
jannotti committed Aug 28, 2024
1 parent 004eefe commit 4fdcff6
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 23 deletions.
24 changes: 10 additions & 14 deletions data/transactions/logic/fields.go
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,12 @@ const (
BlkSeed BlockField = iota
// BlkTimestamp is the Block's timestamp, seconds from epoch
BlkTimestamp

// BlkProposer is the Block's proposer, or ZeroAddress, pre Payouts.Enabled
BlkProposer
// BlkFeesCollected is the sum of fees for the block, or 0, pre Payouts.Enabled
BlkFeesCollected
// BlkBonus is the extra amount to be paid for the given block (from FeeSink)
BlkBonus
// BlkBranch is the hash of the previous block
BlkBranch
// BlkFeeSink is the fee sink for the given round
Expand All @@ -1000,13 +1005,6 @@ const (
BlkProtocol
// BlkTxnCounter is the number of the next transaction after the block
BlkTxnCounter

// BlkProposer is the Block's proposer, or ZeroAddress, pre Payouts.Enabled
BlkProposer
// BlkFeesCollected is the sum of fees for the block, or 0, pre Payouts.Enabled
BlkFeesCollected
// BlkBonus is the extra amount to be paid for the given block (from FeeSink)
BlkBonus
// BlkProposerPayout is the actual amount moved from feesink to proposer
BlkProposerPayout

Expand All @@ -1024,15 +1022,13 @@ type blockFieldSpec struct {
var blockFieldSpecs = [...]blockFieldSpec{
{BlkSeed, StackBytes32, randomnessVersion},
{BlkTimestamp, StackUint64, randomnessVersion},

{BlkBranch, StackBytes32, 11},
{BlkFeeSink, StackAddress, 11},
{BlkProtocol, StackBytes, 11},
{BlkTxnCounter, StackUint64, 11},

{BlkProposer, StackAddress, incentiveVersion},
{BlkFeesCollected, StackUint64, incentiveVersion},
{BlkBonus, StackUint64, incentiveVersion},
{BlkBranch, StackBytes32, incentiveVersion},
{BlkFeeSink, StackAddress, incentiveVersion},
{BlkProtocol, StackBytes, incentiveVersion},
{BlkTxnCounter, StackUint64, incentiveVersion},
{BlkProposerPayout, StackUint64, incentiveVersion},
}

Expand Down
18 changes: 9 additions & 9 deletions data/transactions/logic/fields_string.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4fdcff6

Please sign in to comment.