george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#888] neofs-adm: set contract hashes on read

Browse source 
Non-alphabet contract are always deployed from committee
so it makes sense to calculate hashes in one place.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-10-07 15:25:34 +03:00 • committed by Alex Vanin
parent 6bcd4811e2
commit 8ddd0aab55
3 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,8 +74,7 @@ func (c *initializeContext) deployNNS(method string) error {
return err
}
h := state.CreateContractHash(c.CommitteeAcc.Contract.ScriptHash(), cs.NEF.Checksum, cs.Manifest.Name)
if _, err := c.Client.GetContractStateByHash(h); err == nil && method != "update" {
if _, err := c.Client.GetContractStateByHash(cs.Hash); err == nil && method != "update" {
return nil
}
@ -123,13 +122,11 @@ func (c *initializeContext) deployNNS(method string) error {
func (c *initializeContext) deployContracts(method string) error {
mgmtHash := c.nativeHash(nativenames.Management)
sender := c.CommitteeAcc.Contract.ScriptHash()
for _, ctrName := range contractList {
cs, err := c.readContract(ctrName)
_, err := c.readContract(ctrName)
if err != nil {
return err
}
cs.Hash = state.CreateContractHash(sender, cs.NEF.Checksum, cs.Manifest.Name)
}
alphaCs, err := c.readContract(alphabetContract)
@ -264,13 +261,18 @@ func (c *initializeContext) readContract(ctrName string) (*contractState, error)
return nil, fmt.Errorf("can't parse manifest file: %w", err)
}
c.Contracts[ctrName] = &contractState{
cs := &contractState{
NEF: &nf,
RawNEF: rawNef,
Manifest: m,
RawManifest: rawManif,
}
return c.Contracts[ctrName], nil
if ctrName != alphabetContract {
cs.Hash = state.CreateContractHash(c.CommitteeAcc.Contract.ScriptHash(),
cs.NEF.Checksum, cs.Manifest.Name)
}
c.Contracts[ctrName] = cs
return cs, nil
}
func getContractDeployParameters(rawNef, rawManif []byte, deployData []smartcontract.Parameter) []smartcontract.Parameter {