bump: Update cairo syntax (#580)

* bump(update_cairo_syntax): Updated external to #[abi(embed_v0)] * bump(update_cairo_syntax): Anonymous generic impl * bump(update_cairo_syntax): Embedding impls * bump(update_cairo_syntax): Alexandria update
keep-starknet-strange · Nov 5, 2023 · 0c9ad1a · 0c9ad1a
1 parent 0a109aa
commit 0c9ad1a
Show file tree

Hide file tree

Showing 38 changed files with 57 additions and 62 deletions.
diff --git a/Scarb.lock b/Scarb.lock
@@ -4,36 +4,36 @@ version = 1
 [[package]]
 name = "alexandria_data_structures"
 version = "0.1.0"
-source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=ae1d514#ae1d5149ff601a7ac5b39edc867d33ebd83d7f4f"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?tag=cairo-v2.3.0-rc0#ae1d5149ff601a7ac5b39edc867d33ebd83d7f4f"
 dependencies = [
  "alexandria_encoding",
 ]
 
 [[package]]
 name = "alexandria_encoding"
 version = "0.1.0"
-source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=ae1d514#ae1d5149ff601a7ac5b39edc867d33ebd83d7f4f"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?tag=cairo-v2.3.0-rc0#ae1d5149ff601a7ac5b39edc867d33ebd83d7f4f"
 dependencies = [
  "alexandria_math",
 ]
 
 [[package]]
 name = "alexandria_math"
 version = "0.2.0"
-source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=ae1d514#ae1d5149ff601a7ac5b39edc867d33ebd83d7f4f"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?tag=cairo-v2.3.0-rc0#ae1d5149ff601a7ac5b39edc867d33ebd83d7f4f"
 dependencies = [
  "alexandria_data_structures",
 ]
 
 [[package]]
 name = "alexandria_sorting"
 version = "0.1.0"
-source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=ae1d514#ae1d5149ff601a7ac5b39edc867d33ebd83d7f4f"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?tag=cairo-v2.3.0-rc0#ae1d5149ff601a7ac5b39edc867d33ebd83d7f4f"
 
 [[package]]
 name = "alexandria_storage"
 version = "0.2.0"
-source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=ae1d514#ae1d5149ff601a7ac5b39edc867d33ebd83d7f4f"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?tag=cairo-v2.3.0-rc0#ae1d5149ff601a7ac5b39edc867d33ebd83d7f4f"
 
 [[package]]
 name = "satoru"

diff --git a/Scarb.toml b/Scarb.toml
@@ -19,10 +19,10 @@ sierra-replace-ids = true
 
 [dependencies]
 starknet = ">=2.3.1"
-alexandria_data_structures = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "ae1d514" }
-alexandria_math = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "ae1d514" }
-alexandria_storage = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "ae1d514" }
-alexandria_sorting = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "ae1d514" }
+alexandria_data_structures = { git = "https://github.com/keep-starknet-strange/alexandria.git", tag = "cairo-v2.3.0-rc0" }
+alexandria_math = { git = "https://github.com/keep-starknet-strange/alexandria.git", tag = "cairo-v2.3.0-rc0" }
+alexandria_storage = { git = "https://github.com/keep-starknet-strange/alexandria.git", tag = "cairo-v2.3.0-rc0" }
+alexandria_sorting = { git = "https://github.com/keep-starknet-strange/alexandria.git", tag = "cairo-v2.3.0-rc0" }
 snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.9.1" }
 
 

