Merge branch 'v2/develop' into whylee/v2/fix/build-properly-when-using-libsecp256k1

Author: Yongwoo Lee

CHANGELOG_PENDING.md

@@ -24,6 +24,7 @@ Write the changes made after branching from cosmos-sdk v0.42.1.
 * (config) [\#114](https://github.com/line/lbm-sdk/pull/114) Add idle-timeout to rest server and rpc server config
 * (x/wasm) [\#127](https://github.com/line/lbm-sdk/pull/127) Add wasm with Staragate migration completed.
 * (x/wasm) [\#151](https://github.com/line/lbm-sdk/pull/151) Add contract access control.
+* (x/wasm) [\#194](https://github.com/line/lbm-sdk/pull/194) Replace importing CosmWasm/wasmvm with line/wasmvm.
 
 ### IMPROVEMENTS
 

go.mod

@@ -4,7 +4,6 @@ module github.com/line/lbm-sdk/v2
 
 require (
 	github.com/99designs/keyring v1.1.6
-	github.com/CosmWasm/wasmvm v0.14.0-beta1
 	github.com/DataDog/zstd v1.4.5 // indirect
 	github.com/VictoriaMetrics/fastcache v1.5.8
 	github.com/armon/go-metrics v0.3.6
@@ -32,6 +31,7 @@ require (
 	github.com/line/iavl/v2 v2.0.0-init.1.0.20210507092458-8331d3daef36
 	github.com/line/ostracon v0.34.9-0.20210512045543-6c7ab0535e10
 	github.com/line/tm-db/v2 v2.0.0-init.1.0.20210413083915-5bb60e117524
+	github.com/line/wasmvm v0.14.0-0.5.0
 	github.com/magiconair/properties v1.8.4
 	github.com/mattn/go-isatty v0.0.12
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
@@ -67,7 +67,6 @@ require (
 )
 
 replace (
-	github.com/CosmWasm/wasmvm => github.com/line/wasmvm v0.14.0-0.4.0
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	google.golang.org/grpc => google.golang.org/grpc v1.33.2
 )

go.sum

@@ -341,8 +341,8 @@ github.com/line/ostracon v0.34.9-0.20210512045543-6c7ab0535e10 h1:Ab+t7zJRhoHYZl
 github.com/line/ostracon v0.34.9-0.20210512045543-6c7ab0535e10/go.mod h1:ttnbq+yQJMQ9a2MT5SEisOoa/+pOgh2KenTiK/rVdiw=
 github.com/line/tm-db/v2 v2.0.0-init.1.0.20210413083915-5bb60e117524 h1:eKXXnUm1SblC0AIXAMNDaSyvIbQ50yXqFbh9+Q8Kjvg=
 github.com/line/tm-db/v2 v2.0.0-init.1.0.20210413083915-5bb60e117524/go.mod h1:wmkyPabXjtVZ1dvRofmurjaceghywtCSYGqFuFS+TbI=
-github.com/line/wasmvm v0.14.0-0.4.0 h1:XvJZ0HO7xNtQ/+IEjF2WtK93PC1e+dT0McomCwRTZnQ=
-github.com/line/wasmvm v0.14.0-0.4.0/go.mod h1:iCSHAV56VCjsrPFcLywh32bdha88AH/imzTTn/8Xuao=
+github.com/line/wasmvm v0.14.0-0.5.0 h1:FRjzcUh+LiTMvCrSoucL7a5DlWHHRQgZ78h8YB8l4Fs=
+github.com/line/wasmvm v0.14.0-0.5.0/go.mod h1:cgsILoCDigfQ2XplFI4rOo2ImOLEZH/OM8sulxGoKUA=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY=

x/wasm/ibc.go

@@ -3,14 +3,14 @@ package wasm
 import (
 	"math"
 
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/line/lbm-sdk/v2/types"
 	sdkerrors "github.com/line/lbm-sdk/v2/types/errors"
 	capabilitytypes "github.com/line/lbm-sdk/v2/x/capability/types"
 	channeltypes "github.com/line/lbm-sdk/v2/x/ibc/core/04-channel/types"
 	porttypes "github.com/line/lbm-sdk/v2/x/ibc/core/05-port/types"
 	host "github.com/line/lbm-sdk/v2/x/ibc/core/24-host"
 	wasmTypes "github.com/line/lbm-sdk/v2/x/wasm/internal/types"
+	wasmvmtypes "github.com/line/wasmvm/types"
 )
 
 var _ porttypes.IBCModule = IBCHandler{}

x/wasm/internal/keeper/api.go

@@ -3,8 +3,8 @@ package keeper
 import (
 	"fmt"
 
-	wasmvm "github.com/CosmWasm/wasmvm"
 	sdk "github.com/line/lbm-sdk/v2/types"
+	wasmvm "github.com/line/wasmvm"
 )
 
 type cosmwasmAPIImpl struct {

x/wasm/internal/keeper/handler_plugin.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	codectypes "github.com/line/lbm-sdk/v2/codec/types"
 	sdk "github.com/line/lbm-sdk/v2/types"
 	sdkerrors "github.com/line/lbm-sdk/v2/types/errors"
@@ -16,6 +15,7 @@ import (
 	host "github.com/line/lbm-sdk/v2/x/ibc/core/24-host"
 	stakingtypes "github.com/line/lbm-sdk/v2/x/staking/types"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/types"
+	wasmvmtypes "github.com/line/wasmvm/types"
 )
 
 type DefaultMessageHandler struct {

x/wasm/internal/keeper/handler_plugin_test.go

@@ -13,12 +13,12 @@ import (
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/keeper/wasmtesting"
 	"testing"
 
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/line/lbm-sdk/v2/types"
 	banktypes "github.com/line/lbm-sdk/v2/x/bank/types"
 	distributiontypes "github.com/line/lbm-sdk/v2/x/distribution/types"
 	stakingtypes "github.com/line/lbm-sdk/v2/x/staking/types"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/types"
+	wasmvmtypes "github.com/line/wasmvm/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

x/wasm/internal/keeper/keeper.go

@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"path/filepath"
 
-	wasmvm "github.com/CosmWasm/wasmvm"
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	"github.com/line/lbm-sdk/v2/codec"
 	"github.com/line/lbm-sdk/v2/store/prefix"
 	sdk "github.com/line/lbm-sdk/v2/types"
@@ -18,6 +16,8 @@ import (
 	abci "github.com/line/ostracon/abci/types"
 	"github.com/line/ostracon/crypto"
 	"github.com/line/ostracon/libs/log"
+	wasmvm "github.com/line/wasmvm"
+	wasmvmtypes "github.com/line/wasmvm/types"
 )
 
 // MaxGas for a contract is 10 billion wasmer gas (enforced in rust to prevent overflow)

x/wasm/internal/keeper/keeper_test.go

@@ -8,8 +8,6 @@ import (
 	"testing"
 	"time"
 
-	wasmvm "github.com/CosmWasm/wasmvm"
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	stypes "github.com/line/lbm-sdk/v2/store/types"
 	sdk "github.com/line/lbm-sdk/v2/types"
 	sdkerrors "github.com/line/lbm-sdk/v2/types/errors"
@@ -18,6 +16,8 @@ import (
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/keeper/wasmtesting"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/types"
 	tmproto "github.com/line/ostracon/proto/ostracon/types"
+	wasmvm "github.com/line/wasmvm"
+	wasmvmtypes "github.com/line/wasmvm/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

x/wasm/internal/keeper/proposal_integration_test.go

@@ -8,12 +8,12 @@ import (
 	"io/ioutil"
 	"testing"
 
-	wasmvm "github.com/CosmWasm/wasmvm"
 	sdk "github.com/line/lbm-sdk/v2/types"
 	govtypes "github.com/line/lbm-sdk/v2/x/gov/types"
 	"github.com/line/lbm-sdk/v2/x/params/types/proposal"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/keeper/wasmtesting"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/types"
+	wasmvm "github.com/line/wasmvm"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

x/wasm/internal/keeper/querier_test.go

@@ -9,13 +9,13 @@ import (
 
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/keeper/wasmtesting"
 
-	cosmwasm "github.com/CosmWasm/wasmvm"
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/line/lbm-sdk/v2/types"
 	sdkErrors "github.com/line/lbm-sdk/v2/types/errors"
 	"github.com/line/lbm-sdk/v2/types/query"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/types"
 	"github.com/line/ostracon/libs/log"
+	cosmwasm "github.com/line/wasmvm"
+	wasmvmtypes "github.com/line/wasmvm/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

x/wasm/internal/keeper/query_plugins.go

@@ -7,12 +7,12 @@ import (
 	channeltypes "github.com/line/lbm-sdk/v2/x/ibc/core/04-channel/types"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/types"
 
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/line/lbm-sdk/v2/types"
 	sdkerrors "github.com/line/lbm-sdk/v2/types/errors"
 	distributiontypes "github.com/line/lbm-sdk/v2/x/distribution/types"
 	stakingtypes "github.com/line/lbm-sdk/v2/x/staking/types"
 	abci "github.com/line/ostracon/abci/types"
+	wasmvmtypes "github.com/line/wasmvm/types"
 )
 
 type QueryHandler struct {

x/wasm/internal/keeper/recurse_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/types"
 
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
+	wasmvmtypes "github.com/line/wasmvm/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

x/wasm/internal/keeper/reflect_test.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 	"testing"
 
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	"github.com/line/lbm-sdk/v2/codec"
 	codectypes "github.com/line/lbm-sdk/v2/codec/types"
 	sdk "github.com/line/lbm-sdk/v2/types"
@@ -16,6 +15,7 @@ import (
 	bankkeeper "github.com/line/lbm-sdk/v2/x/bank/keeper"
 	banktypes "github.com/line/lbm-sdk/v2/x/bank/types"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/types"
+	wasmvmtypes "github.com/line/wasmvm/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

x/wasm/internal/keeper/relay.go

@@ -1,10 +1,10 @@
 package keeper
 
 import (
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/line/lbm-sdk/v2/types"
 	sdkerrors "github.com/line/lbm-sdk/v2/types/errors"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/types"
+	wasmvmtypes "github.com/line/wasmvm/types"
 )
 
 // OnOpenChannel calls the contract to participate in the IBC channel handshake step.

x/wasm/internal/keeper/relay_test.go

@@ -5,11 +5,11 @@ import (
 	"errors"
 	"testing"
 
-	wasmvm "github.com/CosmWasm/wasmvm"
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/line/lbm-sdk/v2/types"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/keeper/wasmtesting"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/types"
+	wasmvm "github.com/line/wasmvm"
+	wasmvmtypes "github.com/line/wasmvm/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

x/wasm/internal/keeper/staking_test.go

@@ -5,7 +5,6 @@ import (
 	"io/ioutil"
 	"testing"
 
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	codectypes "github.com/line/lbm-sdk/v2/codec/types"
 	"github.com/line/lbm-sdk/v2/crypto/keys/secp256k1"
 	sdk "github.com/line/lbm-sdk/v2/types"
@@ -17,6 +16,7 @@ import (
 	stakingkeeper "github.com/line/lbm-sdk/v2/x/staking/keeper"
 	"github.com/line/lbm-sdk/v2/x/staking/types"
 	stakingtypes "github.com/line/lbm-sdk/v2/x/staking/types"
+	wasmvmtypes "github.com/line/wasmvm/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

x/wasm/internal/keeper/submsg_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/line/lbm-sdk/v2/types"
+	wasmvmtypes "github.com/line/wasmvm/types"
 	"github.com/stretchr/testify/require"
 )
 

x/wasm/internal/keeper/wasmtesting/messenger.go

@@ -3,8 +3,8 @@ package wasmtesting
 import (
 	"errors"
 
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/line/lbm-sdk/v2/types"
+	wasmvmtypes "github.com/line/wasmvm/types"
 )
 
 type MockMessageHandler struct {

x/wasm/internal/keeper/wasmtesting/mock_engine.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"crypto/sha256"
 
-	wasmvm "github.com/CosmWasm/wasmvm"
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdkerrors "github.com/line/lbm-sdk/v2/types/errors"
 	"github.com/line/lbm-sdk/v2/x/wasm/internal/types"
 	"github.com/line/ostracon/libs/rand"
+	wasmvm "github.com/line/wasmvm"
+	wasmvmtypes "github.com/line/wasmvm/types"
 )
 
 var _ types.WasmerEngine = &MockWasmer{}

x/wasm/internal/types/store.go

@@ -1,8 +1,8 @@
 package types
 
 import (
-	wasmvm "github.com/CosmWasm/wasmvm"
 	storetypes "github.com/line/lbm-sdk/v2/store/types"
+	wasmvm "github.com/line/wasmvm"
 )
 
 var _ wasmvm.KVStore = (*WasmStore)(nil)

x/wasm/internal/types/types.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	"github.com/gogo/protobuf/jsonpb"
 	sdk "github.com/line/lbm-sdk/v2/types"
 	sdkerrors "github.com/line/lbm-sdk/v2/types/errors"
+	wasmvmtypes "github.com/line/wasmvm/types"
 )
 
 const (

x/wasm/internal/types/wasmer_engine.go

@@ -1,8 +1,8 @@
 package types
 
 import (
-	wasmvm "github.com/CosmWasm/wasmvm"
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
+	wasmvm "github.com/line/wasmvm"
+	wasmvmtypes "github.com/line/wasmvm/types"
 )
 
 // WasmerEngine defines the WASM contract runtime engine.

x/wasm/linkwasmd/go.mod

@@ -3,23 +3,24 @@ module github.com/line/lbm-sdk/v2/x/wasm/linkwasmd
 go 1.13
 
 require (
-	github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 // indirect
 	github.com/gorilla/mux v1.8.0
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
 	github.com/line/lbm-sdk/v2 v2.0.0-init.1.0.20210407071744-95eb4e7aef27
-	github.com/line/ostracon v0.34.9-0.20210406083837-4183d649b30c
-	github.com/line/tm-db/v2 v2.0.0-init.1.0.20210406062110-9424ca70955a
+	github.com/line/ostracon v0.34.9-0.20210429084710-ef4fe0a40c7d
+	github.com/line/tm-db/v2 v2.0.0-init.1.0.20210413083915-5bb60e117524
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.7.0
 	github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 // indirect
+	github.com/tendermint/tm-db v0.6.4 // indirect
+	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 )
 
 replace (
-	github.com/CosmWasm/wasmvm => github.com/line/wasmvm v0.14.0-0.3.0
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/line/lbm-sdk/v2 => ../../..
 	github.com/tendermint/tm-db => github.com/line/tm-db v0.5.2