-
Notifications
You must be signed in to change notification settings - Fork 4
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
feat: Upgradeables Contracts (both SN and ETH) #120
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* forge install: openzeppelin-contracts v5.0.1 * apply upgradeable to eth contract (wip) * upgradeable with script (wip) * forge install: openzeppelin-foundry-upgrades * forge install: openzeppelin-contracts-upgradeable v5.0.1 * continue test (still not working) * upgradeable eth working * fix upgrade.sh + env.example * extract initialize variables to envs * remove verbose from upgrade script * refactor Upgrade.s.sol + YABTransfer * fix makefile commands * remove SN_ESCROW_ADDRESS from envs * add upgrade eth to README * remove hardcoded values in .env.example * remove comment for mm-bot * resolve comments * revert changes * Update .env.example * forge install: openzeppelin-contracts v5.0.1 * forge install: openzeppelin-contracts-upgradeable v5.0.1 * remove unused dependencies .gitsubmodules * forge install: openzeppelin-contracts-upgradeable v5.0.1 * minor issues * fix wrong env upgrade.sh * add step for auto-update .env with proxy address * remove ETH_PRIVATE_KEY from scripts * read env using source * refactor dependencies * README - add YAB_TRANSFER_PROXY_ADDRESS to deploy section * rm openzeppelin-contracts-upgradeable * minor change
* Starknet escrow script + make build, clean & test * add ethereum escrow deploy + documentation * rename commands Makefile * update makefile + readme * fix makefile clean commands * OZ dependency + escrow impl * fix import * forge install: openzeppelin-contracts v5.0.1 * fix feedback comments * fix wrong env name (thx @uri-99) * refactor deploy.sh + add upgrade.sh (wip) * refactor deploy.sh & upgrade.sh * add EscrowV2 for test upgradeable * add upgradeable tests * revert method name changes * fix upgrade.sh + refactor * rename SN_PROXY_ESCROW_ADDRESS to SN_ESCROW_ADDRESS * fix deploy error + change upgrade log * eof * update readme * revert solidity files changes * remove "proxy" from echo * rename starknet rpc env * resolve comments * remove openzeppelin-contracts * rename and move EscrowV2 * fix feedback comments * update README * revert .gitmodules change
* feat: escrow contract without herodotus * fix: change ethereum withrawer in mm_bot * feat: upgreadable Escrow_herodotus contract * refactor: readme with herodotus * refactor: remove comment * refactor: add tmp solution disclaimer on readme * refactor: rename starknet escrow contract * refactor: update wording README.md Co-authored-by: urimihura <[email protected]> * refactor: remove transfer.sh * fix: lowercase escrow module --------- Co-authored-by: urimihura <[email protected]>
This reverts commit 8e04ca6.
* start new branch * Add MMAddress filter * WIP debugging _MM not initialized * WIP debugging _MM * fix: change transfer test to proxy format * refactor: mm variable rename to comply with format * prettier ACL and tests * tidy ACL test * more transfer tests * test withdraw WIP * Fix PR comments * refactor: address creation in tests * Test: withdraw function * fix: remove restriction to getMMAddress * fix: test addr creation * fix: test names * fix: tests * fix: test mock value * Update contracts/solidity/test/Transfer.sol Co-authored-by: Santos Rosati <[email protected]> * Update contracts/solidity/test/Transfer.sol Co-authored-by: Santos Rosati <[email protected]> * fix: mock call to L2 --------- Co-authored-by: Uriel Mihura <[email protected]> Co-authored-by: rcatalan98 <[email protected]> Co-authored-by: Santos Rosati <[email protected]>
* start branch * pausable impl start * fix + test: pausable * test: more for pause() * Test: upgrade when paused * Update contracts/cairo/src/tests/test_escrow.cairo Co-authored-by: Roberto J Catalan <[email protected]> * test: L1 handler calling * fix: remove unpause from constructor * Update contracts/cairo/src/tests/test_escrow.cairo Co-authored-by: Roberto J Catalan <[email protected]> * Update contracts/cairo/src/tests/test_escrow.cairo Co-authored-by: Roberto J Catalan <[email protected]> * test: improve call_l1_from_user * fix: test names * fix: remove comment --------- Co-authored-by: Uriel Mihura <[email protected]> Co-authored-by: Roberto J Catalan <[email protected]>
Co-authored-by: Uriel Mihura <[email protected]>
Co-authored-by: Uriel Mihura <[email protected]>
This was
linked to
issues
Jan 24, 2024
* refactor: deployment scripts to avoid errors * fix: add param for contract addr missing * fix: use . instead of source * fix: run starknet-build on starknet-deploy-and-connect * refactor: both deploys and 'make deploy-all' , now setting envs * style: turn off "echo command" in make * feat: same refactor for upgrade in eth * feat: same refactor of env usage for cairo deploy * fix: make starknet-test import * fix: make eth-set-escrow + eth-set-withdraw-selector * Fix: various fixes on desc of this commit updated .env.example .sh colored prints for mac check required var is declared on set_escrow.sh hint to export appropriate var after ethereum-deploy * fix: color prints, and change purple to cyan * fix: usage of printf in .sh * feat: add reminder to finish config after cairo deploy * style: add \n to printed reminder * feat: display relevant info after deploy-all * style: remove unnecessary imports + small prints * style: printed info after make-all * style: remove unnecesary comments * style: \n at EOFs --------- Co-authored-by: Julián Arce <[email protected]> Co-authored-by: Uriel Mihura <[email protected]>
backup of this file is stored inside YAC
JuArce
reviewed
Jan 30, 2024
JuArce
approved these changes
Jan 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges branch Upgradeables into Main.
Branch upgradeables has both ETH upgradeable and SN upgradeable.
Also: