Skip to content

Commit de89907

Browse files
ethanfreyethanfrey
authored
Merge pull request #25 from cosmwasm/cosmwasm-0.6
Cosmwasm 0.6
2 parents 09016ea + f206d9a commit de89907

File tree

17 files changed

+270
-218
lines changed

17 files changed

+270
-218
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ This code was forked from the `cosmos/gaia` repository and the majority of the c
1313

1414
**Note**: Requires [Go 1.13+](https://golang.org/dl/)
1515

16+
**Compatibility**: Last merge from `cosmos/gaia` was `d6dfa141e2ae38a1ff9f53fca8078c0822671b95`
1617

1718
## Quick Start
1819

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.13
44

55
require (
66
github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect
7-
github.com/confio/go-cosmwasm v0.4.1
7+
github.com/confio/go-cosmwasm v0.6.0
88
github.com/cosmos/cosmos-sdk v0.34.4-0.20191114141721-d4c831e63ad3
99
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect
1010
github.com/golang/mock v1.3.1 // indirect

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
3636
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
3737
github.com/confio/go-cosmwasm v0.4.1 h1:ZqqGlK5MA6iJlYU8LtV0VPmv4mMI1s1cx2xWnDSEzH0=
3838
github.com/confio/go-cosmwasm v0.4.1/go.mod h1:pHipRby+f3cv97QPLELkzOAlNs/s87uDyhc+SnMn7L4=
39+
github.com/confio/go-cosmwasm v0.6.0 h1:6MsfozR4IWb+V9TgVhDoGvcEs0ItBCqHg4pGbMafX1A=
40+
github.com/confio/go-cosmwasm v0.6.0/go.mod h1:pHipRby+f3cv97QPLELkzOAlNs/s87uDyhc+SnMn7L4=
3941
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
4042
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
4143
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=

‎x/wasm/alias.go‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,38 @@
11
// nolint
2+
// autogenerated code using github.com/rigelrozanski/multitool
3+
// aliases generated for the following subdirectories:
4+
// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/types
5+
// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/keeper
26
package wasm
37

48
import (
59
"github.com/cosmwasm/wasmd/x/wasm/internal/keeper"
610
"github.com/cosmwasm/wasmd/x/wasm/internal/types"
711
)
812

9-
// autogenerated code using github.com/rigelrozanski/multitool
10-
// aliases generated for the following subdirectories:
11-
// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/keeper/
12-
// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/types/
13-
1413
const (
15-
GasMultiplier = keeper.GasMultiplier
16-
MaxGas = keeper.MaxGas
17-
QueryListContracts = keeper.QueryListContracts
18-
QueryGetContract = keeper.QueryGetContract
19-
QueryGetContractState = keeper.QueryGetContractState
20-
QueryGetCode = keeper.QueryGetCode
21-
QueryListCode = keeper.QueryListCode
22-
DefaultCodespace = types.DefaultCodespace
23-
CodeCreatedFailed = types.CodeCreatedFailed
24-
CodeAccountExists = types.CodeAccountExists
25-
CodeInstantiateFailed = types.CodeInstantiateFailed
26-
CodeExecuteFailed = types.CodeExecuteFailed
27-
CodeGasLimit = types.CodeGasLimit
28-
ModuleName = types.ModuleName
29-
StoreKey = types.StoreKey
30-
TStoreKey = types.TStoreKey
31-
QuerierRoute = types.QuerierRoute
32-
RouterKey = types.RouterKey
33-
MaxWasmSize = types.MaxWasmSize
14+
ModuleName = types.ModuleName
15+
StoreKey = types.StoreKey
16+
TStoreKey = types.TStoreKey
17+
QuerierRoute = types.QuerierRoute
18+
RouterKey = types.RouterKey
19+
MaxWasmSize = types.MaxWasmSize
20+
GasMultiplier = keeper.GasMultiplier
21+
MaxGas = keeper.MaxGas
22+
QueryListContracts = keeper.QueryListContracts
23+
QueryGetContract = keeper.QueryGetContract
24+
QueryGetContractState = keeper.QueryGetContractState
25+
QueryGetCode = keeper.QueryGetCode
26+
QueryListCode = keeper.QueryListCode
27+
QueryMethodContractStateSmart = keeper.QueryMethodContractStateSmart
28+
QueryMethodContractStateAll = keeper.QueryMethodContractStateAll
29+
QueryMethodContractStateRaw = keeper.QueryMethodContractStateRaw
3430
)
3531

3632
var (
3733
// functions aliases
38-
NewKeeper = keeper.NewKeeper
39-
NewQuerier = keeper.NewQuerier
40-
MakeTestCodec = keeper.MakeTestCodec
41-
CreateTestInput = keeper.CreateTestInput
4234
RegisterCodec = types.RegisterCodec
43-
ErrCreateFailed = types.ErrCreateFailed
44-
ErrAccountExists = types.ErrAccountExists
45-
ErrInstantiateFailed = types.ErrInstantiateFailed
46-
ErrExecuteFailed = types.ErrExecuteFailed
47-
ErrGasLimit = types.ErrGasLimit
48-
ErrInvalidGenesis = types.ErrInvalidGenesis
35+
ValidateGenesis = types.ValidateGenesis
4936
GetCodeKey = types.GetCodeKey
5037
GetContractAddressKey = types.GetContractAddressKey
5138
GetContractStorePrefixKey = types.GetContractStorePrefixKey
@@ -54,29 +41,42 @@ var (
5441
NewWasmCoins = types.NewWasmCoins
5542
NewContractInfo = types.NewContractInfo
5643
CosmosResult = types.CosmosResult
57-
58-
// genesis aliases
59-
ValidateGenesis = types.ValidateGenesis
60-
InitGenesis = keeper.InitGenesis
61-
ExportGenesis = keeper.ExportGenesis
44+
InitGenesis = keeper.InitGenesis
45+
ExportGenesis = keeper.ExportGenesis
46+
NewKeeper = keeper.NewKeeper
47+
NewQuerier = keeper.NewQuerier
48+
MakeTestCodec = keeper.MakeTestCodec
49+
CreateTestInput = keeper.CreateTestInput
6250

6351
// variable aliases
64-
ModuleCdc = types.ModuleCdc
65-
KeyLastCodeID = types.KeyLastCodeID
66-
KeyLastInstanceID = types.KeyLastInstanceID
67-
CodeKeyPrefix = types.CodeKeyPrefix
68-
ContractKeyPrefix = types.ContractKeyPrefix
69-
ContractStorePrefix = types.ContractStorePrefix
52+
ModuleCdc = types.ModuleCdc
53+
DefaultCodespace = types.DefaultCodespace
54+
ErrCreateFailed = types.ErrCreateFailed
55+
ErrAccountExists = types.ErrAccountExists
56+
ErrInstantiateFailed = types.ErrInstantiateFailed
57+
ErrExecuteFailed = types.ErrExecuteFailed
58+
ErrGasLimit = types.ErrGasLimit
59+
ErrInvalidGenesis = types.ErrInvalidGenesis
60+
ErrNotFound = types.ErrNotFound
61+
ErrQueryFailed = types.ErrQueryFailed
62+
KeyLastCodeID = types.KeyLastCodeID
63+
KeyLastInstanceID = types.KeyLastInstanceID
64+
CodeKeyPrefix = types.CodeKeyPrefix
65+
ContractKeyPrefix = types.ContractKeyPrefix
66+
ContractStorePrefix = types.ContractStorePrefix
7067
)
7168

7269
type (
73-
Keeper = keeper.Keeper
74-
GetCodeResponse = keeper.GetCodeResponse
70+
GenesisState = types.GenesisState
71+
Code = types.Code
72+
Contract = types.Contract
7573
MsgStoreCode = types.MsgStoreCode
7674
MsgInstantiateContract = types.MsgInstantiateContract
7775
MsgExecuteContract = types.MsgExecuteContract
76+
Model = types.Model
7877
CodeInfo = types.CodeInfo
7978
ContractInfo = types.ContractInfo
80-
81-
GenesisState = types.GenesisState
79+
Keeper = keeper.Keeper
80+
GetCodeResponse = keeper.GetCodeResponse
81+
ListCodeResponse = keeper.ListCodeResponse
8282
)

‎x/wasm/genesis_test.go‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ import (
99
sdk "github.com/cosmos/cosmos-sdk/types"
1010
)
1111

12+
type contractState struct {
13+
}
14+
1215
func TestInitGenesis(t *testing.T) {
1316
data, cleanup := setupTest(t)
1417
defer cleanup()
@@ -31,8 +34,8 @@ func TestInitGenesis(t *testing.T) {
3134

3235
_, _, bob := keyPubAddr()
3336
initMsg := initMsg{
34-
Verifier: fred.String(),
35-
Beneficiary: bob.String(),
37+
Verifier: fred,
38+
Beneficiary: bob,
3639
}
3740
initMsgBz, err := json.Marshal(initMsg)
3841
require.NoError(t, err)
@@ -63,9 +66,9 @@ func TestInitGenesis(t *testing.T) {
6366
assertContractList(t, q, data.ctx, []string{contractAddr.String()})
6467
assertContractInfo(t, q, data.ctx, contractAddr, 1, creator)
6568
assertContractState(t, q, data.ctx, contractAddr, state{
66-
Verifier: fred.String(),
67-
Beneficiary: bob.String(),
68-
Funder: creator.String(),
69+
Verifier: []byte(fred),
70+
Beneficiary: []byte(bob),
71+
Funder: []byte(creator),
6972
})
7073

7174
// export into genstate
@@ -86,8 +89,8 @@ func TestInitGenesis(t *testing.T) {
8689
assertContractList(t, q2, newData.ctx, []string{contractAddr.String()})
8790
assertContractInfo(t, q2, newData.ctx, contractAddr, 1, creator)
8891
assertContractState(t, q2, newData.ctx, contractAddr, state{
89-
Verifier: fred.String(),
90-
Beneficiary: bob.String(),
91-
Funder: creator.String(),
92+
Verifier: []byte(fred),
93+
Beneficiary: []byte(bob),
94+
Funder: []byte(creator),
9295
})
9396
}

‎x/wasm/handler.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func NewHandler(k Keeper) sdk.Handler {
4242
func handleStoreCode(ctx sdk.Context, k Keeper, msg *MsgStoreCode) sdk.Result {
4343
codeID, err := k.Create(ctx, msg.Sender, msg.WASMByteCode)
4444
if err != nil {
45-
return err.Result()
45+
return sdk.ResultFromError(err)
4646
}
4747

4848
ctx.EventManager().EmitEvent(
@@ -64,7 +64,7 @@ func handleStoreCode(ctx sdk.Context, k Keeper, msg *MsgStoreCode) sdk.Result {
6464
func handleInstantiate(ctx sdk.Context, k Keeper, msg *MsgInstantiateContract) sdk.Result {
6565
contractAddr, err := k.Instantiate(ctx, msg.Sender, msg.Code, msg.InitMsg, msg.InitFunds)
6666
if err != nil {
67-
return err.Result()
67+
return sdk.ResultFromError(err)
6868
}
6969

7070
ctx.EventManager().EmitEvent(
@@ -87,7 +87,7 @@ func handleInstantiate(ctx sdk.Context, k Keeper, msg *MsgInstantiateContract) s
8787
func handleExecute(ctx sdk.Context, k Keeper, msg *MsgExecuteContract) sdk.Result {
8888
res, err := k.Execute(ctx, msg.Contract, msg.Sender, msg.SentFunds, msg.Msg)
8989
if err != nil {
90-
return err.Result()
90+
return sdk.ResultFromError(err)
9191
}
9292

9393
ctx.EventManager().EmitEvent(

‎x/wasm/internal/keeper/api.go‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package keeper
2+
3+
import (
4+
"fmt"
5+
cosmwasm "github.com/confio/go-cosmwasm"
6+
sdk "github.com/cosmos/cosmos-sdk/types"
7+
)
8+
9+
func humanAddress(canon []byte) (string, error) {
10+
if len(canon) != sdk.AddrLen {
11+
return "", fmt.Errorf("Expected %d byte address", sdk.AddrLen)
12+
}
13+
return sdk.AccAddress(canon).String(), nil
14+
}
15+
16+
func canonicalAddress(human string) ([]byte, error) {
17+
return sdk.AccAddressFromBech32(human)
18+
}
19+
20+
var cosmwasmAPI = cosmwasm.GoAPI{
21+
HumanAddress: humanAddress,
22+
CanonicalAddress: canonicalAddress,
23+
}

0 commit comments

Comments
 (0)