TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 101 Pull requests 6 Projects Releases 1 Activity Actions

[#888] neofs-adm: update container contract deploy parameters

Browse source 
It supports NNS domain and zone now.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-09-30 17:42:16 +03:00 committed by Alex Vanin
parent 8ddd0aab55
commit 6571f9214f
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -313,10 +313,18 @@ func (c *initializeContext) getContractDeployData(ctrName string, keysParam []sm
newContractParameter(smartcontract.Hash160Type, c.Contracts[netmapContract].Hash), newContractParameter(smartcontract.Hash160Type, c.Contracts[netmapContract].Hash),
newContractParameter(smartcontract.Hash160Type, c.Contracts[containerContract].Hash)) newContractParameter(smartcontract.Hash160Type, c.Contracts[containerContract].Hash))
case containerContract: case containerContract:
// In case if NNS is updated multiple times, we can't calculate
// it's actual hash based on local data, thus query chain.
nnsCs, err := c.Client.GetContractStateByID(1)
if err != nil {
panic("NNS is not yet deployed")
}
items = append(items, items = append(items,
newContractParameter(smartcontract.Hash160Type, c.Contracts[netmapContract].Hash), newContractParameter(smartcontract.Hash160Type, c.Contracts[netmapContract].Hash),
newContractParameter(smartcontract.Hash160Type, c.Contracts[balanceContract].Hash), newContractParameter(smartcontract.Hash160Type, c.Contracts[balanceContract].Hash),
newContractParameter(smartcontract.Hash160Type, c.Contracts[neofsIDContract].Hash)) newContractParameter(smartcontract.Hash160Type, c.Contracts[neofsIDContract].Hash),
newContractParameter(smartcontract.Hash160Type, nnsCs.Hash),
newContractParameter(smartcontract.StringType, "container"))
case neofsIDContract: case neofsIDContract:
items = append(items, items = append(items,
newContractParameter(smartcontract.Hash160Type, c.Contracts[netmapContract].Hash), newContractParameter(smartcontract.Hash160Type, c.Contracts[netmapContract].Hash),