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

feat: deployment config for fee oracle contract #936

Merged
merged 19 commits into from
Jun 2, 2021
Merged

feat: deployment config for fee oracle contract #936

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e7f9675
feat[contracts]: add GasPriceOracle w/o predeploy
smartcontracts May 20, 2021
0d6d2e2
Add an L2 deploy script for gas oracle contract
karlfloersch May 22, 2021
40f5e28
Add a kovan deployment artifact
karlfloersch May 22, 2021
ff28fc8
Add deployment to readme
karlfloersch May 22, 2021
b88023b
Add extra validation & initial execution price
karlfloersch May 24, 2021
2af3c2f
Update README.md
smartcontracts May 24, 2021
86053b2
Merge branch 'feat/deployment-config-for-fee-contract' of github.com:…
karlfloersch May 24, 2021
175e1f5
Fix execution price logic
karlfloersch May 24, 2021
a53ead4
Perform new deployment with final contract
karlfloersch May 24, 2021
c6d9228
Merge remote-tracking branch 'origin/develop' into feat/deployment-co…
karlfloersch May 24, 2021
ebf471f
contracts: better require in ovm gas price oracle
tynes May 26, 2021
16b080c
Deploy L2GasPriceOracle
karlfloersch May 26, 2021
842161d
Update contract to use new fee logic & rename to gas
karlfloersch May 27, 2021
6d50d92
Deploy updated contract
karlfloersch May 27, 2021
8d62807
Fix lint
karlfloersch May 27, 2021
7447768
Merge branch 'develop' into feat/deployment-config-for-fee-contract
gakonst Jun 2, 2021
52329ee
gas price oracle: do not restrict gas price
tynes Jun 2, 2021
5ce4fa3
gas price oracle: new deployment
tynes Jun 2, 2021
fe4c81c
tests: delete dead test
tynes Jun 2, 2021
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
Prev Previous commit
Next Next commit
Fix lint
  • Loading branch information
@karlfloersch
karlfloersch committed May 27, 2021
commit 8d6280798dc26919eb3e3170b3986d9e5144e0bc
32 changes: 12 additions & 20 deletions packages/contracts/test/contracts/OVM/precompiles/OVM_GasPriceOracle.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { expect } from '../../../setup'
import { ethers } from 'hardhat'
import { ContractFactory, Contract, Signer } from 'ethers'

describe.only('OVM_GasPriceOracle', () => {
describe('OVM_GasPriceOracle', () => {
const initialGasPrice = 0
let signer1: Signer
let signer2: Signer
Expand Down Expand Up @@ -37,47 +37,41 @@ describe.only('OVM_GasPriceOracle', () => {

describe('setGasPrice', () => {
it('should revert if called by someone other than the owner', async () => {
await expect(OVM_GasPriceOracle.connect(signer2).setGasPrice(1234))
.to.be.reverted
await expect(OVM_GasPriceOracle.connect(signer2).setGasPrice(1234)).to.be
.reverted
})

it('should revert if DOES NOT satisfy `price % GAS_PRICE_MULTIPLE == 0`', async () => {
const gasPrice = 1234

await expect(
OVM_GasPriceOracle.connect(signer1).setGasPrice(gasPrice)
).to.be.reverted
await expect(OVM_GasPriceOracle.connect(signer1).setGasPrice(gasPrice)).to
.be.reverted
})

it('should revert if DOES NOT satisfy `price % GAS_PRICE_MULTIPLE == 0`', async () => {
const gasPriceMultiple = await OVM_GasPriceOracle.GAS_PRICE_MULTIPLE()
const gasPrice = 1234 * gasPriceMultiple

await expect(
OVM_GasPriceOracle.connect(signer1).setGasPrice(gasPrice)
).to.not.be.reverted
await expect(OVM_GasPriceOracle.connect(signer1).setGasPrice(gasPrice)).to
.not.be.reverted
})

it('should succeed if called by the owner and is equal to `0`', async () => {
await expect(OVM_GasPriceOracle.connect(signer1).setGasPrice(0)).to
.not.be.reverted
await expect(OVM_GasPriceOracle.connect(signer1).setGasPrice(0)).to.not.be
.reverted
})
})

describe('get gasPrice', () => {
it('should return zero at first', async () => {
expect(await OVM_GasPriceOracle.gasPrice()).to.equal(
initialGasPrice
)
expect(await OVM_GasPriceOracle.gasPrice()).to.equal(initialGasPrice)
})

it('should change when setGasPrice is called', async () => {
const gasPriceMultiple = await OVM_GasPriceOracle.GAS_PRICE_MULTIPLE()
const gasPrice = 1234 * gasPriceMultiple

await OVM_GasPriceOracle.connect(signer1).setGasPrice(
gasPrice
)
await OVM_GasPriceOracle.connect(signer1).setGasPrice(gasPrice)

expect(await OVM_GasPriceOracle.gasPrice()).to.equal(gasPrice)
})
Expand All @@ -88,9 +82,7 @@ describe.only('OVM_GasPriceOracle', () => {
const slot = 1

// set the price
await OVM_GasPriceOracle.connect(signer1).setGasPrice(
gasPrice
)
await OVM_GasPriceOracle.connect(signer1).setGasPrice(gasPrice)

// get the storage slot value
const priceAtSlot = await signer1.provider.getStorageAt(
Expand Down