@agoric/cosmos 0.34.2-dev-5fcf452.0 → 0.34.2-dev-d355030.0

package/x/lien/lien_test.go

@@ -1,11 +1,11 @@
 package lien
 
 import (
+	"context"
 	"encoding/json"
 	"reflect"
 	"testing"
 
-	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/lien/types"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
@@ -114,8 +114,8 @@ func (m *mockLienKeeper) GetDelegatorDelegations(ctx sdk.Context, delegator sdk.
 }
 
 func TestBadType(t *testing.T) {
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
 	keeper := mockLienKeeper{
 		states: map[string]types.AccountState{},
 	}
@@ -135,8 +135,8 @@ func TestBadType(t *testing.T) {
 }
 
 func TestGetAccountState(t *testing.T) {
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
 
 	keeper := mockLienKeeper{
 		states: map[string]types.AccountState{
@@ -177,8 +177,9 @@ func TestGetAccountState(t *testing.T) {
 }
 
 func TestGetAccountState_badRequest(t *testing.T) {
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
+
 	keeper := mockLienKeeper{
 		states: map[string]types.AccountState{},
 	}
@@ -214,8 +215,9 @@ func TestGetAccountState_badRequest(t *testing.T) {
 }
 
 func TestSetLiened_badAddr(t *testing.T) {
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
+
 	keeper := mockLienKeeper{}
 	ph := NewPortHandler(&keeper)
 	msg := portMessage{
@@ -235,8 +237,9 @@ func TestSetLiened_badAddr(t *testing.T) {
 }
 
 func TestSetLiened_badDenom(t *testing.T) {
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
+
 	keeper := mockLienKeeper{}
 	ph := NewPortHandler(&keeper)
 	msg := portMessage{
@@ -256,8 +259,9 @@ func TestSetLiened_badDenom(t *testing.T) {
 }
 
 func TestSetLiened(t *testing.T) {
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
+
 	keeper := mockLienKeeper{}
 	ph := NewPortHandler(&keeper)
 	msg := portMessage{
@@ -336,8 +340,8 @@ func TestGetStaking(t *testing.T) {
 	keeper.delegations[addr4.String()] = []stakingTypes.Delegation{}
 
 	ph := NewPortHandler(&keeper)
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
 
 	pi := func(x int64) *sdk.Int {
 		n := i(x)

package/x/swingset/abci.go

@@ -2,6 +2,7 @@ package swingset
 
 import (
 	// "os"
+	"context"
 	"fmt"
 	"time"
 
@@ -88,7 +89,7 @@ func CommitBlock(keeper Keeper) error {
 		BlockHeight: endBlockHeight,
 		BlockTime:   endBlockTime,
 	}
-	_, err := keeper.BlockingSend(sdk.Context{}, action)
+	_, err := keeper.BlockingSend(sdk.Context{}.WithContext(context.Background()), action)
 
 	// fmt.Fprintf(os.Stderr, "COMMIT_BLOCK Returned from SwingSet: %s, %v\n", out, err)
 	if err != nil {
@@ -107,7 +108,7 @@ func AfterCommitBlock(keeper Keeper) error {
 		BlockHeight: endBlockHeight,
 		BlockTime:   endBlockTime,
 	}
-	_, err := keeper.BlockingSend(sdk.Context{}, action)
+	_, err := keeper.BlockingSend(sdk.Context{}.WithContext(context.Background()), action)
 
 	// fmt.Fprintf(os.Stderr, "AFTER_COMMIT_BLOCK Returned from SwingSet: %s, %v\n", out, err)
 	if err != nil {

package/x/swingset/swingset.go

@@ -1,6 +1,7 @@
 package swingset
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -33,7 +34,8 @@ func NewPortHandler(k Keeper) vm.PortHandler {
 // Receive implements the vm.PortHandler method.
 // It receives and processes an inbound message, returning the
 // JSON-serialized response or an error.
-func (ph portHandler) Receive(ctx *vm.ControllerContext, str string) (string, error) {
+func (ph portHandler) Receive(cctx context.Context, str string) (string, error) {
+	ctx := sdk.UnwrapSDKContext(cctx)
 	var msg swingsetMessage
 	err := json.Unmarshal([]byte(str), &msg)
 	if err != nil {
@@ -42,7 +44,7 @@ func (ph portHandler) Receive(ctx *vm.ControllerContext, str string) (string, er
 
 	switch msg.Method {
 	case SwingStoreUpdateExportData:
-		return ph.handleSwingStoreUpdateExportData(ctx.Context, msg.Args)
+		return ph.handleSwingStoreUpdateExportData(ctx, msg.Args)
 
 	default:
 		return "", fmt.Errorf("unrecognized swingset method %s", msg.Method)

package/x/vbank/vbank.go

@@ -121,8 +121,9 @@ func marshal(event vm.Jsonable) ([]byte, error) {
 	return json.Marshal(event)
 }
 
-func (ch portHandler) Receive(ctx *vm.ControllerContext, str string) (ret string, err error) {
+func (ch portHandler) Receive(cctx context.Context, str string) (ret string, err error) {
 	// fmt.Println("vbank.go downcall", str)
+	ctx := sdk.UnwrapSDKContext(cctx)
 	keeper := ch.keeper
 
 	var msg portMessage
@@ -140,7 +141,7 @@ func (ch portHandler) Receive(ctx *vm.ControllerContext, str string) (ret string
 		if err = sdk.ValidateDenom(msg.Denom); err != nil {
 			return "", fmt.Errorf("invalid denom %s: %s", msg.Denom, err)
 		}
-		coin := keeper.GetBalance(ctx.Context, addr, msg.Denom)
+		coin := keeper.GetBalance(ctx, addr, msg.Denom)
 		packet := coin.Amount.String()
 		if err == nil {
 			bytes, err := json.Marshal(&packet)
@@ -162,12 +163,12 @@ func (ch portHandler) Receive(ctx *vm.ControllerContext, str string) (ret string
 			return "", fmt.Errorf("cannot convert %s to int", msg.Amount)
 		}
 		coins := sdk.NewCoins(sdk.NewCoin(msg.Denom, value))
-		if err := keeper.GrabCoins(ctx.Context, addr, coins); err != nil {
+		if err := keeper.GrabCoins(ctx, addr, coins); err != nil {
 			return "", fmt.Errorf("cannot grab %s coins: %s", coins.Sort().String(), err)
 		}
 		addressToBalances := make(map[string]sdk.Coins, 1)
 		addressToBalances[msg.Sender] = sdk.NewCoins(sdk.NewInt64Coin(msg.Denom, 1))
-		bz, err := marshal(getBalanceUpdate(ctx.Context, keeper, addressToBalances))
+		bz, err := marshal(getBalanceUpdate(ctx, keeper, addressToBalances))
 		if err != nil {
 			return "", err
 		}
@@ -190,12 +191,12 @@ func (ch portHandler) Receive(ctx *vm.ControllerContext, str string) (ret string
 			return "", fmt.Errorf("cannot convert %s to int", msg.Amount)
 		}
 		coins := sdk.NewCoins(sdk.NewCoin(msg.Denom, value))
-		if err := keeper.SendCoins(ctx.Context, addr, coins); err != nil {
+		if err := keeper.SendCoins(ctx, addr, coins); err != nil {
 			return "", fmt.Errorf("cannot give %s coins: %s", coins.Sort().String(), err)
 		}
 		addressToBalances := make(map[string]sdk.Coins, 1)
 		addressToBalances[msg.Recipient] = sdk.NewCoins(sdk.NewInt64Coin(msg.Denom, 1))
-		bz, err := marshal(getBalanceUpdate(ctx.Context, keeper, addressToBalances))
+		bz, err := marshal(getBalanceUpdate(ctx, keeper, addressToBalances))
 		if err != nil {
 			return "", err
 		}
@@ -211,20 +212,20 @@ func (ch portHandler) Receive(ctx *vm.ControllerContext, str string) (ret string
 			return "", fmt.Errorf("cannot convert %s to int", msg.Amount)
 		}
 		coins := sdk.NewCoins(sdk.NewCoin(msg.Denom, value))
-		if err := keeper.StoreRewardCoins(ctx.Context, coins); err != nil {
+		if err := keeper.StoreRewardCoins(ctx, coins); err != nil {
 			return "", fmt.Errorf("cannot store reward %s coins: %s", coins.Sort().String(), err)
 		}
 		if err != nil {
 			return "", err
 		}
-		state := keeper.GetState(ctx.Context)
+		state := keeper.GetState(ctx)
 		state.RewardPool = state.RewardPool.Add(coins...)
-		keeper.SetState(ctx.Context, state)
+		keeper.SetState(ctx, state)
 		// We don't supply the module balance, since the controller shouldn't know.
 		ret = "true"
 
 	case "VBANK_GET_MODULE_ACCOUNT_ADDRESS":
-		addr := keeper.GetModuleAccountAddress(ctx.Context, msg.ModuleName).String()
+		addr := keeper.GetModuleAccountAddress(ctx, msg.ModuleName).String()
 		if len(addr) == 0 {
 			return "", fmt.Errorf("module account %s not found", msg.ModuleName)
 		}

package/x/vbank/vbank_test.go

@@ -284,7 +284,7 @@ func Test_Receive_GetBalance(t *testing.T) {
 	}}
 	keeper, ctx := makeTestKit(nil, bank)
 	ch := NewPortHandler(AppModule{}, keeper)
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctlCtx := sdk.WrapSDKContext(ctx)
 
 	ret, err := ch.Receive(ctlCtx, `{
 		"type": "VBANK_GET_BALANCE",
@@ -312,7 +312,7 @@ func Test_Receive_Give(t *testing.T) {
 	}}
 	keeper, ctx := makeTestKit(nil, bank)
 	ch := NewPortHandler(AppModule{}, keeper)
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctlCtx := sdk.WrapSDKContext(ctx)
 
 	ret, err := ch.Receive(ctlCtx, `{
 		"type": "VBANK_GIVE",
@@ -349,7 +349,7 @@ func Test_Receive_GiveToRewardDistributor(t *testing.T) {
 	bank := &mockBank{}
 	keeper, ctx := makeTestKit(nil, bank)
 	ch := NewPortHandler(AppModule{}, keeper)
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctlCtx := sdk.WrapSDKContext(ctx)
 
 	tests := []struct {
 		name          string
@@ -474,7 +474,7 @@ func Test_Receive_Grab(t *testing.T) {
 	}}
 	keeper, ctx := makeTestKit(nil, bank)
 	ch := NewPortHandler(AppModule{}, keeper)
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctlCtx := sdk.WrapSDKContext(ctx)
 
 	ret, err := ch.Receive(ctlCtx, `{
 		"type": "VBANK_GRAB",
@@ -787,7 +787,7 @@ func Test_Module_Account(t *testing.T) {
 	keeper, ctx := makeTestKit(acct, nil)
 	am := AppModule{keeper: keeper}
 	ch := NewPortHandler(am, keeper)
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctlCtx := sdk.WrapSDKContext(ctx)
 
 	mod1 := "vbank/reserve"
 	ret, err := ch.Receive(ctlCtx, `{

package/x/vibc/ibc.go

@@ -1,6 +1,7 @@
 package vibc
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 
@@ -63,8 +64,9 @@ func NewIBCModule(keeper Keeper) IBCModule {
 	}
 }
 
-func (ch IBCModule) Receive(ctx *vm.ControllerContext, str string) (ret string, err error) {
+func (ch IBCModule) Receive(cctx context.Context, str string) (ret string, err error) {
 	// fmt.Println("ibc.go downcall", str)
+	ctx := sdk.UnwrapSDKContext(cctx)
 	keeper := ch.keeper
 
 	msg := new(portMessage)
@@ -80,7 +82,7 @@ func (ch IBCModule) Receive(ctx *vm.ControllerContext, str string) (ret string,
 	switch msg.Method {
 	case "sendPacket":
 		seq, ok := keeper.GetNextSequenceSend(
-			ctx.Context,
+			ctx,
 			msg.Packet.SourcePort,
 			msg.Packet.SourceChannel,
 		)
@@ -91,7 +93,7 @@ func (ch IBCModule) Receive(ctx *vm.ControllerContext, str string) (ret string,
 		timeoutTimestamp := msg.Packet.TimeoutTimestamp
 		if msg.Packet.TimeoutHeight.IsZero() && msg.Packet.TimeoutTimestamp == 0 {
 			// Use the relative timeout if no absolute timeout is specifiied.
-			timeoutTimestamp = uint64(ctx.Context.BlockTime().UnixNano()) + msg.RelativeTimeoutNs
+			timeoutTimestamp = uint64(ctx.BlockTime().UnixNano()) + msg.RelativeTimeoutNs
 		}
 
 		packet := channeltypes.NewPacket(
@@ -100,7 +102,7 @@ func (ch IBCModule) Receive(ctx *vm.ControllerContext, str string) (ret string,
 			msg.Packet.DestinationPort, msg.Packet.DestinationChannel,
 			msg.Packet.TimeoutHeight, timeoutTimestamp,
 		)
-		err = keeper.SendPacket(ctx.Context, packet)
+		err = keeper.SendPacket(ctx, packet)
 		if err == nil {
 			bytes, err := json.Marshal(&packet)
 			if err == nil {
@@ -109,14 +111,14 @@ func (ch IBCModule) Receive(ctx *vm.ControllerContext, str string) (ret string,
 		}
 
 	case "receiveExecuted":
-		err = keeper.WriteAcknowledgement(ctx.Context, msg.Packet, msg.Ack)
+		err = keeper.WriteAcknowledgement(ctx, msg.Packet, msg.Ack)
 		if err == nil {
 			ret = "true"
 		}
 
 	case "startChannelOpenInit":
 		err = keeper.ChanOpenInit(
-			ctx.Context, stringToOrder(msg.Order), msg.Hops,
+			ctx, stringToOrder(msg.Order), msg.Hops,
 			msg.Packet.SourcePort,
 			msg.Packet.DestinationPort,
 			msg.Version,
@@ -126,19 +128,19 @@ func (ch IBCModule) Receive(ctx *vm.ControllerContext, str string) (ret string,
 		}
 
 	case "startChannelCloseInit":
-		err = keeper.ChanCloseInit(ctx.Context, msg.Packet.SourcePort, msg.Packet.SourceChannel)
+		err = keeper.ChanCloseInit(ctx, msg.Packet.SourcePort, msg.Packet.SourceChannel)
 		if err == nil {
 			ret = "true"
 		}
 
 	case "bindPort":
-		err = keeper.BindPort(ctx.Context, msg.Packet.SourcePort)
+		err = keeper.BindPort(ctx, msg.Packet.SourcePort)
 		if err == nil {
 			ret = "true"
 		}
 
 	case "timeoutExecuted":
-		err = keeper.TimeoutExecuted(ctx.Context, msg.Packet)
+		err = keeper.TimeoutExecuted(ctx, msg.Packet)
 		if err == nil {
 			ret = "true"
 		}

package/x/vstorage/vstorage.go

@@ -1,6 +1,7 @@
 package vstorage
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -8,7 +9,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
-	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 )
 
 type vstorageHandler struct {
@@ -41,7 +41,8 @@ func unmarshalSinglePathFromArgs(args []json.RawMessage, path *string) error {
 	return json.Unmarshal(args[0], path)
 }
 
-func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret string, err error) {
+func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string, err error) {
+	ctx := sdk.UnwrapSDKContext(cctx)
 	keeper := sh.keeper
 	msg := new(vstorageMessage)
 	err = json.Unmarshal([]byte(str), &msg)
@@ -56,7 +57,7 @@ func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret s
 			case sdk.ErrorOutOfGas:
 				err = fmt.Errorf(
 					"out of gas in location: %v; gasUsed: %d",
-					rType.Descriptor, cctx.Context.GasMeter().GasConsumed(),
+					rType.Descriptor, ctx.GasMeter().GasConsumed(),
 				)
 			default:
 				// Not ErrorOutOfGas, so panic again.
@@ -74,7 +75,7 @@ func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret s
 			if err != nil {
 				return
 			}
-			keeper.SetStorageAndNotify(cctx.Context, entry)
+			keeper.SetStorageAndNotify(ctx, entry)
 		}
 		return "true", nil
 
@@ -89,7 +90,7 @@ func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret s
 				return
 			}
 			//fmt.Printf("giving Keeper.SetStorage(%s) %s\n", entry.Path(), entry.Value())
-			keeper.LegacySetStorageAndNotify(cctx.Context, entry)
+			keeper.LegacySetStorageAndNotify(ctx, entry)
 		}
 		return "true", nil
 
@@ -100,7 +101,7 @@ func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret s
 			if err != nil {
 				return
 			}
-			keeper.SetStorage(cctx.Context, entry)
+			keeper.SetStorage(ctx, entry)
 		}
 		return "true", nil
 
@@ -115,7 +116,7 @@ func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret s
 				err = fmt.Errorf("no value for append entry with path: %q", entry.Key())
 				return
 			}
-			err = keeper.AppendStorageValueAndNotify(cctx.Context, entry.Key(), entry.StringValue())
+			err = keeper.AppendStorageValueAndNotify(ctx, entry.Key(), entry.StringValue())
 			if err != nil {
 				return
 			}
@@ -130,7 +131,7 @@ func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret s
 			return
 		}
 
-		entry := keeper.GetEntry(cctx.Context, path)
+		entry := keeper.GetEntry(ctx, path)
 		bz, err := json.Marshal(entry.Value())
 		if err != nil {
 			return "", err
@@ -161,7 +162,7 @@ func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret s
 		if err != nil {
 			return
 		}
-		value := keeper.HasStorage(cctx.Context, path)
+		value := keeper.HasStorage(ctx, path)
 		if !value {
 			return "false", nil
 		}
@@ -174,7 +175,7 @@ func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret s
 		if err != nil {
 			return
 		}
-		children := keeper.GetChildren(cctx.Context, path)
+		children := keeper.GetChildren(ctx, path)
 		if children.Children == nil {
 			return "[]", nil
 		}
@@ -190,10 +191,10 @@ func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret s
 		if err != nil {
 			return
 		}
-		children := keeper.GetChildren(cctx.Context, path)
+		children := keeper.GetChildren(ctx, path)
 		entries := make([]agoric.KVEntry, len(children.Children))
 		for i, child := range children.Children {
-			entry := keeper.GetEntry(cctx.Context, fmt.Sprintf("%s.%s", path, child))
+			entry := keeper.GetEntry(ctx, fmt.Sprintf("%s.%s", path, child))
 			if !entry.HasValue() {
 				entries[i] = agoric.NewKVEntryWithNoValue(child)
 			} else {
@@ -212,10 +213,10 @@ func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret s
 		if err != nil {
 			return
 		}
-		children := keeper.GetChildren(cctx.Context, path)
+		children := keeper.GetChildren(ctx, path)
 		vals := make([]*string, len(children.Children))
 		for i, child := range children.Children {
-			vals[i] = keeper.GetEntry(cctx.Context, fmt.Sprintf("%s.%s", path, child)).Value()
+			vals[i] = keeper.GetEntry(ctx, fmt.Sprintf("%s.%s", path, child)).Value()
 		}
 		bytes, err := json.Marshal(vals)
 		if err != nil {
@@ -229,7 +230,7 @@ func (sh vstorageHandler) Receive(cctx *vm.ControllerContext, str string) (ret s
 		if err != nil {
 			return
 		}
-		children := keeper.GetChildren(cctx.Context, path)
+		children := keeper.GetChildren(ctx, path)
 		if children.Children == nil {
 			return "0", nil
 		}

package/x/vstorage/vstorage_test.go

@@ -1,6 +1,7 @@
 package vstorage
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"reflect"
@@ -14,7 +15,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	agorictypes "github.com/Agoric/agoric-sdk/golang/cosmos/types"
-	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/tendermint/tendermint/libs/log"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	dbm "github.com/tendermint/tm-db"
@@ -32,7 +32,7 @@ type testKit struct {
 	keeper  Keeper
 	handler vstorageHandler
 	ctx     sdk.Context
-	cctx    *vm.ControllerContext
+	cctx    context.Context
 }
 
 func makeTestKit() testKit {
@@ -45,14 +45,14 @@ func makeTestKit() testKit {
 		panic(err)
 	}
 	ctx := sdk.NewContext(ms, tmproto.Header{}, false, log.NewNopLogger())
-	cctx := &vm.ControllerContext{Context: ctx}
+	cctx := sdk.WrapSDKContext(ctx)
 	handler := vstorageHandler{keeper}
 	return testKit{keeper, handler, ctx, cctx}
 }
 
 func callReceive(
 	handler vstorageHandler,
-	cctx *vm.ControllerContext,
+	cctx context.Context,
 	method string,
 	args []interface{},
 ) (string, error) {