Skip to content
This repository has been archived by the owner on Jun 9, 2024. It is now read-only.

chore(deps): Bump cosmos-sdk #920

Merged
merged 3 commits into from
Jul 27, 2023
Merged

chore(deps): Bump cosmos-sdk #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23673ab
bing bong
itsdevbear Jul 27, 2023
3820688
push
itsdevbear Jul 27, 2023
b0cc00d
git merge
itsdevbear Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cosmos/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ require (
github.com/cometbft/cometbft v0.38.0-rc3
github.com/cosmos/cosmos-db v1.0.0
github.com/cosmos/cosmos-proto v1.0.0-beta.3
github.com/cosmos/cosmos-sdk v0.50.0-beta.0
github.com/cosmos/cosmos-sdk v0.50.0-beta.0.0.20230727121850-bd61e84ef162
github.com/cosmos/go-bip39 v1.0.0
github.com/cosmos/gogoproto v1.4.10
github.com/ethereum/go-ethereum v1.12.0
Expand Down
4 changes: 2 additions & 2 deletions cosmos/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,8 @@ github.com/cosmos/cosmos-db v1.0.0 h1:EVcQZ+qYag7W6uorBKFPvX6gRjw6Uq2hIh4hCWjuQ0
github.com/cosmos/cosmos-db v1.0.0/go.mod h1:iBvi1TtqaedwLdcrZVYRSSCb6eSy61NLj4UNmdIgs0U=
github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o=
github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I=
github.com/cosmos/cosmos-sdk v0.50.0-beta.0 h1:cPblupyMlA4qvnvuuQEjYQPq1uqSXBgQmsiGREQ5hd0=
github.com/cosmos/cosmos-sdk v0.50.0-beta.0/go.mod h1:MF/wnXyreoL0g8YdRZhUD4apPdgebMc29LgMJB+dh6M=
github.com/cosmos/cosmos-sdk v0.50.0-beta.0.0.20230727121850-bd61e84ef162 h1:jYNPV5xfv3bsH+B6y1qxo2ru2cKz+1vJQqSa7L86byQ=
github.com/cosmos/cosmos-sdk v0.50.0-beta.0.0.20230727121850-bd61e84ef162/go.mod h1:MF/wnXyreoL0g8YdRZhUD4apPdgebMc29LgMJB+dh6M=
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=
Expand Down
18 changes: 9 additions & 9 deletions cosmos/precompile/staking/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ func (c *Contract) delegateHelper(
}

_, err = c.msgServer.Delegate(ctx, stakingtypes.NewMsgDelegate(
cosmlib.AddressToAccAddress(caller),
validatorAddress,
cosmlib.AddressToAccAddress(caller).String(), /* todo move to codec */
validatorAddress.String(), /* todo move to codec */
sdk.Coin{Denom: denom, Amount: sdkmath.NewIntFromBigInt(amount)},
))
return err == nil, err
Expand All @@ -155,8 +155,8 @@ func (c *Contract) undelegateHelper(
}

_, err = c.msgServer.Undelegate(ctx, stakingtypes.NewMsgUndelegate(
cosmlib.AddressToAccAddress(caller),
val,
cosmlib.AddressToAccAddress(caller).String(), /* todo move to codec */
val.String(), /* todo move to codec */
sdk.Coin{Denom: denom, Amount: sdkmath.NewIntFromBigInt(amount)},
))
return err == nil, err
Expand All @@ -177,9 +177,9 @@ func (c *Contract) beginRedelegateHelper(
_, err = c.msgServer.BeginRedelegate(
ctx,
stakingtypes.NewMsgBeginRedelegate(
cosmlib.AddressToAccAddress(caller),
srcVal,
dstVal,
cosmlib.AddressToAccAddress(caller).String(), /* todo move to codec */
srcVal.String(), /* todo move to codec */
dstVal.String(), /* todo move to codec */
sdk.Coin{Denom: bondDenom, Amount: sdkmath.NewIntFromBigInt(amount)},
),
)
Expand All @@ -202,8 +202,8 @@ func (c *Contract) cancelUnbondingDelegationHelper(
_, err = c.msgServer.CancelUnbondingDelegation(
ctx,
stakingtypes.NewMsgCancelUnbondingDelegation(
cosmlib.AddressToAccAddress(caller),
val,
cosmlib.AddressToAccAddress(caller).String(), /* todo move to codec */
val.String(), /* todo move to codec */
creationHeight,
sdk.Coin{Denom: bondDenom, Amount: sdkmath.NewIntFromBigInt(amount)},
),
Expand Down
2 changes: 1 addition & 1 deletion cosmos/precompile/staking/staking_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func createValAddrs(count int) ([]sdk.AccAddress, []sdk.ValAddress) {
}

func NewValidator(operator sdk.ValAddress, pubKey cryptotypes.PubKey) (stakingtypes.Validator, error) {
return stakingtypes.NewValidator(operator, pubKey, stakingtypes.Description{})
return stakingtypes.NewValidator(operator.String() /* todo move to codec */, pubKey, stakingtypes.Description{})
}

var (
Expand Down
2 changes: 1 addition & 1 deletion cosmos/x/evm/keeper/processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import (
)

func NewValidator(operator sdk.ValAddress, pubKey cryptotypes.PubKey) (stakingtypes.Validator, error) {
return stakingtypes.NewValidator(operator, pubKey, stakingtypes.Description{})
return stakingtypes.NewValidator(operator.String() /* todo move to codec */, pubKey, stakingtypes.Description{})
}

var (
Expand Down
2 changes: 1 addition & 1 deletion e2e/localnet/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.20
replace github.com/ethereum/go-ethereum => github.com/berachain/polaris-geth v0.0.0-20230629154458-90866dc0cf0a

require (
github.com/cosmos/cosmos-sdk v0.50.0-beta.0
github.com/cosmos/cosmos-sdk v0.50.0-beta.0.0.20230727121850-bd61e84ef162
github.com/docker/docker v23.0.3+incompatible
github.com/ethereum/go-ethereum v1.12.0
github.com/onsi/ginkgo/v2 v2.11.0
Expand Down
3 changes: 1 addition & 2 deletions e2e/localnet/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,7 @@ github.com/cosmos/cosmos-db v1.0.0 h1:EVcQZ+qYag7W6uorBKFPvX6gRjw6Uq2hIh4hCWjuQ0
github.com/cosmos/cosmos-db v1.0.0/go.mod h1:iBvi1TtqaedwLdcrZVYRSSCb6eSy61NLj4UNmdIgs0U=
github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o=
github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I=
github.com/cosmos/cosmos-sdk v0.50.0-beta.0 h1:cPblupyMlA4qvnvuuQEjYQPq1uqSXBgQmsiGREQ5hd0=
github.com/cosmos/cosmos-sdk v0.50.0-beta.0/go.mod h1:MF/wnXyreoL0g8YdRZhUD4apPdgebMc29LgMJB+dh6M=
github.com/cosmos/cosmos-sdk v0.50.0-beta.0.0.20230727121850-bd61e84ef162 h1:jYNPV5xfv3bsH+B6y1qxo2ru2cKz+1vJQqSa7L86byQ=
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=
Expand Down
Loading
Loading