Merge branch 'main' into soroban/xcall-multi

Author: gcranju

.github/workflows/basic-rust.yml

@@ -12,7 +12,7 @@ on:
   push:
     branches:
       - main
-
+      
 jobs:
 
   test:
@@ -23,20 +23,13 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v3
 
-      - name: Install Rust
-        run: rustup update stable
-
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
 
       - name: Run unit tests
         run: |
           RUST_BACKTRACE=1 cargo unit-test --locked
 
-      - name: Install wasm32
-        run: |
-          rustup target add wasm32-unknown-unknown
-
       - name: Compile WASM contract
         run: |
           RUSTFLAGS='-C link-arg=-s' cargo wasm --locked
@@ -51,16 +44,9 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v3
 
-      - name: Install Rust
-        run: rustup update stable
-
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
-
-      - name: Run cargo fmt
-        run: |
-          cargo fmt --all -- --check
-
+      
       - name: Run cargo clippy
         run: |
           cargo clippy

.github/workflows/build-and-publish-cosmwasm.yml

@@ -20,21 +20,8 @@ jobs:
         with:
           submodules: true
 
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.69.0
-          target: wasm32-unknown-unknown
-          override: true
-          profile: minimal
-
-      - name: Cache Rust dependencies
-        uses: Swatinem/rust-cache@v2
-
       - name: Compile WASM
         run: |
-          rustup component add rustfmt --toolchain 1.69.0-x86_64-unknown-linux-gnu
-          rustup component add clippy --toolchain 1.69.0-x86_64-unknown-linux-gnu
           bash ./scripts/optimize-cosmwasm.sh
 
       - name: Archive artifacts

.github/workflows/cosmwasm-contracts-code-coverage.yml

@@ -25,10 +25,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
-      - name: Install Rust
-        run: rustup update stable
-      - name: Cache Rust dependencies
-        uses: Swatinem/rust-cache@v2
+        
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: Generate code coverage

.github/workflows/deploy-cosmwasm-contracts.yml

@@ -23,21 +23,8 @@ jobs:
           cp ./scripts/archway/docker_compose_archway.yaml .
           docker compose -f docker_compose_archway.yaml up -d
 
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.69.0
-          target: wasm32-unknown-unknown
-          override: true
-          profile: minimal
-
-      - name: Cache Rust dependencies
-        uses: Swatinem/rust-cache@v2
-
       - name: Compile WASM
         run: |
-          rustup component add rustfmt --toolchain 1.69.0-x86_64-unknown-linux-gnu
-          rustup component add clippy --toolchain 1.69.0-x86_64-unknown-linux-gnu
           sudo chmod -R 777 artifacts
           sudo chmod -R 777 scripts
           bash ./scripts/optimize-cosmwasm.sh

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
           ./gradlew optimizedJar
           ./gradlew zipOutputOptimizedJars
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: javascore-contracts
           path: ./contracts/javascore/build/javascore-contracts.zip
@@ -37,24 +37,18 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.69.0
-          target: wasm32-unknown-unknown
-          override: true
-          profile: minimal
+          
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
       - name: Compile WASM
         run: |
-          rustup component add rustfmt --toolchain 1.69.0-x86_64-unknown-linux-gnu
-          rustup component add clippy --toolchain 1.69.0-x86_64-unknown-linux-gnu     
+          # rustup component add rustfmt --toolchain 1.78.0-x86_64-unknown-linux-gnu
+          # rustup component add clippy --toolchain 1.78.0-x86_64-unknown-linux-gnu     
           bash ./scripts/optimize-cosmwasm.sh
           cd artifacts/archway && zip -r ../../cosmwasm-contracts.zip . -j
           
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: cosmwasm-contracts
           path: cosmwasm-contracts.zip
@@ -79,7 +73,7 @@ jobs:
           cd artifacts && zip -r ../../../solidity-contracts.zip . -j
         
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: solidity-contracts
           path: solidity-contracts.zip
@@ -96,19 +90,19 @@ jobs:
           echo «::set-output name=date::$(date +'%Y-%m-%d')»
           echo «::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)»
       - name: Download Javascore Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: javascore-contracts
           path: javascore-contracts
 
       - name: Download Cosmwasm Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: cosmwasm-contracts
           path: cosmwasm-contracts
 
       - name: Download Solidity Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: solidity-contracts
           path: solidity-contracts

.github/workflows/sui-move-build-test.yml

