aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

dao: restrict GetStorageItems by prefix

Browse source 
All storage items can still be retrived via zero-length prefix.
This commit is contained in:
Evgenii Stratonikov 2020-05-27 10:56:47 +03:00
parent 776bd85ded
commit 503442a60d
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/core/blockchain.go
View file

@ -1147,7 +1147,7 @@ func (bc *Blockchain) GetStorageItem(scripthash util.Uint160, key []byte) *state
// GetStorageItems returns all storage items for a given scripthash.
func (bc *Blockchain) GetStorageItems(hash util.Uint160) (map[string]*state.StorageItem, error) {
siMap, err := bc.dao.GetStorageItems(hash)
siMap, err := bc.dao.GetStorageItems(hash, nil)
if err != nil {
return nil, err
}

8
pkg/core/dao/cacheddao.go
View file

@ -321,7 +321,7 @@ type StorageIteratorFunc func() ([]byte, []byte, error)
// GetStorageItemsIterator returns iterator over all storage items.
// Function returned can be called until first error.
func (cd *Cached) GetStorageItemsIterator(hash util.Uint160, prefix []byte) (StorageIteratorFunc, error) {
items, err := cd.DAO.GetStorageItems(hash)
items, err := cd.DAO.GetStorageItems(hash, prefix)
if err != nil {
return nil, err
}
@ -352,7 +352,7 @@ func (cd *Cached) GetStorageItemsIterator(hash util.Uint160, prefix []byte) (Sto
index++
for ; index < len(items); index++ {
_, ok := cache[string(items[index].Key)]
if !ok && bytes.HasPrefix(items[index].Key, prefix) {
if !ok {
return items[index].Key, items[index].Value, nil
}
}
@ -362,8 +362,8 @@ func (cd *Cached) GetStorageItemsIterator(hash util.Uint160, prefix []byte) (Sto
}
// GetStorageItems returns all storage items for a given scripthash.
func (cd *Cached) GetStorageItems(hash util.Uint160) ([]StorageItemWithKey, error) {
items, err := cd.DAO.GetStorageItems(hash)
func (cd *Cached) GetStorageItems(hash util.Uint160, prefix []byte) ([]StorageItemWithKey, error) {
items, err := cd.DAO.GetStorageItems(hash, prefix)
if err != nil {
return nil, err
}

6
pkg/core/dao/dao.go
View file

@ -35,7 +35,7 @@ type DAO interface {
GetNEP5Balances(acc util.Uint160) (*state.NEP5Balances, error)
GetNEP5TransferLog(acc util.Uint160, index uint32) (*state.NEP5TransferLog, error)
GetStorageItem(scripthash util.Uint160, key []byte) *state.StorageItem
GetStorageItems(hash util.Uint160) ([]StorageItemWithKey, error)
GetStorageItems(hash util.Uint160, prefix []byte) ([]StorageItemWithKey, error)
GetTransaction(hash util.Uint256) (*transaction.Transaction, uint32, error)
GetUnspentCoinState(hash util.Uint256) (*state.UnspentCoin, error)
GetValidatorState(publicKey *keys.PublicKey) (*state.Validator, error)
@ -442,7 +442,7 @@ type StorageItemWithKey struct {
}
// GetStorageItems returns all storage items for a given scripthash.
func (dao *Simple) GetStorageItems(hash util.Uint160) ([]StorageItemWithKey, error) {
func (dao *Simple) GetStorageItems(hash util.Uint160, prefix []byte) ([]StorageItemWithKey, error) {
var res []StorageItemWithKey
var err error
@ -462,7 +462,7 @@ func (dao *Simple) GetStorageItems(hash util.Uint160) ([]StorageItemWithKey, err
s.Key = k[21:]
res = append(res, s)
}
dao.Store.Seek(storage.AppendPrefix(storage.STStorage, hash.BytesLE()), saveToMap)
dao.Store.Seek(makeStorageItemKey(hash, prefix), saveToMap)
if err != nil {
return nil, err
}

2
pkg/core/interop_neo.go
View file

@ -582,7 +582,7 @@ func (ic *interopContext) contractMigrate(v *vm.VM) error {
}
if contract.HasStorage() {
hash := getContextScriptHash(v, 0)
siMap, err := ic.dao.GetStorageItems(hash)
siMap, err := ic.dao.GetStorageItems(hash, nil)
if err != nil {
return err
}

2
pkg/core/interop_system.go
View file

@ -561,7 +561,7 @@ func (ic *interopContext) contractDestroy(v *vm.VM) error {
return err
}
if cs.HasStorage() {
siMap, err := ic.dao.GetStorageItems(hash)
siMap, err := ic.dao.GetStorageItems(hash, nil)
if err != nil {
return err
}