Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

encapsulate SubmitDelegatedFallbackDirect func #2244

Merged
merged 3 commits into from
Aug 28, 2024
Merged

encapsulate SubmitDelegatedFallbackDirect func #2244

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2c8740
encapsulate SubmitDelegatedFallbackDirect func
Intizar-T Aug 28, 2024
d1873d0
fix getting new nonce in delegated and direct funcs
Intizar-T Aug 28, 2024
c2c5096
dont get new nonce in the last iteration
Intizar-T Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 51 additions & 28 deletions node/pkg/chain/helper/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,47 +243,69 @@ func (t *ChainHelper) PublicAddressString() (string, error) {
}

func (t *ChainHelper) SubmitDelegatedFallbackDirect(ctx context.Context, contractAddress string, functionString string, maxRetrial int, args ...interface{}) error {
if t.delegatorUrl != "" {
err, tryDirect := t.submitDelegated(ctx, contractAddress, functionString, maxRetrial, args...)
if !tryDirect {
return err
}
}

return t.submitDirect(ctx, contractAddress, functionString, maxRetrial, args...)
}

func (t *ChainHelper) submitDelegated(ctx context.Context, contractAddress string, functionString string, maxRetrial int, args ...interface{}) (error, bool) {
var err error
var tx *types.Transaction

clientIndex := 0

nonce, err := noncemanager.GetAndIncrementNonce(t.wallet)
if err != nil {
return err
return err, false
}

if t.delegatorUrl != "" {
for i := 0; i < maxRetrial; i++ {
tx, err = utils.MakeFeeDelegatedTx(ctx, t.clients[clientIndex], contractAddress, t.wallet, functionString, t.chainID, nonce, args...)
if err != nil {
if utils.ShouldRetryWithSwitchedJsonRPC(err) {
clientIndex = (clientIndex + 1) % len(t.clients)
}
continue
for i := 0; i < maxRetrial; i++ {
tx, err = utils.MakeFeeDelegatedTx(ctx, t.clients[clientIndex], contractAddress, t.wallet, functionString, t.chainID, nonce, args...)
if err != nil {
if utils.ShouldRetryWithSwitchedJsonRPC(err) {
clientIndex = (clientIndex + 1) % len(t.clients)
}
continue
}

tx, err = t.GetSignedFromDelegator(tx)
if err != nil {
break // if delegator signing fails, try direct transaction
}
tx, err = t.GetSignedFromDelegator(tx)
if err != nil {
return nil, true // if delegator signing fails, try direct transaction
}

err = utils.SubmitRawTx(ctx, t.clients[clientIndex], tx)
if err != nil {
if utils.ShouldRetryWithSwitchedJsonRPC(err) {
clientIndex = (clientIndex + 1) % len(t.clients)
} else if errors.Is(err, errorSentinel.ErrChainTransactionFail) {
return err // if transaction fails, the data will probably be too old to retry
} else if utils.IsNonceError(err) || err == context.DeadlineExceeded {
nonce, err = noncemanager.GetAndIncrementNonce(t.wallet)
if err != nil {
return err
}
err = utils.SubmitRawTx(ctx, t.clients[clientIndex], tx)
if err != nil {
if utils.ShouldRetryWithSwitchedJsonRPC(err) {
clientIndex = (clientIndex + 1) % len(t.clients)
} else if errors.Is(err, errorSentinel.ErrChainTransactionFail) {
return err, false // if transaction fails, the data will probably be too old to retry
} else if i == maxRetrial-1 {
return err, true // dont get new nonce if it's the last iteration, instead try direct transaction
} else if utils.IsNonceError(err) || err == context.DeadlineExceeded {
nonce, err = noncemanager.GetAndIncrementNonce(t.wallet)
if err != nil {
return err, false
}
continue
}
return nil
continue
}
return nil, false
}
return err, true
}

func (t *ChainHelper) submitDirect(ctx context.Context, contractAddress string, functionString string, maxRetrial int, args ...interface{}) error {
var err error
var tx *types.Transaction
clientIndex := 0

nonce, err := noncemanager.GetAndIncrementNonce(t.wallet)
if err != nil {
return err
}

for i := 0; i < maxRetrial; i++ {
Expand All @@ -301,6 +323,8 @@ func (t *ChainHelper) SubmitDelegatedFallbackDirect(ctx context.Context, contrac
clientIndex = (clientIndex + 1) % len(t.clients)
} else if errors.Is(err, errorSentinel.ErrChainTransactionFail) {
return err // if transaction fails, the data will probably be too old to retry
} else if i == maxRetrial-1 {
return err // dont get new nonce if it's the last iteration
} else if utils.IsNonceError(err) || err == context.DeadlineExceeded {
nonce, err = noncemanager.GetAndIncrementNonce(t.wallet)
if err != nil {
Expand All @@ -311,7 +335,6 @@ func (t *ChainHelper) SubmitDelegatedFallbackDirect(ctx context.Context, contrac
}
return nil
}

return err
}

Expand Down