use upgradeable interface for multisig

smartcontractkit · Oct 3, 2023 · ea71a8d · ea71a8d
1 parent 7928e2f
commit ea71a8d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/contracts/src/multisig.cairo b/contracts/src/multisig.cairo
@@ -50,7 +50,6 @@ trait IMultisig<TContractState> {
     fn is_executed(self: @TContractState, nonce: u128) -> bool;
     fn get_transaction(self: @TContractState, nonce: u128) -> (Transaction, Array::<felt252>);
     fn type_and_version(self: @TContractState) -> felt252;
-    fn upgrade(ref self: TContractState, new_impl: ClassHash);
     fn submit_transaction(
         ref self: TContractState,
         to: ContractAddress,
@@ -93,7 +92,7 @@ mod Multisig {
     use starknet::storage_write_syscall;
     use starknet::class_hash::ClassHash;
 
-    use chainlink::libraries::upgradeable::Upgradeable;
+    use chainlink::libraries::upgradeable::{Upgradeable, IUpgradeable};
 
     #[event]
     #[derive(Drop, starknet::Event)]
@@ -162,6 +161,14 @@ mod Multisig {
         self._set_threshold(threshold);
     }
 
+    #[external(v0)]
+    impl UpgradeableImpl of IUpgradeable<ContractState> {
+        fn upgrade(ref self: ContractState, new_impl: ClassHash) {
+            self._require_multisig();
+            Upgradeable::upgrade(new_impl)
+        }
+    }
+
     #[external(v0)]
     impl MultisigImpl of super::IMultisig<ContractState> {
         /// Views
@@ -214,11 +221,6 @@ mod Multisig {
 
         /// Externals
 
-        fn upgrade(ref self: ContractState, new_impl: ClassHash) {
-            self._require_multisig();
-            Upgradeable::upgrade(new_impl)
-        }
-
         fn submit_transaction(
             ref self: ContractState,
             to: ContractAddress,

diff --git a/contracts/src/tests/test_multisig.cairo b/contracts/src/tests/test_multisig.cairo
@@ -12,7 +12,7 @@ use traits::TryInto;
 
 use chainlink::multisig::assert_unique_values;
 use chainlink::multisig::Multisig;
-use chainlink::multisig::Multisig::MultisigImpl;
+use chainlink::multisig::Multisig::{MultisigImpl, UpgradeableImpl};
 
 #[starknet::contract]
 mod MultisigTest {
@@ -288,7 +288,7 @@ fn test_upgrade_not_multisig() {
     let account = contract_address_const::<777>();
     set_caller_address(account);
 
-    MultisigImpl::upgrade(ref state, class_hash_const::<1>())
+    UpgradeableImpl::upgrade(ref state, class_hash_const::<1>())
 }
 
 #[test]