Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions packages/contracts-bedrock/foundry.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[default]
src = 'contracts'
# We need to build seperate artifacts for forge and hh, because they each expect a different
# structure for the artifacts directory.
out = 'forge-artifacts'
optimizer = true
optimizer_runs = 999999
Expand All @@ -14,4 +12,5 @@ remappings = [
'forge-std/=node_modules/forge-std/src',
'ds-test/=node_modules/ds-test/src'
]
extra_output = ['devdoc', 'userdoc', 'metadata', 'storageLayout']
bytecode_hash = "none"
9 changes: 4 additions & 5 deletions packages/contracts-bedrock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@
},
"scripts": {
"build:forge": "forge build",
"build": "yarn hardhat compile",
"test:hh": "yarn hardhat test",
"test": "yarn test:forge",
"test:forge": "forge test",
"build": "hardhat compile && tsc && hardhat typechain",
"build:ts": "tsc",
"test": "forge test",
"gas-snapshot": "forge snapshot",
"slither": "slither .",
"clean": "rm -rf ./artifacts ./forge-artifacts ./cache ./coverage ./tsconfig.tsbuildinfo",
"clean": "rm -rf ./dist ./artifacts ./forge-artifacts ./cache ./coverage ./tsconfig.tsbuildinfo",
"lint:ts:check": "eslint .",
"lint:contracts:check": "yarn solhint -f table 'contracts/**/*.sol'",
"lint:check": "yarn lint:contracts:check && yarn lint:ts:check",
Expand Down
3 changes: 3 additions & 0 deletions packages/contracts-bedrock/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from './utils'
export * from './generateProofs'
export * from './constants'
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/tasks/deposits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { task, types } from 'hardhat/config'
import { Contract, providers, utils, Wallet, Event } from 'ethers'
import dotenv from 'dotenv'

import { DepositTx } from '../helpers/index'
import { DepositTx } from '../src'

dotenv.config()

Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/test/helpers.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect } from 'chai'
import { BigNumber } from 'ethers'

import { DepositTx, SourceHashDomain } from '../helpers'
import { DepositTx, SourceHashDomain } from '../src'

describe('Helpers', () => {
describe('DepositTx', () => {
Expand Down
9 changes: 6 additions & 3 deletions packages/contracts-bedrock/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"extends": "../../tsconfig.json",
"include": ["./scripts/", "./helpers/"],
"compilerOptions": {
"rootDir": ".",
"rootDir": "./src",
"outDir": "./dist"
}
},
"exclude": ["hardhat.config.ts", "deploy", "tasks", "test"],
"include": [
"src/**/*"
]
}