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.

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

[R4R]return error when executing mirror or mirror sync request failed #823

Merged
merged 1 commit into from
Jan 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions plugins/bridge/cross_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@ func (app *MirrorApp) ExecuteSynPackage(ctx sdk.Context, payload []byte, relayer
return sdk.ExecuteResult{
Payload: ackPackage,
Tags: tags,
Err: types.ErrInvalidMirror("invalid mirror package"),
}
}

Expand All @@ -540,6 +541,7 @@ func (app *MirrorApp) ExecuteSynPackage(ctx sdk.Context, payload []byte, relayer
return sdk.ExecuteResult{
Payload: ackPackage,
Tags: tags,
Err: types.ErrMirrorSymbolExists(fmt.Sprintf("symbol %s already exists", symbol)),
}
}

Expand Down Expand Up @@ -700,6 +702,7 @@ func (app *MirrorSyncApp) ExecuteSynPackage(ctx sdk.Context, payload []byte, rel
return sdk.ExecuteResult{
Payload: ackPackage,
Tags: tags,
Err: types.ErrInvalidMirrorSync("invalid mirror sync package"),
}
}

Expand All @@ -720,6 +723,7 @@ func (app *MirrorSyncApp) ExecuteSynPackage(ctx sdk.Context, payload []byte, rel
return sdk.ExecuteResult{
Tags: tags,
Payload: ackPackage,
Err: types.ErrNotBoundByMirror(fmt.Sprintf("token %s is not bound by mirror", token.GetSymbol())),
}
}

Expand All @@ -737,8 +741,10 @@ func (app *MirrorSyncApp) ExecuteSynPackage(ctx sdk.Context, payload []byte, rel
return sdk.ExecuteResult{
Tags: tags,
Payload: ackPackage,
Err: types.ErrMirrorSyncInvalidSupply(fmt.Sprintf("mirror sync supply %d is invalid", newSupply)),
}
}

oldSupply := token.GetTotalSupply().ToInt64()
if newSupply > oldSupply {
if _, _, sdkError := app.bridgeKeeper.BankKeeper.AddCoins(ctx, token.GetOwner(),
Expand Down
25 changes: 25 additions & 0 deletions plugins/bridge/types/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ const (
CodeTokenBindRelationChanged sdk.CodeType = 15
CodeTransferInExpire sdk.CodeType = 16
CodeScriptsExecutionError sdk.CodeType = 17
CodeInvalidMirror sdk.CodeType = 18
CodeMirrorSymbolExists sdk.CodeType = 19
CodeInvalidMirrorSync sdk.CodeType = 20
CodeNotBoundByMirror sdk.CodeType = 21
CodeMirrorSyncInvalidSupply sdk.CodeType = 22
)

//----------------------------------------
Expand Down Expand Up @@ -96,3 +101,23 @@ func ErrTransferInExpire(msg string) sdk.Error {
func ErrScriptsExecutionError(msg string) sdk.Error {
return sdk.NewError(DefaultCodespace, CodeScriptsExecutionError, msg)
}

func ErrInvalidMirror(msg string) sdk.Error {
return sdk.NewError(DefaultCodespace, CodeInvalidMirror, msg)
}

func ErrMirrorSymbolExists(msg string) sdk.Error {
return sdk.NewError(DefaultCodespace, CodeMirrorSymbolExists, msg)
}

func ErrInvalidMirrorSync(msg string) sdk.Error {
return sdk.NewError(DefaultCodespace, CodeInvalidMirrorSync, msg)
}

func ErrNotBoundByMirror(msg string) sdk.Error {
return sdk.NewError(DefaultCodespace, CodeNotBoundByMirror, msg)
}

func ErrMirrorSyncInvalidSupply(msg string) sdk.Error {
return sdk.NewError(DefaultCodespace, CodeMirrorSyncInvalidSupply, msg)
}