Commit 6e3449ba authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

contracts: fix typechain packaging (#2984)

* contracts: fix typechain packaging

* deps: update typechain

* dtl: fix typechain import
Co-authored-by: default avatarmergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
parent 95fc3fbf
---
'@eth-optimism/data-transport-layer': patch
---
Upgrade import path for new typechain
---
'@eth-optimism/contracts': patch
---
Properly export typechain
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"files": [ "files": [
"dist/**/*.js", "dist/**/*.js",
"dist/**/*.d.ts", "dist/**/*.d.ts",
"dist/types/*.ts", "dist/types",
"artifacts/contracts/**/*.json", "artifacts/contracts/**/*.json",
"deployments/**/*.json", "deployments/**/*.json",
"chugsplash", "chugsplash",
...@@ -76,8 +76,8 @@ ...@@ -76,8 +76,8 @@
"@openzeppelin/contracts": "4.3.2", "@openzeppelin/contracts": "4.3.2",
"@openzeppelin/contracts-upgradeable": "4.3.2", "@openzeppelin/contracts-upgradeable": "4.3.2",
"@primitivefi/hardhat-dodoc": "^0.1.3", "@primitivefi/hardhat-dodoc": "^0.1.3",
"@typechain/ethers-v5": "^8.0.2", "@typechain/ethers-v5": "^10.1.0",
"@typechain/hardhat": "^3.0.0", "@typechain/hardhat": "^6.1.2",
"@types/chai": "^4.2.18", "@types/chai": "^4.2.18",
"@types/lodash": "^4.14.168", "@types/lodash": "^4.14.168",
"@types/mkdirp": "^1.0.1", "@types/mkdirp": "^1.0.1",
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
"squirrelly": "^8.0.8", "squirrelly": "^8.0.8",
"ts-generator": "0.0.8", "ts-generator": "0.0.8",
"ts-node": "^10.0.0", "ts-node": "^10.0.0",
"typechain": "^6.0.2", "typechain": "^8.1.0",
"typescript": "^4.6.2" "typescript": "^4.6.2"
}, },
"peerDependencies": { "peerDependencies": {
......
...@@ -8,7 +8,7 @@ import { ...@@ -8,7 +8,7 @@ import {
BatchType, BatchType,
SequencerBatch, SequencerBatch,
} from '@eth-optimism/core-utils' } from '@eth-optimism/core-utils'
import { SequencerBatchAppendedEvent } from '@eth-optimism/contracts/dist/types/CanonicalTransactionChain' import { SequencerBatchAppendedEvent } from '@eth-optimism/contracts/dist/types/contracts/L1/rollup/CanonicalTransactionChain'
/* Imports: Internal */ /* Imports: Internal */
import { MissingElementError } from './errors' import { MissingElementError } from './errors'
......
/* Imports: External */ /* Imports: External */
import { StateBatchAppendedEvent } from '@eth-optimism/contracts/dist/types/StateCommitmentChain' import { StateBatchAppendedEvent } from '@eth-optimism/contracts/dist/types/contracts/L1/rollup/StateCommitmentChain'
import { getContractFactory } from '@eth-optimism/contracts' import { getContractFactory } from '@eth-optimism/contracts'
import { BigNumber } from 'ethers' import { BigNumber } from 'ethers'
......
/* Imports: External */ /* Imports: External */
import { BigNumber } from 'ethers' import { BigNumber } from 'ethers'
import { TransactionEnqueuedEvent } from '@eth-optimism/contracts/dist/types/CanonicalTransactionChain' import { TransactionEnqueuedEvent } from '@eth-optimism/contracts/dist/types/contracts/L1/rollup/CanonicalTransactionChain'
/* Imports: Internal */ /* Imports: Internal */
import { MissingElementError } from './errors' import { MissingElementError } from './errors'
......
...@@ -3175,20 +3175,13 @@ ...@@ -3175,20 +3175,13 @@
dependencies: dependencies:
ethers "^5.0.2" ethers "^5.0.2"
"@typechain/ethers-v5@^8.0.2": "@typechain/hardhat@^6.1.2":
version "8.0.5" version "6.1.2"
resolved "https://registry.yarnpkg.com/@typechain/ethers-v5/-/ethers-v5-8.0.5.tgz#d469420e9a73deb7fa076cde9edb45d713dd1b8c" resolved "https://registry.yarnpkg.com/@typechain/hardhat/-/hardhat-6.1.2.tgz#d3beccc6937d93f9b437616b741f839a8b953693"
integrity sha512-ntpj4cS3v4WlDu+hSKSyj9A3o1tKtWC30RX1gobeYymZColeJiUemC1Kgfa0MWGmInm5CKxoHVhEvYVgPOZn1A== integrity sha512-k4Ea3pVITKB2DH8p1a5U38cyy7KZPD04Spo4q5b4wO+n2mT+uAz5dxckPtbczn/Kk5wiFq+ZkuOtw5ZKFhL/+w==
dependencies:
lodash "^4.17.15"
ts-essentials "^7.0.1"
"@typechain/hardhat@^3.0.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@typechain/hardhat/-/hardhat-3.1.0.tgz#88bd9e9d55e30fbece6fbb34c03ecd40a8b2013a"
integrity sha512-C6Be6l+vTpao19PvMH2CB/lhL1TRLkhdPkvQCF/zqkY1e+0iqY2Bb9Jd3PTt6I8QvMm89ZDerrCJC9927ZHmlg==
dependencies: dependencies:
fs-extra "^9.1.0" fs-extra "^9.1.0"
lodash "^4.17.15"
"@typechain/hardhat@^6.1.2": "@typechain/hardhat@^6.1.2":
version "6.1.2" version "6.1.2"
...@@ -17135,22 +17128,6 @@ typechain@^3.0.0: ...@@ -17135,22 +17128,6 @@ typechain@^3.0.0:
ts-essentials "^6.0.3" ts-essentials "^6.0.3"
ts-generator "^0.1.1" ts-generator "^0.1.1"
typechain@^6.0.2:
version "6.1.0"
resolved "https://registry.yarnpkg.com/typechain/-/typechain-6.1.0.tgz#462a35f555accf870689d1ba5698749108d0ce81"
integrity sha512-GGfkK0p3fUgz8kYxjSS4nKcWXE0Lo+teHTetghousIK5njbNoYNDlwn91QIyD181L3fVqlTvBE0a/q3AZmjNfw==
dependencies:
"@types/prettier" "^2.1.1"
debug "^4.1.1"
fs-extra "^7.0.0"
glob "^7.1.6"
js-sha3 "^0.8.0"
lodash "^4.17.15"
mkdirp "^1.0.4"
prettier "^2.1.2"
ts-command-line-args "^2.2.0"
ts-essentials "^7.0.1"
typechain@^8.1.0: typechain@^8.1.0:
version "8.1.0" version "8.1.0"
resolved "https://registry.yarnpkg.com/typechain/-/typechain-8.1.0.tgz#fc4902ce596519cb2ccfd012e4ddf92a9945b569" resolved "https://registry.yarnpkg.com/typechain/-/typechain-8.1.0.tgz#fc4902ce596519cb2ccfd012e4ddf92a9945b569"
......
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