@@ -0,0 +1,29 @@
+name: SUI Move Build and Test
+
+on:
+  pull_request:
+    branches:
+      - "main"
+  push:
+    branches:
+      - "**"
+
+jobs:
+  build:
+    name: sui move build and test
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ github.token }}
+      REPO_OWNER: MystenLabs
+      REPO_NAME: sui
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Install sui
+        run: bash -x ./scripts/install_sui.sh
+      
+      - name: build and test
+        run: bash ./scripts/optimize-move.sh
+       

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
 [submodule "contracts/evm/xcall/lib/openzeppelin-contracts"]
 	path = contracts/evm/lib/openzeppelin-contracts
-	url = https://github.com/Openzeppelin/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
 [submodule "contracts/evm/lib/openzeppelin-foundry-upgrades"]
 	path = contracts/evm/lib/openzeppelin-foundry-upgrades
 	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
@@ -16,3 +16,9 @@
 [submodule "contracts/evm/lib/solidity-examples"]
 	path = contracts/evm/lib/solidity-examples
 	url = https://github.com/LayerZero-Labs/solidity-examples
+[submodule "contracts/evm/lib/openzeppelin-contracts"]
+	path = contracts/evm/lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "contracts/evm/lib/openzeppelin-contracts-upgradeable"]
+	path = contracts/evm/lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

Cargo.toml

