From bf87f5e6c35dc7da8052991419524fe5c4834b3c Mon Sep 17 00:00:00 2001
From: laizy <4203231+laizy@users.noreply.github.com>
Date: Fri, 28 Mar 2025 11:30:53 +0800
Subject: [PATCH 1/2] update rust wasm test version

---
 wasmtest/contracts-rust/travis.build.sh | 2 +-
 wasmtest/gha-run-wasm-tests.sh          | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/wasmtest/contracts-rust/travis.build.sh b/wasmtest/contracts-rust/travis.build.sh
index dba9a83aa..250b880d0 100644
--- a/wasmtest/contracts-rust/travis.build.sh
+++ b/wasmtest/contracts-rust/travis.build.sh
@@ -13,7 +13,7 @@ do
 	[[ -d $dir ]] && {
 		cd $dir
 		echo $dir
-		RUSTFLAGS="-C link-arg=-zstack-size=32768" cargo build --release --target=wasm32-unknown-unknown
+		RUSTFLAGS="-C target-cpu=mvp -C link-arg=-zstack-size=32768" cargo build -Zbuild-std=panic_abort,core,alloc --release --target wasm32-unknown-unknown
 		cd ..
 	}
 done
diff --git a/wasmtest/gha-run-wasm-tests.sh b/wasmtest/gha-run-wasm-tests.sh
index 1975e7492..8e1ac5219 100644
--- a/wasmtest/gha-run-wasm-tests.sh
+++ b/wasmtest/gha-run-wasm-tests.sh
@@ -5,17 +5,12 @@ set -x
 # install build tools
 # ensure clang
 
-wget releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz > /dev/null
-tar xf clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz > /dev/null 2>&1
-export PATH="$(pwd)/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-18.04/bin":$PATH
-
-RUST_VERSION=nightly-2022-12-07
+RUST_VERSION=nightly-2025-03-11
 
 # ensure rust
 curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VERSION
 source $HOME/.cargo/env
 
-
 rustup default $RUST_VERSION
 rustup target add wasm32-unknown-unknown
 which ontio-wasm-build || cargo install --git=https://github.com/ontio/ontio-wasm-build
@@ -24,8 +19,6 @@ which ontio-wasm-build || cargo install --git=https://github.com/ontio/ontio-was
 mkdir -p testwasmdata
 cd contracts-rust && bash travis.build.sh && cd ../
 
-cd contracts-cplus && bash travis.build.bash && cd ../
-
 # verify and optimize wasm contract
 for wasm in testwasmdata/*.wasm ; do
   ontio-wasm-build $wasm $wasm

From a759ec36b5201bbe2267f579ef40ae7198b3f2e4 Mon Sep 17 00:00:00 2001
From: laizy <4203231+laizy@users.noreply.github.com>
Date: Fri, 28 Mar 2025 11:30:53 +0800
Subject: [PATCH 2/2] update rust wasm test version

---
 wasmtest/gha-run-wasm-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wasmtest/gha-run-wasm-tests.sh b/wasmtest/gha-run-wasm-tests.sh
index 8e1ac5219..dc989a5f2 100644
--- a/wasmtest/gha-run-wasm-tests.sh
+++ b/wasmtest/gha-run-wasm-tests.sh
@@ -13,6 +13,7 @@ source $HOME/.cargo/env
 
 rustup default $RUST_VERSION
 rustup target add wasm32-unknown-unknown
+rustup component add rust-src
 which ontio-wasm-build || cargo install --git=https://github.com/ontio/ontio-wasm-build
 
 # build rust wasm contracts