Skip to content

N
nebula
Commit 3273df8b authored by Kelvin Fichter's avatar Kelvin Fichter Committed by GitHub
Browse files
Options

Added changes to make state transitioner work (#91)

parent d824abcc
Show whitespace changes
Inline Side-by-side
Showing with 412 additions and 485 deletions
packages/contracts/contracts/optimistic-ethereum/OVM/verification/OVM_StateTransitioner.sol
View file @ 3273df8b
......@@ -7,6 +7,8 @@ import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";
import { Lib_EthUtils } from "../../libraries/utils/Lib_EthUtils.sol";
import { Lib_SecureMerkleTrie } from "../../libraries/trie/Lib_SecureMerkleTrie.sol";
import { Lib_RLPWriter } from "../../libraries/rlp/Lib_RLPWriter.sol";
import { Lib_RLPReader } from "../../libraries/rlp/Lib_RLPReader.sol";
/* Interface Imports */
import { iOVM_StateTransitioner } from "../../iOVM/verification/iOVM_StateTransitioner.sol";
......@@ -266,13 +268,15 @@ contract OVM_StateTransitioner is Lib_AddressResolver, OVM_FraudContributor, iOV
(
bool exists,
bytes memory value
bytes memory encodedValue
) = Lib_SecureMerkleTrie.get(
abi.encodePacked(_key),
_storageTrieWitness,
ovmStateManager.getAccountStorageRoot(_ovmContractAddress)
);
bytes memory value = Lib_RLPReader.readBytes(encodedValue);
if (exists == true) {
require(
keccak256(value) == keccak256(abi.encodePacked(_value)),
......@@ -393,7 +397,9 @@ contract OVM_StateTransitioner is Lib_AddressResolver, OVM_FraudContributor, iOV
account.storageRoot = Lib_SecureMerkleTrie.update(
abi.encodePacked(_key),
abi.encodePacked(value),
Lib_RLPWriter.writeBytes(
abi.encodePacked(value)
),
_storageTrieWitness,
account.storageRoot
);
......
packages/contracts/test/bond.ts
View file @ 3273df8b
......@@ -302,11 +302,7 @@ describe('BondManager', () => {
// a dispute is created about a block that intersects
const disputeTimestamp = withdrawalTimestamp - 100
await fraudVerifier.finalize(
preStateRoot,
sender,
disputeTimestamp
)
await fraudVerifier.finalize(preStateRoot, sender, disputeTimestamp)
await mineBlock(deployer.provider, timestamp)
await expect(bondManager.finalizeWithdrawal()).to.be.revertedWith(
......@@ -321,11 +317,7 @@ describe('BondManager', () => {
// a dispute is created, but since the fraud period is already over
// it doesn't matter
const disputeTimestamp = withdrawalTimestamp - ONE_WEEK - 1
await fraudVerifier.finalize(
preStateRoot,
sender,
disputeTimestamp
)
await fraudVerifier.finalize(preStateRoot, sender, disputeTimestamp)
const finalizeWithdrawalTimestamp = withdrawalTimestamp + ONE_WEEK
await mineBlock(deployer.provider, finalizeWithdrawalTimestamp)
......
packages/contracts/test/contracts/OVM/accounts/OVM_ECDSAContractAccount.spec.ts
View file @ 3273df8b
......@@ -214,7 +214,7 @@ describe('OVM_ECDSAContractAccount', () => {
it(`should revert on incorrect chainId`, async () => {
const alteredChainIdTx = {
...DEFAULT_EIP155_TX,
chainId : 421
chainId: 421,
}
const message = serializeNativeTransaction(alteredChainIdTx)
const sig = await signNativeTransaction(wallet, alteredChainIdTx)
......
packages/contracts/test/contracts/OVM/execution/OVM_StateManager.gas-spec.ts
View file @ 3273df8b
......@@ -6,7 +6,15 @@ import { Contract, ContractFactory, Signer, BigNumber } from 'ethers'
import _ from 'lodash'
/* Internal Imports */
import { DUMMY_ACCOUNTS, DUMMY_BYTES32, ZERO_ADDRESS, EMPTY_ACCOUNT_CODE_HASH, NON_ZERO_ADDRESS, NON_NULL_BYTES32, STORAGE_XOR_VALUE } from '../../../helpers'
import {
DUMMY_ACCOUNTS,
DUMMY_BYTES32,
ZERO_ADDRESS,
EMPTY_ACCOUNT_CODE_HASH,
NON_ZERO_ADDRESS,
NON_NULL_BYTES32,
STORAGE_XOR_VALUE,
} from '../../../helpers'
const DUMMY_ACCOUNT = DUMMY_ACCOUNTS[0]
const DUMMY_KEY = DUMMY_BYTES32[0]
......@@ -26,9 +34,9 @@ describe('OVM_StateManager gas consumption', () => {
'OVM_StateManager'
)
Helper_GasMeasurer = await (await (await ethers.getContractFactory(
'Helper_GasMeasurer'
)).deploy()).connect(owner)
Helper_GasMeasurer = await (
await (await ethers.getContractFactory('Helper_GasMeasurer')).deploy()
).connect(owner)
})
let OVM_StateManager: Contract
......@@ -43,7 +51,9 @@ describe('OVM_StateManager gas consumption', () => {
const measure = (
methodName: string,
methodArgs: Array<any> = [],
doFirst: () => Promise<any> = async () => {return}
doFirst: () => Promise<any> = async () => {
return
}
) => {
it('measured consumption!', async () => {
await doFirst()
......@@ -51,13 +61,13 @@ describe('OVM_StateManager gas consumption', () => {
})
}
const getSMGasCost = async (methodName: string, methodArgs: Array<any> = []): Promise<number> => {
const getSMGasCost = async (
methodName: string,
methodArgs: Array<any> = []
): Promise<number> => {
const gasCost: number = await Helper_GasMeasurer.callStatic.measureCallGas(
OVM_StateManager.address,
OVM_StateManager.interface.encodeFunctionData(
methodName,
methodArgs
)
OVM_StateManager.interface.encodeFunctionData(methodName, methodArgs)
)
console.log(` calculated gas cost of ${gasCost}`)
......@@ -71,10 +81,7 @@ describe('OVM_StateManager gas consumption', () => {
})
}
const setupNonFreshAccount = async () => {
await OVM_StateManager.putAccount(
DUMMY_ACCOUNT.address,
DUMMY_ACCOUNT.data
)
await OVM_StateManager.putAccount(DUMMY_ACCOUNT.address, DUMMY_ACCOUNT.data)
}
const putSlot = async (value: string) => {
await OVM_StateManager.putContractStorage(
......@@ -87,71 +94,52 @@ describe('OVM_StateManager gas consumption', () => {
describe('ItemState testAndSetters', () => {
describe('testAndSetAccountLoaded', () => {
describe('when account ItemState is ITEM_UNTOUCHED', () => {
measure(
'testAndSetAccountLoaded',
[NON_ZERO_ADDRESS]
)
measure('testAndSetAccountLoaded', [NON_ZERO_ADDRESS])
})
describe('when account ItemState is ITEM_LOADED', () => {
measure(
'testAndSetAccountLoaded',
[NON_ZERO_ADDRESS],
async () => {
measure('testAndSetAccountLoaded', [NON_ZERO_ADDRESS], async () => {
await OVM_StateManager.testAndSetAccountLoaded(NON_ZERO_ADDRESS)
}
)
})
})
describe('when account ItemState is ITEM_CHANGED', () => {
measure(
'testAndSetAccountLoaded',
[NON_ZERO_ADDRESS],
async () => {
measure('testAndSetAccountLoaded', [NON_ZERO_ADDRESS], async () => {
await OVM_StateManager.testAndSetAccountChanged(NON_ZERO_ADDRESS)
}
)
})
})
})
describe('testAndSetAccountChanged', () => {
describe('when account ItemState is ITEM_UNTOUCHED', () => {
measure(
'testAndSetAccountChanged',
[NON_ZERO_ADDRESS]
)
measure('testAndSetAccountChanged', [NON_ZERO_ADDRESS])
})
describe('when account ItemState is ITEM_LOADED', () => {
measure(
'testAndSetAccountChanged',
[NON_ZERO_ADDRESS],
async () => {
measure('testAndSetAccountChanged', [NON_ZERO_ADDRESS], async () => {
await OVM_StateManager.testAndSetAccountLoaded(NON_ZERO_ADDRESS)
}
)
})
})
describe('when account ItemState is ITEM_CHANGED', () => {
measure(
'testAndSetAccountChanged',
[NON_ZERO_ADDRESS],
async () => {
measure('testAndSetAccountChanged', [NON_ZERO_ADDRESS], async () => {
await OVM_StateManager.testAndSetAccountChanged(NON_ZERO_ADDRESS)
}
)
})
})
})
describe('testAndSetContractStorageLoaded', () => {
describe('when storage ItemState is ITEM_UNTOUCHED', () => {
measure(
'testAndSetContractStorageLoaded',
[NON_ZERO_ADDRESS, DUMMY_KEY]
)
measure('testAndSetContractStorageLoaded', [
NON_ZERO_ADDRESS,
DUMMY_KEY,
])
})
describe('when storage ItemState is ITEM_LOADED', () => {
measure(
'testAndSetContractStorageLoaded',
[NON_ZERO_ADDRESS, DUMMY_KEY],
async () => {
await OVM_StateManager.testAndSetContractStorageLoaded(NON_ZERO_ADDRESS, DUMMY_KEY)
await OVM_StateManager.testAndSetContractStorageLoaded(
NON_ZERO_ADDRESS,
DUMMY_KEY
)
}
)
})
......@@ -160,7 +148,10 @@ describe('OVM_StateManager gas consumption', () => {
'testAndSetContractStorageLoaded',
[NON_ZERO_ADDRESS, DUMMY_KEY],
async () => {
await OVM_StateManager.testAndSetContractStorageChanged(NON_ZERO_ADDRESS, DUMMY_KEY)
await OVM_StateManager.testAndSetContractStorageChanged(
NON_ZERO_ADDRESS,
DUMMY_KEY
)
}
)
})
......@@ -168,17 +159,20 @@ describe('OVM_StateManager gas consumption', () => {
describe('testAndSetContractStorageChanged', () => {
describe('when storage ItemState is ITEM_UNTOUCHED', () => {
measure(
'testAndSetContractStorageChanged',
[NON_ZERO_ADDRESS, DUMMY_KEY]
)
measure('testAndSetContractStorageChanged', [
NON_ZERO_ADDRESS,
DUMMY_KEY,
])
})
describe('when storage ItemState is ITEM_LOADED', () => {
measure(
'testAndSetContractStorageChanged',
[NON_ZERO_ADDRESS, DUMMY_KEY],
async () => {
await OVM_StateManager.testAndSetContractStorageLoaded(NON_ZERO_ADDRESS, DUMMY_KEY)
await OVM_StateManager.testAndSetContractStorageLoaded(
NON_ZERO_ADDRESS,
DUMMY_KEY
)
}
)
})
......@@ -187,7 +181,10 @@ describe('OVM_StateManager gas consumption', () => {
'testAndSetContractStorageChanged',
[NON_ZERO_ADDRESS, DUMMY_KEY],
async () => {
await OVM_StateManager.testAndSetContractStorageChanged(NON_ZERO_ADDRESS, DUMMY_KEY)
await OVM_StateManager.testAndSetContractStorageChanged(
NON_ZERO_ADDRESS,
DUMMY_KEY
)
}
)
})
......@@ -226,178 +223,107 @@ describe('OVM_StateManager gas consumption', () => {
DUMMY_ACCOUNT.data
)
}
measure(
'hasAccount',
[DUMMY_ACCOUNT.address],
doFirst
)
measure('hasAccount', [DUMMY_ACCOUNT.address], doFirst)
})
})
describe('hasEmptyAccount', () => {
describe('when it does have an empty account', () => {
measure(
'hasEmptyAccount',
[DUMMY_ACCOUNT.address],
async () => {
measure('hasEmptyAccount', [DUMMY_ACCOUNT.address], async () => {
await OVM_StateManager.putAccount(DUMMY_ACCOUNT.address, {
...DUMMY_ACCOUNT.data,
codeHash: EMPTY_ACCOUNT_CODE_HASH,
})
}
)
})
})
describe('when it has an account which is not emtpy', () => {
measure(
'hasEmptyAccount',
[DUMMY_ACCOUNT.address],
async () => {
measure('hasEmptyAccount', [DUMMY_ACCOUNT.address], async () => {
await OVM_StateManager.putAccount(
DUMMY_ACCOUNT.address,
DUMMY_ACCOUNT.data
)
}
)
})
})
})
describe('setAccountNonce', () => {
describe('when the nonce is 0 and set to 0', () => {
measure(
'setAccountNonce',
[DUMMY_ACCOUNT.address, 0],
async () => {
await OVM_StateManager.putAccount(
DUMMY_ACCOUNT.address,
{
measure('setAccountNonce', [DUMMY_ACCOUNT.address, 0], async () => {
await OVM_StateManager.putAccount(DUMMY_ACCOUNT.address, {
...DUMMY_ACCOUNT.data,
nonce: 0
}
)
}
)
nonce: 0,
})
})
})
describe('when the nonce is 0 and set to nonzero', () => {
measure(
'setAccountNonce',
[DUMMY_ACCOUNT.address, 1],
async () => {
await OVM_StateManager.putAccount(
DUMMY_ACCOUNT.address,
{
measure('setAccountNonce', [DUMMY_ACCOUNT.address, 1], async () => {
await OVM_StateManager.putAccount(DUMMY_ACCOUNT.address, {
...DUMMY_ACCOUNT.data,
nonce: 0
}
)
}
)
nonce: 0,
})
})
})
describe('when the nonce is nonzero and set to 0', () => {
measure(
'setAccountNonce',
[DUMMY_ACCOUNT.address, 0],
async () => {
await OVM_StateManager.putAccount(
DUMMY_ACCOUNT.address,
{
measure('setAccountNonce', [DUMMY_ACCOUNT.address, 0], async () => {
await OVM_StateManager.putAccount(DUMMY_ACCOUNT.address, {
...DUMMY_ACCOUNT.data,
nonce: 1
}
)
}
)
nonce: 1,
})
})
})
describe('when the nonce is nonzero and set to nonzero', () => {
measure(
'setAccountNonce',
[DUMMY_ACCOUNT.address, 2],
async () => {
await OVM_StateManager.putAccount(
DUMMY_ACCOUNT.address,
{
measure('setAccountNonce', [DUMMY_ACCOUNT.address, 2], async () => {
await OVM_StateManager.putAccount(DUMMY_ACCOUNT.address, {
...DUMMY_ACCOUNT.data,
nonce: 1
}
)
}
)
nonce: 1,
})
})
})
})
describe('getAccountNonce', () => {
describe('when the nonce is 0', () => {
measure(
'getAccountNonce',
[DUMMY_ACCOUNT.address]
)
measure('getAccountNonce', [DUMMY_ACCOUNT.address])
})
describe('when the nonce is nonzero', () => {
measure(
'getAccountNonce',
[DUMMY_ACCOUNT.address],
async () => {
await OVM_StateManager.putAccount(
DUMMY_ACCOUNT.address,
{
measure('getAccountNonce', [DUMMY_ACCOUNT.address], async () => {
await OVM_StateManager.putAccount(DUMMY_ACCOUNT.address, {
...DUMMY_ACCOUNT.data,
nonce: 1
}
)
}
)
nonce: 1,
})
})
})
})
describe('getAccountEthAddress', () => {
describe('when the ethAddress is a random address', () => {
measure(
'getAccountEthAddress',
[DUMMY_ACCOUNT.address],
async () => {
await OVM_StateManager.putAccount(
DUMMY_ACCOUNT.address,
{
measure('getAccountEthAddress', [DUMMY_ACCOUNT.address], async () => {
await OVM_StateManager.putAccount(DUMMY_ACCOUNT.address, {
...DUMMY_ACCOUNT.data,
ethAddress: NON_ZERO_ADDRESS
}
)
}
)
ethAddress: NON_ZERO_ADDRESS,
})
})
})
describe('when the ethAddress is zero', () => {
measure(
'getAccountEthAddress',
[DUMMY_ACCOUNT.address],
async () => {
await OVM_StateManager.putAccount(
DUMMY_ACCOUNT.address,
{
measure('getAccountEthAddress', [DUMMY_ACCOUNT.address], async () => {
await OVM_StateManager.putAccount(DUMMY_ACCOUNT.address, {
...DUMMY_ACCOUNT.data,
ethAddress: ZERO_ADDRESS
}
)
}
)
ethAddress: ZERO_ADDRESS,
})
})
})
})
describe('initPendingAccount', () => {
// note: this method should only be accessibl if _hasEmptyAccount is true, so it should always be empty nonce etc
measure(
'initPendingAccount',
[NON_ZERO_ADDRESS]
)
measure('initPendingAccount', [NON_ZERO_ADDRESS])
})
describe('commitPendingAccount', () => {
// this should only set ethAddress and codeHash from ZERO to NONZERO, so one case should be sufficient
measure(
'commitPendingAccount',
[
NON_ZERO_ADDRESS,
NON_ZERO_ADDRESS,
NON_NULL_BYTES32
],
[NON_ZERO_ADDRESS, NON_ZERO_ADDRESS, NON_NULL_BYTES32],
async () => {
await OVM_StateManager.initPendingAccount(NON_ZERO_ADDRESS)
}
......@@ -462,11 +388,7 @@ describe('OVM_StateManager gas consumption', () => {
})
describe('putContractStorage', () => {
const relevantValues = [
DUMMY_VALUE_1,
DUMMY_VALUE_2,
STORAGE_XOR_VALUE
]
const relevantValues = [DUMMY_VALUE_1, DUMMY_VALUE_2, STORAGE_XOR_VALUE]
for (let preValue of relevantValues) {
for (let postValue of relevantValues) {
describe(`when overwriting ${preValue} with ${postValue}`, () => {
......
packages/contracts/test/contracts/OVM/execution/OVM_StateManager.spec.ts
View file @ 3273df8b
......@@ -6,9 +6,13 @@ import { Contract, ContractFactory, Signer, BigNumber } from 'ethers'
import _ from 'lodash'
/* Internal Imports */
import { DUMMY_ACCOUNTS, DUMMY_BYTES32, ZERO_ADDRESS, EMPTY_ACCOUNT_CODE_HASH, KECCAK_256_NULL } from '../../../helpers'
import {
DUMMY_ACCOUNTS,
DUMMY_BYTES32,
ZERO_ADDRESS,
EMPTY_ACCOUNT_CODE_HASH,
KECCAK_256_NULL,
} from '../../../helpers'
describe('OVM_StateManager', () => {
let signer1: Signer
......
packages/contracts/test/contracts/OVM/verification/OVM_FraudVerifier.spec.ts
View file @ 3273df8b
......@@ -192,7 +192,7 @@ describe('OVM_FraudVerifier', () => {
})
it('should revert when provided with a incorrect transaction root global index', async () => {
await expect (
await expect(
OVM_FraudVerifier.initializeFraudVerification(
NULL_BYTES32,
DUMMY_BATCH_HEADERS[0],
......@@ -202,7 +202,9 @@ describe('OVM_FraudVerifier', () => {
DUMMY_BATCH_HEADERS[0],
DUMMY_BATCH_PROOFS_WITH_INDEX[0]
)
).to.be.revertedWith('Pre-state root global index must equal to the transaction root global index.')
).to.be.revertedWith(
'Pre-state root global index must equal to the transaction root global index.'
)
})
})
})
......
packages/contracts/test/contracts/OVM/verification/OVM_StateTransitioner.spec.ts
View file @ 3273df8b
......@@ -4,6 +4,7 @@ import { expect } from '../../../setup'
/* External Imports */
import { ethers } from '@nomiclabs/buidler'
import { BigNumber, Contract, ContractFactory } from 'ethers'
import * as rlp from 'rlp'
/* Internal Imports */
import {
......@@ -234,7 +235,7 @@ describe('OVM_StateTransitioner', () => {
nodes: [
{
key,
val,
val: '0x' + rlp.encode(val).toString('hex'),
},
],
secure: true,
......@@ -268,7 +269,7 @@ describe('OVM_StateTransitioner', () => {
nodes: [
{
key,
val,
val: '0x' + rlp.encode(val).toString('hex'),
},
],
secure: true,
......@@ -452,7 +453,7 @@ describe('OVM_StateTransitioner', () => {
nodes: [
{
key,
val,
val: '0x' + rlp.encode(val).toString('hex'),
},
],
secure: true,
......@@ -460,7 +461,7 @@ describe('OVM_StateTransitioner', () => {
const storageTest = await storageGenerator.makeNodeUpdateTest(
key,
newVal
'0x' + rlp.encode(newVal).toString('hex')
)
const generator = await TrieTestGenerator.fromAccounts({
......
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