From 03ad1fb1a09bcb5e0aa49843f9bdf355aa46ef95 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Wed, 6 May 2020 11:21:15 +0200 Subject: [PATCH] Update to CosmWasm/go-cosmwasm master --- Dockerfile | 2 +- go.mod | 4 ++-- go.sum | 6 ++++-- x/wasm/internal/keeper/api.go | 2 +- x/wasm/internal/keeper/keeper.go | 4 ++-- x/wasm/internal/keeper/mask_test.go | 2 +- x/wasm/internal/keeper/opaque.go | 2 +- x/wasm/internal/types/types.go | 2 +- x/wasm/module_test.go | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 276fb4b9..91383c05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN make install # Install libgo_cosmwasm.so to a shared directory where it is readable by all users # See https://github.com/CosmWasm/wasmd/issues/43#issuecomment-608366314 -RUN cp /go/pkg/mod/github.com/confio/go-cosmwasm@v*/api/libgo_cosmwasm.so /lib/x86_64-linux-gnu +RUN cp /go/pkg/mod/github.com/CosmWasm/go-cosmwasm@v*/api/libgo_cosmwasm.so /lib/x86_64-linux-gnu COPY docker/* /opt/ RUN chmod +x /opt/*.sh diff --git a/go.mod b/go.mod index e4b57dee..2ad1a6be 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/cosmwasm/wasmd go 1.13 require ( + github.com/CosmWasm/go-cosmwasm v0.7.3-0.20200506091810-b5d72f383001 github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/confio/go-cosmwasm v0.7.2 github.com/cosmos/cosmos-sdk v0.38.3 github.com/golang/mock v1.4.3 // indirect github.com/gorilla/mux v1.7.4 @@ -22,7 +22,7 @@ require ( github.com/stretchr/testify v1.5.1 github.com/tendermint/go-amino v0.15.1 github.com/tendermint/tendermint v0.33.3 - github.com/tendermint/tm-db v0.5.0 + github.com/tendermint/tm-db v0.5.1 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect ) diff --git a/go.sum b/go.sum index 187a79e6..6b8ddc85 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ChainSafe/go-schnorrkel v0.0.0-20200102211924-4bcbc698314f h1:4O1om+UVU+Hfcihr1timk8YNXHxzZWgCo7ofnrZRApw= github.com/ChainSafe/go-schnorrkel v0.0.0-20200102211924-4bcbc698314f/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= +github.com/CosmWasm/go-cosmwasm v0.7.3-0.20200506091810-b5d72f383001 h1:QvYlAMha7Wcmjn2e/D0Vk1/EFqHcnH3I01laQrSKIgk= +github.com/CosmWasm/go-cosmwasm v0.7.3-0.20200506091810-b5d72f383001/go.mod h1:gAFCwllx97ejI+m9SqJQrmd2SBW7HA0fOjvWWJjM2uc= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -66,8 +68,6 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/confio/cosmos-sdk v0.38.7 h1:soa3c5ZZaYEnT8sZtwkSW7F6IykbpaVumtObIIkAp2w= github.com/confio/cosmos-sdk v0.38.7/go.mod h1:bltscsRmNMNThQcnIF3JV0iUNEdLa7GIU7r80W12CL8= -github.com/confio/go-cosmwasm v0.7.2 h1:pnEmTbML0jEWKjnRutTsA0XfKnjN1b9vrCDUQMQ8slY= -github.com/confio/go-cosmwasm v0.7.2/go.mod h1:pHipRby+f3cv97QPLELkzOAlNs/s87uDyhc+SnMn7L4= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -444,6 +444,8 @@ github.com/tendermint/tendermint v0.33.3/go.mod h1:25DqB7YvV1tN3tHsjWoc2vFtlwICf github.com/tendermint/tm-db v0.4.1/go.mod h1:JsJ6qzYkCGiGwm5GHl/H5GLI9XLb6qZX7PRe425dHAY= github.com/tendermint/tm-db v0.5.0 h1:qtM5UTr1dlRnHtDY6y7MZO5Di8XAE2j3lc/pCnKJ5hQ= github.com/tendermint/tm-db v0.5.0/go.mod h1:lSq7q5WRR/njf1LnhiZ/lIJHk2S8Y1Zyq5oP/3o9C2U= +github.com/tendermint/tm-db v0.5.1 h1:H9HDq8UEA7Eeg13kdYckkgwwkQLBnJGgX4PgLJRhieY= +github.com/tendermint/tm-db v0.5.1/go.mod h1:g92zWjHpCYlEvQXvy9M168Su8V1IBEeawpXVVBaK4f4= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= diff --git a/x/wasm/internal/keeper/api.go b/x/wasm/internal/keeper/api.go index c0401ede..73db3bbc 100644 --- a/x/wasm/internal/keeper/api.go +++ b/x/wasm/internal/keeper/api.go @@ -2,7 +2,7 @@ package keeper import ( "fmt" - cosmwasm "github.com/confio/go-cosmwasm" + cosmwasm "github.com/CosmWasm/go-cosmwasm" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/wasm/internal/keeper/keeper.go b/x/wasm/internal/keeper/keeper.go index bff46176..d1690d2f 100644 --- a/x/wasm/internal/keeper/keeper.go +++ b/x/wasm/internal/keeper/keeper.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - wasm "github.com/confio/go-cosmwasm" - wasmTypes "github.com/confio/go-cosmwasm/types" + wasm "github.com/CosmWasm/go-cosmwasm" + wasmTypes "github.com/CosmWasm/go-cosmwasm/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/wasm/internal/keeper/mask_test.go b/x/wasm/internal/keeper/mask_test.go index f07351d5..cef1448e 100644 --- a/x/wasm/internal/keeper/mask_test.go +++ b/x/wasm/internal/keeper/mask_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - wasmTypes "github.com/confio/go-cosmwasm/types" + wasmTypes "github.com/CosmWasm/go-cosmwasm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/bank" diff --git a/x/wasm/internal/keeper/opaque.go b/x/wasm/internal/keeper/opaque.go index 5f013c6b..e51f840f 100644 --- a/x/wasm/internal/keeper/opaque.go +++ b/x/wasm/internal/keeper/opaque.go @@ -1,7 +1,7 @@ package keeper import ( - wasmTypes "github.com/confio/go-cosmwasm/types" + wasmTypes "github.com/CosmWasm/go-cosmwasm/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/wasm/internal/types/types.go b/x/wasm/internal/types/types.go index f464cc46..9a9f0cd1 100644 --- a/x/wasm/internal/types/types.go +++ b/x/wasm/internal/types/types.go @@ -5,7 +5,7 @@ import ( tmBytes "github.com/tendermint/tendermint/libs/bytes" - wasmTypes "github.com/confio/go-cosmwasm/types" + wasmTypes "github.com/CosmWasm/go-cosmwasm/types" sdk "github.com/cosmos/cosmos-sdk/types" auth "github.com/cosmos/cosmos-sdk/x/auth/exported" ) diff --git a/x/wasm/module_test.go b/x/wasm/module_test.go index 2e3d2406..67773290 100644 --- a/x/wasm/module_test.go +++ b/x/wasm/module_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - wasmTypes "github.com/confio/go-cosmwasm/types" + wasmTypes "github.com/CosmWasm/go-cosmwasm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth"