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

[#722] neofs-adm: Provide contract state to getContractDeployParameters

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-04-08 16:23:34 +03:00 committed by LeL
parent efb6545bfe
commit 5bd6624eb6
1 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,19 +113,18 @@ func (c *initializeContext) deployNNS(method string) error {
return fmt.Errorf("can't sign manifest group: %v", err) return fmt.Errorf("can't sign manifest group: %v", err)
} }
params := getContractDeployParameters(cs.RawNEF, cs.RawManifest, nil) params := getContractDeployParameters(cs, nil)
signer := transaction.Signer{ signer := transaction.Signer{
Account: c.CommitteeAcc.Contract.ScriptHash(), Account: c.CommitteeAcc.Contract.ScriptHash(),
Scopes: transaction.CalledByEntry, Scopes: transaction.CalledByEntry,
} }
mgmtHash := c.nativeHash(nativenames.Management) invokeHash := c.nativeHash(nativenames.Management)
if method == updateMethodName { if method == updateMethodName {
mgmtHash = nnsCs.Hash invokeHash = nnsCs.Hash
} }
res, err := invokeFunction(c.Client, mgmtHash, method, params, []transaction.Signer{signer}) res, err := invokeFunction(c.Client, invokeHash, method, params, []transaction.Signer{signer})
if err != nil { if err != nil {
return fmt.Errorf("can't deploy NNS contract: %w", err) return fmt.Errorf("can't deploy NNS contract: %w", err)
} }
@ -233,8 +232,7 @@ func (c *initializeContext) updateContracts() error {
invokeHash = ctrHash invokeHash = ctrHash
} }
params := getContractDeployParameters(cs.RawNEF, cs.RawManifest, params := getContractDeployParameters(cs, c.getContractDeployData(ctrName, keysParam))
c.getContractDeployData(ctrName, keysParam))
signer := transaction.Signer{ signer := transaction.Signer{
Account: c.CommitteeAcc.Contract.ScriptHash(), Account: c.CommitteeAcc.Contract.ScriptHash(),
Scopes: transaction.Global, Scopes: transaction.Global,
@ -294,13 +292,10 @@ func (c *initializeContext) deployContracts() error {
continue continue
} }
invokeHash := mgmtHash
keysParam = append(keysParam, acc.PrivateKey().PublicKey().Bytes()) keysParam = append(keysParam, acc.PrivateKey().PublicKey().Bytes())
params := getContractDeployParameters(alphaCs, c.getAlphabetDeployItems(i, len(c.Wallets)))
params := getContractDeployParameters(alphaCs.RawNEF, alphaCs.RawManifest, res, err := invokeFunction(c.Client, mgmtHash, deployMethodName, params, []transaction.Signer{{
c.getAlphabetDeployItems(i, len(c.Wallets)))
res, err := invokeFunction(c.Client, invokeHash, deployMethodName, params, []transaction.Signer{{
Account: acc.Contract.ScriptHash(), Account: acc.Contract.ScriptHash(),
Scopes: transaction.CalledByEntry, Scopes: transaction.CalledByEntry,
}}) }})
@ -330,15 +325,13 @@ func (c *initializeContext) deployContracts() error {
return fmt.Errorf("can't sign manifest group: %v", err) return fmt.Errorf("can't sign manifest group: %v", err)
} }
invokeHash := mgmtHash params := getContractDeployParameters(cs, c.getContractDeployData(ctrName, keysParam))
params := getContractDeployParameters(cs.RawNEF, cs.RawManifest,
c.getContractDeployData(ctrName, keysParam))
signer := transaction.Signer{ signer := transaction.Signer{
Account: c.CommitteeAcc.Contract.ScriptHash(), Account: c.CommitteeAcc.Contract.ScriptHash(),
Scopes: transaction.Global, Scopes: transaction.Global,
} }
res, err := invokeFunction(c.Client, invokeHash, deployMethodName, params, []transaction.Signer{signer}) res, err := invokeFunction(c.Client, mgmtHash, deployMethodName, params, []transaction.Signer{signer})
if err != nil { if err != nil {
return fmt.Errorf("can't deploy %s contract: %w", ctrName, err) return fmt.Errorf("can't deploy %s contract: %w", ctrName, err)
} }
@ -491,8 +484,8 @@ func readContractsFromArchive(file io.Reader, names []string) (map[string]*contr
return m, nil return m, nil
} }
func getContractDeployParameters(rawNef, rawManif []byte, deployData []interface{}) []interface{} { func getContractDeployParameters(cs *contractState, deployData []interface{}) []interface{} {
return []interface{}{rawNef, rawManif, deployData} return []interface{}{cs.RawNEF, cs.RawManifest, deployData}
} }
func (c *initializeContext) getContractDeployData(ctrName string, keysParam []interface{}) []interface{} { func (c *initializeContext) getContractDeployData(ctrName string, keysParam []interface{}) []interface{} {
@ -569,10 +562,3 @@ func (c *initializeContext) getAlphabetDeployItems(i, n int) []interface{} {
items[5] = int64(n) items[5] = int64(n)
return items return items
} }
func newContractParameter(typ smartcontract.ParamType, value interface{}) smartcontract.Parameter {
return smartcontract.Parameter{
Type: typ,
Value: value,
}
}