Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump cosmwasm to v0.6.4, newer wasmer #46

Merged
merged 2 commits into from
Feb 10, 2020
Merged

Bump cosmwasm to v0.6.4, newer wasmer #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df762a1
Bump cosmwasm to v0.6.4, newer wasmer
ethanfrey Feb 10, 2020
35be87c
Build new so and dylib files
ethanfrey Feb 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
234 changes: 127 additions & 107 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "go-cosmwasm"
version = "0.6.2"
version = "0.6.3"
authors = ["Ethan Frey <[email protected]>"]
edition = "2018"
description = "Go bindings for cosmwasm contracts"
Expand All @@ -18,14 +18,14 @@ circle-ci = { repository = "confio/go-cosmwasm", branch = "master" }
maintenance = { status = "actively-developed" }

[features]
default = ["singlepass"]
default = ["singlepass", "backtraces"]
backtraces = ["snafu/backtraces"]
singlepass = ["cosmwasm-vm/default-singlepass"]
cranelift = ["cosmwasm-vm/default-cranelift"]

[dependencies]
cosmwasm = "0.6.3"
cosmwasm-vm = "0.6.3"
cosmwasm = "0.6.4"
cosmwasm-vm = "0.6.4"
errno = "0.2"
snafu = { version = "0.5.0", default-features = false, features = ["rust_1_30"] }

Expand Down
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: all build build-rust build-go test docker-image docker-build docker-image-centos7

DOCKER_TAG := 0.6.2
DOCKER_TAG := 0.6.3
USER_ID := $(shell id -u)
USER_GROUP = $(shell id -g)

Expand All @@ -21,7 +21,9 @@ all: build test

build: build-rust build-go

build-rust: build-rust-release strip
# don't strip for now, for better error reporting
# build-rust: build-rust-release strip
build-rust: build-rust-release

# use debug build for quick testing
build-rust-debug:
Expand Down Expand Up @@ -57,4 +59,4 @@ docker-image-cross:

release: docker-image-cross docker-image-centos7
docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code go-cosmwasm:$(DOCKER_TAG)-cross
docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code go-cosmwasm:$(DOCKER_TAG)-centos
docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code go-cosmwasm:$(DOCKER_TAG)-centos7
1 change: 1 addition & 0 deletions api/lib.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ type Cache struct {
func InitCache(dataDir string, cacheSize uint64) (Cache, error) {
dir := sendSlice([]byte(dataDir))
errmsg := C.Buffer{}

ptr, err := C.init_cache(dir, usize(cacheSize), &errmsg)
if err != nil {
return Cache{}, errorWithMessage(err, errmsg)
Expand Down
Binary file modified api/libgo_cosmwasm.dylib
View file
Open in desktop
Binary file not shown.
Binary file modified api/libgo_cosmwasm.so
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion build/build_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@

cargo build --release
cp target/release/deps/libgo_cosmwasm.so api
strip api/libgo_cosmwasm.so
# FIXME: re-enable stripped so when we approach a production release, symbols are nice for debugging
# strip api/libgo_cosmwasm.so