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.

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

Move hc contracts #12

Merged
merged 9 commits into from
Oct 22, 2024
Merged

Move hc contracts #12

merged 9 commits into from
Oct 22, 2024

Conversation

mmontour1306
Copy link
Collaborator

Moves the HC contracts out of the bobanetwork/account-abstraction-hc repo, so that we can import a clean upstream version of the repo. Updated the deployer to find contracts in the new location, and to use .json files from Foundry rather than building contracts locally with solcx.

Updates deployer to find the new paths, and to import ABI json from
the Forge build rather than compiling in Python.

 Changes to be committed:
	modified:   Cargo.lock
	modified:   crates/types/contracts/hc_scripts/ExampleDeploy.s.sol
	modified:   crates/types/contracts/hc_scripts/LocalDeploy.s.sol
	modified:   crates/types/contracts/lib/account-abstraction-versions/v0_6
	new file:   crates/types/contracts/src/hc0_6/HCHelper.sol
	new file:   crates/types/contracts/src/hc0_6/HybridAccount.sol
	new file:   crates/types/contracts/src/hc0_6/HybridAccountFactory.sol
	new file:   crates/types/contracts/src/hc0_6/TestAuctionSystem.sol
	new file:   crates/types/contracts/src/hc0_6/TestCaptcha.sol
	new file:   crates/types/contracts/src/hc0_6/TestHybrid.sol
	new file:   crates/types/contracts/src/hc0_6/TestKyc.sol
	new file:   crates/types/contracts/src/hc0_6/TestRainfallInsurance.sol
	new file:   crates/types/contracts/src/hc0_6/TestSportsBetting.sol
	new file:   crates/types/contracts/src/hc0_6/TestTokenPrice.sol
	modified:   crates/types/contracts/src/v0_6/imports.sol
	modified:   hybrid-compute/deploy-local.py
 Changes to be committed:
	modified:   hybrid-compute/Dockerfile.offchain-rpc
 Changes to be committed:
	modified:   .gitmodules
 Changes to be committed:
	modified:   hybrid-compute/deploy-local.py
	modified:   hybrid-compute/offchain/userop.py
	modified:   hybrid-compute/offchain/userop_utils.py
 Changes to be committed:
	modified:   deploy-local.py
 Changes to be committed:
	new file:   requirements.txt
 Changes to be committed:
	modified:   Cargo.lock
(which deprecated certain keywords). The exceptions should be audited
and compared with upstream to ensure they are appropriate.

 Changes to be committed:
	modified:   deny.toml
 Changes to be committed:
	modified:   crates/types/src/timestamp.rs
@mmontour1306 mmontour1306 merged commit 9e0afd9 into boba-develop Oct 22, 2024
3 of 5 checks passed
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.

2 participants