dstepanov-yadro/frostfs-contract
1
0
Fork 0
forked from TrueCloudLab/frostfs-contract
Code Pull requests Activity

[#202] *: remove owner from contract storage

Browse source 
It is no longer used and should've be removed on update.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-12-27 10:15:36 +03:00 committed by Alex Vanin
parent c1adea2484
commit 1944a4332b
8 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
alphabet/alphabet_contract.go
View file

@ -33,7 +33,9 @@ func OnNEP17Payment(from interop.Hash160, amount int, data interface{}) {
}
func _deploy(data interface{}, isUpdate bool) {
ctx := storage.GetContext()
if isUpdate {
storage.Delete(ctx, common.LegacyOwnerKey)
return
}
@ -46,8 +48,6 @@ func _deploy(data interface{}, isUpdate bool) {
total int
})
ctx := storage.GetContext()
if len(args.addrNetmap) != interop.Hash160Len || !args.notaryDisabled && len(args.addrProxy) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}

4
audit/audit_contract.go
View file

@ -43,7 +43,9 @@ const (
)
func _deploy(data interface{}, isUpdate bool) {
ctx := storage.GetContext()
if isUpdate {
storage.Delete(ctx, common.LegacyOwnerKey)
return
}
@ -52,8 +54,6 @@ func _deploy(data interface{}, isUpdate bool) {
addrNetmap interop.Hash160
})
ctx := storage.GetContext()
if len(args.addrNetmap) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}

4
balance/balance_contract.go
View file

@ -59,7 +59,9 @@ func init() {
}
func _deploy(data interface{}, isUpdate bool) {
ctx := storage.GetContext()
if isUpdate {
storage.Delete(ctx, common.LegacyOwnerKey)
return
}
@ -69,8 +71,6 @@ func _deploy(data interface{}, isUpdate bool) {
addrContainer interop.Hash160
})
ctx := storage.GetContext()
if len(args.addrNetmap) != interop.Hash160Len || len(args.addrContainer) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}

3
common/update.go
View file

@ -4,6 +4,9 @@ import (
"github.com/nspcc-dev/neo-go/pkg/interop/runtime"
)
// LegacyOwnerKey is storage key used to store contract owner.
const LegacyOwnerKey = "contractOwner"
// HasUpdateAccess returns true if contract can be updated.
func HasUpdateAccess() bool {
return runtime.CheckWitness(CommitteeAddress())

8
container/container_contract.go
View file

@ -83,6 +83,10 @@ func OnNEP11Payment(a interop.Hash160, b int, c []byte, d interface{}) {
func _deploy(data interface{}, isUpdate bool) {
ctx := storage.GetContext()
if isUpdate {
storage.Delete(ctx, common.LegacyOwnerKey)
return
}
args := data.(struct {
notaryDisabled bool
@ -93,10 +97,6 @@ func _deploy(data interface{}, isUpdate bool) {
nnsRoot string
})
if isUpdate {
return
}
if len(args.addrNetmap) != interop.Hash160Len ||
len(args.addrBalance) != interop.Hash160Len ||
len(args.addrID) != interop.Hash160Len {

1
neofsid/neofsid_contract.go
View file

@ -33,6 +33,7 @@ func _deploy(data interface{}, isUpdate bool) {
ctx := storage.GetContext()
if isUpdate {
storage.Delete(ctx, common.LegacyOwnerKey)
it := storage.Find(ctx, []byte{}, storage.None)
for iterator.Next(it) {
kv := iterator.Value(it).([][]byte)

1
netmap/netmap_contract.go
View file

@ -83,6 +83,7 @@ func _deploy(data interface{}, isUpdate bool) {
}
if isUpdate {
storage.Delete(ctx, common.LegacyOwnerKey)
return
}

3
proxy/proxy_contract.go
View file

@ -7,6 +7,7 @@ import (
"github.com/nspcc-dev/neo-go/pkg/interop/native/management"
"github.com/nspcc-dev/neo-go/pkg/interop/native/neo"
"github.com/nspcc-dev/neo-go/pkg/interop/runtime"
"github.com/nspcc-dev/neo-go/pkg/interop/storage"
"github.com/nspcc-dev/neofs-contract/common"
)
@ -19,7 +20,9 @@ func OnNEP17Payment(from interop.Hash160, amount int, data interface{}) {
}
func _deploy(_ interface{}, isUpdate bool) {
ctx := storage.GetContext()
if isUpdate {
storage.Delete(ctx, common.LegacyOwnerKey)
return
}