Merge branch 'develop' into BCI-25888/stom-works

smartcontractkit · Feb 27, 2024 · 756c94d · 756c94d
2 parents b4c86d9 + a8374fc
commit 756c94d
Show file tree

Hide file tree

Showing 48 changed files with 860 additions and 945 deletions.
diff --git a/.github/actions/install-cairo/action.yml b/.github/actions/install-cairo/action.yml
@@ -4,11 +4,11 @@ description: A composite action that installs cairo and scarb binaries
 inputs:
   cairo_version:
     description: Cairo release version
-    default: "v2.4.3"
+    default: "v2.5.4"
     required: false
   scarb_version:
     description: Scarb release version
-    default: "v2.4.3"
+    default: "v2.5.4"
     required: false
 
 runs:

diff --git a/.tool-versions b/.tool-versions
@@ -9,7 +9,7 @@ mockery 2.22.1
 golangci-lint 1.55.0
 actionlint 1.6.12
 shellcheck 0.8.0
-scarb 2.4.3
+scarb 2.5.4
 postgres 15.1
 
 # Kubernetes

diff --git a/Makefile b/Makefile
@@ -221,8 +221,6 @@ test-integration-soak-ci:
 test-integration-contracts: build-ts env-devnet-hardhat
 	echo "Tests currently broken because of starknet-hardhat-plugin"
 	exit 1
-	cd packages-ts/integration-multisig/ && \
-		yarn test
 	cd packages-ts/starknet/ && \
 		yarn test
 

