diff --git a/poetry.lock b/poetry.lock index 315a6f9b..69fcafa9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3139,9 +3139,30 @@ forking-recommended = ["ujson"] [package.source] type = "git" -url = "https://github.com/DanielSchiavini/titanoboa.git" +url = "https://github.com/DanielSchiavini/titanoboa" reference = "zksync" -resolved_reference = "f0a25396a8256b6cbb7d245a840298e30d705c87" +resolved_reference = "f96fff3450c060b6849a632608377b4477667884" + +[[package]] +name = "titanoboa-zksync" +version = "0.0.1" +description = "A Zksync plugin for the Titanoboa Vyper interpreter" +optional = false +python-versions = "*" +files = [] +develop = false + +[package.dependencies] +titanoboa = {git = "https://github.com/DanielSchiavini/titanoboa", rev = "zksync"} + +[package.extras] +forking-recommended = ["ujson"] + +[package.source] +type = "git" +url = "https://github.com/DanielSchiavini/titanoboa-zksync.git" +reference = "5f13b427df4b8832fcc16ec1f6d44460f1d04b49" +resolved_reference = "5f13b427df4b8832fcc16ec1f6d44460f1d04b49" [[package]] name = "tomli" @@ -3452,4 +3473,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "0ea00c3e42641a769590bdee9c4cb74c6e895703c14c3cab81129fda4cce571f" +content-hash = "251db9973fb842214b8fa1401ec565f64f6e82e3aac76755a4a26fab226fca05" diff --git a/pyproject.toml b/pyproject.toml index 11092ace..0d8ca2c8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,10 +10,10 @@ packages = [] [tool.poetry.dependencies] python = "^3.10" poetry = "1.5.1" -titanoboa = {git = "https://github.com/DanielSchiavini/titanoboa.git", rev = "zksync"} vyper = "0.3.10" pycryptodome = "^3.18.0" pre-commit = "^3.3.3" +titanoboa-zksync = {git = "https://github.com/DanielSchiavini/titanoboa-zksync.git", rev = "5f13b427df4b8832fcc16ec1f6d44460f1d04b49"} [tool.poetry.group.dev.dependencies] black = "22.3.0" diff --git a/scripts/deploy_infra.py b/scripts/deploy_infra.py index 0be5dae4..9087bd04 100644 --- a/scripts/deploy_infra.py +++ b/scripts/deploy_infra.py @@ -191,8 +191,8 @@ "zksync:mainnet": { "math": "0xcf19236e85000901dE2Fad3199aA4A1F74a78B6C", "views": "0xDD82bEe76CB4b161B44533e4B6Dfc2eee7e066D4", - "plain_amm": "", - "meta_amm": "", + "plain_amm": "0x3ce3009F8ad07161BA9d02d7A0173180d0281cA4", + "meta_amm": "0x1E9A82C2a3DF2E0793a2B828aA652Db192f3C8F3", "factory": "0x375444aeDEb6C3db897f293E1DBa85D7422A6859", "zap": "0x4232Dcc6D31543A2431079BdE2082C69eA3A771E", }, @@ -363,7 +363,7 @@ def deploy_infra(network, url, account, fork=False): current_pool_impl = factory.pool_implementations(0) if not current_pool_impl == plain_blueprint.address: - logger.log(f"Curent 'plain' pool impl at index 0: {current_pool_impl}") + logger.log(f"Current 'plain' pool impl at index 0: {current_pool_impl}") factory.set_pool_implementations(0, plain_blueprint.address) logger.log(f"Set plain amm implementation at index 0 to: {plain_blueprint.address}")