dstepanov-yadro/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#984] neofs-adm: compare NEF.Checksum to check if contract was updated

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-11-24 09:19:39 +03:00 committed by LeL
parent 6207a2f261
commit 63a8b530f6
1 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cmd/neofs-adm/internal/modules/morph/initialize_deploy.go
View file

@ -86,7 +86,9 @@ const updateMethodName = "update"
func (c *initializeContext) deployNNS(method string) error { func (c *initializeContext) deployNNS(method string) error {
cs := c.getContract(nnsContract) cs := c.getContract(nnsContract)
if _, err := c.Client.GetContractStateByHash(cs.Hash); err == nil && method != updateMethodName { realCs, err := c.Client.GetContractStateByID(1)
if err == nil && realCs.NEF.Checksum == cs.NEF.Checksum {
c.Command.Println("NNS contract is already deployed.")
return nil return nil
} }
@ -147,17 +149,20 @@ func (c *initializeContext) deployContracts(method string) error {
// alphabet contracts should be deployed by individual nodes to get different hashes. // alphabet contracts should be deployed by individual nodes to get different hashes.
for i, acc := range c.Accounts { for i, acc := range c.Accounts {
ctrHash := state.CreateContractHash(acc.Contract.ScriptHash(), alphaCs.NEF.Checksum, alphaCs.Manifest.Name) ctrHash := state.CreateContractHash(acc.Contract.ScriptHash(), alphaCs.NEF.Checksum, alphaCs.Manifest.Name)
if _, err := c.Client.GetContractStateByHash(ctrHash); err == nil && method != updateMethodName { if method == updateMethodName {
ctrHash, err = nnsResolveHash(c.Client, nnsHash, getAlphabetNNSDomain(i))
if err != nil {
return fmt.Errorf("can't resolve hash for contract update: %w", err)
}
}
if c.isUpdated(ctrHash, alphaCs) {
c.Command.Printf("Alphabet contract #%d is already deployed.\n", i) c.Command.Printf("Alphabet contract #%d is already deployed.\n", i)
continue continue
} }
invokeHash := mgmtHash invokeHash := mgmtHash
if method == updateMethodName { if method == updateMethodName {
invokeHash, err = nnsResolveHash(c.Client, nnsHash, getAlphabetNNSDomain(i)) invokeHash = ctrHash
if err != nil {
return fmt.Errorf("can't resolve hash for contract update: %w", err)
}
} }
keysParam = append(keysParam, smartcontract.Parameter{ keysParam = append(keysParam, smartcontract.Parameter{
@ -205,17 +210,22 @@ func (c *initializeContext) deployContracts(method string) error {
for _, ctrName := range contractList { for _, ctrName := range contractList {
cs := c.Contracts[ctrName] cs := c.Contracts[ctrName]
if _, err := c.Client.GetContractStateByHash(cs.Hash); err == nil && method != updateMethodName {
ctrHash := cs.Hash
if method == updateMethodName {
ctrHash, err = nnsResolveHash(c.Client, nnsHash, ctrName+".neofs")
if err != nil {
return fmt.Errorf("can't resolve hash for contract update: %w", err)
}
}
if c.isUpdated(ctrHash, cs) {
c.Command.Printf("%s contract is already deployed.\n", ctrName) c.Command.Printf("%s contract is already deployed.\n", ctrName)
continue continue
} }
invokeHash := mgmtHash invokeHash := mgmtHash
if method == updateMethodName { if method == updateMethodName {
invokeHash, err = nnsResolveHash(c.Client, nnsHash, ctrName+".neofs") invokeHash = ctrHash
if err != nil {
return fmt.Errorf("can't resolve hash for contract update: %w", err)
}
} }
params := getContractDeployParameters(cs.RawNEF, cs.RawManifest, params := getContractDeployParameters(cs.RawNEF, cs.RawManifest,
@ -241,6 +251,11 @@ func (c *initializeContext) deployContracts(method string) error {
return c.awaitTx() return c.awaitTx()
} }
func (c *initializeContext) isUpdated(ctrHash util.Uint160, cs *contractState) bool {
realCs, err := c.Client.GetContractStateByHash(ctrHash)
return err == nil && realCs.NEF.Checksum == cs.NEF.Checksum
}
func (c *initializeContext) getContract(ctrName string) *contractState { func (c *initializeContext) getContract(ctrName string) *contractState {
return c.Contracts[ctrName] return c.Contracts[ctrName]
} }