compolabs · chlenc · Apr 7, 2023 · Apr 7, 2023 · Apr 7, 2023 · Apr 7, 2023
diff --git a/abi/oracle_abi/src/main.sw b/abi/oracle_abi/src/main.sw
@@ -1,4 +1,4 @@
-library oracle_abi;
+library ;
 
 pub struct Price {
     asset_id: ContractId,

diff --git a/abi/token_abi/src/main.sw b/abi/token_abi/src/main.sw
@@ -1,4 +1,4 @@
-library token_abi;
+library ;
 
 abi Token {
     // Initialize contract

diff --git a/contracts/market/Cargo.lock b/contracts/market/Cargo.lock
diff --git a/contracts/market/Cargo.toml b/contracts/market/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Alex Nagorny <[email protected]>"]
 license = "Apache-2.0"
 
 [dev-dependencies]
-fuels = { version = "0.38.1", features = ["fuel-core-lib"] }
+fuels = { version = "0.39", features = ["fuel-core-lib"] }
 tokio = { version = "1.12", features = ["rt", "macros"] }
 
 [[test]]
@@ -17,7 +17,6 @@ path = "tests/harness.rs"
 
 [dependencies]
 dotenv = "0.15.0"
-fuels-types = "0.38.1"
 rand = "0.8.5"
 reqwest = "0.11.13"
 serde_json = "1.0.91"
diff --git a/contracts/market/Forc.lock b/contracts/market/Forc.lock
@@ -1,6 +1,6 @@
 [[package]]
 name = 'core'
-source = 'path+from-root-894BF76E6DA2FFD3'
+source = 'path+from-root-FDF4A5DCC6ECD181'
 
 [[package]]
 name = 'market'
@@ -18,7 +18,7 @@ dependencies = ['std']
 
 [[package]]
 name = 'std'
-source = 'git+https://github.com/fuellabs/sway?tag=v0.35.3#5d2b10bd83791d2eaff04206dbd45bfdd9cf23ff'
+source = 'git+https://github.com/fuellabs/sway?tag=v0.37.0#607ac50176db8bef936f91bacf435d0ea37d041e'
 dependencies = ['core']
 
 [[package]]

diff --git a/contracts/market/src/i64.sw b/contracts/market/src/i64.sw
@@ -1,4 +1,4 @@
-library i64;
+library;
 
 pub struct I64 {
     value: u64,

diff --git a/contracts/market/src/main.sw b/contracts/market/src/main.sw
@@ -6,12 +6,12 @@ contract;
  * @notice An efficient monolithic money market protocol
  * @author SWAY GANG
  */
-dep numbers;
-dep structs;
-dep i64;
+mod numbers;
+// mod structs;
+mod i64;
 
 use i64::I64;
-use structs::*;
+// use structs::*;
 use numbers::*;
 use oracle_abi::*;
 use token_abi::*;
@@ -37,6 +37,94 @@ use std::{
     u128::U128,
 };
 
+//library structs
+//------------------------------------------------------------------------
+
+pub struct MarketConfiguration {
+    governor: Address,
+    pause_guardian: Address,
+    base_token: ContractId,
+    base_token_decimals: u8,
+    base_token_price_feed: ContractId,
+    kink: u64, // decimals: 18
+    supply_per_second_interest_rate_slope_low: u64, // decimals: 18
+    supply_per_second_interest_rate_slope_high: u64, // decimals: 18
+    borrow_per_second_interest_rate_slope_low: u64, // decimals: 18
+    borrow_per_second_interest_rate_slope_high: u64, // decimals: 18
+    borrow_per_second_interest_rate_base: u64, // decimals: 18
+    store_front_price_factor: u64, // decimals: 4
+    base_tracking_supply_speed: u64, // decimals 18
+    base_tracking_borrow_speed: u64, // decimals 18
+    base_min_for_rewards: u64, // decimals base_token_decimals
+    base_borrow_min: u64, // decimals: base_token_decimals
+    target_reserves: u64, // decimals: base_token_decimals
+    reward_token: ContractId, 
+}
+
+pub struct AssetConfig {
+    asset: ContractId,
+    price_feed: ContractId,
+    decimals: u8,
+    borrow_collateral_factor: u64, // decimals: 4
+    liquidate_collateral_factor: u64, // decimals: 4
+    liquidation_penalty: u64, // decimals: 4
+    supply_cap: u64, // decimals: asset decimals
+}
+
+pub struct PauseConfiguration {
+    supply_paused: bool, 
+    withdraw_paused: bool, 
+    absorb_paused: bool, 
+    buy_pause: bool,
+    // claim_paused: bool,
+}
+
+pub struct UserBasic {
+    principal: I64, // decimals: base_asset_decimal
+    base_tracking_index: u64,	// decimals: 18
+    base_tracking_accrued: u64,	// decimals: native_asset_decimal
+    reward_claimed: u64,	// decimals: native_asset_decimal
+}
+
+impl UserBasic {
+    pub fn default() -> Self {
+        UserBasic {
+            principal: I64::new(),
+            base_tracking_index: 0,
+            base_tracking_accrued: 0,
+            reward_claimed: 0,
+        }
+     }
+}
+
+pub struct MarketBasics {
+    base_supply_index: u64,// decimals	18
+    base_borrow_index: u64,// decimals	18
+    tracking_supply_index: u64,// decimals	18
+    tracking_borrow_index: u64,// decimals	18
+    total_supply_base: u64,// decimals	base_asset_decimal
+    total_borrow_base: u64,// decimals	base_asset_decimal
+    last_accrual_time: u64,
+}
+
+pub enum Error {
+    AlreadyInitialized: (),
+    Paused: (),
+    Unauthorized: (),
+    InsufficientReserves: (),
+    NotLiquidatable: (),
+    NotForSale: (),
+    TooMuchSlippage: (),
+    SupplyCapExceeded: (),
+    NotCollateralized: (),
+    BorrowTooSmall: (),
+    NotPermitted: (),
+    InvalidPayment: (),
+    DebuggingDisabled: (),
+}
+
+//------------------------------------------------------------------------
+
 abi Market {
     #[storage(read, write)]
     fn debug_increment_timestamp();

diff --git a/contracts/market/src/numbers.sw b/contracts/market/src/numbers.sw
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-library numbers;
+library;
 use std::u128::U128;
 
 impl U128 {

diff --git a/contracts/market/src/structs.sw b/contracts/market/src/structs.sw
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
-library structs;
-dep i64;
+library;
 
+mod i64;
 use i64::I64;
 
 

diff --git a/contracts/market/tests/local_tests/functions/available_to_borrow.rs b/contracts/market/tests/local_tests/functions/available_to_borrow.rs
@@ -1,4 +1,4 @@
-use fuels_types::Address;
+use fuels::types::Address;
 
 use crate::utils::{
     local_tests_utils::{

diff --git a/contracts/market/tests/local_tests/functions/initialize.rs b/contracts/market/tests/local_tests/functions/initialize.rs
@@ -1,4 +1,4 @@
-use fuels_types::Address;
+use fuels::types::Address;
 
 use crate::utils::local_tests_utils::market::{self, get_market_config, market_abi_calls};