Merge pull request #461 from Phoenix-Protocol-Group/phoenix-v2-upgrade

To tidy up the update script

Author: ueco-jb

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [2.0.0] - 2025-06-07
+
 ## Changed
 
 - All: Updates the soroban SDK to latest stable version 22 ([#411])
@@ -34,6 +36,7 @@ and this project adheres to
 - All: Adds a mechanism to change the admin of a contract that ensures safety of transition ([#448])
 - All: Adds constructors instead of using `initialize` (#[455])
 - Factory, Trader, Vesting: adds `update_config` ([#457])
+- Set phoenix version v2.0.0 ([#461])
 
 ## Fixed
 
@@ -66,6 +69,7 @@ and this project adheres to
 [#455]: https://github.com/Phoenix-Protocol-Group/phoenix-contracts/pull/455
 [#457]: https://github.com/Phoenix-Protocol-Group/phoenix-contracts/pull/457
 [#458]: https://github.com/Phoenix-Protocol-Group/phoenix-contracts/pull/458
+[#461]: https://github.com/Phoenix-Protocol-Group/phoenix-contracts/pull/461
 
 ## [1.1.0] - 2024-08-27
 

Cargo.lock

@@ -3,7 +3,7 @@ members = ["contracts/*", "packages/*"]
 resolver = "2"
 
 [workspace.package]
-version = "1.1.0"
+version = "2.0.0"
 edition = "2021"
 license = "GPL-3.0"
 repository = "https://github.com/Phoenix-Protocol-Group/phoenix-contracts"
@@ -20,6 +20,12 @@ soroban-token-sdk = "22.0.7"
 test-case = "3.3"
 pretty_assertions = "1.4.0"
 
+[workspace.lints.clippy]
+too_many_arguments = "allow"
+
+[workspace.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ["cfg(tarpaulin_include)"] }
+
 [profile.release]
 opt-level = "z"
 overflow-checks = true

Cargo.toml

@@ -13,13 +13,13 @@ crate-type = ["cdylib"]
 testutils = ["soroban-sdk/testutils"]
 upgrade = []
 
+[lints]
+workspace = true
+
 [dependencies]
 soroban-sdk = { workspace = true }
 phoenix = { workspace = true }
 
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ["cfg(tarpaulin_include)"] }
-
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
 test-case = { workspace = true }

contracts/factory/Cargo.toml

@@ -31,7 +31,6 @@ pub struct Factory;
 
 #[allow(dead_code)]
 pub trait FactoryTrait {
-    #[allow(clippy::too_many_arguments)]
     fn create_liquidity_pool(
         env: Env,
         sender: Address,
@@ -84,7 +83,6 @@ pub trait FactoryTrait {
 
 #[contractimpl]
 impl FactoryTrait for Factory {
-    #[allow(clippy::too_many_arguments)]
     fn create_liquidity_pool(
         env: Env,
         sender: Address,
@@ -182,7 +180,6 @@ impl FactoryTrait for Factory {
         lp_contract_address
     }
 
-    #[allow(clippy::too_many_arguments)]
     fn update_config(
         env: Env,
         multihop_address: Option<Address>,
@@ -543,7 +540,6 @@ impl FactoryTrait for Factory {
 
 #[contractimpl]
 impl Factory {
-    #[allow(clippy::too_many_arguments)]
     pub fn __constructor(
         env: Env,
         admin: Address,

contracts/factory/src/contract.rs

@@ -16,7 +16,6 @@ pub mod token_contract {
     );
 }
 
-#[allow(clippy::too_many_arguments)]
 pub mod stake_contract {
     soroban_sdk::contractimport!(
         file = "../../target/wasm32-unknown-unknown/release/phoenix_stake.wasm"

contracts/factory/src/lib.rs

@@ -10,70 +10,60 @@ pub const ONE_DAY: u64 = 86400;
 const TOKEN_WASM: &[u8] =
     include_bytes!("../../../../target/wasm32-unknown-unknown/release/soroban_token_contract.wasm");
 
-#[allow(clippy::too_many_arguments)]
 #[cfg(feature = "upgrade")]
 pub mod old_factory {
     soroban_sdk::contractimport!(file = "../../.wasm_binaries_mainnet/live_factory.wasm");
 }
 
-#[allow(clippy::too_many_arguments)]
 #[cfg(feature = "upgrade")]
 pub fn install_old_multihop_wasm(env: &Env) -> BytesN<32> {
     soroban_sdk::contractimport!(file = "../../.wasm_binaries_mainnet/live_multihop.wasm");
     env.deployer().upload_contract_wasm(WASM)
 }
 
-#[allow(clippy::too_many_arguments)]
 #[cfg(feature = "upgrade")]
 pub fn install_old_token_wasm(env: &Env) -> BytesN<32> {
     soroban_sdk::contractimport!(file = "../../.wasm_binaries_mainnet/live_token_contract.wasm");
     env.deployer().upload_contract_wasm(WASM)
 }
 
-#[allow(clippy::too_many_arguments)]
 #[cfg(feature = "upgrade")]
 pub fn old_lp_wasm(env: &Env) -> BytesN<32> {
     soroban_sdk::contractimport!(file = "../../.wasm_binaries_mainnet/live_pho_usdc_pool.wasm");
     env.deployer().upload_contract_wasm(WASM)
 }
 
-#[allow(clippy::too_many_arguments)]
 #[cfg(feature = "upgrade")]
 pub fn old_stake_wasm(env: &Env) -> BytesN<32> {
     soroban_sdk::contractimport!(file = "../../.wasm_binaries_mainnet/live_pho_usdc_stake.wasm");
     env.deployer().upload_contract_wasm(WASM)
 }
 
-#[allow(clippy::too_many_arguments)]
 pub(crate) fn install_latest_factory(env: &Env) -> BytesN<32> {
     soroban_sdk::contractimport!(
         file = "../../target/wasm32-unknown-unknown/release/phoenix_factory.wasm"
     );
     env.deployer().upload_contract_wasm(WASM)
 }
 
-#[allow(clippy::too_many_arguments)]
 pub mod lp_contract {
     soroban_sdk::contractimport!(
         file = "../../target/wasm32-unknown-unknown/release/phoenix_pool.wasm"
     );
 }
 
-#[allow(clippy::too_many_arguments)]
 pub mod stable_lp {
     soroban_sdk::contractimport!(
         file = "../../target/wasm32-unknown-unknown/release/phoenix_pool_stable.wasm"
     );
 }
 
-#[allow(clippy::too_many_arguments)]
 pub mod stake_contract {
     soroban_sdk::contractimport!(
         file = "../../target/wasm32-unknown-unknown/release/phoenix_stake.wasm"
     );
 }
 
-#[allow(clippy::too_many_arguments)]
 pub fn install_multihop_wasm(env: &Env) -> BytesN<32> {
     soroban_sdk::contractimport!(
         file = "../../target/wasm32-unknown-unknown/release/phoenix_multihop.wasm"
@@ -93,7 +83,6 @@ pub fn install_token_wasm(env: &Env) -> BytesN<32> {
     env.deployer().upload_contract_wasm(token_contract::WASM)
 }
 
-#[allow(clippy::too_many_arguments)]
 pub fn install_stake_wasm(env: &Env) -> BytesN<32> {
     soroban_sdk::contractimport!(
         file = "../../target/wasm32-unknown-unknown/release/phoenix_stake.wasm"

contracts/factory/src/tests/setup.rs

@@ -13,12 +13,12 @@ crate-type = ["cdylib"]
 testutils = ["soroban-sdk/testutils"]
 upgrade = []
 
+[lints]
+workspace = true
+
 [dependencies]
 soroban-sdk = { workspace = true }
 phoenix = { workspace = true }
 
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ["cfg(tarpaulin_include)"] }
-
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }

contracts/multihop/Cargo.toml

@@ -29,7 +29,6 @@ pub struct Multihop;
 
 #[allow(dead_code)]
 pub trait MultihopTrait {
-    #[allow(clippy::too_many_arguments)]
     fn swap(
         env: Env,
         recipient: Address,
@@ -74,7 +73,6 @@ pub trait MultihopTrait {
 
 #[contractimpl]
 impl MultihopTrait for Multihop {
-    #[allow(clippy::too_many_arguments)]
     fn swap(
         env: Env,
         recipient: Address,

contracts/multihop/src/contract.rs

@@ -4,7 +4,6 @@ mod error;
 mod storage;
 mod utils;
 
-#[allow(clippy::too_many_arguments)]
 pub mod xyk_pool {
     // The import will code generate:
     // - A ContractClient type that can be used to invoke functions on the contract.
@@ -14,14 +13,12 @@ pub mod xyk_pool {
     );
 }
 
-#[allow(clippy::too_many_arguments)]
 pub mod stable_pool {
     soroban_sdk::contractimport!(
         file = "../../target/wasm32-unknown-unknown/release/phoenix_pool_stable.wasm"
     );
 }
 
-#[allow(clippy::too_many_arguments)]
 pub mod factory_contract {
     soroban_sdk::contractimport!(
         file = "../../target/wasm32-unknown-unknown/release/phoenix_factory.wasm"