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

Enrich contract events to contain data needed by child-chain and watcher #686

Merged
merged 6 commits into from
Aug 27, 2020
Merged

Enrich contract events to contain data needed by child-chain and watcher #686

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2fef884
feat: change ExitStarted, InFlightExitStarted, InFlightExitChallenged…
Aug 17, 2020
6dc88a2
test: refactor tests for events
pgebal Aug 18, 2020
901fbf3
test: refactor process exit tests to NOT check if ExitStarted even wa…
pgebal Aug 20, 2020
57df1d3
refactor: delete rlpOutputTx from ExitStarted event and inputTxs from…
pgebal Aug 26, 2020
ae28352
refactor: update docs
pgebal Aug 26, 2020
369f86a
Merge branch 'v2.0.0' into pgebal/contract-events-review
pgebal Aug 26, 2020
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
16 changes: 14 additions & 2 deletions plasma_framework/contracts/src/exits/payment/controllers/PaymentChallengeIFENotCanonical.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ library PaymentChallengeIFENotCanonical {
event InFlightExitChallenged(
address indexed challenger,
bytes32 indexed txHash,
uint256 challengeTxPosition
uint256 challengeTxPosition,
uint16 inFlightTxInputIndex,
bytes challengeTx,
uint16 challengeTxInputIndex,
bytes challengeTxWitness
);

event InFlightExitChallengeResponded(
Expand Down Expand Up @@ -131,7 +135,15 @@ library PaymentChallengeIFENotCanonical {
// Set a flag so that only the inputs are exitable, unless a response is received.
ife.isCanonical = false;

emit InFlightExitChallenged(msg.sender, keccak256(args.inFlightTx), competitorPosition);
emit InFlightExitChallenged({
challenger: msg.sender,
txHash: keccak256(args.inFlightTx),
challengeTxPosition: competitorPosition,
inFlightTxInputIndex: args.inFlightTxInputIndex,
challengeTx: args.competingTx,
challengeTxInputIndex: args.competingTxInputIndex,
challengeTxWitness: args.competingTxWitness
});
}

/**
Expand Down
15 changes: 13 additions & 2 deletions plasma_framework/contracts/src/exits/payment/controllers/PaymentStartInFlightExit.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ library PaymentStartInFlightExit {

event InFlightExitStarted(
address indexed initiator,
bytes32 indexed txHash
bytes32 indexed txHash,
bytes inFlightTx,
uint256[] inputUtxosPos,
bytes[] inputTxs,
bytes[] inFlightTxWitnesses
);

/**
Expand Down Expand Up @@ -105,7 +109,14 @@ library PaymentStartInFlightExit {
StartExitData memory startExitData = createStartExitData(self, args);
verifyStart(startExitData, inFlightExitMap);
startExit(startExitData, inFlightExitMap);
emit InFlightExitStarted(msg.sender, startExitData.inFlightTxHash);
emit InFlightExitStarted({
initiator: msg.sender,
txHash: startExitData.inFlightTxHash,
inFlightTx: args.inFlightTx,
inputUtxosPos: args.inputUtxosPos,
inputTxs: args.inputTxs,
inFlightTxWitnesses: args.inFlightTxWitnesses
});
}

function createStartExitData(
Expand Down
11 changes: 9 additions & 2 deletions plasma_framework/contracts/src/exits/payment/controllers/PaymentStartStandardExit.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ library PaymentStartStandardExit {

event ExitStarted(
address indexed owner,
uint168 exitId
uint168 exitId,
uint256 utxoPos,
bytes rlpOutputTx
Copy link
Contributor

@InoMurko InoMurko Aug 24, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmmm, do we need rlpOutputTx ? I don't think we do. I thin it's only utxoPos that we pull out of calldata.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/omgnetwork/elixir-omg/blob/306246168240d90f9f4cad63092a8f5ea243ea57/apps/omg_watcher/lib/omg_watcher/exit_processor.ex#L717

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rlpOutputTx gets renamed into:

{"outputTxInclusionProof", :output_tx_inclusion_proof},
      {"rlpOutputTx", :output_tx},
      {"utxoPos", :utxo_pos}

so it's output_tx.

Copy link
Contributor Author

@pgebal pgebal Aug 24, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need it in our current code @InoMurko . Check fields.ex and exit processor core. We are currently getting it from call data. We could work around that by getting the tx from rocksdb storage.

Copy link
Contributor

@InoMurko InoMurko Aug 24, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah fields.ex is a mapping module for structural decoding of ABI data, it's not really used anywhere.

Copy link
Contributor Author

@pgebal pgebal Aug 24, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@InoMurko @boolafish how about here: https://github.com/omgnetwork/elixir-omg/blob/a7b4188c938390b13d069f40d941507ca79faca3/apps/omg_watcher/lib/omg_watcher/exit_processor/exit_info.ex#L66
Isn't it the exiting tx bytes from call data?
Called here: https://github.com/omgnetwork/elixir-omg/blob/a7b4188c938390b13d069f40d941507ca79faca3/apps/omg_watcher/lib/omg_watcher/exit_processor/core.ex#L188

);

/**
Expand Down Expand Up @@ -90,7 +92,12 @@ library PaymentStartStandardExit {
saveStandardExitData(data, exitMap);
enqueueStandardExit(data);

emit ExitStarted(msg.sender, data.exitId);
emit ExitStarted({
owner: msg.sender,
exitId: data.exitId,
utxoPos: args.utxoPos,
rlpOutputTx: args.rlpOutputTx
});
}

function setupStartStandardExitData(
Expand Down
257 changes: 257 additions & 0 deletions plasma_framework/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading