From 506337b27631a56ffcee8dff7ce7939e4098534d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mati=CC=81as?= <mjlescano@protonmail.com>
Date: Tue, 5 Mar 2024 19:36:53 -0300
Subject: [PATCH] update cannonfiles for 1.4.1

---
 cannon/create-safe.toml |  6 ++----
 cannon/l1.toml          | 10 +++++-----
 cannon/l2.toml          |  8 ++++----
 hardhat.config.ts       |  5 ++++-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/cannon/create-safe.toml b/cannon/create-safe.toml
index 76550252b..546dd83c5 100644
--- a/cannon/create-safe.toml
+++ b/cannon/create-safe.toml
@@ -1,10 +1,10 @@
 name = "safe"
-version = "1.3.0"
+version = "1.4.1"
 
 description = "Deploys a safe Ethereum multisig contract"
 
 [setting.safe_impl_package]
-defaultValue = "safe-impl:1.3.0"
+defaultValue = "safe-impl:1.4.1"
 
 [setting.salt]
 
@@ -46,5 +46,3 @@ args = [
 factory.Safe.abiOf = ["impl.SafeSingleton"]
 factory.Safe.event = "ProxyCreation"
 factory.Safe.arg = 0
-
-depends = ["import.impl"]
\ No newline at end of file
diff --git a/cannon/l1.toml b/cannon/l1.toml
index bfb98f3e5..b677a814b 100644
--- a/cannon/l1.toml
+++ b/cannon/l1.toml
@@ -1,5 +1,5 @@
 name = "safe-impl"
-version = "1.3.0"
+version = "1.4.1"
 
 description = "Ethereum multisig contract--implementation contracts"
 
@@ -12,12 +12,12 @@ salt = "<%= settings.salt %>"
 create2 = true
 
 [contract.SafeProxyFactory]
-artifact = "GnosisSafeProxyFactory"
+artifact = "SafeProxyFactory"
 salt = "<%= settings.salt %>"
 create2 = true
 
-[contract.DefaultCallbackHandler]
-artifact = "DefaultCallbackHandler"
+[contract.TokenCallbackHandler]
+artifact = "TokenCallbackHandler"
 salt = "<%= settings.salt %>"
 create2 = true
 
@@ -47,6 +47,6 @@ salt = "<%= settings.salt %>"
 create2 = true
 
 [contract.SafeSingleton]
-artifact = "GnosisSafe"
+artifact = "Safe"
 salt = "<%= settings.salt %>"
 create2 = true
diff --git a/cannon/l2.toml b/cannon/l2.toml
index 0813907c8..741464ed1 100644
--- a/cannon/l2.toml
+++ b/cannon/l2.toml
@@ -1,10 +1,10 @@
 include = [
-    "cannonfile.toml"
+    "l1.toml"
 ]
 
-version = "<%= package.version %>-l2"
+version = "1.4.1-l2"
 
 [contract.SafeSingleton]
-artifact = "GnosisSafeL2"
+artifact = "SafeL2"
 salt = "<%= settings.salt %>"
-create2 = true
\ No newline at end of file
+create2 = true
diff --git a/hardhat.config.ts b/hardhat.config.ts
index 74e39a964..784954556 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -30,7 +30,10 @@ if (PK) {
     };
 }
 
-if (["mainnet", "rinkeby", "kovan", "goerli", "ropsten", "mumbai", "polygon", "sepolia"].includes(argv.network) && INFURA_KEY === undefined) {
+if (
+    ["mainnet", "rinkeby", "kovan", "goerli", "ropsten", "mumbai", "polygon", "sepolia"].includes(argv.network) &&
+    INFURA_KEY === undefined
+) {
     throw new Error(`Could not find Infura key in env, unable to connect to network ${argv.network}`);
 }