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

[#1294] neofs-adm: Check persisted tx status

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-04-05 17:01:59 +03:00 committed by fyrchik
parent 629a4f79cd
commit 55362f0607
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cmd/neofs-adm/internal/modules/morph/initialize.go
View file

@ -14,6 +14,7 @@ import (
"github.com/nspcc-dev/neo-go/pkg/rpc/client"
"github.com/nspcc-dev/neo-go/pkg/smartcontract/trigger"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neo-go/pkg/vm"
"github.com/nspcc-dev/neo-go/pkg/wallet"
"github.com/nspcc-dev/neofs-node/cmd/neofs-adm/internal/modules/config"
"github.com/nspcc-dev/neofs-node/pkg/innerring"
@ -292,17 +293,27 @@ func (c *clientContext) awaitTx(cmd *cobra.Command) error {
at := trigger.Application
var retErr error
loop:
for i := range c.Hashes {
_, err := c.Client.GetApplicationLog(c.Hashes[i], &at)
res, err := c.Client.GetApplicationLog(c.Hashes[i], &at)
if err == nil {
if retErr == nil && len(res.Executions) > 0 && res.Executions[0].VMState != vm.HaltState {
retErr = fmt.Errorf("tx persisted in %s state: %s",
res.Executions[0].VMState, res.Executions[0].FaultException)
}
continue loop
}
for {
select {
case <-tick.C:
_, err := c.Client.GetApplicationLog(c.Hashes[i], &at)
res, err := c.Client.GetApplicationLog(c.Hashes[i], &at)
if err == nil {
if retErr == nil && len(res.Executions) > 0 && res.Executions[0].VMState != vm.HaltState {
retErr = fmt.Errorf("tx persisted in %s state: %s",
res.Executions[0].VMState, res.Executions[0].FaultException)
}
continue loop
}
case <-timer.C:
@ -311,7 +322,7 @@ loop:
}
}
return nil
return retErr
}
func (c *initializeContext) sendCommitteeTx(script []byte, sysFee int64) error {