@@ -8,10 +8,10 @@ members = [
 [workspace.package]
 authors = ["Icon Foundation<foo@icon.foundation>"]
 repository = "https://github.com/icon-project/ibc-integration.git"
-version="0.2.0"
+version="0.2.1"
 
 [workspace.dependencies]
-cosmwasm-std = {version="1.2.2",default-features = false,features = ["iterator", "staking"]}
+cosmwasm-std = {version="1.5.5",default-features = false,features = ["iterator", "staking"]}
 cw-storage-plus = {git="https://github.com/icon-project/cw-storage-plus.git", branch="fix-raw"}
 cosmwasm-storage = "1.2.2"
 cosmwasm-schema = "1.2.2"

contracts/cosmwasm-vm/cw-centralized-connection/src/contract.rs

@@ -43,7 +43,6 @@ impl<'a> CwCentralizedConnection<'a> {
         self.ensure_xcall(deps.storage, info.sender)?;
 
         let next_conn_sn = self.get_next_conn_sn(deps.storage)?;
-        self.store_conn_sn(deps.storage, next_conn_sn)?;
 
         let mut fee = 0;
 

contracts/cosmwasm-vm/cw-centralized-connection/src/helper.rs

@@ -58,7 +58,7 @@ impl<'a> CwCentralizedConnection<'a> {
         };
         let call_message: CosmosMsg<Empty> = CosmosMsg::Wasm(WasmMsg::Execute {
             contract_addr: xcall_host.to_string(),
-            msg: to_binary(&xcall_msg).unwrap(),
+            msg: to_json_binary(&xcall_msg).unwrap(),
             funds: vec![],
         });
         let sub_msg: SubMsg = SubMsg::reply_always(call_message, XCALL_HANDLE_MESSAGE_REPLY_ID);
@@ -76,7 +76,7 @@ impl<'a> CwCentralizedConnection<'a> {
         };
         let call_message: CosmosMsg<Empty> = CosmosMsg::Wasm(WasmMsg::Execute {
             contract_addr: xcall_host.to_string(),
-            msg: to_binary(&xcall_msg).unwrap(),
+            msg: to_json_binary(&xcall_msg).unwrap(),
             funds: vec![],
         });
         let sub_msg: SubMsg = SubMsg::reply_always(call_message, XCALL_HANDLE_ERROR_REPLY_ID);

contracts/cosmwasm-vm/cw-centralized-connection/src/lib.rs

@@ -7,11 +7,10 @@ pub mod types;
 
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
-    entry_point, to_binary, Binary, CosmosMsg, Deps, DepsMut, Empty, Env, MessageInfo, Reply,
+    entry_point, to_json_binary, Binary, CosmosMsg, Deps, DepsMut, Empty, Env, MessageInfo, Reply,
     Response, StdError, StdResult, Storage, SubMsg, WasmMsg,
 };
 
-pub use contract::*;
 use cw2::set_contract_version;
 use cw_storage_plus::{Item, Map};
 pub use errors::*;
@@ -65,7 +64,7 @@ pub fn execute(
 pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
     let centralized_connection = CwCentralizedConnection::default();
     match msg {
-        QueryMsg::GetFee { nid, response } => to_binary(
+        QueryMsg::GetFee { nid, response } => to_json_binary(
             &centralized_connection
                 .get_fee(deps.storage, nid, response)
                 .unwrap(),
@@ -74,10 +73,12 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
         QueryMsg::GetReceipt {
             src_network,
             conn_sn,
-        } => to_binary(&centralized_connection.get_receipt(deps.storage, src_network, conn_sn)),
+        } => {
+            to_json_binary(&centralized_connection.get_receipt(deps.storage, src_network, conn_sn))
+        }
 
         QueryMsg::Admin {} => {
-            to_binary(&centralized_connection.admin().load(deps.storage).unwrap())
+            to_json_binary(&centralized_connection.admin().load(deps.storage).unwrap())
         }
     }
 }

contracts/cosmwasm-vm/cw-integration/tests/test_xcall.rs

@@ -360,7 +360,7 @@ fn test_rollback_reply() {
 }
 
 fn test_call_message(
-    mut ctx: &mut TestContext,
+    ctx: &mut TestContext,
     data: Vec<u8>,
     msg_type: MessageType,
 ) -> Result<AppResponse, AppError> {

contracts/cosmwasm-vm/cw-mock-dapp-multi/src/contract.rs

@@ -64,7 +64,7 @@ impl<'a> CwMockService<'a> {
         };
         let message: CosmosMsg<Empty> = CosmosMsg::Wasm(WasmMsg::Execute {
             contract_addr: address,
-            msg: to_binary(&msg).unwrap(),
+            msg: to_json_binary(&msg).unwrap(),
             funds: info.funds,
         });
         let submessage = SubMsg {
@@ -123,7 +123,7 @@ impl<'a> CwMockService<'a> {
         let msg = ExecuteMsg::SendCall { envelope, to };
         let message: CosmosMsg<Empty> = CosmosMsg::Wasm(WasmMsg::Execute {
             contract_addr: address,
-            msg: to_binary(&msg).unwrap(),
+            msg: to_json_binary(&msg).unwrap(),
             funds: info.funds,
         });
 
@@ -154,7 +154,7 @@ impl<'a> CwMockService<'a> {
         let msg = ExecuteMsg::SendCall { to, envelope };
         let message: CosmosMsg<Empty> = CosmosMsg::Wasm(WasmMsg::Execute {
             contract_addr: address,
-            msg: to_binary(&msg).unwrap(),
+            msg: to_json_binary(&msg).unwrap(),
             funds: info.funds,
         });
 

contracts/cosmwasm-vm/cw-mock-dapp-multi/src/lib.rs

@@ -7,19 +7,16 @@ pub mod types;
 
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
-    entry_point, to_binary, Binary, CosmosMsg, Deps, DepsMut, Empty, Env, MessageInfo, Response,
-    StdError, StdResult, Storage, WasmMsg,
+    entry_point, to_json_binary, Binary, CosmosMsg, Deps, DepsMut, Empty, Env, MessageInfo,
+    Response, StdError, StdResult, Storage, WasmMsg,
 };
 
-pub use contract::*;
 use cw2::set_contract_version;
 use cw_storage_plus::{Item, Map};
 pub use errors::*;
-pub use helper::*;
 use msg::{ExecuteMsg, QueryMsg};
 use state::{Connection, CwMockService};
 use thiserror::Error;
-use types::InstantiateMsg;
 pub use types::*;
 
 #[entry_point]
@@ -85,6 +82,8 @@ pub fn execute(
 pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
     let call_service = CwMockService::default();
     match msg {
-        QueryMsg::GetSequence {} => to_binary(&call_service.get_sequence(deps.storage).unwrap()),
+        QueryMsg::GetSequence {} => {
+            to_json_binary(&call_service.get_sequence(deps.storage).unwrap())
+        }
     }
 }

contracts/cosmwasm-vm/cw-mock-dapp/src/contract.rs

@@ -51,7 +51,7 @@ impl<'a> CwMockService<'a> {
         };
         let message: CosmosMsg<Empty> = CosmosMsg::Wasm(WasmMsg::Execute {
             contract_addr: address,
-            msg: to_binary(&msg).unwrap(),
+            msg: to_json_binary(&msg).unwrap(),
             funds: info.funds,
         });
 
@@ -89,7 +89,7 @@ impl<'a> CwMockService<'a> {
         let msg = ExecuteMsg::SendCall { envelope, to };
         let message: CosmosMsg<Empty> = CosmosMsg::Wasm(WasmMsg::Execute {
             contract_addr: address,
-            msg: to_binary(&msg).unwrap(),
+            msg: to_json_binary(&msg).unwrap(),
             funds: info.funds,
         });