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.

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

Ica 45 #2

Open
wants to merge 79 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
0fc0ac5
Replace custom codec with sdk codec
alpe Feb 21, 2022
95d58b8
Merge pull request #760 from CosmWasm/749-client-encoding
alpe Feb 21, 2022
446c664
Redact errors returned in reply
ethanfrey Feb 23, 2022
8f75ad1
Fix lint error, failing test
ethanfrey Feb 23, 2022
30bb290
Fix submessage tests
ethanfrey Feb 23, 2022
32976f2
bump tendermint and tm-db
faddat Mar 1, 2022
3953bda
Adjust error string
ethanfrey Mar 2, 2022
66ac1f5
Handle nil logger again
ethanfrey Mar 2, 2022
d4284fb
Merge pull request #767 from notional-labs/faddat/tm-tmdb
alpe Mar 2, 2022
654fcec
Revert "Handle nil logger again"
alpe Mar 2, 2022
b2217a3
Fix test setup and assertions
alpe Mar 2, 2022
70ee69a
Add no admin flag for gov
alpe Mar 2, 2022
64ac68e
Merge pull request #771 from CosmWasm/768-gov-noadmin
ethanfrey Mar 2, 2022
daf0d00
Merge pull request #770 from CosmWasm/759-redact-reply-errors-tests
ethanfrey Mar 2, 2022
c3aeb1b
Merge pull request #765 from CosmWasm/759-redact-reply-errors
ethanfrey Mar 2, 2022
e3215d4
Add SECURITY text inspired by @elsehow
ethanfrey Jan 5, 2022
747a4ad
Address PR feedback
ethanfrey Mar 2, 2022
e03c7f4
Relaxed address strength restrictions for legacy 20 byte addresses (#…
iramiller Mar 3, 2022
bfa6a1c
Make utils methods public (#773)
pinosu Mar 3, 2022
f35a13f
Merge pull request #716 from CosmWasm/update-security-md
ethanfrey Mar 3, 2022
05a59a5
Bump deps to wasmvm v1.0.0-beta7
ethanfrey Mar 7, 2022
c8a7b83
Update static lib download in Dockerfile
ethanfrey Mar 7, 2022
feeccb6
Mark a whole lot of tests to skip on m1 as they core dump
ethanfrey Mar 7, 2022
5757449
Redact query errors
ethanfrey Mar 7, 2022
4638213
Add deny list for some grpc queries
ethanfrey Mar 7, 2022
6a780dc
Make type conversion helpers public
alpe Mar 9, 2022
b7dd4ce
Merge pull request #775 from CosmWasm/redact-query-errors
ethanfrey Mar 9, 2022
4c12353
cleanup from PR comments
ethanfrey Mar 9, 2022
c1a72f7
Merge pull request #776 from CosmWasm/limit-stargate-querier
ethanfrey Mar 9, 2022
a2512c4
Merge pull request #778 from CosmWasm/public_utils
ethanfrey Mar 9, 2022
2700e6b
Merge pull request #774 from CosmWasm/wasmvm-beta7
ethanfrey Mar 9, 2022
380301d
Improve how we redact query errors
ethanfrey Mar 9, 2022
2bd4041
Skip a few more tests on m1
ethanfrey Mar 9, 2022
3554193
[skip ci] Update CHANGELOG for 0.24 release
ethanfrey Mar 9, 2022
f35326a
Ensure SystemError is consistently unredacted
ethanfrey Mar 9, 2022
327f6b6
[skip ci] Update version info in README / INTEGRATION
ethanfrey Mar 9, 2022
3bc0bde
Merge pull request #779 from CosmWasm/prepare-0.24
ethanfrey Mar 9, 2022
c23c7ec
Bump github.com/cosmos/ibc-go/v2 from 2.0.3 to 2.2.0
dependabot[bot] Mar 16, 2022
f1ba587
Bump github.com/stretchr/testify from 1.7.0 to 1.7.1
dependabot[bot] Mar 16, 2022
e7a3ac3
Merge pull request #787 from CosmWasm/dependabot/go_modules/github.co…
alpe Mar 16, 2022
7ec06a0
Upgrade sdk and iavl with osmosis's fast storage, make necessary adju…
p0mvn Feb 20, 2022
6aa516c
push smol thing to github so can work with Mr. Vuong
faddat Mar 19, 2022
1aeee0c
ica
faddat Mar 19, 2022
03ad826
capital on app.*
faddat Mar 19, 2022
c88f056
ica+wasm for juno
faddat Mar 19, 2022
22c91a1
Merge branch 'v0.24.0-osmo' into ica-45
faddat Mar 19, 2022
16ea5b0
Merge pull request #786 from CosmWasm/dependabot/go_modules/github.co…
alpe Mar 20, 2022
8d175d0
fix bug in app.go
vuong177 Mar 20, 2022
39dc661
add counterpartyChannelID param to wasm IBCHandler.OnChainOpenAck
vuong177 Mar 21, 2022
5a17535
fix err in test
vuong177 Mar 21, 2022
da3e82b
update app.go
vuong177 Mar 21, 2022
069afd7
update ChannelKeeper for ibc v3
vuong177 Mar 21, 2022
f9be12b
update test
vuong177 Mar 21, 2022
96989a2
update app.go
vuong177 Mar 21, 2022
1f80a48
all test passed
vuong177 Mar 22, 2022
3dd9622
no iavl anymore ?&& cosmos-sdk mainline
vuong177 Mar 22, 2022
1c9a1e1
fix: close iterators
albertchon Mar 22, 2022
50daae1
Merge https://github.com/CosmWasm/wasmd into ica-45
faddat Mar 23, 2022
35d86bd
Use libwasmvm_muslc.aarch64.a in docker image
webmaster128 Mar 22, 2022
49ee92a
Merge pull request #792 from albertchon/b/close-iterators
alpe Mar 25, 2022
a543aa5
Use callback pattern for contract state iterator
alpe Mar 25, 2022
2032c33
Merge pull request #794 from CosmWasm/792_contract_state_callback
alpe Mar 28, 2022
09629ab
Merge pull request #790 from CosmWasm/use-libwasmvm_muslc.aarch64.a
webmaster128 Mar 30, 2022
5666089
Prepare Changelog for v0.25.0
alpe Apr 5, 2022
1dd874a
Add more tests for event edge cases
alpe Apr 6, 2022
72062f1
Upgrade wasmvm to v1.0.0-beta10
webmaster128 Apr 6, 2022
5ad1d86
Update Dockerfile to v1.0.0-beta10 artifacts
webmaster128 Apr 6, 2022
fe0cd52
Update CHANGELOG.md
webmaster128 Apr 6, 2022
1460371
Merge pull request #798 from CosmWasm/changelog_v025
webmaster128 Apr 6, 2022
574e30a
Merge pull request #800 from CosmWasm/upgrade-wasmvm-to-beta10
alpe Apr 6, 2022
64d39c3
Merge pull request #799 from CosmWasm/empty_events
alpe Apr 6, 2022
52a18fd
Create link to SECURITY.md in other repo
webmaster128 Apr 11, 2022
2d5bd22
Bring back Supported Versions
webmaster128 Apr 11, 2022
d482ab3
Bump 0.22 -> 0.25
webmaster128 Apr 11, 2022
68b4908
Unpack contract details from genesis (#802)
alpe Apr 12, 2022
ab661d5
Merge pull request #801 from CosmWasm/link-SECURITY.md
webmaster128 Apr 12, 2022
45c826a
Revisit gov params doc and tests
alpe Apr 13, 2022
57ead1a
Merge pull request #805 from CosmWasm/804-param_change
alpe Apr 14, 2022
8dc296f
Merge branch 'CosmWasm:master' into ica-45
faddat Apr 18, 2022
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
Prev Previous commit
Next Next commit
Use libwasmvm_muslc.aarch64.a in docker image
  • Loading branch information
webmaster128 committed Mar 24, 2022
commit 35d86bd0f3b5db32d03217d919cde49fbdcd87ae
14 changes: 11 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# docker build . -t cosmwasm/wasmd:latest
# docker run --rm -it cosmwasm/wasmd:latest /bin/sh
FROM golang:1.17-alpine3.15 AS go-builder
ARG arch=x86_64

# this comes from standard alpine nightly file
# https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile
Expand All @@ -15,11 +16,18 @@ WORKDIR /code
COPY . /code/

# See https://github.com/CosmWasm/wasmvm/releases
ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0-beta7/libwasmvm_muslc.a /lib/libwasmvm_muslc.a
RUN sha256sum /lib/libwasmvm_muslc.a | grep d0152067a5609bfdfb3f0d5d6c0f2760f79d5f2cd7fd8513cafa9932d22eb350
ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0-beta9/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0-beta9/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 922ca7aa0057da68ab49572c3d3294fb2b0d1eb12786276fdb2ca099058074b0
RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep 2aed14e6d6f4df2a7a5d23cab4da13262e740ca51160cb9be1f2d86bd34292f2

# Copy the library you want to the final location that will be found by the linker flag `-lwasmvm_muslc`
RUN cp /lib/libwasmvm_muslc.${arch}.a /lib/libwasmvm_muslc.a

# force it to use static lib (from above) not standard libgo_cosmwasm.so file
RUN LEDGER_ENABLED=false BUILD_TAGS=muslc make build
RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build
RUN echo "Ensuring binary is statically linked ..." \
&& (file /code/build/wasmd | grep "statically linked")

# --------------------------------------------------------
FROM alpine:3.15
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=wasm \
ifeq ($(WITH_CLEVELDB),yes)
ldflags += -X github.com/cosmos/cosmos-sdk/types.DBBackend=cleveldb
endif
ifeq ($(LINK_STATICALLY),true)
ldflags += -linkmode=external -extldflags "-Wl,-z,muldefs -static"
endif
ldflags += $(LDFLAGS)
ldflags := $(strip $(ldflags))

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/CosmWasm/wasmd
go 1.17

require (
github.com/CosmWasm/wasmvm v1.0.0-beta7
github.com/CosmWasm/wasmvm v1.0.0-beta9
github.com/cosmos/cosmos-sdk v0.45.1
github.com/cosmos/iavl v0.17.3
github.com/cosmos/ibc-go/v2 v2.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg=
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4=
github.com/CosmWasm/wasmvm v1.0.0-beta7 h1:hCa6P8tUTh8viabzeXfede5iPlopSav9Guh+hupXjvU=
github.com/CosmWasm/wasmvm v1.0.0-beta7/go.mod h1:y+yd9piV8KlrB7ISRZz1sDwH4UVm4Q9rEX9501dBNog=
github.com/CosmWasm/wasmvm v1.0.0-beta9 h1:yQJ3vQZxWyWGSyOYNvgTOMq+g8ZEB9f4OOy/2+XfYDo=
github.com/CosmWasm/wasmvm v1.0.0-beta9/go.mod h1:y+yd9piV8KlrB7ISRZz1sDwH4UVm4Q9rEX9501dBNog=
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
Expand Down