diff --git a/contracts/Scarb.lock b/contracts/Scarb.lock
@@ -10,5 +10,5 @@ dependencies = [
 
 [[package]]
 name = "openzeppelin"
-version = "0.8.0"
-source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.8.0#c23e8e96de60e6e3159b1ff8591a1187269c0eb7"
+version = "0.9.0"
+source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.9.0#861fc416f87addbe23a3b47f9d19ab27c10d5dc8"
diff --git a/contracts/Scarb.toml b/contracts/Scarb.toml
@@ -12,7 +12,7 @@ sierra = "cairo-compile . -r"
 # Note: currently testing doesn't work with dependencies
 [dependencies]
 starknet = ">=1.3.0"
-openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.8.0" }
+openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.9.0" }
 
 [lib]
 

diff --git a/contracts/src/access_control/access_controller.cairo b/contracts/src/access_control/access_controller.cairo
@@ -3,16 +3,18 @@ mod AccessController {
     use starknet::ContractAddress;
     use starknet::class_hash::ClassHash;
 
+    use openzeppelin::access::ownable::ownable::OwnableComponent;
+
     use chainlink::libraries::access_control::{AccessControlComponent, IAccessController};
-    use chainlink::libraries::ownable::{OwnableComponent, IOwnable};
+    use chainlink::libraries::type_and_version::ITypeAndVersion;
     use chainlink::libraries::upgradeable::{Upgradeable, IUpgradeable};
 
     component!(path: OwnableComponent, storage: ownable, event: OwnableEvent);
     component!(path: AccessControlComponent, storage: access_control, event: AccessControlEvent);
 
     #[abi(embed_v0)]
-    impl OwnableImpl = OwnableComponent::OwnableImpl<ContractState>;
-    impl InternalImpl = OwnableComponent::InternalImpl<ContractState>;
+    impl OwnableImpl = OwnableComponent::OwnableTwoStepImpl<ContractState>;
+    impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;
 
     #[abi(embed_v0)]
     impl AccessControlImpl =
@@ -42,16 +44,14 @@ mod AccessController {
         self.access_control.initializer();
     }
 
-    ///
-    /// Upgradeable
-    ///
-
-    // #[view]
-    fn type_and_version(self: @ContractState) -> felt252 {
-        'AccessController 1.0.0'
+    #[abi(embed_v0)]
+    impl TypeAndVersionImpl of ITypeAndVersion<ContractState> {
+        fn type_and_version(self: @ContractState) -> felt252 {
+            'AccessController 1.0.0'
+        }
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl UpgradeableImpl of IUpgradeable<ContractState> {
         fn upgrade(ref self: ContractState, new_impl: ClassHash) {
             self.ownable.assert_only_owner();

diff --git a/contracts/src/account.cairo b/contracts/src/account.cairo
@@ -1,7 +1,7 @@
-// copied from https://github.com/OpenZeppelin/cairo-contracts/blob/v0.8.1/src/presets/account.cairo
+// copied from https://raw.githubusercontent.com/OpenZeppelin/cairo-contracts/861fc416f87addbe23a3b47f9d19ab27c10d5dc8/src/presets/account.cairo (0.9.0)
 
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts for Cairo v0.8.1 (presets/account.cairo)
+// OpenZeppelin Contracts for Cairo v0.9.0 (presets/account.cairo)
 
 /// # Account Preset
 ///

diff --git a/contracts/src/emergency/sequencer_uptime_feed.cairo b/contracts/src/emergency/sequencer_uptime_feed.cairo
@@ -27,9 +27,11 @@ mod SequencerUptimeFeed {
     use option::OptionTrait;
     use zeroable::Zeroable;
 
-    use chainlink::libraries::ownable::{OwnableComponent, IOwnable};
+    use openzeppelin::access::ownable::ownable::OwnableComponent;
+
     use chainlink::libraries::access_control::{AccessControlComponent, IAccessController};
     use chainlink::libraries::access_control::AccessControlComponent::InternalTrait as AccessControlInternalTrait;
+    use chainlink::libraries::type_and_version::ITypeAndVersion;
     use chainlink::ocr2::aggregator::Round;
     use chainlink::ocr2::aggregator::IAggregator;
     use chainlink::ocr2::aggregator::{Transmission};
@@ -39,7 +41,7 @@ mod SequencerUptimeFeed {
     component!(path: AccessControlComponent, storage: access_control, event: AccessControlEvent);
 
     #[abi(embed_v0)]
-    impl OwnableImpl = OwnableComponent::OwnableImpl<ContractState>;
+    impl OwnableImpl = OwnableComponent::OwnableTwoStepImpl<ContractState>;
     impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;
 
     #[abi(embed_v0)]
@@ -108,7 +110,14 @@ mod SequencerUptimeFeed {
         to_address: EthAddress
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
+    impl TypeAndVersion of ITypeAndVersion<ContractState> {
+        fn type_and_version(self: @ContractState) -> felt252 {
+            'SequencerUptimeFeed 1.0.0'
+        }
+    }
+
+    #[abi(embed_v0)]
     impl AggregatorImpl of IAggregator<ContractState> {
         fn latest_round_data(self: @ContractState) -> Round {
             self._require_read_access();
@@ -143,10 +152,6 @@ mod SequencerUptimeFeed {
         fn decimals(self: @ContractState) -> u8 {
             0_u8
         }
-
-        fn type_and_version(self: @ContractState) -> felt252 {
-            'SequencerUptimeFeed 1.0.0'
-        }
     }
 
     #[constructor]
@@ -185,7 +190,7 @@ mod SequencerUptimeFeed {
         }
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl SequencerUptimeFeedImpl of super::ISequencerUptimeFeed<ContractState> {
         fn set_l1_sender(ref self: ContractState, address: EthAddress) {
             self.ownable.assert_only_owner();
@@ -216,7 +221,7 @@ mod SequencerUptimeFeed {
     /// Upgradeable
     ///
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     fn upgrade(ref self: ContractState, new_impl: ClassHash) {
         self.ownable.assert_only_owner();
         Upgradeable::upgrade(new_impl)

diff --git a/contracts/src/libraries.cairo b/contracts/src/libraries.cairo
@@ -1,5 +1,5 @@
-mod ownable;
 mod access_control;
 mod token;
 mod upgradeable;
 mod mocks;
+mod type_and_version;
diff --git a/contracts/src/libraries/access_control.cairo b/contracts/src/libraries/access_control.cairo
@@ -16,7 +16,8 @@ mod AccessControlComponent {
     use starknet::class_hash::ClassHash;
     use zeroable::Zeroable;
 
-    use chainlink::libraries::ownable::{OwnableComponent};
+    use openzeppelin::access::ownable::ownable::OwnableComponent;
+
     use OwnableComponent::InternalImpl as OwnableInternalImpl;
 
     #[storage]
@@ -90,7 +91,7 @@ mod AccessControlComponent {
         }
 
         fn add_access(ref self: ComponentState<TContractState>, user: ContractAddress) {
-            get_dep_component!(self, Ownable).assert_only_owner();
+            get_dep_component!(@self, Ownable).assert_only_owner();
             let has_access = self._access_list.read(user);
             if !has_access {
                 self._access_list.write(user, true);
@@ -99,7 +100,7 @@ mod AccessControlComponent {
         }
 
         fn remove_access(ref self: ComponentState<TContractState>, user: ContractAddress) {
-            get_dep_component!(self, Ownable).assert_only_owner();
+            get_dep_component!(@self, Ownable).assert_only_owner();
             let has_access = self._access_list.read(user);
             if has_access {
                 self._access_list.write(user, false);
@@ -108,7 +109,7 @@ mod AccessControlComponent {
         }
 
         fn enable_access_check(ref self: ComponentState<TContractState>) {
-            get_dep_component!(self, Ownable).assert_only_owner();
+            get_dep_component!(@self, Ownable).assert_only_owner();
             let check_enabled = self._check_enabled.read();
             if !check_enabled {
                 self._check_enabled.write(true);
@@ -117,7 +118,7 @@ mod AccessControlComponent {
         }
 
         fn disable_access_check(ref self: ComponentState<TContractState>) {
-            get_dep_component!(self, Ownable).assert_only_owner();
+            get_dep_component!(@self, Ownable).assert_only_owner();
             let check_enabled = self._check_enabled.read();
             if check_enabled {
                 self._check_enabled.write(false);

diff --git a/contracts/src/libraries/mocks/mock_non_upgradeable.cairo b/contracts/src/libraries/mocks/mock_non_upgradeable.cairo
@@ -11,7 +11,7 @@ mod MockNonUpgradeable {
     #[constructor]
     fn constructor(ref self: ContractState) {}
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl MockNonUpgradeableImpl of super::IMockNonUpgradeable<ContractState> {
         fn bar(self: @ContractState) -> bool {
             true

diff --git a/contracts/src/libraries/mocks/mock_upgradeable.cairo b/contracts/src/libraries/mocks/mock_upgradeable.cairo
@@ -18,7 +18,7 @@ mod MockUpgradeable {
     #[constructor]
     fn constructor(ref self: ContractState) {}
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl MockUpgradeableImpl of super::IMockUpgradeable<ContractState> {
         fn foo(self: @ContractState) -> bool {
             true

diff --git a/contracts/src/libraries/ownable.cairo b/contracts/src/libraries/ownable.cairo