Skip to content

fix: rebase develop on master#61

Merged
gakonst merged 13 commits intodevelopfrom
fix/develop
Jun 24, 2022
Merged

fix: rebase develop on master#61
gakonst merged 13 commits intodevelopfrom
fix/develop

Conversation

@tynes
Copy link
Copy Markdown
Collaborator

@tynes tynes commented Jun 21, 2022

This PR rebases develop on top of master. I'd like to fix the git history in this repo so that we can do a release soon, because until a release happens the plugin breaks if build_info = true in the foundry.toml. Unblocks #60

tynes and others added 13 commits May 31, 2022 17:54
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Typechain uses a private method on the artifact
with an unsafe `any` typecast to get artifact paths.
To work with typechain, this method must exist until
typechain is updated.

The issue is here: dethcrypto/TypeChain#544

Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* fix(hh/forge): typechain support (#45)

Typechain uses a private method on the artifact
with an unsafe `any` typecast to get artifact paths.
To work with typechain, this method must exist until
typechain is updated.

The issue is here: dethcrypto/TypeChain#544

* feat: `Artifacts.getBuildInfo` (#48)

Implement a naive `getBuildInfo` function. This is useful
for tooling that integrates more deeply with the hardhat ecosystem.
Note that this implementation is not 100% with the output
that the hardhat compiler toolchain outputs, but the output
is good enough to get more tooling to be compatible.
* fix(hh/forge): typechain support (#45)

Typechain uses a private method on the artifact
with an unsafe `any` typecast to get artifact paths.
To work with typechain, this method must exist until
typechain is updated.

The issue is here: dethcrypto/TypeChain#544

* feat: `Artifacts.getBuildInfo` (#48)

Implement a naive `getBuildInfo` function. This is useful
for tooling that integrates more deeply with the hardhat ecosystem.
Note that this implementation is not 100% with the output
that the hardhat compiler toolchain outputs, but the output
is good enough to get more tooling to be compatible.

* hardhat-forge: use the correct source name (#51)

The relative path to the file from the root
of the project should be used as the source name
in the artifact.

Closes #36

This will fix tooling that depends on the source name:
https://github.com/defi-wonderland/smock/blob/27fe7a5f3c351714257cdc98204e282932c11e12/src/utils/storage.ts#L54

* test: explicitly set port for anvil (#53)

* test: explicitly set port for anvil

* chore: add changeset

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Implement a naive `getBuildInfo` function. This is useful
for tooling that integrates more deeply with the hardhat ecosystem.
Note that this implementation is not 100% with the output
that the hardhat compiler toolchain outputs, but the output
is good enough to get more tooling to be compatible.
The relative path to the file from the root
of the project should be used as the source name
in the artifact.

Closes #36

This will fix tooling that depends on the source name:
https://github.com/defi-wonderland/smock/blob/27fe7a5f3c351714257cdc98204e282932c11e12/src/utils/storage.ts#L54
* test: explicitly set port for anvil

* chore: add changeset
* feat(hardhat-forge): better `BuildInfo` support

Requires foundry with foundry-rs/foundry@6ce16a4.
Generates the debug files for easy access to the build info files
during hardhat scripts.

* feat(hardhat-forge): buildinfo tests

* feat(hardhat-forge): better `BuildInfo` support
@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Jun 21, 2022

🦋 Changeset detected

Latest commit: 29c8d2d

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
Name Type
@foundry-rs/hardhat-forge Patch
@foundry-rs/hardhat Patch
@foundry-rs/hardhat-anvil Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link
Copy Markdown
Member

@mattsse mattsse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I lack the understanding of how this bot works in detail with develop/master and changesets, so I defer to @gakonst

@tynes
Copy link
Copy Markdown
Collaborator Author

tynes commented Jun 21, 2022

I think we need to either:

  1. force push master to develop, or
  2. rebase develop on master

Then we need to start merging the changesets PRs into develop before merging develop into master to trigger releases. Following that scheme was the only way we could reliably get changesets to work

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants