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

Jump to bottom

ABI dir fixes #2003

Merged

istankovic merged 37 commits into main from config-commands-abi

Jul 11, 2023

Contributor

istankovic commented Jun 30, 2023 •

edited

Loading

This PR fixes the current situation with ABI handling (i.e. not using the specfied ABI dir at all and instead relying on contracts/.build). A major change was to move beamer.deploy.artifacts one level up, which required extensive preparation itself. This was necessary due to a headache of circular imports between beamer.deploy.artifacts, beamer.deploy.util and beamer.contracts, the latter being in need of deployment information if it is to do anything useful. Also, it just makes sense on its own because other components need access to artifacts too.

Once this was done, things became somewhat easier, especially proceeding with beamer.contract changes now. Scripts and commands have been updated to make use of the ABI dir, but also the entire code-base was switched to use the new artifacts APIs. In turn, this allowed us to simplify and remove some of the code in beamer.contracts that has now become obsolete.

Summary of the changes

use the newly-introduced ABIManager API across the codebase
use the new artifacts API wherever appropriate
remove old facilities for loading ABI files and deployment artifacts
make beamer config, beamer deploy and beamer deploy-base commands handle ABI dir correctly
fix fallout in scripts and tests

Closes: #1975

istankovic force-pushed the config-commands-abi branch 9 times, most recently from d73621e to e6298ed Compare

July 7, 2023 14:55

istankovic marked this pull request as ready for review

July 7, 2023 15:24

istankovic requested review from bilbeyt and fredo

July 7, 2023 15:24

fredo reviewed

View reviewed changes

beamer/deploy/commands.py Outdated Show resolved Hide resolved

bilbeyt reviewed

View reviewed changes

beamer/contracts.py Show resolved Hide resolved

bilbeyt reviewed

View reviewed changes

beamer/artifacts.py Outdated Show resolved Hide resolved

bilbeyt reviewed

View reviewed changes

beamer/tests/agent/utils.py Show resolved Hide resolved

bilbeyt reviewed

View reviewed changes

beamer/tests/agent/multiple_processors/test_multiple_event_processors.py Outdated Show resolved Hide resolved

bilbeyt reviewed

View reviewed changes

beamer/tests/agent/multiple_processors/test_multiple_event_processors.py Outdated Show resolved Hide resolved

bilbeyt reviewed

View reviewed changes

beamer/contracts.py Outdated Show resolved Hide resolved

bilbeyt reviewed

View reviewed changes

pyproject.toml Outdated Show resolved Hide resolved

bilbeyt suggested changes

View reviewed changes

Contributor

bilbeyt left a comment

Generally looking really good with some small things.

istankovic force-pushed the config-commands-abi branch from 42324eb to 682c376 Compare

July 10, 2023 11:56

Ivan Stanković added 8 commits

July 11, 2023 10:56


          beamer: move load_rpc_info from beamer.deploy.config to beamer.util

It makes more sense to be there.


          beamer: tests: config: add missing --abi-dir option

ff393cd


          beamer: move get_commit_id from beamer.deploy.util to beamer.util


          beamer: deploy: move artifacts generation to util

030e906

This is in preparation for the move of artifacts module outside of
beamer.deploy package.


          beamer: contract: add obtain_contract

9da442a

This is paving the way to remove Deployment.obtain_contract and related infrastructure.


          beamer: deploy: add missing --abi-dir options

7ec1dbb

And convert to use beamer.contract.obtain.contract.


          beamer: config: convert to use beamer.contract.obtain_contract

2f48315


          scripts: e2e-test-op-commands: convert to use beamer.contracts.obtain…

2428f1a

…_contract

Ivan Stanković added 23 commits

July 11, 2023 10:56


          beamer: contracts: introduce ABIManager

2b76f1a

This provides contract ABI and bytecode in a lazy manner, i.e. it reads
each ABI file only once, upon first request, and stores the loaded data
in its cache.


          beamer: deploy: use ABIManager

ec02cde


          beamer: deploy: remove unused code

86b071b


          beamer: deploy: silence pylint

2e194c4


          beamer: contracts: require an ABIManager in obtain_contract

19b7cb6

This is in preparation to remove load_contract_abi.


          beamer: provide an ABIManager instance to obtain_contract instead of …

9508f2c

…a path


          beamer: artifacts: add a helper load_all function

01ef1e4

This is used to collect all artifacts under the given artifacts dir into
a mapping keyed by the chain ID.


          beamer: artifacts: add a helper property, Deployment.earliest_block

65ad190

Useful to avoid repeating the same computation in several places.


          beamer: health: move to use the new ABIManager and artifacts facilities

7a3bff7


          beamer: tests: move the 'root' variable into _generate_deployment_dir

04c5938

This is in preparation for the move of that function to the util module.


          beamer: tests: split _generate_deployment_dir into two and make it av…

6dd0433

…ailable in the utils module


          beamer: agent: don't load artifacts as part of config setup

63066e8

Instead, move it to the agent, where it belongs.


          beamer: tests: name artifacts properly when generating them

3b3dea4

Also allow for already existing artifacts and ABI dirs.


          beamer: tests: make tests work again after the config changes

78a8c0d


          beamer: contracts: switch contracts_for_web3 to use new API internally

15fdd1c


          beamer: contracts: remove unused code

86ff05b

This code is no longer needed since we switched to the new artifacts and
ABI handling API.


          docker: scripts: fix deploy-base and deploy invocation

2e0475b


          beamer: artifacts: add a new helper function to load only a single de…

8eb045a

…ployment


          scripts: move away from using contracts_for_web3

ff22dc7

Instead use the ABI manager and the newly added helper in beamer.artifacts.


          beamer: contracts: remove the now unused contracts_for_web3

11a5da6


          beamer: agent: use beamer.artifacts.load instead of load_all

695c356


          beamer: health: use beamer.artifacts.load instead of load_all

c614b55


          beamer: artifacts: remove the now unused load_all function

1c16f81

istankovic force-pushed the config-commands-abi branch from 682c376 to 1c16f81 Compare

July 11, 2023 09:30


          beamer: tests: config: don't hardcode chain ID

istankovic requested a review from bilbeyt

July 11, 2023 09:49

bilbeyt reviewed

View reviewed changes

scripts/call_contracts.py Show resolved Hide resolved

bilbeyt approved these changes

View reviewed changes

Contributor

bilbeyt left a comment

LGTM!

istankovic merged commit 084a636 into main

1 check passed

istankovic deleted the config-commands-abi branch

July 11, 2023 12:12

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

Labels

None yet