[#404] innerring: Wait for deposit in initialization

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2021-02-25 19:53:30 +03:00 committed by Alex Vanin
parent ddf1ac0f28
commit 8c3864e6d6
3 changed files with 72 additions and 1 deletions

View file

@ -112,6 +112,12 @@ const (
// extra blocks to overlap two deposits, we do that to make sure that // extra blocks to overlap two deposits, we do that to make sure that
// there won't be any blocks without deposited assets in notary contract. // there won't be any blocks without deposited assets in notary contract.
notaryExtraBlocks = 100 notaryExtraBlocks = 100
// amount of tries before notary deposit timeout.
notaryDepositTimeout = 100
)
var (
errDepositTimeout = errors.New("notary deposit didn't appeared in the network")
) )
// Start runs all event providers. // Start runs all event providers.
@ -133,6 +139,14 @@ func (s *Server) Start(ctx context.Context, intError chan<- error) error {
return err return err
} }
// wait a bit for notary contract deposit
s.log.Info("waiting to accept notary deposit")
err = s.awaitNotaryDeposit(ctx)
if err != nil {
return err
}
// vote for sidechain validator if it is prepared in config // vote for sidechain validator if it is prepared in config
err = s.voteForSidechainValidator(s.predefinedValidators) err = s.voteForSidechainValidator(s.predefinedValidators)
if err != nil { if err != nil {
@ -739,3 +753,27 @@ func (s *Server) depositNotary() error {
s.notaryDuration+notaryExtraBlocks, s.notaryDuration+notaryExtraBlocks,
) )
} }
func (s *Server) awaitNotaryDeposit(ctx context.Context) error {
for i := 0; i < notaryDepositTimeout; i++ {
select {
case <-ctx.Done():
return nil
default:
}
deposit, err := s.morphClient.GetNotaryDeposit()
if err != nil {
return errors.Wrap(err, "can't get notary deposit")
}
if deposit > 0 {
return nil
}
s.log.Info("empty notary deposit, waiting one more block")
s.morphClient.Wait(ctx, 1)
}
return errDepositTimeout
}

View file

@ -209,6 +209,9 @@ func toStackParameter(value interface{}) (sc.Parameter, error) {
result.Value = arr result.Value = arr
case string: case string:
result.Type = sc.StringType result.Type = sc.StringType
case util.Uint160:
result.Type = sc.ByteArrayType
result.Value = v.BytesBE()
default: default:
return result, errors.Errorf("chain/client: unsupported parameter %v", value) return result, errors.Errorf("chain/client: unsupported parameter %v", value)
} }

View file

@ -47,11 +47,15 @@ const (
defaultNotaryFallbackTime = 40 defaultNotaryFallbackTime = 40
innerRingListMethod = "innerRingList" innerRingListMethod = "innerRingList"
notaryBalanceOfMethod = "balanceOf"
notaryBalanceErrMsg = "can't fetch notary balance"
) )
var ( var (
errNotaryNotEnabled = errors.New("notary support was not enabled on this client") errNotaryNotEnabled = errors.New("notary support was not enabled on this client")
errInvalidIR = errors.New("invalid inner ring list from netmap contract") errInvalidIR = errors.New("invalid inner ring list from netmap contract")
errUnexpectedItems = errors.New("invalid number of NEO VM arguments on stack")
) )
func defaultNotaryConfig() *notaryCfg { func defaultNotaryConfig() *notaryCfg {
@ -126,6 +130,32 @@ func (c *Client) DepositNotary(amount fixedn.Fixed8, delta uint32) error {
return nil return nil
} }
// GetNotaryDeposit returns deposit of client's account in notary contract.
// Notary support should be enabled in client to use this function.
func (c *Client) GetNotaryDeposit() (int64, error) {
if c.notary == nil {
return 0, errNotaryNotEnabled
}
sh := c.acc.PrivateKey().PublicKey().GetScriptHash()
items, err := c.TestInvoke(c.notary.notary, notaryBalanceOfMethod, sh)
if err != nil {
return 0, errors.Wrap(err, notaryBalanceErrMsg)
}
if len(items) != 1 {
return 0, errors.Wrap(errUnexpectedItems, notaryBalanceErrMsg)
}
bigIntDeposit, err := items[0].TryInteger()
if err != nil {
return 0, errors.Wrap(err, notaryBalanceErrMsg)
}
return bigIntDeposit.Int64(), nil
}
// Invoke invokes contract method by sending tx to notary contract in // Invoke invokes contract method by sending tx to notary contract in
// blockchain. Fallback tx is a `RET`. Notary support should be enabled // blockchain. Fallback tx is a `RET`. Notary support should be enabled
// in client to use this function. // in client to use this function.