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

state: always deserialize LastGasPerVote #3122

Merged
merged 1 commit into from
Sep 6, 2023
Merged

state: always deserialize LastGasPerVote #3122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions pkg/core/state/native_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,17 +148,17 @@ func (s *NEOBalance) FromStackItem(item stackitem.Item) error {
s.BalanceHeight = uint32(h.Int64())
if _, ok := structItem[2].(stackitem.Null); ok {
s.VoteTo = nil
return nil
}
bs, err := structItem[2].TryBytes()
if err != nil {
return fmt.Errorf("invalid public key stackitem: %w", err)
}
pub, err := keys.NewPublicKeyFromBytes(bs, elliptic.P256())
if err != nil {
return fmt.Errorf("invalid public key bytes: %w", err)
} else {
bs, err := structItem[2].TryBytes()
if err != nil {
return fmt.Errorf("invalid public key stackitem: %w", err)
}
pub, err := keys.NewPublicKeyFromBytes(bs, elliptic.P256())
if err != nil {
return fmt.Errorf("invalid public key bytes: %w", err)
}
s.VoteTo = pub
}
s.VoteTo = pub
if len(structItem) >= 4 {
lastGasPerVote, err := structItem[3].TryInteger()
if err != nil {
Expand Down
32 changes: 32 additions & 0 deletions pkg/core/state/native_state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package state

import (
"math/big"
"testing"

"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neo-go/pkg/vm/stackitem"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -47,6 +49,36 @@ func TestNEP17BalanceFromBytesInvalid(t *testing.T) {
require.Error(t, err)
}

func TestNEOBalanceSerialization(t *testing.T) {
var b = NEOBalance{
NEP17Balance: NEP17Balance{*big.NewInt(100500)},
BalanceHeight: 42,
}
si, err := b.ToStackItem()
require.NoError(t, err)

var bb NEOBalance
require.NoError(t, bb.FromStackItem(si))
require.Equal(t, b, bb)

b.VoteTo, err = keys.NewPublicKeyFromString("03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c")
require.NoError(t, err)
b.LastGasPerVote = *big.NewInt(100500)

si, err = b.ToStackItem()
require.NoError(t, err)
bb = NEOBalance{}
require.NoError(t, bb.FromStackItem(si))
require.Equal(t, b, bb)

b.VoteTo = nil
si, err = b.ToStackItem()
require.NoError(t, err)
bb = NEOBalance{}
require.NoError(t, bb.FromStackItem(si))
require.Equal(t, b, bb)
}

func BenchmarkNEP17BalanceBytes(b *testing.B) {
var bl NEP17Balance
bl.Balance.SetInt64(0x12345678910)
Expand Down