Merge pull request #399 from icon-project/fix/stellar-external-audit-…

…issues

fix: stellar external audit issues

Cargo.toml

@@ -1,8 +1,6 @@
 [workspace]
 members = [
-    "contracts/cosmwasm-vm/*",
-    "contracts/soroban/contracts/*",
-    "contracts/soroban/libs/*"
+    "contracts/cosmwasm-vm/*"
 ]
 
 [workspace.package]
@@ -38,8 +36,6 @@ cw-common={ git="https://github.com/icon-project/IBC-Integration.git", branch =
 cw-mock-dapp = {path="contracts/cosmwasm-vm/cw-mock-dapp"}
 cw-mock-dapp-multi = { path="contracts/cosmwasm-vm/cw-mock-dapp-multi"}
 
-soroban-sdk = "21.6.0"
-
 [profile.release]
 opt-level = 'z'
 debug = false

contracts/soroban/Cargo.toml

@@ -6,7 +6,7 @@ members = [
 ]
 
 [workspace.dependencies]
-soroban-sdk = "20.5.0"
+soroban-sdk = "21.7.4"
 
 [profile.release]
 opt-level = "z"

contracts/soroban/contracts/centralized-connection/Cargo.toml

@@ -10,6 +10,8 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true, features = ["alloc"] }
+xcall = { path = "../xcall" }
+soroban-xcall-lib = { path = "../../libs/soroban-xcall-lib" }
 
 [dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }

contracts/soroban/contracts/centralized-connection/src/contract.rs

@@ -125,11 +125,13 @@ impl CentralizedConnection {
         helpers::ensure_upgrade_authority(&env)?;
         env.deployer().update_current_contract_wasm(new_wasm_hash);
 
+        let current_version = storage::get_contract_version(&env);
+        storage::set_contract_version(&env, current_version + 1);
+
         Ok(())
     }
 
-    pub fn extend_instance_storage(env: Env) -> Result<(), ContractError> {
-        storage::extend_instance(&env);
-        Ok(())
+    pub fn version(env: Env) -> u32 {
+        storage::get_contract_version(&env)
     }
 }

contracts/soroban/contracts/centralized-connection/src/storage.rs

@@ -50,13 +50,6 @@ pub fn native_token(e: &Env) -> Result<Address, ContractError> {
         .ok_or(ContractError::Uninitialized)
 }
 
-pub fn get_conn_sn(e: &Env) -> Result<u128, ContractError> {
-    e.storage()
-        .instance()
-        .get(&StorageKey::ConnSn)
-        .ok_or(ContractError::Uninitialized)
-}
-
 pub fn get_next_conn_sn(e: &Env) -> u128 {
     let mut sn = e.storage().instance().get(&StorageKey::ConnSn).unwrap_or(0);
     sn += 1;
@@ -103,6 +96,19 @@ pub fn get_sn_receipt(e: &Env, network_id: String, sn: u128) -> bool {
     is_received
 }
 
+pub fn get_contract_version(e: &Env) -> u32 {
+    e.storage()
+        .instance()
+        .get(&StorageKey::Version)
+        .unwrap_or(1)
+}
+
+pub fn set_contract_version(e: &Env, new_version: u32) {
+    e.storage()
+        .instance()
+        .set(&StorageKey::Version, &new_version);
+}
+
 pub fn store_receipt(e: &Env, network_id: String, sn: u128) {
     let key = StorageKey::Receipts(network_id, sn);
     e.storage().persistent().set(&key, &true);