Skip to content

Commit

Permalink
Disable integer sign extensions (#139)
Browse files Browse the repository at this point in the history
* Update to recent (post 1.69) nightly

* Build without LLVM sign extensions

* Satisfy clippy
  • Loading branch information
rafal-ch authored and deuszex committed Jun 17, 2024
1 parent 2236196 commit e1803bb
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
prepare:
rustup target add wasm32-unknown-unknown
rustup component add clippy --toolchain ${PINNED_TOOLCHAIN}
rustup component add rustfmt --toolchain ${PINNED_TOOLCHAIN}
rustup component add rust-src --toolchain ${PINNED_TOOLCHAIN}

.PHONY: build-contract
build-contract:
cd cep18 && cargo build --release --target wasm32-unknown-unknown
cd cep18-test-contract && cargo build --release --target wasm32-unknown-unknown
wasm-strip ./cep18/target/wasm32-unknown-unknown/release/cep18.wasm
wasm-strip ./cep18-test-contract/target/wasm32-unknown-unknown/release/cep18_test_contract.wasm
RUSTFLAGS="-C target-cpu=mvp" cargo build --release --target wasm32-unknown-unknown -Z build-std=std,panic_abort -p cep18
RUSTFLAGS="-C target-cpu=mvp" cargo build --release --target wasm32-unknown-unknown -Z build-std=std,panic_abort -p cep18-test-contract
wasm-strip target/wasm32-unknown-unknown/release/cep18.wasm
wasm-strip target/wasm32-unknown-unknown/release/cep18_test_contract.wasm

setup-test: build-contract
mkdir -p tests/wasm
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2023-03-25
nightly-2024-05-28
6 changes: 6 additions & 0 deletions tests/src/utility/installer_request_builders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,15 @@ pub(crate) fn get_test_result<T: FromBytes + CLTyped>(
.get_package(cep18_test_contract_package)
.expect("should have contract package");
let enabled_versions = contract_package.enabled_versions();
<<<<<<< HEAD
let contract_hash = enabled_versions
.contract_hashes()
.last()
=======
let (_version, contract_hash) = enabled_versions
.iter()
.next_back()
>>>>>>> d6348eb (Disable integer sign extensions (#139))
.expect("should have latest version");
let entity_addr = EntityAddr::new_smart_contract(contract_hash.value());
builder.get_value(entity_addr, RESULT_KEY)
Expand Down

0 comments on commit e1803bb

Please sign in to comment.