diff --git a/src/bank/bank.cairo b/src/bank/bank.cairo
@@ -82,7 +82,7 @@ mod Bank {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl BankImpl of super::IBank<ContractState> {
         fn initialize(
             ref self: ContractState,

diff --git a/src/bank/strict_bank.cairo b/src/bank/strict_bank.cairo
@@ -95,7 +95,7 @@ mod StrictBank {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl StrictBank of super::IStrictBank<ContractState> {
         fn initialize(
             ref self: ContractState,

diff --git a/src/callback/mocks.cairo b/src/callback/mocks.cairo
@@ -25,14 +25,14 @@ mod CallbackMock {
     }
 
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl ICallbackMockImpl of super::ICallbackMock<ContractState> {
         fn get_counter(self: @ContractState) -> u32 {
             self.counter.read()
         }
     }
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl IDepositCallbackReceiverImpl of IDepositCallbackReceiver<ContractState> {
         fn after_deposit_execution(
             ref self: ContractState, key: felt252, deposit: Deposit, log_data: Array<felt252>,

diff --git a/src/chain/chain.cairo b/src/chain/chain.cairo
@@ -28,7 +28,7 @@ mod Chain {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl Chain of super::IChain<ContractState> {
         fn get_block_number(self: @ContractState) -> u64 {
             starknet::info::get_block_number()

diff --git a/src/config/config.cairo b/src/config/config.cairo
@@ -97,7 +97,7 @@ mod Config {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl ConfigImpl of super::IConfig<ContractState> {
         fn set_bool(
             ref self: ContractState, base_key: felt252, data: Array<felt252>, value: bool,

diff --git a/src/config/timelock.cairo b/src/config/timelock.cairo
@@ -45,6 +45,6 @@ mod Timelock {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl TimelockImpl of super::ITimelock<ContractState> {}
 }
diff --git a/src/data/data_store.cairo b/src/data/data_store.cairo
@@ -549,7 +549,7 @@ mod DataStore {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl DataStore of super::IDataStore<ContractState> {
         // *************************************************************************
         //                      Felt252 related functions.

diff --git a/src/deposit/deposit_vault.cairo b/src/deposit/deposit_vault.cairo
@@ -100,7 +100,7 @@ mod DepositVault {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl DepositVaultImpl of super::IDepositVault<ContractState> {
         fn initialize(
             ref self: ContractState,

diff --git a/src/event/event_emitter.cairo b/src/event/event_emitter.cairo
@@ -1549,7 +1549,7 @@ mod EventEmitter {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl EventEmitterImpl of super::IEventEmitter<ContractState> {
         /// Emits the `ClaimableCollateralUpdated` event.
         fn emit_claimable_collateral_updated(

diff --git a/src/exchange/adl_handler.cairo b/src/exchange/adl_handler.cairo
@@ -170,7 +170,7 @@ mod AdlHandler {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl AdlHandlerImpl of super::IAdlHandler<ContractState> {
         fn update_adl_state(
             ref self: ContractState,

diff --git a/src/exchange/base_order_handler.cairo b/src/exchange/base_order_handler.cairo
@@ -135,7 +135,7 @@ mod BaseOrderHandler {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl BaseOrderHandlerImpl of super::IBaseOrderHandler<ContractState> {
         fn initialize(
             ref self: ContractState,

diff --git a/src/exchange/deposit_handler.cairo b/src/exchange/deposit_handler.cairo
@@ -147,7 +147,7 @@ mod DepositHandler {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl DepositHandlerImpl of super::IDepositHandler<ContractState> {
         fn create_deposit(
             ref self: ContractState, account: ContractAddress, params: CreateDepositParams

diff --git a/src/exchange/liquidation_handler.cairo b/src/exchange/liquidation_handler.cairo
@@ -119,7 +119,7 @@ mod LiquidationHandler {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl LiquidationHandlerImpl of super::ILiquidationHandler<
         ContractState
     > { // executes a position liquidation

diff --git a/src/exchange/order_handler.cairo b/src/exchange/order_handler.cairo
@@ -194,7 +194,7 @@ mod OrderHandler {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl OrderHandlerImpl of super::IOrderHandler<ContractState> {
         fn create_order(
             ref self: ContractState, account: ContractAddress, params: CreateOrderParams

diff --git a/src/exchange/withdrawal_handler.cairo b/src/exchange/withdrawal_handler.cairo
@@ -135,7 +135,7 @@ mod WithdrawalHandler {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl WithdrawalHandlerImpl of super::IWithdrawalHandler<ContractState> {
         fn create_withdrawal(
             ref self: ContractState, account: ContractAddress, params: CreateWithdrawalParams

diff --git a/src/fee/fee_handler.cairo b/src/fee/fee_handler.cairo
@@ -91,7 +91,7 @@ mod FeeHandler {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl FeeHandlerImpl of super::IFeeHandler<ContractState> {
         fn initialize(
             ref self: ContractState,

diff --git a/src/market/market.cairo b/src/market/market.cairo
@@ -39,7 +39,7 @@ use zeroable::Zeroable;
 use satoru::market::error::MarketError;
 use satoru::market::market_token::{IMarketTokenDispatcher, IMarketTokenDispatcherTrait};
 
-/// Deriving the `storage_access::StorageAccess` trait
+/// Deriving the `storage_access::Store` trait
 /// allows us to store the `Market` struct in a contract's storage.
 /// We use `Copy` but this is inneficient.
 /// TODO: Optimize this.

diff --git a/src/market/market_factory.cairo b/src/market/market_factory.cairo
@@ -102,7 +102,7 @@ mod MarketFactory {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl MarketFactory of super::IMarketFactory<ContractState> {
         fn create_market(
             ref self: ContractState,

diff --git a/src/market/market_token.cairo b/src/market/market_token.cairo
@@ -84,8 +84,7 @@ mod MarketToken {
     //
     // External
     //
-
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl MarketTokenImpl of IMarketToken<ContractState> {
         fn name(self: @ContractState) -> felt252 {
             self.name.read()

diff --git a/src/mock/governable.cairo b/src/mock/governable.cairo
@@ -57,7 +57,7 @@ mod Governable {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl Governable of super::IGovernable<ContractState> {
         fn initialize(ref self: ContractState, event_emitter_address: ContractAddress) {
             assert(self.gov.read().is_zero(), MockError::ALREADY_INITIALIZED);

diff --git a/src/mock/referral_storage.cairo b/src/mock/referral_storage.cairo
@@ -155,7 +155,7 @@ mod ReferralStorage {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl ReferralStorageImpl of super::IReferralStorage<ContractState> {
         fn initialize(ref self: ContractState, event_emitter_address: ContractAddress) {
             let mut gov_state = Governable::unsafe_new_contract_state();

diff --git a/src/oracle/oracle.cairo b/src/oracle/oracle.cairo
@@ -273,7 +273,7 @@ mod Oracle {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl OracleImpl of super::IOracle<ContractState> {
         fn initialize(
             ref self: ContractState,

diff --git a/src/oracle/oracle_store.cairo b/src/oracle/oracle_store.cairo
@@ -107,7 +107,7 @@ mod OracleStore {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl OracleStoreImpl of super::IOracleStore<ContractState> {
         fn initialize(
             ref self: ContractState,

diff --git a/src/oracle/price_feed.cairo b/src/oracle/price_feed.cairo
@@ -35,7 +35,7 @@ mod PriceFeed {
     #[storage]
     struct Storage {}
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl PriceFeedImpl of super::IPriceFeed<ContractState> {
         fn get_data_median(self: @ContractState, data_type: DataType) -> PragmaPricesResponse {
             PragmaPricesResponse {

diff --git a/src/order/order_vault.cairo b/src/order/order_vault.cairo
@@ -75,7 +75,7 @@ mod OrderVault {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl OrderVaultImpl of super::IOrderVault<ContractState> {
         fn transfer_out(
             ref self: ContractState,

diff --git a/src/reader/reader.cairo b/src/reader/reader.cairo
@@ -475,7 +475,7 @@ mod Reader {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl Reader of super::IReader<ContractState> {
         fn get_market(
             self: @ContractState, data_store: IDataStoreDispatcher, key: ContractAddress

diff --git a/src/role/role_module.cairo b/src/role/role_module.cairo
@@ -58,7 +58,7 @@ mod RoleModule {
     // *************************************************************************
     // EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl RoleModule of super::IRoleModule<ContractState> {
         fn initialize(ref self: ContractState, role_store_address: ContractAddress) {
             self.role_store.write(IRoleStoreDispatcher { contract_address: role_store_address });

diff --git a/src/role/role_store.cairo b/src/role/role_store.cairo
@@ -149,7 +149,7 @@ mod RoleStore {
     // *************************************************************************
     // EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl RoleStore of super::IRoleStore<ContractState> {
         fn has_role(self: @ContractState, account: ContractAddress, role_key: felt252) -> bool {
             self._has_role(account, role_key)

diff --git a/src/router/exchange_router.cairo b/src/router/exchange_router.cairo
@@ -273,7 +273,7 @@ mod ExchangeRouter {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl ExchangeRouterImpl of super::IExchangeRouter<ContractState> {
         fn send_tokens(
             ref self: ContractState, token: ContractAddress, receiver: ContractAddress, amount: u128

diff --git a/src/router/router.cairo b/src/router/router.cairo
@@ -70,7 +70,7 @@ mod Router {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl RouterImpl of super::IRouter<ContractState> {
         fn plugin_transfer(
             ref self: ContractState,

diff --git a/src/swap/swap_handler.cairo b/src/swap/swap_handler.cairo
@@ -63,7 +63,7 @@ mod SwapHandler {
     // *************************************************************************
     //                          EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl SwapHandler of super::ISwapHandler<ContractState> {
         fn swap(ref self: ContractState, params: SwapParams) -> (ContractAddress, u128) {
             let mut role_module: RoleModule::ContractState =

diff --git a/src/token/erc20/erc20.cairo b/src/token/erc20/erc20.cairo
@@ -53,7 +53,7 @@ mod ERC20 {
     // External
     //
 
-    #[external(v0)]
+    #[abi(embed_v0)]
     impl ERC20Impl of IERC20<ContractState> {
         fn name(self: @ContractState) -> felt252 {
             self._name.read()

diff --git a/src/utils/serializable_dict.cairo b/src/utils/serializable_dict.cairo
@@ -57,9 +57,7 @@ impl ItemImpl<T> of ItemTrait<T> {
     }
 }
 
-impl ItemPartialEq<
-    T, impl TCopy: Copy<T>, impl TPartialEq: PartialEq<T>, impl TDrop: Drop<T>
-> of PartialEq<Item<T>> {
+impl ItemPartialEq<T, +Copy<T>, +PartialEq<T>, +Drop<T>> of PartialEq<Item<T>> {
     fn eq(lhs: @Item<T>, rhs: @Item<T>) -> bool {
         if lhs.is_single() && rhs.is_single() {
             return lhs.unwrap_single() == rhs.unwrap_single();
@@ -96,7 +94,7 @@ struct SerializableFelt252Dict<T> {
 }
 
 impl SerializableFelt252DictDestruct<
-    T, impl TDrop: Drop<T>, impl TDefault: Felt252DictValue<T>
+    T, +Drop<T>, +Felt252DictValue<T>
 > of Destruct<SerializableFelt252Dict<T>> {
     fn destruct(self: SerializableFelt252Dict<T>) nopanic {
         self.values.squash();