Skip to content

Commit

Permalink
Apply review suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
@piotrm50
piotrm50 committed Nov 7, 2023
1 parent fb5f2c0 commit fe232db
Show file tree
Hide file tree
Showing 6 changed files with 148 additions and 125 deletions.
172 changes: 72 additions & 100 deletions pkg/tests/accounts_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@ package tests
import (
"testing"

"github.com/stretchr/testify/require"

"github.com/iotaledger/hive.go/lo"
"github.com/iotaledger/iota-core/pkg/model"
"github.com/iotaledger/iota-core/pkg/protocol/engine/accounts"
"github.com/iotaledger/iota-core/pkg/protocol/engine/blocks"
"github.com/iotaledger/iota-core/pkg/protocol/engine/utxoledger"
"github.com/iotaledger/iota-core/pkg/testsuite"
"github.com/iotaledger/iota-core/pkg/testsuite/mock"
"github.com/iotaledger/iota-core/pkg/testsuite/snapshotcreator"
Expand Down Expand Up @@ -480,33 +476,34 @@ func Test_NegativeBIC(t *testing.T) {
node1 := ts.AddValidatorNode("node1")
node2 := ts.AddNode("node2")

validatorBIC := iotago.MaxBlockIssuanceCredits / 2
// Add a default block issuer to the network. This will add another block issuer account to the snapshot.
walletBIC := iotago.BlockIssuanceCredits(499)
wallet := ts.AddGenesisWallet("default", node2, walletBIC)
wallet1BIC := iotago.BlockIssuanceCredits(100000)
wallet2BIC := iotago.BlockIssuanceCredits(0)

wallet1 := ts.AddGenesisWallet("wallet 1", node2, wallet1BIC)
wallet2 := ts.AddGenesisWallet("wallet 2", node2, wallet2BIC)

ts.Run(false)

// check that the accounts added in the genesis snapshot were added to the account manager correctly.
// validator node account.
validatorAccountOutput := ts.AccountOutput("Genesis:1")

// wallet 1 block issuer account.
wallet1OutputID := ts.AccountOutput("Genesis:2").OutputID()
ts.AssertAccountData(&accounts.AccountData{
ID: node1.Validator.AccountID,
Credits: accounts.NewBlockIssuanceCredits(validatorBIC, 0),
OutputID: validatorAccountOutput.OutputID(),
ID: wallet1.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(wallet1BIC, 0),
OutputID: wallet1OutputID,
ExpirySlot: iotago.MaxSlotIndex,
BlockIssuerKeys: node1.Validator.BlockIssuerKeys(),
StakeEndEpoch: iotago.MaxEpochIndex,
ValidatorStake: mock.MinValidatorAccountAmount,
BlockIssuerKeys: wallet1.BlockIssuer.BlockIssuerKeys(),
}, ts.Nodes()...)
// default wallet block issuer account.
blockIssuerAccountOutput := ts.AccountOutput("Genesis:2")

// wallet 2 block issuer account.
wallet2OutputID := ts.AccountOutput("Genesis:3").OutputID()
ts.AssertAccountData(&accounts.AccountData{
ID: wallet.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(walletBIC, 0),
OutputID: blockIssuerAccountOutput.OutputID(),
ID: wallet2.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(wallet2BIC, 0),
OutputID: wallet2OutputID,
ExpirySlot: iotago.MaxSlotIndex,
BlockIssuerKeys: wallet.BlockIssuer.BlockIssuerKeys(),
BlockIssuerKeys: wallet2.BlockIssuer.BlockIssuerKeys(),
}, ts.Nodes()...)

// MODIFY EXISTING GENESIS ACCOUNT
Expand All @@ -516,32 +513,30 @@ func Test_NegativeBIC(t *testing.T) {
{
block1Commitment := iotago.NewEmptyCommitment(ts.API.ProtocolParameters().Version())
block1Commitment.ReferenceManaCost = ts.API.ProtocolParameters().CongestionControlParameters().MinReferenceManaCost
block11 := ts.IssueBasicBlockAtSlotWithOptions("block1.1", block1Slot, ts.Wallet("node1"), &iotago.TaggedData{}, mock.WithSlotCommitment(block1Commitment))
block12 := ts.IssueBasicBlockAtSlotWithOptions("block1.2", block1Slot, wallet, &iotago.TaggedData{}, mock.WithStrongParents(block11.ID()), mock.WithSlotCommitment(block1Commitment))
block11 := ts.IssueBasicBlockAtSlotWithOptions("block1.1", block1Slot, wallet1, &iotago.TaggedData{}, mock.WithSlotCommitment(block1Commitment))
block12 := ts.IssueBasicBlockAtSlotWithOptions("block1.2", block1Slot, wallet2, &iotago.TaggedData{}, mock.WithStrongParents(block11.ID()), mock.WithSlotCommitment(block1Commitment))

// Commit BIC burns and check account states.
latestParent = ts.CommitUntilSlot(ts.BlockID("block1.2").Slot(), block12)

burned := iotago.BlockIssuanceCredits(block11.WorkScore()) * iotago.BlockIssuanceCredits(ts.API.ProtocolParameters().CongestionControlParameters().MinReferenceManaCost)

validatorBIC -= burned
walletBIC -= burned
wallet1BIC -= burned
wallet2BIC -= burned

ts.AssertAccountData(&accounts.AccountData{
ID: node1.Validator.AccountID,
Credits: accounts.NewBlockIssuanceCredits(validatorBIC, block1Slot),
OutputID: validatorAccountOutput.OutputID(),
ID: wallet1.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(wallet1BIC, block1Slot),
OutputID: wallet1OutputID,
ExpirySlot: iotago.MaxSlotIndex,
BlockIssuerKeys: node1.Validator.BlockIssuerKeys(),
StakeEndEpoch: iotago.MaxEpochIndex,
ValidatorStake: mock.MinValidatorAccountAmount,
BlockIssuerKeys: wallet1.BlockIssuer.BlockIssuerKeys(),
}, ts.Nodes()...)
ts.AssertAccountData(&accounts.AccountData{
ID: wallet.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(walletBIC, block1Slot),
ID: wallet2.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(wallet2BIC, block1Slot),
ExpirySlot: iotago.MaxSlotIndex,
OutputID: blockIssuerAccountOutput.OutputID(),
BlockIssuerKeys: wallet.BlockIssuer.BlockIssuerKeys(),
OutputID: wallet2OutputID,
BlockIssuerKeys: wallet2.BlockIssuer.BlockIssuerKeys(),
}, ts.Nodes()...)
}

Expand All @@ -551,121 +546,98 @@ func Test_NegativeBIC(t *testing.T) {
// the other has the block rejected in the CommitmentFilter as his account has negative BIC value.
{

block21 := ts.IssueBasicBlockAtSlotWithOptions("block2.1", block2Slot, ts.Wallet("node1"), &iotago.TaggedData{})
block21 := ts.IssueBasicBlockAtSlotWithOptions("block2.1", block2Slot, wallet1, &iotago.TaggedData{})

block22 := ts.IssueBasicBlockAtSlotWithOptions("block2.2", block2Slot, wallet, &iotago.TaggedData{}, mock.WithStrongParents(ts.BlockID("block2.1")))
block22 := ts.IssueBasicBlockAtSlotWithOptions("block2.2", block2Slot, wallet2, &iotago.TaggedData{}, mock.WithStrongParents(ts.BlockID("block2.1")))

ts.AssertBlockFiltered([]*blocks.Block{block22}, iotago.ErrNegativeBIC, wallet.Node)
ts.AssertBlockFiltered([]*blocks.Block{block22}, iotago.ErrNegativeBIC, wallet2.Node)

latestParent = ts.CommitUntilSlot(ts.BlockID("block2.1").Slot(), block21)

burned := iotago.BlockIssuanceCredits(block21.WorkScore()) * iotago.BlockIssuanceCredits(ts.API.ProtocolParameters().CongestionControlParameters().MinReferenceManaCost)

validatorBIC -= burned
wallet1BIC -= burned

ts.AssertAccountData(&accounts.AccountData{
ID: node1.Validator.AccountID,
Credits: accounts.NewBlockIssuanceCredits(validatorBIC, block2Slot),
OutputID: validatorAccountOutput.OutputID(),
ID: wallet1.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(wallet1BIC, block2Slot),
OutputID: wallet1OutputID,
ExpirySlot: iotago.MaxSlotIndex,
BlockIssuerKeys: node1.Validator.BlockIssuerKeys(),
StakeEndEpoch: iotago.MaxEpochIndex,
ValidatorStake: mock.MinValidatorAccountAmount,
LatestSupportedProtocolVersionAndHash: model.VersionAndHash{
Version: ts.API.ProtocolParameters().Version(),
Hash: lo.PanicOnErr(ts.API.ProtocolParameters().Hash()),
},
BlockIssuerKeys: wallet1.BlockIssuer.BlockIssuerKeys(),
}, ts.Nodes()...)
ts.AssertAccountData(&accounts.AccountData{
ID: wallet.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(walletBIC, block1Slot),
ID: wallet2.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(wallet2BIC, block1Slot),
ExpirySlot: iotago.MaxSlotIndex,
OutputID: blockIssuerAccountOutput.OutputID(),
BlockIssuerKeys: wallet.BlockIssuer.BlockIssuerKeys(),
OutputID: wallet2OutputID,
BlockIssuerKeys: wallet2.BlockIssuer.BlockIssuerKeys(),
}, ts.Nodes()...)
}

block3Slot := latestParent.ID().Slot()

// Allot some mana to the locked account to unlock it.
// The locked wallet 2 is preparing and signs the transaction, but it's issued by wallet 1 whose account is not locked.
{
allottedBIC := iotago.BlockIssuanceCredits(500)
tx1, err := wallet.CreateSignedTransactionWithOptions(
"TX1",
mock.WithInputs(utxoledger.Outputs{wallet.Output("Genesis:0")}),
mock.WithOutputs(iotago.Outputs[iotago.Output]{wallet.Output("Genesis:0").Output()}),
mock.WithSlotCreated(block3Slot),
mock.WithAllotments(iotago.Allotments{&iotago.Allotment{
AccountID: wallet.BlockIssuer.AccountID,
allottedBIC := iotago.BlockIssuanceCredits(1000)
tx1 := wallet2.AllotManaFromInputs("TX1",
iotago.Allotments{&iotago.Allotment{
AccountID: wallet2.BlockIssuer.AccountID,
Mana: iotago.Mana(allottedBIC),
}}),
)
require.NoError(t, err)
}}, "Genesis:0")

block3Commitment := node1.Protocol.MainEngineInstance().Storage.Settings().LatestCommitment().Commitment()
block31 := ts.IssueBasicBlockAtSlotWithOptions("block3.1", block3Slot, ts.Wallet("node1"), tx1, mock.WithStrongParents(latestParent.ID()), mock.WithSlotCommitment(block3Commitment))
// Wallet 1 whose account is not locked is issuing the block to unlock the account of wallet 2.
block31 := ts.IssueBasicBlockAtSlotWithOptions("block3.1", block3Slot, wallet1, tx1, mock.WithStrongParents(latestParent.ID()), mock.WithSlotCommitment(block3Commitment))

latestParent = ts.CommitUntilSlot(ts.BlockID("block3.1").Slot(), block31)

burned := iotago.BlockIssuanceCredits(block31.WorkScore()) * iotago.BlockIssuanceCredits(ts.API.ProtocolParameters().CongestionControlParameters().MinReferenceManaCost)

validatorBIC -= burned
walletBIC += allottedBIC
wallet1BIC -= burned
wallet2BIC += allottedBIC

ts.AssertAccountData(&accounts.AccountData{
ID: node1.Validator.AccountID,
Credits: accounts.NewBlockIssuanceCredits(validatorBIC, block3Slot),
OutputID: validatorAccountOutput.OutputID(),
ID: wallet1.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(wallet1BIC, block3Slot),
OutputID: wallet1OutputID,
ExpirySlot: iotago.MaxSlotIndex,
BlockIssuerKeys: node1.Validator.BlockIssuerKeys(),
StakeEndEpoch: iotago.MaxEpochIndex,
ValidatorStake: mock.MinValidatorAccountAmount,
LatestSupportedProtocolVersionAndHash: model.VersionAndHash{
Version: ts.API.ProtocolParameters().Version(),
Hash: lo.PanicOnErr(ts.API.ProtocolParameters().Hash()),
},
BlockIssuerKeys: wallet1.BlockIssuer.BlockIssuerKeys(),
}, ts.Nodes()...)
ts.AssertAccountData(&accounts.AccountData{
ID: wallet.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(walletBIC, block3Slot),
ID: wallet2.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(wallet2BIC, block3Slot),
ExpirySlot: iotago.MaxSlotIndex,
OutputID: blockIssuerAccountOutput.OutputID(),
BlockIssuerKeys: wallet.BlockIssuer.BlockIssuerKeys(),
OutputID: wallet2OutputID,
BlockIssuerKeys: wallet2.BlockIssuer.BlockIssuerKeys(),
}, ts.Nodes()...)
}

block4Slot := latestParent.ID().Slot()

// Issue block from the unlocked account to make sure that it's actually unlocked.
// Issue block from the unlocked account of wallet 2 to make sure that it's actually unlocked.
{

block4 := ts.IssueBasicBlockAtSlotWithOptions("block4", block4Slot, wallet, &iotago.TaggedData{}, mock.WithStrongParents(latestParent.ID()))
block4 := ts.IssueBasicBlockAtSlotWithOptions("block4", block4Slot, wallet2, &iotago.TaggedData{}, mock.WithStrongParents(latestParent.ID()))

latestParent = ts.CommitUntilSlot(ts.BlockID("block4").Slot(), block4)

burned := iotago.BlockIssuanceCredits(block4.WorkScore()) * iotago.BlockIssuanceCredits(ts.API.ProtocolParameters().CongestionControlParameters().MinReferenceManaCost)

walletBIC -= burned
wallet2BIC -= burned

ts.AssertAccountData(&accounts.AccountData{
ID: node1.Validator.AccountID,
Credits: accounts.NewBlockIssuanceCredits(validatorBIC, block3Slot),
OutputID: validatorAccountOutput.OutputID(),
ID: wallet1.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(wallet1BIC, block3Slot),
OutputID: wallet1OutputID,
ExpirySlot: iotago.MaxSlotIndex,
BlockIssuerKeys: node1.Validator.BlockIssuerKeys(),
StakeEndEpoch: iotago.MaxEpochIndex,
ValidatorStake: mock.MinValidatorAccountAmount,
LatestSupportedProtocolVersionAndHash: model.VersionAndHash{
Version: ts.API.ProtocolParameters().Version(),
Hash: lo.PanicOnErr(ts.API.ProtocolParameters().Hash()),
},
BlockIssuerKeys: wallet1.BlockIssuer.BlockIssuerKeys(),
}, ts.Nodes()...)
ts.AssertAccountData(&accounts.AccountData{
ID: wallet.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(walletBIC, block4Slot),
ID: wallet2.BlockIssuer.AccountID,
Credits: accounts.NewBlockIssuanceCredits(wallet2BIC, block4Slot),
ExpirySlot: iotago.MaxSlotIndex,
OutputID: blockIssuerAccountOutput.OutputID(),
BlockIssuerKeys: wallet.BlockIssuer.BlockIssuerKeys(),
OutputID: wallet2OutputID,
BlockIssuerKeys: wallet2.BlockIssuer.BlockIssuerKeys(),
}, ts.Nodes()...)
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/testsuite/mock/blockissuer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func NewBlockIssuer(t *testing.T, name string, keyManager *KeyManager, accountID
priv, pub := keyManager.KeyPair()

if accountID == iotago.EmptyAccountID {
accountID = iotago.AccountID(blake2b.Sum256(pub))
accountID = blake2b.Sum256(pub)
}
accountID.RegisterAlias(name)

Expand Down
11 changes: 7 additions & 4 deletions pkg/testsuite/mock/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,6 @@ func (n *Node) hookEvents() {
events.CandidateEngineActivated.Hook(func(e *engine.Engine) { n.candidateEngineActivatedCount.Add(1) })

events.MainEngineSwitched.Hook(func(e *engine.Engine) { n.mainEngineSwitchedCount.Add(1) })

events.Engine.CommitmentFilter.BlockFiltered.Hook(func(event *commitmentfilter.BlockFilteredEvent) {
n.filteredBlockEvents = append(n.filteredBlockEvents, event)
})
}

func (n *Node) hookLogging(failOnBlockFiltered bool) {
Expand Down Expand Up @@ -319,6 +315,10 @@ func (n *Node) attachEngineLogsWithName(failOnBlockFiltered bool, instance *engi
if failOnBlockFiltered {
n.Testing.Fatal("no blocks should be filtered")
}

n.mutex.Lock()
defer n.mutex.Unlock()
n.filteredBlockEvents = append(n.filteredBlockEvents, event)
})

events.BlockRequester.Tick.Hook(func(blockID iotago.BlockID) {
Expand Down Expand Up @@ -512,6 +512,9 @@ func (n *Node) CandidateEngineActivatedCount() int {
}

func (n *Node) FilteredBlocks() []*commitmentfilter.BlockFilteredEvent {
n.mutex.RLock()
defer n.mutex.RUnlock()

return n.filteredBlockEvents
}

Expand Down
Loading

0 comments on commit fe232db

Please sign in to comment.