Skip to content

Commit b0b0875

Browse files
committed
fix(Manifest): use *SafeL2 on v1.3.0+
1 parent 1a1b4c1 commit b0b0875

1 file changed

Lines changed: 21 additions & 9 deletions

File tree

ape_safe/packages.py

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
from ape.contracts import ContractContainer, ContractInstance
1313

1414

15-
with resources.as_file(resources.files(__package__).joinpath("manifests")) as manifest_folder:
15+
with resources.as_file(
16+
resources.files(__package__).joinpath("manifests")
17+
) as manifest_folder:
1618
MANIFESTS_BY_VERSION = {
17-
Version(m.stem.lstrip("safe-v")): m for m in manifest_folder.glob("safe-v*.json")
19+
Version(m.stem.lstrip("safe-v")): m
20+
for m in manifest_folder.glob("safe-v*.json")
1821
}
1922

2023

@@ -56,7 +59,12 @@ def __call__(self, version: Union[Version, str]) -> "ContractContainer":
5659
return package.SafeProxyFactory
5760

5861
elif version > Version("1.3.0"):
59-
SafeSingleton = package.Safe
62+
# NOTE: Use `SafeL2` as it has an extra event
63+
SafeSingleton = package.SafeL2
64+
65+
elif version == Version("1.3.0"):
66+
# NOTE: Use `SafeL2` as it has an extra event
67+
SafeSingleton = package.GnosisSafeL2
6068

6169
else:
6270
SafeSingleton = package.GnosisSafe
@@ -89,9 +97,7 @@ class DeploymentAsset(BaseModel):
8997
networkAddresses: dict[int, Union[DeploymentType, list[DeploymentType]]]
9098

9199

92-
BASE_ASSETS_URL = (
93-
"https://raw.githubusercontent.com/safe-global/safe-deployments/refs/heads/main/src/assets/"
94-
)
100+
BASE_ASSETS_URL = "https://raw.githubusercontent.com/safe-global/safe-deployments/refs/heads/main/src/assets/"
95101

96102

97103
def get_deployment_artifact(
@@ -101,16 +107,22 @@ def get_deployment_artifact(
101107
version = Version(version.lstrip("v"))
102108

103109
if package_type is PackageType.SINGLETON:
104-
deployment_filename = "gnosis_safe.json" if version <= Version("1.3.0") else "safe.json"
110+
deployment_filename = (
111+
"gnosis_safe.json" if version <= Version("1.3.0") else "safe.json"
112+
)
105113

106114
elif package_type is PackageType.PROXY_FACTORY:
107115
deployment_filename = (
108-
"proxy_factory.json" if version <= Version("1.3.0") else "safe_proxy_factory.json"
116+
"proxy_factory.json"
117+
if version <= Version("1.3.0")
118+
else "safe_proxy_factory.json"
109119
)
110120

111121
elif package_type is PackageType.MULTISEND:
112122
deployment_filename = (
113-
"multi_send.json" if version <= Version("1.1.1") else "multi_send_call_only.json"
123+
"multi_send.json"
124+
if version <= Version("1.1.1")
125+
else "multi_send_call_only.json"
114126
)
115127

116128
else:

0 commit comments

Comments
 (0)