Commit 4a3ef8f6 authored by Kelvin Fichter's avatar Kelvin Fichter Committed by GitHub

Adds contract changes necessary for fraud prover (#88)

* Contract changes necessary for fraud prover

* Small cleanup fix

* Fix failing tests
parent 12c436d4
...@@ -679,6 +679,14 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad ...@@ -679,6 +679,14 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad
extraData: hex"" extraData: hex""
}); });
emit TransactionBatchAppended(
header.batchIndex,
header.batchRoot,
header.batchSize,
header.prevTotalElements,
header.extraData
);
bytes32 batchHeaderHash = Lib_OVMCodec.hashBatchHeader(header); bytes32 batchHeaderHash = Lib_OVMCodec.hashBatchHeader(header);
bytes27 latestBatchContext = _makeBatchExtraData( bytes27 latestBatchContext = _makeBatchExtraData(
totalElements + uint40(header.batchSize), totalElements + uint40(header.batchSize),
......
...@@ -38,7 +38,7 @@ contract OVM_StateTransitioner is Lib_AddressResolver, OVM_FraudContributor, iOV ...@@ -38,7 +38,7 @@ contract OVM_StateTransitioner is Lib_AddressResolver, OVM_FraudContributor, iOV
* Contract Variables: Contract References * * Contract Variables: Contract References *
*******************************************/ *******************************************/
iOVM_StateManager internal ovmStateManager; iOVM_StateManager public ovmStateManager;
/******************************************* /*******************************************
...@@ -47,7 +47,7 @@ contract OVM_StateTransitioner is Lib_AddressResolver, OVM_FraudContributor, iOV ...@@ -47,7 +47,7 @@ contract OVM_StateTransitioner is Lib_AddressResolver, OVM_FraudContributor, iOV
bytes32 internal preStateRoot; bytes32 internal preStateRoot;
bytes32 internal postStateRoot; bytes32 internal postStateRoot;
TransitionPhase internal phase; TransitionPhase public phase;
uint256 internal stateTransitionIndex; uint256 internal stateTransitionIndex;
bytes32 internal transactionHash; bytes32 internal transactionHash;
......
...@@ -35,6 +35,14 @@ interface iOVM_CanonicalTransactionChain { ...@@ -35,6 +35,14 @@ interface iOVM_CanonicalTransactionChain {
uint256 _totalElements uint256 _totalElements
); );
event TransactionBatchAppended(
uint256 indexed _batchIndex,
bytes32 _batchRoot,
uint256 _batchSize,
uint256 _prevTotalElements,
bytes _extraData
);
/*********** /***********
* Structs * * Structs *
......
...@@ -93,7 +93,7 @@ interface iOVM_BondManager { ...@@ -93,7 +93,7 @@ interface iOVM_BondManager {
function finalizeWithdrawal() external; function finalizeWithdrawal() external;
function claim( function claim(
address who address _who
) external; ) external;
function isCollateralized( function isCollateralized(
......
...@@ -42,7 +42,7 @@ contract mockOVM_BondManager is iOVM_BondManager { ...@@ -42,7 +42,7 @@ contract mockOVM_BondManager is iOVM_BondManager {
{} {}
function claim( function claim(
bytes32 _preStateRoot address _who
) )
override override
public public
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment