Update contracts to build with 2.1.0

smartcontractkit · Aug 8, 2023 · 3d931bb · 3d931bb
1 parent 2aaa6f1
commit 3d931bb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/contracts/src/emergency/sequencer_uptime_feed.cairo b/contracts/src/emergency/sequencer_uptime_feed.cairo
@@ -14,7 +14,6 @@ mod SequencerUptimeFeed {
     use starknet::Felt252TryIntoEthAddress;
     use starknet::EthAddressZeroable;
     use starknet::ContractAddress;
-    use starknet::StorageAccess;
     use starknet::StorageBaseAddress;
     use starknet::SyscallResult;
     use starknet::storage_read_syscall;

diff --git a/contracts/src/multisig.cairo b/contracts/src/multisig.cairo
@@ -30,7 +30,7 @@ fn _assert_unique_values_loop<
     _assert_unique_values_loop(a, len, j, k + 1_usize);
 }
 
-#[derive(Copy, Drop, Serde, storage_access::StorageAccess)]
+#[derive(Copy, Drop, Serde, starknet::Store)]
 struct Transaction {
     to: ContractAddress,
     function_selector: felt252,
@@ -82,7 +82,6 @@ mod Multisig {
     use starknet::ContractAddress;
     use starknet::ContractAddressIntoFelt252;
     use starknet::Felt252TryIntoContractAddress;
-    use starknet::StorageAccess;
     use starknet::StorageBaseAddress;
     use starknet::SyscallResult;
     use starknet::call_contract_syscall;

diff --git a/contracts/src/ocr2/aggregator.cairo b/contracts/src/ocr2/aggregator.cairo
@@ -10,7 +10,7 @@ struct Round {
     updated_at: u64,
 }
 
-#[derive(Copy, Drop, Serde, storage_access::StorageAccess)]
+#[derive(Copy, Drop, Serde, starknet::Store)]
 struct Transmission {
     answer: u128,
     block_num: u64,
@@ -237,7 +237,7 @@ mod Aggregator {
         reimbursement: u128
     }
 
-    #[derive(Copy, Drop, Serde, storage_access::StorageAccess)]
+    #[derive(Copy, Drop, Serde, starknet::Store)]
     struct Oracle {
         index: usize,
         // entire supply of LINK always fits into u96, so u128 is safe to use
@@ -932,7 +932,7 @@ mod Aggregator {
 
     // --- Billing Config
 
-    #[derive(Copy, Drop, Serde, storage_access::StorageAccess)]
+    #[derive(Copy, Drop, Serde, starknet::Store)]
     struct BillingConfig {
         observation_payment_gjuels: u32,
         transmission_payment_gjuels: u32,

diff --git a/contracts/src/ocr2/aggregator_proxy.cairo b/contracts/src/ocr2/aggregator_proxy.cairo
@@ -57,7 +57,7 @@ mod AggregatorProxy {
     const SHIFT: felt252 = 0x100000000000000000000000000000000;
     const MAX_ID: felt252 = 0xffffffffffffffffffffffffffffffff;
 
-    #[derive(Copy, Drop, Serde, storage_access::StorageAccess)]
+    #[derive(Copy, Drop, Serde, starknet::Store)]
     struct Phase {
         id: u128,
         aggregator: ContractAddress