fix: upgrade to stargate rc4

Agoric · Dec 10, 2020 · 2a549e4 · 2a549e4
1 parent 6ba739e
commit 2a549e4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.14
 require (
 	github.com/btcsuite/btcd v0.21.0-beta
 	github.com/btcsuite/btcutil v1.0.2
-	github.com/cosmos/cosmos-sdk v0.40.0-rc3
+	github.com/cosmos/cosmos-sdk v0.40.0-rc4
 	github.com/ethereum/go-ethereum v1.9.22
 	github.com/gogo/protobuf v1.3.1
 	github.com/gorilla/mux v1.8.0
@@ -30,5 +30,4 @@ replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alp
 
 // For testing against a local cosmos-sdk or tendermint
 // replace github.com/cosmos/cosmos-sdk => ../forks/cosmos-sdk
-
 // replace github.com/tendermint/tendermint => ../forks/tendermint
diff --git a/go.sum b/go.sum
@@ -140,6 +140,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20201010134738-15324920548c h1:NONho0tjbe
 github.com/cosmos/cosmos-sdk v0.34.4-0.20201010134738-15324920548c/go.mod h1:YZcO00Tq/qqj4ncsfn+PobyTelsot7wEMGPpxEbEAT0=
 github.com/cosmos/cosmos-sdk v0.40.0-rc3 h1:sS9BZ82dOxXiZPZdfrzSniEAzLLN0oTP5lFVyjnq2x4=
 github.com/cosmos/cosmos-sdk v0.40.0-rc3/go.mod h1:eKgbkQO4FEvC+a1+eyRuL7UgluGK1ad4PufPTpQc6ZA=
+github.com/cosmos/cosmos-sdk v0.40.0-rc4 h1:jWdbXON/cIs/XbIAA/4dlUH8xtyNjdWTEF4f+4sskPU=
+github.com/cosmos/cosmos-sdk v0.40.0-rc4/go.mod h1:eKgbkQO4FEvC+a1+eyRuL7UgluGK1ad4PufPTpQc6ZA=
 github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=

diff --git a/golang/cosmos/app/app.go b/golang/cosmos/app/app.go
@@ -332,7 +332,6 @@ func NewAgoricApp(
 	}
 
 	// The SwingSetKeeper is the Keeper from the SwingSet module
-	// It handles interactions with the kvstore and IBC.
 	app.SwingSetKeeper = swingset.NewKeeper(
 		appCodec, keys[swingset.StoreKey],
 		app.AccountKeeper, app.BankKeeper,

diff --git a/golang/cosmos/x/dibc/keeper/keeper.go b/golang/cosmos/x/dibc/keeper/keeper.go
@@ -56,13 +56,13 @@ func (k Keeper) GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) s
 }
 
 // GetNextSequenceSend defines a wrapper function for the channel Keeper's function
-// in order to expose it to the SwingSet IBC handler.
+// in order to expose it to the dibc IBC handler.
 func (k Keeper) GetNextSequenceSend(ctx sdk.Context, portID, channelID string) (uint64, bool) {
 	return k.channelKeeper.GetNextSequenceSend(ctx, portID, channelID)
 }
 
 // ChanOpenInit defines a wrapper function for the channel Keeper's function
-// in order to expose it to the SwingSet IBC handler.
+// in order to expose it to the dibc IBC handler.
 func (k Keeper) ChanOpenInit(ctx sdk.Context, order channeltypes.Order, connectionHops []string,
 	portID, channelID, rPortID, rChannelID, version string,
 ) error {
@@ -84,7 +84,7 @@ func (k Keeper) ChanOpenInit(ctx sdk.Context, order channeltypes.Order, connecti
 }
 
 // SendPacket defines a wrapper function for the channel Keeper's function
-// in order to expose it to the SwingSet IBC handler.
+// in order to expose it to the dibc IBC handler.
 func (k Keeper) SendPacket(ctx sdk.Context, packet ibcexported.PacketI) error {
 	portID := packet.GetSourcePort()
 	channelID := packet.GetSourceChannel()
@@ -97,10 +97,10 @@ func (k Keeper) SendPacket(ctx sdk.Context, packet ibcexported.PacketI) error {
 }
 
 // WriteAcknowledgement defines a wrapper function for the channel Keeper's function
-// in order to expose it to the SwingSet IBC handler.
+// in order to expose it to the dibc IBC handler.
 func (k Keeper) WriteAcknowledgement(ctx sdk.Context, packet ibcexported.PacketI, acknowledgement []byte) error {
-	portID := packet.GetSourcePort()
-	channelID := packet.GetSourceChannel()
+	portID := packet.GetDestPort()
+	channelID := packet.GetDestChannel()
 	capName := host.ChannelCapabilityPath(portID, channelID)
 	chanCap, ok := k.GetCapability(ctx, capName)
 	if !ok {
@@ -110,7 +110,7 @@ func (k Keeper) WriteAcknowledgement(ctx sdk.Context, packet ibcexported.PacketI
 }
 
 // ChanCloseInit defines a wrapper function for the channel Keeper's function
-// in order to expose it to the SwingSet IBC handler.
+// in order to expose it to the dibc IBC handler.
 func (k Keeper) ChanCloseInit(ctx sdk.Context, portID, channelID string) error {
 	capName := host.ChannelCapabilityPath(portID, channelID)
 	chanCap, ok := k.GetCapability(ctx, capName)
@@ -121,14 +121,14 @@ func (k Keeper) ChanCloseInit(ctx sdk.Context, portID, channelID string) error {
 }
 
 // BindPort defines a wrapper function for the port Keeper's function in
-// order to expose it to the SwingSet IBC handler.
+// order to expose it to the dibc IBC handler.
 func (k Keeper) BindPort(ctx sdk.Context, portID string) error {
 	cap := k.portKeeper.BindPort(ctx, portID)
 	return k.ClaimCapability(ctx, cap, host.PortPath(portID))
 }
 
 // TimeoutExecuted defines a wrapper function for the channel Keeper's function
-// in order to expose it to the SwingSet IBC handler.
+// in order to expose it to the dibc IBC handler.
 func (k Keeper) TimeoutExecuted(ctx sdk.Context, packet ibcexported.PacketI) error {
 	portID := packet.GetSourcePort()
 	channelID := packet.GetSourceChannel()
@@ -140,7 +140,7 @@ func (k Keeper) TimeoutExecuted(ctx sdk.Context, packet ibcexported.PacketI) err
 	return k.channelKeeper.TimeoutExecuted(ctx, chanCap, packet)
 }
 
-// ClaimCapability allows the SwingSet module to claim a capability that IBC module
+// ClaimCapability allows the dibc module to claim a capability that IBC module
 // passes to it
 func (k Keeper) ClaimCapability(ctx sdk.Context, cap *capability.Capability, name string) error {
 	return k.scopedKeeper.ClaimCapability(ctx, cap, name)