bump version and remove the oracle token function

Author: moodysalem

Scarb.lock

@@ -4,7 +4,7 @@ version = 1
 [[package]]
 name = "ekubo"
 version = "0.1.0"
-source = "git+https://github.com/ekuboprotocol/abis#0bd97534dfa42271a7667a37b8a19464a7ded716"
+source = "git+https://github.com/ekuboprotocol/abis#edb6de8c9baf515f1053bbab3d86825d54a63bc3"
 
 [[package]]
 name = "ekubo_oracle_extension"
@@ -17,12 +17,12 @@ dependencies = [
 [[package]]
 name = "snforge_scarb_plugin"
 version = "0.1.0"
-source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.29.0#d37d2272ca6c915117646de76cdf26ec06e44f61"
+source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.30.0#196f06b251926697c3d66800f2a93ae595e76496"
 
 [[package]]
 name = "snforge_std"
-version = "0.29.0"
-source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.29.0#d37d2272ca6c915117646de76cdf26ec06e44f61"
+version = "0.30.0"
+source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.30.0#196f06b251926697c3d66800f2a93ae595e76496"
 dependencies = [
  "snforge_scarb_plugin",
 ]

Scarb.toml

@@ -26,5 +26,5 @@ url = "https://free-rpc.nethermind.io/mainnet-juno"
 block_id.number = "677957"
 
 [dev-dependencies]
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.29.0" }
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.30.0" }
 assert_macros = "2.8.0"

src/oracle.cairo

@@ -98,11 +98,6 @@ pub trait IOracle<TContractState> {
 
     // Returns the set oracle token
     fn get_oracle_token(self: @TContractState) -> ContractAddress;
-
-    // Sets the oracle token. If set to a non-zero address, the oracle only allows Oracle pools with
-    // the specified token, and uses that token as the intermediary oracle for all queries If set to
-    // zero, any oracle pool may be created.
-    fn set_oracle_token(ref self: TContractState, oracle_token: ContractAddress);
 }
 
 #[starknet::contract]
@@ -321,7 +316,7 @@ pub mod Oracle {
 
             let oracle_token = self.oracle_token.read();
 
-            if oracle_token.is_zero() || base_token == oracle_token || quote_token == oracle_token {
+            if base_token == oracle_token || quote_token == oracle_token {
                 let (token0, token1, flipped) = if base_token < quote_token {
                     (base_token, quote_token, false)
                 } else {
@@ -498,10 +493,6 @@ pub mod Oracle {
         fn get_oracle_token(self: @ContractState) -> ContractAddress {
             self.oracle_token.read()
         }
-
-        fn set_oracle_token(ref self: ContractState, oracle_token: ContractAddress) {
-            self.oracle_token.write(oracle_token);
-        }
     }
 
     pub(crate) const MAX_TICK_SPACING: u128 = 354892;
@@ -514,12 +505,10 @@ pub mod Oracle {
             self.check_caller_is_core();
 
             let oracle_token = self.oracle_token.read();
-            if oracle_token.is_non_zero() {
-                assert(
-                    pool_key.token0 == oracle_token || pool_key.token1 == oracle_token,
-                    'Must use oracle token'
-                );
-            }
+            assert(
+                pool_key.token0 == oracle_token || pool_key.token1 == oracle_token,
+                'Must use oracle token'
+            );
 
             let key = pool_key.to_pair_key();
 
@@ -609,16 +598,14 @@ pub mod Oracle {
 
             let oracle_token = self.oracle_token.read();
 
-            if oracle_token.is_non_zero() {
-                // must be using the oracle token in the pool, or withdrawing liquidity
-                assert(
-                    pool_key.token0 == oracle_token
-                        || pool_key.token1 == oracle_token
-                        || params.liquidity_delta.is_zero()
-                        || params.liquidity_delta.sign,
-                    'Must use oracle token'
-                );
-            }
+            // must be using the oracle token in the pool, or withdrawing liquidity
+            assert(
+                pool_key.token0 == oracle_token
+                    || pool_key.token1 == oracle_token
+                    || params.liquidity_delta.is_zero()
+                    || params.liquidity_delta.sign,
+                'Must use oracle token'
+            );
         }
 
         fn after_update_position(

src/oracle_test.cairo

@@ -14,8 +14,7 @@ use ekubo_oracle_extension::oracle::{
 };
 use ekubo_oracle_extension::test_token::{IERC20Dispatcher, IERC20DispatcherTrait};
 use snforge_std::{
-    declare, DeclareResultTrait, ContractClassTrait, cheat_block_timestamp, CheatSpan,
-    ContractClass, cheat_caller_address
+    declare, DeclareResultTrait, ContractClassTrait, cheat_block_timestamp, CheatSpan, ContractClass
 };
 use starknet::{get_contract_address, get_block_timestamp, contract_address_const, ContractAddress};
 
@@ -70,7 +69,6 @@ fn router() -> IRouterDispatcher {
 }
 
 fn setup() -> (PoolKey, PoolKey) {
-    let oracle = deploy_oracle(default_owner(), ekubo_core(), Zero::zero());
     let token_class = declare("TestToken").unwrap().contract_class();
     let owner = get_contract_address();
     let (tokenA, tokenB, tokenC) = (
@@ -103,6 +101,7 @@ fn setup() -> (PoolKey, PoolKey) {
         (token0, token1, tokenC)
     };
 
+    let oracle = deploy_oracle(default_owner(), ekubo_core(), token1.contract_address);
     let pool_key_0 = PoolKey {
         token0: token0.contract_address,
         token1: token1.contract_address,
@@ -306,8 +305,6 @@ fn test_get_price_history() {
 fn test_get_price_history_through_oracle_token() {
     let (pool_key_0, pool_key_1) = setup();
     let oracle = IOracleDispatcher { contract_address: pool_key_0.extension };
-    cheat_caller_address(oracle.contract_address, default_owner(), CheatSpan::TargetCalls(1));
-    oracle.set_oracle_token(pool_key_0.token1);
 
     let start_time = 100;
     cheat_block_timestamp(oracle.contract_address, start_time, CheatSpan::Indefinite);