certusone
/
wasmd
mirror of https://github.com/certusone/wasmd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into vw/add-rest-server

This commit is contained in:
Ethan Frey 2020-01-20 10:45:50 +01:00
parent 329ee0433b a04f39f1cf
commit 2db61ec46c
15 changed files with 222 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/app.go
View File

@ -1,6 +1,7 @@
package app
import (
"fmt"
"io"
"os"
"path/filepath"
@ -122,6 +123,12 @@ type WasmApp struct {
sm *module.SimulationManager
}
// WasmWrapper allows us to use namespacing in the config file
// This is only used for parsing in the app, x/wasm expects WasmConfig
type WasmWrapper struct {
Wasm wasm.WasmConfig `mapstructure:"wasm"`
}
// NewWasmApp returns a reference to an initialized WasmApp.
func NewWasmApp(
logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool,
@ -181,7 +188,16 @@ func NewWasmApp(
// better way to get this dir???
homeDir := viper.GetString(cli.HomeFlag)
wasmDir := filepath.Join(homeDir, "wasm")
app.wasmKeeper = wasm.NewKeeper(app.cdc, keys[wasm.StoreKey], app.accountKeeper, app.bankKeeper, wasmRouter, wasmDir)
wasmWrap := WasmWrapper{Wasm: wasm.DefaultWasmConfig()}
err := viper.Unmarshal(&wasmWrap)
if err != nil {
fmt.Println("error while reading wasm config:", err.Error())
}
wasmConfig := wasmWrap.Wasm
fmt.Printf("WasmConfig: %#v\n", wasmConfig)
app.wasmKeeper = wasm.NewKeeper(app.cdc, keys[wasm.StoreKey], app.accountKeeper, app.bankKeeper, wasmRouter, wasmDir, wasmConfig)
// create evidence keeper with evidence router
app.evidenceKeeper = evidence.NewKeeper(

2
go.sum
View File

@ -34,8 +34,6 @@ github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtE
github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/confio/go-cosmwasm v0.4.1 h1:ZqqGlK5MA6iJlYU8LtV0VPmv4mMI1s1cx2xWnDSEzH0=
github.com/confio/go-cosmwasm v0.4.1/go.mod h1:pHipRby+f3cv97QPLELkzOAlNs/s87uDyhc+SnMn7L4=
github.com/confio/go-cosmwasm v0.6.0 h1:6MsfozR4IWb+V9TgVhDoGvcEs0ItBCqHg4pGbMafX1A=
github.com/confio/go-cosmwasm v0.6.0/go.mod h1:pHipRby+f3cv97QPLELkzOAlNs/s87uDyhc+SnMn7L4=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=

28
x/wasm/README.md Normal file
View File

@ -0,0 +1,28 @@
# Wasm Module
This should be a brief overview of the functionality
## Configuration
You can add the following section to `config/app.toml`. Below is shown with defaults:
```toml
[wasm]
# This is the maximum sdk gas (wasm and storage) that we allow for any x/wasm "smart" queries
query_gas_limit = 300000
# This is the number of wasm vm instances we keep cached in memory for speed-up
# Warning: this is currently unstable and may lead to crashes, best to keep for 0 unless testing locally
lru_size = 0
```
## Messages
TODO
## CLI
TODO
## Rest
TODO

2
x/wasm/alias.go
View File

@ -41,6 +41,7 @@ var (
NewWasmCoins = types.NewWasmCoins
NewContractInfo = types.NewContractInfo
CosmosResult = types.CosmosResult
DefaultWasmConfig = types.DefaultWasmConfig
InitGenesis = keeper.InitGenesis
ExportGenesis = keeper.ExportGenesis
NewKeeper = keeper.NewKeeper
@ -76,6 +77,7 @@ type (
Model = types.Model
CodeInfo = types.CodeInfo
ContractInfo = types.ContractInfo
WasmConfig = types.WasmConfig
Keeper = keeper.Keeper
GetCodeResponse = keeper.GetCodeResponse
ListCodeResponse = keeper.ListCodeResponse

31
x/wasm/client/cli/tx.go
View File

@ -21,13 +21,12 @@ import (
)
const (
flagTo = "to"
flagAmount = "amount"
flagTo = "to"
flagAmount = "amount"
flagSource = "source"
flagBuilder = "builder"
)
// limit max bytes read to prevent gzip bombs
const maxSize = 400 * 1024
// GetTxCmd returns the transaction commands for this module
func GetTxCmd(cdc *codec.Codec) *cobra.Command {
txCmd := &cobra.Command{
@ -48,7 +47,7 @@ func GetTxCmd(cdc *codec.Codec) *cobra.Command {
// StoreCodeCmd will upload code to be reused.
func StoreCodeCmd(cdc *codec.Codec) *cobra.Command {
cmd := &cobra.Command{
Use: "store [from_key_or_address] [wasm file]",
Use: "store [from_key_or_address] [wasm file] --source [source] --builder [builder]",
Short: "Upload a wasm binary",
Args: cobra.ExactArgs(2),
RunE: func(cmd *cobra.Command, args []string) error {
@ -62,11 +61,9 @@ func StoreCodeCmd(cdc *codec.Codec) *cobra.Command {
return err
}
// limit the input size
if len(wasm) > maxSize {
return fmt.Errorf("input size exceeds the max size allowed (allowed:%d, actual: %d)",
maxSize, len(wasm))
}
source := viper.GetString(flagSource)
builder := viper.GetString(flagBuilder)
// gzip the wasm file
if wasmUtils.IsWasm(wasm) {
@ -83,10 +80,22 @@ func StoreCodeCmd(cdc *codec.Codec) *cobra.Command {
msg := types.MsgStoreCode{
Sender: cliCtx.GetFromAddress(),
WASMByteCode: wasm,
Source: source,
Builder: builder,
}
err = msg.ValidateBasic()
if err != nil {
return err
}
return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msg})
},
}
cmd.Flags().String(flagSource, "", "A valid URI reference to the contract's source code, optional")
cmd.Flags().String(flagBuilder, "", "A valid docker tag for the build system, optional")
return cmd
}

10
x/wasm/client/utils/utils_test.go
View File

@ -6,7 +6,7 @@ import (
"testing"
)
func GetTestData() ([]byte, []byte, []byte, error){
func GetTestData() ([]byte, []byte, []byte, error) {
wasmCode, err := ioutil.ReadFile("../../internal/keeper/testdata/contract.wasm")
if err != nil {
@ -23,7 +23,7 @@ func GetTestData() ([]byte, []byte, []byte, error){
return wasmCode, someRandomStr, gzipData, nil
}
func TestIsWasm (t *testing.T) {
func TestIsWasm(t *testing.T) {
wasmCode, someRandomStr, gzipData, err := GetTestData()
require.NoError(t, err)
@ -35,7 +35,7 @@ func TestIsWasm (t *testing.T) {
require.True(t, IsWasm(wasmCode))
}
func TestIsGzip (t *testing.T) {
func TestIsGzip(t *testing.T) {
wasmCode, someRandomStr, gzipData, err := GetTestData()
require.NoError(t, err)
@ -44,7 +44,7 @@ func TestIsGzip (t *testing.T) {
require.True(t, IsGzip(gzipData))
}
func TestGzipIt (t *testing.T) {
func TestGzipIt(t *testing.T) {
wasmCode, someRandomStr, _, err := GetTestData()
originalGzipData := []byte{31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 202, 72, 205, 201, 201, 87, 40, 207, 47, 202, 73, 1,
4, 0, 0, 255, 255, 133, 17, 74, 13, 11, 0, 0, 0}
@ -61,4 +61,4 @@ func TestGzipIt (t *testing.T) {
require.True(t, IsGzip(strToGzip))
require.NoError(t, err)
require.Equal(t, originalGzipData, strToGzip)
}
}

62
x/wasm/genesis_test.go
View File

@ -24,11 +24,73 @@ func TestInitGenesis(t *testing.T) {
h := data.module.NewHandler()
q := data.module.NewQuerierHandler()
t.Log("fail with invalid source url")
msg := MsgStoreCode{
Sender: creator,
WASMByteCode: testContract,
Source: "someinvalidurl",
Builder: "",
}
sdkerr := msg.ValidateBasic()
require.Error(t, sdkerr)
res := h(data.ctx, msg)
require.False(t, res.IsOK())
t.Log("fail with relative source url")
msg = MsgStoreCode{
Sender: creator,
WASMByteCode: testContract,
Source: "./testdata/escrow.wasm",
Builder: "",
}
sdkerr = msg.ValidateBasic()
require.Error(t, sdkerr)
res = h(data.ctx, msg)
require.False(t, res.IsOK())
t.Log("fail with unreachable source url")
msg = MsgStoreCode{
Sender: creator,
WASMByteCode: testContract,
Source: "https://github.com/cosmwasm/wasmddddddrandom",
Builder: "",
}
sdkerr = msg.ValidateBasic()
require.Error(t, sdkerr)
res = h(data.ctx, msg)
require.False(t, res.IsOK())
t.Log("fail with invalid build tag")
msg = MsgStoreCode{
Sender: creator,
WASMByteCode: testContract,
Source: "",
Builder: "somerandombuildtag-0.6.2",
}
sdkerr = msg.ValidateBasic()
require.Error(t, sdkerr)
res = h(data.ctx, msg)
require.False(t, res.IsOK())
t.Log("no error with valid source and build tag")
msg = MsgStoreCode{
Sender: creator,
WASMByteCode: testContract,
Source: "https://github.com/cosmwasm/wasmd/blob/master/x/wasm/testdata/escrow.wasm",
Builder: "cosmwasm-opt:0.5.2",
}
sdkerr = msg.ValidateBasic()
require.NoError(t, sdkerr)
res = h(data.ctx, msg)
require.True(t, res.IsOK())
require.Equal(t, res.Data, []byte("1"))

7
x/wasm/handler.go
View File

@ -40,7 +40,12 @@ func NewHandler(k Keeper) sdk.Handler {
}
func handleStoreCode(ctx sdk.Context, k Keeper, msg *MsgStoreCode) sdk.Result {
codeID, err := k.Create(ctx, msg.Sender, msg.WASMByteCode)
sdkerr := msg.ValidateBasic()
if sdkerr != nil {
return sdk.ResultFromError(sdkerr)
}
codeID, err := k.Create(ctx, msg.Sender, msg.WASMByteCode, msg.Source, msg.Builder)
if err != nil {
return sdk.ResultFromError(err)
}

2
x/wasm/internal/keeper/genesis.go
View File

@ -14,7 +14,7 @@ import (
// CONTRACT: all types of accounts must have been already initialized/created
func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) {
for _, code := range data.Codes {
newId, err := keeper.Create(ctx, code.CodeInfo.Creator, code.CodesBytes)
newId, err := keeper.Create(ctx, code.CodeInfo.Creator, code.CodesBytes, code.CodeInfo.Source, code.CodeInfo.Builder)
if err != nil {
panic(err)
}

17
x/wasm/internal/keeper/keeper.go
View File

@ -28,8 +28,6 @@ const GasMultiplier = 100
// MaxGas for a contract is 900 million (enforced in rust)
const MaxGas = 900_000_000
const smartQueryGasLimit = 3000000 // Todo: should be set by app.toml
// Keeper will have a reference to Wasmer with it's own data directory.
type Keeper struct {
storeKey sdk.StoreKey
@ -45,8 +43,9 @@ type Keeper struct {
}
// NewKeeper creates a new contract Keeper instance
func NewKeeper(cdc *codec.Codec, storeKey sdk.StoreKey, accountKeeper auth.AccountKeeper, bankKeeper bank.Keeper, router sdk.Router, homeDir string) Keeper {
wasmer, err := wasm.NewWasmer(filepath.Join(homeDir, "wasm"), 0)
func NewKeeper(cdc *codec.Codec, storeKey sdk.StoreKey, accountKeeper auth.AccountKeeper, bankKeeper bank.Keeper,
router sdk.Router, homeDir string, wasmConfig types.WasmConfig) Keeper {
wasmer, err := wasm.NewWasmer(filepath.Join(homeDir, "wasm"), wasmConfig.CacheSize)
if err != nil {
panic(err)
}
@ -58,13 +57,13 @@ func NewKeeper(cdc *codec.Codec, storeKey sdk.StoreKey, accountKeeper auth.Accou
accountKeeper: accountKeeper,
bankKeeper: bankKeeper,
router: router,
queryGasLimit: smartQueryGasLimit,
queryGasLimit: wasmConfig.SmartQueryGasLimit,
}
}
// Create uploads and compiles a WASM contract, returning a short identifier for the contract
func (k Keeper) Create(ctx sdk.Context, creator sdk.AccAddress, wasmCode []byte) (uint64, error) {
wasmCode, err := uncompress(wasmCode)
func (k Keeper) Create(ctx sdk.Context, creator sdk.AccAddress, wasmCode []byte, source string, builder string) (codeID uint64, err error) {
wasmCode, err = uncompress(wasmCode)
if err != nil {
return 0, sdkErrors.Wrap(types.ErrCreateFailed, err.Error())
}
@ -75,8 +74,8 @@ func (k Keeper) Create(ctx sdk.Context, creator sdk.AccAddress, wasmCode []byte)
}
store := ctx.KVStore(k.storeKey)
codeID := k.autoIncrementID(ctx, types.KeyLastCodeID)
contractInfo := types.NewCodeInfo(codeHash, creator)
codeID = k.autoIncrementID(ctx, types.KeyLastCodeID)
contractInfo := types.NewCodeInfo(codeHash, creator, source, builder)
// 0x01 | codeID (uint64) -> ContractInfo
store.Set(types.GetCodeKey(codeID), k.cdc.MustMarshalBinaryBare(contractInfo))

10
x/wasm/internal/keeper/keeper_test.go
View File

@ -38,7 +38,7 @@ func TestCreate(t *testing.T) {
wasmCode, err := ioutil.ReadFile("./testdata/contract.wasm")
require.NoError(t, err)
contractID, err := keeper.Create(ctx, creator, wasmCode)
contractID, err := keeper.Create(ctx, creator, wasmCode, "https://github.com/cosmwasm/wasmd/blob/master/x/wasm/testdata/escrow.wasm", "cosmwasm-opt:0.5.2")
require.NoError(t, err)
require.Equal(t, uint64(1), contractID)
// and verify content
@ -59,7 +59,7 @@ func TestCreateWithGzippedPayload(t *testing.T) {
wasmCode, err := ioutil.ReadFile("./testdata/contract.wasm.gzip")
require.NoError(t, err)
contractID, err := keeper.Create(ctx, creator, wasmCode)
contractID, err := keeper.Create(ctx, creator, wasmCode, "https://github.com/cosmwasm/wasmd/blob/master/x/wasm/testdata/escrow.wasm", "")
require.NoError(t, err)
require.Equal(t, uint64(1), contractID)
// and verify content
@ -82,7 +82,7 @@ func TestInstantiate(t *testing.T) {
wasmCode, err := ioutil.ReadFile("./testdata/contract.wasm")
require.NoError(t, err)
contractID, err := keeper.Create(ctx, creator, wasmCode)
contractID, err := keeper.Create(ctx, creator, wasmCode, "https://github.com/cosmwasm/wasmd/blob/master/x/wasm/testdata/escrow.wasm", "")
require.NoError(t, err)
_, _, bob := keyPubAddr()
@ -103,7 +103,7 @@ func TestInstantiate(t *testing.T) {
require.Equal(t, "cosmos18vd8fpwxzck93qlwghaj6arh4p7c5n89uzcee5", addr.String())
gasAfter := ctx.GasMeter().GasConsumed()
require.Equal(t, uint64(36698), gasAfter-gasBefore)
require.Equal(t, uint64(36923), gasAfter-gasBefore)
}
func TestInstantiateWithNonExistingCodeID(t *testing.T) {
@ -141,7 +141,7 @@ func TestExecute(t *testing.T) {
wasmCode, err := ioutil.ReadFile("./testdata/contract.wasm")
require.NoError(t, err)
contractID, err := keeper.Create(ctx, creator, wasmCode)
contractID, err := keeper.Create(ctx, creator, wasmCode, "", "")
require.NoError(t, err)
_, _, bob := keyPubAddr()

2
x/wasm/internal/keeper/querier_test.go
View File

@ -33,7 +33,7 @@ func TestQueryContractState(t *testing.T) {
wasmCode, err := ioutil.ReadFile("./testdata/contract.wasm")
require.NoError(t, err)
contractID, err := keeper.Create(ctx, creator, wasmCode)
contractID, err := keeper.Create(ctx, creator, wasmCode, "", "")
require.NoError(t, err)
_, _, bob := keyPubAddr()

10
x/wasm/internal/keeper/test_common.go
View File

@ -16,8 +16,13 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
dbm "github.com/tendermint/tm-db"
wasmTypes "github.com/cosmwasm/wasmd/x/wasm/internal/types"
)
const flagLRUCacheSize = "lru_size"
const flagQueryGasLimit = "query_gas_limit"
func MakeTestCodec() *codec.Codec {
var cdc = codec.New()
@ -69,7 +74,10 @@ func CreateTestInput(t *testing.T, isCheckTx bool, tempDir string) (sdk.Context,
h := bank.NewHandler(bk)
router.AddRoute(bank.RouterKey, h)
keeper := NewKeeper(cdc, keyContract, accountKeeper, bk, router, tempDir)
// Load default wasm config
wasmConfig := wasmTypes.DefaultWasmConfig()
keeper := NewKeeper(cdc, keyContract, accountKeeper, bk, router, tempDir, wasmConfig)
return ctx, accountKeeper, keeper
}

37
x/wasm/internal/types/msg.go
View File

@ -1,17 +1,26 @@
package types
import (
"net/http"
"net/url"
"regexp"
sdk "github.com/cosmos/cosmos-sdk/types"
)
const (
MaxWasmSize = 500 * 1024
MaxWasmSize = 500 * 1024
BuildTagRegex = "^cosmwasm-opt:"
)
type MsgStoreCode struct {
Sender sdk.AccAddress `json:"sender" yaml:"sender"`
// WASMByteCode can be raw or gzip compressed
WASMByteCode []byte `json:"wasm_byte_code" yaml:"wasm_byte_code"`
// Source is a valid URI reference to the contract's source code, optional
Source string `json:"source" yaml:"source"`
// Builder is a docker tag, optional
Builder string `json:"builder" yaml:"builder"`
}
func (msg MsgStoreCode) Route() string {
@ -26,9 +35,35 @@ func (msg MsgStoreCode) ValidateBasic() sdk.Error {
if len(msg.WASMByteCode) == 0 {
return sdk.ErrInternal("empty wasm code")
}
if len(msg.WASMByteCode) > MaxWasmSize {
return sdk.ErrInternal("wasm code too large")
}
if msg.Source != "" {
u, err := url.Parse(msg.Source)
if err != nil {
return sdk.ErrInternal("source should be a valid url")
}
if !u.IsAbs() {
return sdk.ErrInternal("source should be an absolute url")
}
// check if the source is reachable
resp, err := http.Get(msg.Source)
if err != nil || resp.StatusCode != 200 {
return sdk.ErrInternal("source url is not reachable")
}
}
if msg.Builder != "" {
ok, err := regexp.MatchString(BuildTagRegex, msg.Builder)
if err != nil || !ok {
return sdk.ErrInternal("invalid tag supplied for builder")
}
}
return nil
}

23
x/wasm/internal/types/types.go
View File

@ -6,6 +6,9 @@ import (
auth "github.com/cosmos/cosmos-sdk/x/auth/exported"
)
const defaultLRUCacheSize = uint64(0)
const defaultQueryGasLimit = uint64(3000000)
// Model is a struct that holds a KV pair
type Model struct {
Key string `json:"key"`
@ -16,13 +19,17 @@ type Model struct {
type CodeInfo struct {
CodeHash []byte `json:"code_hash"`
Creator sdk.AccAddress `json:"creator"`
Source string `json:"source"`
Builder string `json:"builder"`
}
// NewCodeInfo fills a new Contract struct
func NewCodeInfo(codeHash []byte, creator sdk.AccAddress) CodeInfo {
func NewCodeInfo(codeHash []byte, creator sdk.AccAddress, source string, builder string) CodeInfo {
return CodeInfo{
CodeHash: codeHash,
Creator: creator,
Source: source,
Builder: builder,
}
}
@ -81,3 +88,17 @@ func CosmosResult(wasmResult wasmTypes.Result) sdk.Result {
GasUsed: wasmResult.GasUsed,
}
}
// WasmConfig is the extra config required for wasm
type WasmConfig struct {
SmartQueryGasLimit uint64 `mapstructure:"query_gas_limit"`
CacheSize uint64 `mapstructure:"lru_size"`
}
// DefaultWasmConfig returns the default settings for WasmConfig
func DefaultWasmConfig() WasmConfig {
return WasmConfig{
SmartQueryGasLimit: defaultQueryGasLimit,
CacheSize: defaultLRUCacheSize,
}
}