Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed account diffs #958

Merged
merged 12 commits into from
May 7, 2024
Merged

Fixed account diffs #958

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df3aef1
Fixed panic in stringify
alexsporn May 3, 2024
4f46d66
Only update the BIC in the account ledger if there was a change, else…
alexsporn May 3, 2024
588db18
Store the initial account creation slot in the BIC
alexsporn May 3, 2024
9f7e9d2
Changed how we export/import the account ledger
alexsporn May 6, 2024
f1b551b
Adapt how we roll back
alexsporn May 6, 2024
67f5e98
Enable trace logs in test
alexsporn May 6, 2024
b0675e2
Fix snapshot generation for destroyed accounts.
piotrm50 May 6, 2024
d194e2f
Fix linter issues
piotrm50 May 6, 2024
a3db017
Add mutex to a rollback method
piotrm50 May 6, 2024
f6f3e60
Fixed data race warning
alexsporn May 6, 2024
c922159
Adapted tests to changed AccountData models
alexsporn May 6, 2024
ab8fc6e
Do not rollback pool stats and upgrade signals on the last slot of an…
alexsporn May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkg/model/account_diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package model

import (
"io"
"strconv"

"github.com/iotaledger/hive.go/ierrors"
"github.com/iotaledger/hive.go/lo"
Expand Down Expand Up @@ -83,8 +84,8 @@ func (d *AccountDiff) String() string {
builder.AddField(stringify.NewStructField("PreviousExpirySlot", uint32(d.PreviousExpirySlot)))
builder.AddField(stringify.NewStructField("NewOutputID", d.NewOutputID))
builder.AddField(stringify.NewStructField("PreviousOutputID", d.PreviousOutputID))
builder.AddField(stringify.NewStructField("BlockIssuerKeysAdded", d.BlockIssuerKeysAdded))
builder.AddField(stringify.NewStructField("BlockIssuerKeysRemoved", d.BlockIssuerKeysRemoved))
builder.AddField(stringify.NewStructField("BlockIssuerKeysAdded", func() string { return strconv.Itoa(d.BlockIssuerKeysAdded.Size()) }()))
builder.AddField(stringify.NewStructField("BlockIssuerKeysRemoved", func() string { return strconv.Itoa(d.BlockIssuerKeysRemoved.Size()) }()))
builder.AddField(stringify.NewStructField("ValidatorStakeChange", d.ValidatorStakeChange))
builder.AddField(stringify.NewStructField("DelegationStakeChange", d.DelegationStakeChange))
builder.AddField(stringify.NewStructField("FixedCostChange", d.FixedCostChange))
Expand Down
11 changes: 9 additions & 2 deletions pkg/protocol/engine/accounts/accountsledger/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,13 @@ func (m *Manager) rollbackAccountTo(accountData *accounts.AccountData, targetSlo
return false, false, ierrors.Wrapf(err, "can't retrieve account, could not load diff for account %s in slot %d", accountData.ID, diffSlot)
}

m.LogDebug("Rolling back account", "accountID", accountData.ID, "slot", diffSlot, "accountData", accountData, "diffChange", diffChange, "destroyed", destroyed)

// update the account data with the diff
accountData.Credits.Update(-diffChange.BICChange, diffChange.PreviousUpdatedSlot)
if diffChange.BICChange != 0 {
accountData.Credits.Update(-diffChange.BICChange, diffChange.PreviousUpdatedSlot)
}

// update the expiry slot of the account if it was changed
if diffChange.PreviousExpirySlot != diffChange.NewExpirySlot {
accountData.ExpirySlot = diffChange.PreviousExpirySlot
Expand Down Expand Up @@ -564,7 +569,9 @@ func (m *Manager) commitAccountTree(slot iotago.SlotIndex, accountDiffChanges ma
diffChange.BICChange -= accountData.Credits.Value - iotago.BlockIssuanceCredits(decayedPreviousCredits)
}

accountData.Credits.Update(diffChange.BICChange, slot)
if diffChange.BICChange != 0 {
accountData.Credits.Update(diffChange.BICChange, slot)
}
}

// update the expiry slot of the account if it changed
Expand Down
Loading