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

Jump to bottom

fix(bridge-ui): fix claim eth message processed #13656

Merged
merged 2 commits into from
Apr 26, 2023
Merged

fix(bridge-ui): fix claim eth message processed #13656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85374b5
Fix message already processed when claiming eth
jscriptcoder Apr 26, 2023
cc8278e
Throw different error when status is Failed
jscriptcoder Apr 26, 2023
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
1 change: 1 addition & 0 deletions packages/bridge-ui/src/bridge/ERC20Bridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ export class ERC20Bridge implements Bridge {
messageStatus === MessageStatus.Done ||
messageStatus === MessageStatus.Failed
) {
// TODO: should be throw a different error when status is Failed?
throw Error('message already processed');
}

Expand Down
6 changes: 6 additions & 0 deletions packages/bridge-ui/src/bridge/ETHBridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,18 @@ export class ETHBridge implements Bridge {
throw Error('message already processed');
}

if (messageStatus === MessageStatus.Failed) {
throw Error('user can not process this, message has failed');
}

const signerAddress = await opts.signer.getAddress();

if (opts.message.owner.toLowerCase() !== signerAddress.toLowerCase()) {
throw Error('user can not process this, it is not their message');
}

// TODO: up to here we share same logic as ERC20Bridge

if (messageStatus === MessageStatus.New) {
const proofOpts = {
srcChain: opts.message.srcChainId,
Expand Down