From f6b1bb1c9b1060c208d7547b6119ef1b3655788f Mon Sep 17 00:00:00 2001
From: Joowon Yun <40225835+JoowonYun@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:33:20 +0900
Subject: [PATCH 1/6] feat: support to thirdweb (#142)
* feat: support to thirdweb
* fix: add error handling in vm execute
* fix: rollback refunded gas
* fix: use reward distribution account
* chore: use upgrade fee supporter
---
app/app.go | 4 +-
app/upgrades/v1_6/const.go | 27 +++++++++++
app/upgrades/v1_6/upgrades.go | 89 +++++++++++++++++++++++++++++++++++
3 files changed, 118 insertions(+), 2 deletions(-)
create mode 100644 app/upgrades/v1_6/const.go
create mode 100644 app/upgrades/v1_6/upgrades.go
diff --git a/app/app.go b/app/app.go
index 6784fc7..c3e323d 100644
--- a/app/app.go
+++ b/app/app.go
@@ -46,7 +46,7 @@ import (
"github.com/xpladev/xpla/app/openapiconsole"
xplaappparams "github.com/xpladev/xpla/app/params"
"github.com/xpladev/xpla/app/upgrades"
- v1_5 "github.com/xpladev/xpla/app/upgrades/v1_5"
+ v1_6 "github.com/xpladev/xpla/app/upgrades/v1_6"
"github.com/xpladev/xpla/docs"
"github.com/CosmWasm/wasmd/x/wasm"
@@ -58,7 +58,7 @@ var (
DefaultNodeHome string
Upgrades = []upgrades.Upgrade{
- v1_5.Upgrade,
+ v1_6.Upgrade,
}
)
diff --git a/app/upgrades/v1_6/const.go b/app/upgrades/v1_6/const.go
new file mode 100644
index 0000000..d6c453d
--- /dev/null
+++ b/app/upgrades/v1_6/const.go
@@ -0,0 +1,27 @@
+package v1_6
+
+import (
+ store "github.com/cosmos/cosmos-sdk/store/types"
+
+ "github.com/xpladev/xpla/app/upgrades"
+)
+
+const (
+ UpgradeName = "v1_6"
+)
+
+var Upgrade = upgrades.Upgrade{
+ UpgradeName: UpgradeName,
+ CreateUpgradeHandler: CreateUpgradeHandler,
+ StoreUpgrades: store.StoreUpgrades{
+ Added: []string{},
+ Deleted: []string{},
+ },
+}
+
+const (
+ // https://github.com/Arachnid/deterministic-deployment-proxy
+ thirdwebProxy = "0xf8a58085174876e800830186a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222"
+
+ upgradeFeeSupporter = "xpla1xj3vn9a27u5q945e2xvwfdh3hv6zuy0qkx9d4l"
+)
diff --git a/app/upgrades/v1_6/upgrades.go b/app/upgrades/v1_6/upgrades.go
new file mode 100644
index 0000000..412bdac
--- /dev/null
+++ b/app/upgrades/v1_6/upgrades.go
@@ -0,0 +1,89 @@
+package v1_6
+
+import (
+ "math/big"
+
+ "cosmossdk.io/errors"
+ sdkmath "cosmossdk.io/math"
+ "github.com/cosmos/cosmos-sdk/codec"
+ sdk "github.com/cosmos/cosmos-sdk/types"
+ "github.com/cosmos/cosmos-sdk/types/module"
+ authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+ upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ ethtypes "github.com/ethereum/go-ethereum/core/types"
+
+ evmtypes "github.com/xpladev/ethermint/x/evm/types"
+ "github.com/xpladev/xpla/app/keepers"
+)
+
+func CreateUpgradeHandler(
+ mm *module.Manager,
+ configurator module.Configurator,
+ keepers *keepers.AppKeepers,
+ cdc codec.BinaryCodec,
+) upgradetypes.UpgradeHandler {
+ return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+ data, err := hexutil.Decode(thirdwebProxy)
+ if err != nil {
+ return nil, errors.Wrap(err, "failed to decode ethereum tx hex bytes")
+ }
+
+ msg := &evmtypes.MsgEthereumTx{}
+ if err := msg.UnmarshalBinary(data); err != nil {
+ return nil, err
+ }
+
+ if err := msg.ValidateBasic(); err != nil {
+ return nil, err
+ }
+
+ // fund fee collector by upgrade fee supporter
+ upgradeFeeSupporterAccout, err := sdk.AccAddressFromBech32(upgradeFeeSupporter)
+ if err != nil {
+ return nil, err
+ }
+ evmDenom := keepers.EvmKeeper.GetParams(ctx).EvmDenom
+ borrowedCoins := sdk.NewCoin(evmDenom, sdk.DefaultPowerReduction)
+ err = keepers.BankKeeper.SendCoinsFromAccountToModule(ctx, upgradeFeeSupporterAccout, authtypes.FeeCollectorName, sdk.NewCoins(borrowedCoins))
+ if err != nil {
+ return nil, err
+ }
+
+ // execute thiredweb proxy contract
+ res, err := keepers.EvmKeeper.EthereumTx(ctx, msg)
+ if err != nil {
+ return nil, err
+ }
+
+ if res.Failed() {
+ return nil, errors.ErrPanic.Wrap(res.VmError)
+ }
+
+ // Gas refunded rollback without use
+ tx := msg.AsTransaction()
+
+ signer := ethtypes.NewLondonSigner(keepers.EvmKeeper.ChainID())
+ from, err := signer.Sender(tx)
+ if err != nil {
+ return nil, err
+ }
+
+ // sender -> rewardDistributeAccount
+ refundedGas := msg.GetGas() - res.GasUsed
+ refundAmount := new(big.Int).Mul(new(big.Int).SetUint64(refundedGas), tx.GasPrice())
+ refundCoin := sdk.NewCoin(evmDenom, sdkmath.NewIntFromBigInt(refundAmount))
+ err = keepers.BankKeeper.SendCoins(ctx, from.Bytes(), upgradeFeeSupporterAccout, sdk.NewCoins(refundCoin))
+ if err != nil {
+ return nil, err
+ }
+
+ // feeCollector -> rewardDistributeAccount
+ err = keepers.BankKeeper.SendCoinsFromModuleToAccount(ctx, authtypes.FeeCollectorName, upgradeFeeSupporterAccout, sdk.NewCoins(borrowedCoins.Sub(refundCoin)))
+ if err != nil {
+ return nil, err
+ }
+
+ return mm.RunMigrations(ctx, configurator, fromVM)
+ }
+}
From 5238ddd28a80eac47ed0e035c110794f698fd6ac Mon Sep 17 00:00:00 2001
From: Joowon Yun <40225835+JoowonYun@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:35:20 +0900
Subject: [PATCH 2/6] feat: add to fund reward pool (#143)
---
docs/proto/proto-docs.md | 20 +--
proto/xpla/reward/v1beta1/tx.proto | 19 ++-
x/reward/client/cli/tx.go | 14 +--
x/reward/keeper/keeper.go | 9 +-
x/reward/keeper/msg_server.go | 6 +-
x/reward/types/codec.go | 4 +-
x/reward/types/msg.go | 28 ++---
x/reward/types/msg_test.go | 4 +-
x/reward/types/tx.pb.go | 194 ++++++++++++++---------------
9 files changed, 148 insertions(+), 150 deletions(-)
diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md
index 752902d..be27df2 100644
--- a/docs/proto/proto-docs.md
+++ b/docs/proto/proto-docs.md
@@ -19,8 +19,8 @@
- [Query](#xpla.reward.v1beta1.Query)
- [xpla/reward/v1beta1/tx.proto](#xpla/reward/v1beta1/tx.proto)
- - [MsgFundFeeCollector](#xpla.reward.v1beta1.MsgFundFeeCollector)
- - [MsgFundFeeCollectorResponse](#xpla.reward.v1beta1.MsgFundFeeCollectorResponse)
+ - [MsgFundRewardPool](#xpla.reward.v1beta1.MsgFundRewardPool)
+ - [MsgFundRewardPoolResponse](#xpla.reward.v1beta1.MsgFundRewardPoolResponse)
- [MsgUpdateParams](#xpla.reward.v1beta1.MsgUpdateParams)
- [MsgUpdateParamsResponse](#xpla.reward.v1beta1.MsgUpdateParamsResponse)
@@ -200,11 +200,11 @@ Query defines the gRPC querier service for reward module.
-
+
-### MsgFundFeeCollector
-MsgFundFeeCollector allows an account to directly
-fund the fee collector.
+### MsgFundRewardPool
+MsgFundRewardPool allows an account to directly
+fund the reward pool.
| Field | Type | Label | Description |
@@ -217,10 +217,10 @@ fund the fee collector.
-
+
-### MsgFundFeeCollectorResponse
-MsgFundFeeCollectorResponse defines the Msg/FundFeeCollector response type.
+### MsgFundRewardPoolResponse
+MsgFundRewardPoolResponse defines the Msg/FundRewardPool response type.
@@ -269,7 +269,7 @@ Msg defines the reawrd Msg service.
| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint |
| ----------- | ------------ | ------------- | ------------| ------- | -------- |
-| `FundFeeCollector` | [MsgFundFeeCollector](#xpla.reward.v1beta1.MsgFundFeeCollector) | [MsgFundFeeCollectorResponse](#xpla.reward.v1beta1.MsgFundFeeCollectorResponse) | FundFeeCollector defines a method to allow an account to directly fund the fee collector. | |
+| `FundRewardPool` | [MsgFundRewardPool](#xpla.reward.v1beta1.MsgFundRewardPool) | [MsgFundRewardPoolResponse](#xpla.reward.v1beta1.MsgFundRewardPoolResponse) | MsgFundRewardPool defines a method to allow an account to directly fund the reward pool. | |
| `UpdateParams` | [MsgUpdateParams](#xpla.reward.v1beta1.MsgUpdateParams) | [MsgUpdateParamsResponse](#xpla.reward.v1beta1.MsgUpdateParamsResponse) | UpdateParams defined a governance operation for updating the x/reward module parameters. The authority is hard-coded to the Cosmos SDK x/gov module account | |
diff --git a/proto/xpla/reward/v1beta1/tx.proto b/proto/xpla/reward/v1beta1/tx.proto
index 5cd7c9a..fe0b144 100644
--- a/proto/xpla/reward/v1beta1/tx.proto
+++ b/proto/xpla/reward/v1beta1/tx.proto
@@ -12,10 +12,9 @@ import "amino/amino.proto";
// Msg defines the reawrd Msg service.
service Msg {
- // FundFeeCollector defines a method to allow an account to directly
- // fund the fee collector.
- rpc FundFeeCollector(MsgFundFeeCollector)
- returns (MsgFundFeeCollectorResponse);
+ // MsgFundRewardPool defines a method to allow an account to directly
+ // fund the reward pool.
+ rpc FundRewardPool(MsgFundRewardPool) returns (MsgFundRewardPoolResponse);
// UpdateParams defined a governance operation for updating the x/reward
// module parameters. The authority is hard-coded to the Cosmos SDK x/gov
@@ -23,10 +22,10 @@ service Msg {
rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
}
-// MsgFundFeeCollector allows an account to directly
-// fund the fee collector.
-message MsgFundFeeCollector {
- option (amino.name) = "xpladev/MsgFundFeeCollector";
+// MsgFundRewardPool allows an account to directly
+// fund the reward pool.
+message MsgFundRewardPool {
+ option (amino.name) = "xpladev/MsgFundRewardPool";
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;
@@ -37,8 +36,8 @@ message MsgFundFeeCollector {
string depositor = 2;
}
-// MsgFundFeeCollectorResponse defines the Msg/FundFeeCollector response type.
-message MsgFundFeeCollectorResponse {}
+// MsgFundRewardPoolResponse defines the Msg/FundRewardPool response type.
+message MsgFundRewardPoolResponse {}
// MsgUpdateParams is the Msg/UpdateParams request type for reward parameters.
// Since: cosmos-sdk 0.47
diff --git a/x/reward/client/cli/tx.go b/x/reward/client/cli/tx.go
index e67eaad..609aed1 100644
--- a/x/reward/client/cli/tx.go
+++ b/x/reward/client/cli/tx.go
@@ -30,7 +30,7 @@ func NewTxCmd() *cobra.Command {
}
distTxCmd.AddCommand(
- NewFundFeeCollectorCmd(),
+ NewFundRewardPoolCmd(),
)
return distTxCmd
@@ -38,16 +38,16 @@ func NewTxCmd() *cobra.Command {
type newGenerateOrBroadcastFunc func(client.Context, *pflag.FlagSet, ...sdk.Msg) error
-func NewFundFeeCollectorCmd() *cobra.Command {
+func NewFundRewardPoolCmd() *cobra.Command {
cmd := &cobra.Command{
- Use: "fund-fee-collector [amount]",
+ Use: "fund-reward-pool [amount]",
Args: cobra.ExactArgs(1),
- Short: "Funds the fee collector with the specified amount",
+ Short: "Funds the reward pool with the specified amount",
Long: strings.TrimSpace(
- fmt.Sprintf(`Funds the fee collector with the specified amount
+ fmt.Sprintf(`Funds the reward pool with the specified amount
Example:
-$ %s tx reward fund-fee-collector 100axpla --from mykey
+$ %s tx reward fund-reward-pool 100axpla --from mykey
`,
version.AppName,
),
@@ -63,7 +63,7 @@ $ %s tx reward fund-fee-collector 100axpla --from mykey
return err
}
- msg := types.NewMsgFundFeeCollector(amount, depositorAddr)
+ msg := types.NewMsgFundRewardPool(amount, depositorAddr)
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
},
diff --git a/x/reward/keeper/keeper.go b/x/reward/keeper/keeper.go
index c01095f..699e4f9 100644
--- a/x/reward/keeper/keeper.go
+++ b/x/reward/keeper/keeper.go
@@ -8,7 +8,6 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
- authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/xpladev/xpla/x/reward/types"
)
@@ -59,11 +58,11 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger {
return ctx.Logger().With("module", "x/"+types.ModuleName)
}
-// FundFeeCollector allows an account to directly fund the fee collector fund.
-// The amount is added to the fee collector account
+// FundRewardPool allows an account to directly fund the reward pool fund.
+// The amount is added to the reward pool account
// An error is returned if the amount cannot be sent to the module account.
-func (k Keeper) FundFeeCollector(ctx sdk.Context, amount sdk.Coins, sender sdk.AccAddress) error {
- if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, sender, authtypes.FeeCollectorName, amount); err != nil {
+func (k Keeper) FundRewardPool(ctx sdk.Context, amount sdk.Coins, sender sdk.AccAddress) error {
+ if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, sender, types.ModuleName, amount); err != nil {
return err
}
diff --git a/x/reward/keeper/msg_server.go b/x/reward/keeper/msg_server.go
index 1107955..d996fd7 100644
--- a/x/reward/keeper/msg_server.go
+++ b/x/reward/keeper/msg_server.go
@@ -21,7 +21,7 @@ func NewMsgServerImpl(keeper Keeper) types.MsgServer {
var _ types.MsgServer = msgServer{}
-func (k msgServer) FundFeeCollector(goCtx context.Context, msg *types.MsgFundFeeCollector) (*types.MsgFundFeeCollectorResponse, error) {
+func (k msgServer) FundRewardPool(goCtx context.Context, msg *types.MsgFundRewardPool) (*types.MsgFundRewardPoolResponse, error) {
ctx := sdk.UnwrapSDKContext(goCtx)
depositer, err := sdk.AccAddressFromBech32(msg.Depositor)
@@ -29,7 +29,7 @@ func (k msgServer) FundFeeCollector(goCtx context.Context, msg *types.MsgFundFee
return nil, err
}
- err = k.Keeper.FundFeeCollector(ctx, msg.Amount, depositer)
+ err = k.Keeper.FundRewardPool(ctx, msg.Amount, depositer)
if err != nil {
return nil, err
}
@@ -42,7 +42,7 @@ func (k msgServer) FundFeeCollector(goCtx context.Context, msg *types.MsgFundFee
),
)
- return &types.MsgFundFeeCollectorResponse{}, nil
+ return &types.MsgFundRewardPoolResponse{}, nil
}
// UpdateParams implements the gRPC MsgServer interface. After a successful governance vote
diff --git a/x/reward/types/codec.go b/x/reward/types/codec.go
index dcefda2..7895942 100644
--- a/x/reward/types/codec.go
+++ b/x/reward/types/codec.go
@@ -9,14 +9,14 @@ import (
)
func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
- cdc.RegisterConcrete(&MsgFundFeeCollector{}, "xpladev/MsgFundFeeCollector", nil)
+ cdc.RegisterConcrete(&MsgFundRewardPool{}, "xpladev/MsgFundRewardPool", nil)
cdc.RegisterConcrete(&MsgUpdateParams{}, "xpladev/reward/MsgUpdateParams", nil)
}
func RegisterInterfaces(registry types.InterfaceRegistry) {
registry.RegisterImplementations(
(*sdk.Msg)(nil),
- &MsgFundFeeCollector{},
+ &MsgFundRewardPool{},
&MsgUpdateParams{},
)
diff --git a/x/reward/types/msg.go b/x/reward/types/msg.go
index 631adca..80f77dc 100644
--- a/x/reward/types/msg.go
+++ b/x/reward/types/msg.go
@@ -6,28 +6,28 @@ import (
)
const (
- TypeMsgFundFeeCollector = "fund_fee_collector"
- TypeMsgUpdateParams = "update_params"
+ TypeMsgFundRewardPool = "fund_reward_pool"
+ TypeMsgUpdateParams = "update_params"
)
-// NewMsgFundFeeCollector returns a new MsgFundFeeCollector with a sender and
+// NewMsgFundRewardPool returns a new MsgFundRewardPool with a sender and
// a funding amount.
-func NewMsgFundFeeCollector(amount sdk.Coins, depositor sdk.AccAddress) *MsgFundFeeCollector {
- return &MsgFundFeeCollector{
+func NewMsgFundRewardPool(amount sdk.Coins, depositor sdk.AccAddress) *MsgFundRewardPool {
+ return &MsgFundRewardPool{
Amount: amount,
Depositor: depositor.String(),
}
}
-// Route returns the MsgFundFeeCollector message route.
-func (msg MsgFundFeeCollector) Route() string { return ModuleName }
+// Route returns the MsgFundRewardPool message route.
+func (msg MsgFundRewardPool) Route() string { return ModuleName }
-// Type returns the MsgFundFeeCollector message type.
-func (msg MsgFundFeeCollector) Type() string { return TypeMsgFundFeeCollector }
+// Type returns the MsgFundRewardPool message type.
+func (msg MsgFundRewardPool) Type() string { return TypeMsgFundRewardPool }
// GetSigners returns the signer addresses that are expected to sign the result
// of GetSignBytes.
-func (msg MsgFundFeeCollector) GetSigners() []sdk.AccAddress {
+func (msg MsgFundRewardPool) GetSigners() []sdk.AccAddress {
depoAddr, err := sdk.AccAddressFromBech32(msg.Depositor)
if err != nil {
panic(err)
@@ -35,15 +35,15 @@ func (msg MsgFundFeeCollector) GetSigners() []sdk.AccAddress {
return []sdk.AccAddress{depoAddr}
}
-// GetSignBytes returns the raw bytes for a MsgFundFeeCollector message that
+// GetSignBytes returns the raw bytes for a MsgFundRewardPool message that
// the expected signer needs to sign.
-func (msg MsgFundFeeCollector) GetSignBytes() []byte {
+func (msg MsgFundRewardPool) GetSignBytes() []byte {
bz := ModuleCdc.MustMarshalJSON(&msg)
return sdk.MustSortJSON(bz)
}
-// ValidateBasic performs basic MsgFundFeeCollector message validation.
-func (msg MsgFundFeeCollector) ValidateBasic() error {
+// ValidateBasic performs basic MsgFundRewardPool message validation.
+func (msg MsgFundRewardPool) ValidateBasic() error {
if !msg.Amount.IsValid() {
return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, msg.Amount.String())
}
diff --git a/x/reward/types/msg_test.go b/x/reward/types/msg_test.go
index fcc4d9e..92fdb9c 100644
--- a/x/reward/types/msg_test.go
+++ b/x/reward/types/msg_test.go
@@ -10,7 +10,7 @@ import (
"github.com/xpladev/xpla/x/reward/types"
)
-func TestMsgFundFeeCollector(t *testing.T) {
+func TestMsgFundRewardPool(t *testing.T) {
tests := []struct {
amount sdk.Coins
depositorAddr sdk.AccAddress
@@ -22,7 +22,7 @@ func TestMsgFundFeeCollector(t *testing.T) {
}
for i, tc := range tests {
- msg := types.NewMsgFundFeeCollector(tc.amount, tc.depositorAddr)
+ msg := types.NewMsgFundRewardPool(tc.amount, tc.depositorAddr)
if tc.expectPass {
require.Nil(t, msg.ValidateBasic(), "test index: %v", i)
} else {
diff --git a/x/reward/types/tx.pb.go b/x/reward/types/tx.pb.go
index 96246f6..d08676d 100644
--- a/x/reward/types/tx.pb.go
+++ b/x/reward/types/tx.pb.go
@@ -33,25 +33,25 @@ var _ = math.Inf
// proto package needs to be updated.
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
-// MsgFundFeeCollector allows an account to directly
-// fund the fee collector.
-type MsgFundFeeCollector struct {
+// MsgFundRewardPool allows an account to directly
+// fund the reward pool.
+type MsgFundRewardPool struct {
Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"`
Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"`
}
-func (m *MsgFundFeeCollector) Reset() { *m = MsgFundFeeCollector{} }
-func (m *MsgFundFeeCollector) String() string { return proto.CompactTextString(m) }
-func (*MsgFundFeeCollector) ProtoMessage() {}
-func (*MsgFundFeeCollector) Descriptor() ([]byte, []int) {
+func (m *MsgFundRewardPool) Reset() { *m = MsgFundRewardPool{} }
+func (m *MsgFundRewardPool) String() string { return proto.CompactTextString(m) }
+func (*MsgFundRewardPool) ProtoMessage() {}
+func (*MsgFundRewardPool) Descriptor() ([]byte, []int) {
return fileDescriptor_9ab6178765eaaaf2, []int{0}
}
-func (m *MsgFundFeeCollector) XXX_Unmarshal(b []byte) error {
+func (m *MsgFundRewardPool) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
-func (m *MsgFundFeeCollector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgFundRewardPool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
- return xxx_messageInfo_MsgFundFeeCollector.Marshal(b, m, deterministic)
+ return xxx_messageInfo_MsgFundRewardPool.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b)
@@ -61,34 +61,34 @@ func (m *MsgFundFeeCollector) XXX_Marshal(b []byte, deterministic bool) ([]byte,
return b[:n], nil
}
}
-func (m *MsgFundFeeCollector) XXX_Merge(src proto.Message) {
- xxx_messageInfo_MsgFundFeeCollector.Merge(m, src)
+func (m *MsgFundRewardPool) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_MsgFundRewardPool.Merge(m, src)
}
-func (m *MsgFundFeeCollector) XXX_Size() int {
+func (m *MsgFundRewardPool) XXX_Size() int {
return m.Size()
}
-func (m *MsgFundFeeCollector) XXX_DiscardUnknown() {
- xxx_messageInfo_MsgFundFeeCollector.DiscardUnknown(m)
+func (m *MsgFundRewardPool) XXX_DiscardUnknown() {
+ xxx_messageInfo_MsgFundRewardPool.DiscardUnknown(m)
}
-var xxx_messageInfo_MsgFundFeeCollector proto.InternalMessageInfo
+var xxx_messageInfo_MsgFundRewardPool proto.InternalMessageInfo
-// MsgFundFeeCollectorResponse defines the Msg/FundFeeCollector response type.
-type MsgFundFeeCollectorResponse struct {
+// MsgFundRewardPoolResponse defines the Msg/FundRewardPool response type.
+type MsgFundRewardPoolResponse struct {
}
-func (m *MsgFundFeeCollectorResponse) Reset() { *m = MsgFundFeeCollectorResponse{} }
-func (m *MsgFundFeeCollectorResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgFundFeeCollectorResponse) ProtoMessage() {}
-func (*MsgFundFeeCollectorResponse) Descriptor() ([]byte, []int) {
+func (m *MsgFundRewardPoolResponse) Reset() { *m = MsgFundRewardPoolResponse{} }
+func (m *MsgFundRewardPoolResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgFundRewardPoolResponse) ProtoMessage() {}
+func (*MsgFundRewardPoolResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_9ab6178765eaaaf2, []int{1}
}
-func (m *MsgFundFeeCollectorResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgFundRewardPoolResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
-func (m *MsgFundFeeCollectorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgFundRewardPoolResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
- return xxx_messageInfo_MsgFundFeeCollectorResponse.Marshal(b, m, deterministic)
+ return xxx_messageInfo_MsgFundRewardPoolResponse.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b)
@@ -98,17 +98,17 @@ func (m *MsgFundFeeCollectorResponse) XXX_Marshal(b []byte, deterministic bool)
return b[:n], nil
}
}
-func (m *MsgFundFeeCollectorResponse) XXX_Merge(src proto.Message) {
- xxx_messageInfo_MsgFundFeeCollectorResponse.Merge(m, src)
+func (m *MsgFundRewardPoolResponse) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_MsgFundRewardPoolResponse.Merge(m, src)
}
-func (m *MsgFundFeeCollectorResponse) XXX_Size() int {
+func (m *MsgFundRewardPoolResponse) XXX_Size() int {
return m.Size()
}
-func (m *MsgFundFeeCollectorResponse) XXX_DiscardUnknown() {
- xxx_messageInfo_MsgFundFeeCollectorResponse.DiscardUnknown(m)
+func (m *MsgFundRewardPoolResponse) XXX_DiscardUnknown() {
+ xxx_messageInfo_MsgFundRewardPoolResponse.DiscardUnknown(m)
}
-var xxx_messageInfo_MsgFundFeeCollectorResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgFundRewardPoolResponse proto.InternalMessageInfo
// MsgUpdateParams is the Msg/UpdateParams request type for reward parameters.
// Since: cosmos-sdk 0.47
@@ -207,8 +207,8 @@ func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() {
var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo
func init() {
- proto.RegisterType((*MsgFundFeeCollector)(nil), "xpla.reward.v1beta1.MsgFundFeeCollector")
- proto.RegisterType((*MsgFundFeeCollectorResponse)(nil), "xpla.reward.v1beta1.MsgFundFeeCollectorResponse")
+ proto.RegisterType((*MsgFundRewardPool)(nil), "xpla.reward.v1beta1.MsgFundRewardPool")
+ proto.RegisterType((*MsgFundRewardPoolResponse)(nil), "xpla.reward.v1beta1.MsgFundRewardPoolResponse")
proto.RegisterType((*MsgUpdateParams)(nil), "xpla.reward.v1beta1.MsgUpdateParams")
proto.RegisterType((*MsgUpdateParamsResponse)(nil), "xpla.reward.v1beta1.MsgUpdateParamsResponse")
}
@@ -216,38 +216,38 @@ func init() {
func init() { proto.RegisterFile("xpla/reward/v1beta1/tx.proto", fileDescriptor_9ab6178765eaaaf2) }
var fileDescriptor_9ab6178765eaaaf2 = []byte{
- // 488 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xbf, 0x6f, 0xd3, 0x40,
- 0x14, 0xf6, 0x51, 0x14, 0x29, 0x57, 0xc4, 0x0f, 0xb7, 0x52, 0xf3, 0xa3, 0x38, 0x51, 0x84, 0x90,
- 0x55, 0x51, 0x5f, 0x13, 0x24, 0x24, 0x3a, 0x41, 0x2a, 0x75, 0x8b, 0x84, 0x8c, 0x58, 0x58, 0xd0,
- 0xd9, 0x3e, 0xb9, 0x16, 0xb1, 0x9f, 0x75, 0xef, 0x12, 0xd2, 0x95, 0x09, 0x31, 0x31, 0xf0, 0x07,
- 0x74, 0x66, 0xea, 0xc0, 0x5f, 0xc0, 0xd4, 0xb1, 0x62, 0x82, 0x05, 0x50, 0x32, 0x94, 0x3f, 0x03,
- 0xd9, 0x3e, 0x93, 0x02, 0x46, 0xca, 0x92, 0x8b, 0xdf, 0xf7, 0xdd, 0xf7, 0x7d, 0xef, 0xde, 0xa3,
- 0xdb, 0xb3, 0x74, 0xcc, 0x99, 0x14, 0xaf, 0xb8, 0x0c, 0xd8, 0xb4, 0xef, 0x09, 0xc5, 0xfb, 0x4c,
- 0xcd, 0x9c, 0x54, 0x82, 0x02, 0x73, 0x23, 0x43, 0x9d, 0x02, 0x75, 0x34, 0xda, 0xda, 0x0c, 0x21,
- 0x84, 0x1c, 0x67, 0xd9, 0xbf, 0x82, 0xda, 0xb2, 0x7c, 0xc0, 0x18, 0x90, 0x79, 0x1c, 0xc5, 0x6f,
- 0x21, 0x1f, 0xa2, 0x44, 0xe3, 0x5b, 0x1a, 0x8f, 0x31, 0x64, 0xd3, 0x7e, 0x76, 0x68, 0xa0, 0x59,
- 0x00, 0x2f, 0x0a, 0xc5, 0xe2, 0x43, 0x43, 0xdd, 0xaa, 0x70, 0x3a, 0x4d, 0xc1, 0xb8, 0xc5, 0xe3,
- 0x28, 0x01, 0x96, 0xff, 0x16, 0xa5, 0xde, 0x27, 0x42, 0x37, 0x46, 0x18, 0x1e, 0x4e, 0x92, 0xe0,
- 0x50, 0x88, 0x03, 0x18, 0x8f, 0x85, 0xaf, 0x40, 0x9a, 0x3e, 0xad, 0xf1, 0x18, 0x26, 0x89, 0x6a,
- 0x90, 0xee, 0x9a, 0xbd, 0x3e, 0x68, 0x3a, 0xda, 0x2b, 0x4b, 0x5c, 0x36, 0xe7, 0x1c, 0x40, 0x94,
- 0x0c, 0xf7, 0xce, 0xbe, 0x75, 0x8c, 0x0f, 0xdf, 0x3b, 0x76, 0x18, 0xa9, 0xa3, 0x89, 0xe7, 0xf8,
- 0x10, 0xeb, 0x60, 0xfa, 0xd8, 0xc5, 0xe0, 0x25, 0x53, 0xc7, 0xa9, 0xc0, 0xfc, 0x02, 0xba, 0x5a,
- 0xda, 0xdc, 0xa6, 0xf5, 0x40, 0xa4, 0x80, 0x91, 0x02, 0xd9, 0xb8, 0xd2, 0x25, 0x76, 0xdd, 0x5d,
- 0x16, 0xf6, 0xed, 0x37, 0x27, 0x1d, 0xe3, 0xe7, 0x49, 0xc7, 0x78, 0x7b, 0x71, 0xba, 0xd3, 0xce,
- 0x9a, 0x0b, 0xc4, 0x94, 0x55, 0x84, 0xed, 0xdd, 0xa6, 0xed, 0x8a, 0xb2, 0x2b, 0x30, 0x85, 0x04,
- 0x45, 0xef, 0x3d, 0xa1, 0x37, 0x46, 0x18, 0x3e, 0x4b, 0x03, 0xae, 0xc4, 0x13, 0x2e, 0x79, 0x8c,
- 0xe6, 0x03, 0x5a, 0xe7, 0x13, 0x75, 0x04, 0x32, 0x52, 0xc7, 0x0d, 0x92, 0x59, 0x0f, 0x1b, 0x9f,
- 0x3f, 0xee, 0x6e, 0xea, 0x2e, 0x1f, 0x07, 0x81, 0x14, 0x88, 0x4f, 0x95, 0x8c, 0x92, 0xd0, 0x5d,
- 0x52, 0xcd, 0x87, 0xb4, 0x96, 0xe6, 0x0a, 0x79, 0xde, 0xf5, 0x41, 0xdb, 0xa9, 0x18, 0xba, 0x53,
- 0x98, 0x0c, 0xaf, 0x66, 0x2f, 0xe3, 0xea, 0x0b, 0xfb, 0xd7, 0x5f, 0x5f, 0x9c, 0xee, 0x2c, 0xa5,
- 0x7a, 0x4d, 0xba, 0xf5, 0x57, 0xaa, 0x32, 0xf1, 0xe0, 0x2b, 0xa1, 0x6b, 0x23, 0x0c, 0xcd, 0x84,
- 0xde, 0xfc, 0x67, 0x32, 0x76, 0xa5, 0x63, 0x45, 0xff, 0xad, 0xbd, 0x55, 0x99, 0xa5, 0xaf, 0xe9,
- 0xd1, 0x6b, 0x7f, 0xbc, 0xd2, 0x9d, 0xff, 0x29, 0x5c, 0x66, 0xb5, 0xee, 0xad, 0xc2, 0x2a, 0x3d,
- 0x86, 0x8f, 0xce, 0xe6, 0x16, 0x39, 0x9f, 0x5b, 0xe4, 0xc7, 0xdc, 0x22, 0xef, 0x16, 0x96, 0x71,
- 0xbe, 0xb0, 0x8c, 0x2f, 0x0b, 0xcb, 0x78, 0x7e, 0xf7, 0xd2, 0x02, 0x95, 0xe3, 0xce, 0x77, 0x7a,
- 0x56, 0x6e, 0x75, 0xbe, 0x44, 0x5e, 0x2d, 0x5f, 0xdd, 0xfb, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff,
- 0x69, 0x2f, 0x59, 0x50, 0x8e, 0x03, 0x00, 0x00,
+ // 483 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x31, 0x6f, 0xd3, 0x40,
+ 0x14, 0xf6, 0x51, 0x14, 0x29, 0x57, 0x54, 0x54, 0x53, 0xa9, 0x71, 0x5a, 0x39, 0x51, 0x84, 0xa2,
+ 0xa8, 0xa2, 0x77, 0x24, 0x48, 0x48, 0x74, 0x82, 0x20, 0xb1, 0x45, 0xaa, 0x8c, 0x58, 0x58, 0xd0,
+ 0x39, 0x3e, 0x39, 0x16, 0xb5, 0x9f, 0xe5, 0x77, 0x09, 0xe9, 0xca, 0x84, 0x98, 0x18, 0xf8, 0x01,
+ 0x9d, 0x99, 0x3a, 0x30, 0x33, 0x77, 0xac, 0x60, 0x61, 0x02, 0x94, 0x0c, 0xe5, 0x67, 0x20, 0x9f,
+ 0xcf, 0xa4, 0x34, 0x41, 0xea, 0xe2, 0xf3, 0xbd, 0xef, 0x7b, 0xef, 0xfb, 0xde, 0xbd, 0x47, 0x77,
+ 0xa7, 0xe9, 0x91, 0xe0, 0x99, 0x7c, 0x23, 0xb2, 0x80, 0x4f, 0xba, 0xbe, 0x54, 0xa2, 0xcb, 0xd5,
+ 0x94, 0xa5, 0x19, 0x28, 0xb0, 0xef, 0xe4, 0x28, 0x2b, 0x50, 0x66, 0xd0, 0xfa, 0x56, 0x08, 0x21,
+ 0x68, 0x9c, 0xe7, 0x7f, 0x05, 0xb5, 0xee, 0x0e, 0x01, 0x63, 0x40, 0xee, 0x0b, 0x94, 0x7f, 0x0b,
+ 0x0d, 0x21, 0x4a, 0x0c, 0xbe, 0x6d, 0xf0, 0x18, 0x43, 0x3e, 0xe9, 0xe6, 0x87, 0x01, 0x9c, 0x02,
+ 0x78, 0x55, 0x54, 0x2c, 0x2e, 0x06, 0x6a, 0xae, 0x32, 0x67, 0xdc, 0x14, 0x8c, 0x4d, 0x11, 0x47,
+ 0x09, 0x70, 0xfd, 0x2d, 0x42, 0xad, 0x2f, 0x84, 0x6e, 0x0e, 0x30, 0x7c, 0x36, 0x4e, 0x02, 0x4f,
+ 0x53, 0x0f, 0x01, 0x8e, 0xec, 0x21, 0xad, 0x88, 0x18, 0xc6, 0x89, 0xaa, 0x91, 0xe6, 0x5a, 0x67,
+ 0xbd, 0xe7, 0x30, 0xa3, 0x94, 0xfb, 0x2d, 0x5b, 0x63, 0x4f, 0x21, 0x4a, 0xfa, 0xf7, 0xcf, 0x7e,
+ 0x34, 0xac, 0x4f, 0x3f, 0x1b, 0x9d, 0x30, 0x52, 0xa3, 0xb1, 0xcf, 0x86, 0x10, 0x1b, 0x5b, 0xe6,
+ 0xd8, 0xc7, 0xe0, 0x35, 0x57, 0xc7, 0xa9, 0x44, 0x9d, 0x80, 0x9e, 0x29, 0x6d, 0xef, 0xd2, 0x6a,
+ 0x20, 0x53, 0xc0, 0x48, 0x41, 0x56, 0xbb, 0xd1, 0x24, 0x9d, 0xaa, 0xb7, 0x08, 0x1c, 0xb4, 0xdf,
+ 0x9d, 0x34, 0xac, 0xdf, 0x27, 0x0d, 0xeb, 0xfd, 0xc5, 0xe9, 0x9e, 0x93, 0xb7, 0x16, 0xc8, 0x09,
+ 0x5f, 0xb2, 0xda, 0xda, 0xa1, 0xce, 0x52, 0xd0, 0x93, 0x98, 0x42, 0x82, 0xb2, 0xf5, 0x91, 0xd0,
+ 0xdb, 0x03, 0x0c, 0x5f, 0xa4, 0x81, 0x50, 0xf2, 0x50, 0x64, 0x22, 0x46, 0xfb, 0x21, 0xad, 0x8a,
+ 0xb1, 0x1a, 0x41, 0x16, 0xa9, 0xe3, 0x1a, 0xc9, 0x65, 0xfb, 0xb5, 0xaf, 0x9f, 0xf7, 0xb7, 0x4c,
+ 0x87, 0x4f, 0x82, 0x20, 0x93, 0x88, 0xcf, 0x55, 0x16, 0x25, 0xa1, 0xb7, 0xa0, 0xda, 0x8f, 0x68,
+ 0x25, 0xd5, 0x15, 0xb4, 0xd7, 0xf5, 0xde, 0x0e, 0x5b, 0x31, 0x6e, 0x56, 0x88, 0xf4, 0x6f, 0xe6,
+ 0xaf, 0xe2, 0x99, 0x84, 0x83, 0x8d, 0xb7, 0x17, 0xa7, 0x7b, 0x8b, 0x52, 0x2d, 0x87, 0x6e, 0x5f,
+ 0x71, 0x55, 0x3a, 0xee, 0x7d, 0x23, 0x74, 0x6d, 0x80, 0xa1, 0x3d, 0xa2, 0x1b, 0x57, 0x66, 0xd2,
+ 0x5e, 0xa9, 0xb7, 0xd4, 0x7b, 0x9d, 0x5d, 0x8f, 0x57, 0x2a, 0xda, 0x3e, 0xbd, 0xf5, 0xcf, 0xfb,
+ 0xdc, 0xfd, 0x5f, 0xfe, 0x65, 0x56, 0xfd, 0xde, 0x75, 0x58, 0xa5, 0x46, 0xff, 0xf1, 0xd9, 0xcc,
+ 0x25, 0xe7, 0x33, 0x97, 0xfc, 0x9a, 0xb9, 0xe4, 0xc3, 0xdc, 0xb5, 0xce, 0xe7, 0xae, 0xf5, 0x7d,
+ 0xee, 0x5a, 0x2f, 0xdb, 0x97, 0xd6, 0xa6, 0x1c, 0xb2, 0xde, 0xe3, 0x69, 0xb9, 0xc9, 0x7a, 0x75,
+ 0xfc, 0x8a, 0x5e, 0xd7, 0x07, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x52, 0x9b, 0x66, 0x8c, 0x82,
+ 0x03, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -262,9 +262,9 @@ const _ = grpc.SupportPackageIsVersion4
//
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
type MsgClient interface {
- // FundFeeCollector defines a method to allow an account to directly
- // fund the fee collector.
- FundFeeCollector(ctx context.Context, in *MsgFundFeeCollector, opts ...grpc.CallOption) (*MsgFundFeeCollectorResponse, error)
+ // MsgFundRewardPool defines a method to allow an account to directly
+ // fund the reward pool.
+ FundRewardPool(ctx context.Context, in *MsgFundRewardPool, opts ...grpc.CallOption) (*MsgFundRewardPoolResponse, error)
// UpdateParams defined a governance operation for updating the x/reward
// module parameters. The authority is hard-coded to the Cosmos SDK x/gov
// module account
@@ -279,9 +279,9 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient {
return &msgClient{cc}
}
-func (c *msgClient) FundFeeCollector(ctx context.Context, in *MsgFundFeeCollector, opts ...grpc.CallOption) (*MsgFundFeeCollectorResponse, error) {
- out := new(MsgFundFeeCollectorResponse)
- err := c.cc.Invoke(ctx, "/xpla.reward.v1beta1.Msg/FundFeeCollector", in, out, opts...)
+func (c *msgClient) FundRewardPool(ctx context.Context, in *MsgFundRewardPool, opts ...grpc.CallOption) (*MsgFundRewardPoolResponse, error) {
+ out := new(MsgFundRewardPoolResponse)
+ err := c.cc.Invoke(ctx, "/xpla.reward.v1beta1.Msg/FundRewardPool", in, out, opts...)
if err != nil {
return nil, err
}
@@ -299,9 +299,9 @@ func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts
// MsgServer is the server API for Msg service.
type MsgServer interface {
- // FundFeeCollector defines a method to allow an account to directly
- // fund the fee collector.
- FundFeeCollector(context.Context, *MsgFundFeeCollector) (*MsgFundFeeCollectorResponse, error)
+ // MsgFundRewardPool defines a method to allow an account to directly
+ // fund the reward pool.
+ FundRewardPool(context.Context, *MsgFundRewardPool) (*MsgFundRewardPoolResponse, error)
// UpdateParams defined a governance operation for updating the x/reward
// module parameters. The authority is hard-coded to the Cosmos SDK x/gov
// module account
@@ -312,8 +312,8 @@ type MsgServer interface {
type UnimplementedMsgServer struct {
}
-func (*UnimplementedMsgServer) FundFeeCollector(ctx context.Context, req *MsgFundFeeCollector) (*MsgFundFeeCollectorResponse, error) {
- return nil, status.Errorf(codes.Unimplemented, "method FundFeeCollector not implemented")
+func (*UnimplementedMsgServer) FundRewardPool(ctx context.Context, req *MsgFundRewardPool) (*MsgFundRewardPoolResponse, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method FundRewardPool not implemented")
}
func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented")
@@ -323,20 +323,20 @@ func RegisterMsgServer(s grpc1.Server, srv MsgServer) {
s.RegisterService(&_Msg_serviceDesc, srv)
}
-func _Msg_FundFeeCollector_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
- in := new(MsgFundFeeCollector)
+func _Msg_FundRewardPool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(MsgFundRewardPool)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
- return srv.(MsgServer).FundFeeCollector(ctx, in)
+ return srv.(MsgServer).FundRewardPool(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: "/xpla.reward.v1beta1.Msg/FundFeeCollector",
+ FullMethod: "/xpla.reward.v1beta1.Msg/FundRewardPool",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
- return srv.(MsgServer).FundFeeCollector(ctx, req.(*MsgFundFeeCollector))
+ return srv.(MsgServer).FundRewardPool(ctx, req.(*MsgFundRewardPool))
}
return interceptor(ctx, in, info, handler)
}
@@ -364,8 +364,8 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
HandlerType: (*MsgServer)(nil),
Methods: []grpc.MethodDesc{
{
- MethodName: "FundFeeCollector",
- Handler: _Msg_FundFeeCollector_Handler,
+ MethodName: "FundRewardPool",
+ Handler: _Msg_FundRewardPool_Handler,
},
{
MethodName: "UpdateParams",
@@ -376,7 +376,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
Metadata: "xpla/reward/v1beta1/tx.proto",
}
-func (m *MsgFundFeeCollector) Marshal() (dAtA []byte, err error) {
+func (m *MsgFundRewardPool) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -386,12 +386,12 @@ func (m *MsgFundFeeCollector) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil
}
-func (m *MsgFundFeeCollector) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgFundRewardPool) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
-func (m *MsgFundFeeCollector) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgFundRewardPool) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
@@ -420,7 +420,7 @@ func (m *MsgFundFeeCollector) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return len(dAtA) - i, nil
}
-func (m *MsgFundFeeCollectorResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgFundRewardPoolResponse) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -430,12 +430,12 @@ func (m *MsgFundFeeCollectorResponse) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil
}
-func (m *MsgFundFeeCollectorResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgFundRewardPoolResponse) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
-func (m *MsgFundFeeCollectorResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgFundRewardPoolResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
@@ -517,7 +517,7 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int {
dAtA[offset] = uint8(v)
return base
}
-func (m *MsgFundFeeCollector) Size() (n int) {
+func (m *MsgFundRewardPool) Size() (n int) {
if m == nil {
return 0
}
@@ -536,7 +536,7 @@ func (m *MsgFundFeeCollector) Size() (n int) {
return n
}
-func (m *MsgFundFeeCollectorResponse) Size() (n int) {
+func (m *MsgFundRewardPoolResponse) Size() (n int) {
if m == nil {
return 0
}
@@ -575,7 +575,7 @@ func sovTx(x uint64) (n int) {
func sozTx(x uint64) (n int) {
return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63))))
}
-func (m *MsgFundFeeCollector) Unmarshal(dAtA []byte) error {
+func (m *MsgFundRewardPool) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
@@ -598,10 +598,10 @@ func (m *MsgFundFeeCollector) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
- return fmt.Errorf("proto: MsgFundFeeCollector: wiretype end group for non-group")
+ return fmt.Errorf("proto: MsgFundRewardPool: wiretype end group for non-group")
}
if fieldNum <= 0 {
- return fmt.Errorf("proto: MsgFundFeeCollector: illegal tag %d (wire type %d)", fieldNum, wire)
+ return fmt.Errorf("proto: MsgFundRewardPool: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
@@ -691,7 +691,7 @@ func (m *MsgFundFeeCollector) Unmarshal(dAtA []byte) error {
}
return nil
}
-func (m *MsgFundFeeCollectorResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgFundRewardPoolResponse) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
@@ -714,10 +714,10 @@ func (m *MsgFundFeeCollectorResponse) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
- return fmt.Errorf("proto: MsgFundFeeCollectorResponse: wiretype end group for non-group")
+ return fmt.Errorf("proto: MsgFundRewardPoolResponse: wiretype end group for non-group")
}
if fieldNum <= 0 {
- return fmt.Errorf("proto: MsgFundFeeCollectorResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+ return fmt.Errorf("proto: MsgFundRewardPoolResponse: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
default:
From f8ede53e2b355ceafa0c944f31ada00ead666aee Mon Sep 17 00:00:00 2001
From: Joowon Yun <40225835+JoowonYun@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:36:08 +0900
Subject: [PATCH 3/6] feat: cosmos sdk v0.47.13 & ibc-go v7.7.0 (#141)
---
app/keepers/keepers.go | 3 +++
go.mod | 22 +++++++++++-----------
go.sum | 41 +++++++++++++++++++++--------------------
3 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
index bd2bca1..45b48da 100644
--- a/app/keepers/keepers.go
+++ b/app/keepers/keepers.go
@@ -466,6 +466,9 @@ func NewAppKeeper(
bApp.MsgServiceRouter(),
)
+ // required since ibc-go v7.5.0
+ appKeepers.ICAHostKeeper.WithQueryRouter(bApp.GRPCQueryRouter())
+
// ICA Controller keeper
appKeepers.ICAControllerKeeper = icacontrollerkeeper.NewKeeper(
appCodec, appKeepers.keys[icacontrollertypes.StoreKey], appKeepers.GetSubspace(icacontrollertypes.SubModuleName),
diff --git a/go.mod b/go.mod
index b7b3be4..b26b993 100644
--- a/go.mod
+++ b/go.mod
@@ -10,11 +10,11 @@ require (
github.com/CosmWasm/wasmd v0.45.0
github.com/cometbft/cometbft v0.37.5
github.com/cometbft/cometbft-db v0.8.0
- github.com/cosmos/cosmos-proto v1.0.0-beta.4
- github.com/cosmos/cosmos-sdk v0.47.10
+ github.com/cosmos/cosmos-proto v1.0.0-beta.5
+ github.com/cosmos/cosmos-sdk v0.47.13
github.com/cosmos/gogoproto v1.4.10
- github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3-0.20240228213828-cce7f56d000b
- github.com/cosmos/ibc-go/v7 v7.4.0
+ github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3
+ github.com/cosmos/ibc-go/v7 v7.7.0
github.com/ethereum/go-ethereum v1.10.26
github.com/golang/protobuf v1.5.4
github.com/grpc-ecosystem/grpc-gateway v1.16.0
@@ -24,7 +24,7 @@ require (
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.18.2
- github.com/stretchr/testify v1.8.4
+ github.com/stretchr/testify v1.9.0
github.com/xpladev/ethermint v0.23.0-xpla-4
golang.org/x/sync v0.6.0
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80
@@ -125,7 +125,7 @@ require (
github.com/gtank/merlin v0.1.1 // indirect
github.com/gtank/ristretto255 v0.1.2 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
- github.com/hashicorp/go-getter v1.7.1 // indirect
+ github.com/hashicorp/go-getter v1.7.5 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
@@ -205,12 +205,12 @@ require (
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
- golang.org/x/crypto v0.18.0 // indirect
+ golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
- golang.org/x/net v0.20.0 // indirect
+ golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
- golang.org/x/sys v0.16.0 // indirect
- golang.org/x/term v0.16.0 // indirect
+ golang.org/x/sys v0.18.0 // indirect
+ golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/api v0.155.0 // indirect
@@ -229,7 +229,7 @@ require (
replace (
// use cosmos fork of keyring
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
- github.com/cosmos/cosmos-sdk => github.com/xpladev/cosmos-sdk v0.47.10-xpla
+ github.com/cosmos/cosmos-sdk => github.com/xpladev/cosmos-sdk v0.47.13-xpla
github.com/cosmos/ledger-cosmos-go => github.com/xpladev/ledger-cosmos-go v0.12.2-xpla
diff --git a/go.sum b/go.sum
index 11da6ad..c045c9c 100644
--- a/go.sum
+++ b/go.sum
@@ -358,8 +358,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk=
github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis=
-github.com/cosmos/cosmos-proto v1.0.0-beta.4 h1:aEL7tU/rLOmxZQ9z4i7mzxcLbSCY48OdY7lIWTLG7oU=
-github.com/cosmos/cosmos-proto v1.0.0-beta.4/go.mod h1:oeB+FyVzG3XrQJbJng0EnV8Vljfk9XvTIpGILNU/9Co=
+github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA=
+github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec=
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
@@ -370,10 +370,10 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK
github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg=
github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
-github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3-0.20240228213828-cce7f56d000b h1:VwhHRRIPdMshBMb2TP7xrkY4Ee8CJWsHZvucYeJ56no=
-github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3-0.20240228213828-cce7f56d000b/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s=
-github.com/cosmos/ibc-go/v7 v7.4.0 h1:8FqYMptvksgMvlbN4UW9jFxTXzsPyfAzEZurujXac8M=
-github.com/cosmos/ibc-go/v7 v7.4.0/go.mod h1:L/KaEhzV5TGUCTfGysVgMBQtl5Dm7hHitfpk+GIeoAo=
+github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3 h1:MZGDMETv72suFpTAD6VPGqSIm1FJcChtk2HmVh9D+Bo=
+github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s=
+github.com/cosmos/ibc-go/v7 v7.7.0 h1:/ndLv4GiAkOaHQKpcoQyoGIZpGpT4d+9kjl5n3DsaVQ=
+github.com/cosmos/ibc-go/v7 v7.7.0/go.mod h1:zzFhtp9g9RrN/UxXWrdUu5VyonBALCAHujXQCzrZSu8=
github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=
github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0=
github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo=
@@ -680,8 +680,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY=
-github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
+github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4=
+github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
@@ -1032,8 +1032,8 @@ github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5J
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -1043,8 +1043,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
@@ -1084,8 +1085,8 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX
github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/xpladev/cosmos-sdk v0.47.10-xpla h1:7zbtoMCBGYlPUzz+2+nDHW7sSvnHlJknorAZfd7bwfc=
-github.com/xpladev/cosmos-sdk v0.47.10-xpla/go.mod h1:WjqTUUHJnaRjkgJbP2aQ1F+9pxDpLsOBpfuP2S0W+Ck=
+github.com/xpladev/cosmos-sdk v0.47.13-xpla h1:DsCHa2waalcw8UasF2Jb12JZucn/ueLdIDPuG8UuLqw=
+github.com/xpladev/cosmos-sdk v0.47.13-xpla/go.mod h1:pYMzhTfKFn9AJB5X64Epwe9NgYk0y3v7XN8Ks5xqWoo=
github.com/xpladev/ethermint v0.23.0-xpla-4 h1:l6QxGfnh83Y19hjmt8IJtk4skcRnsO2XNsgHdu8OSig=
github.com/xpladev/ethermint v0.23.0-xpla-4/go.mod h1:cAx0S0XxPKY0enn4nufgaJIxtHEM51UXFOrOS3aEDwA=
github.com/xpladev/go-ethereum v1.10.26-xpla h1:tz9WTV9Fhhu9Xcpxo7RcXBygKcUbb5Zps4PBOVFgRqQ=
@@ -1164,8 +1165,8 @@ golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
-golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb h1:xIApU0ow1zwMa2uL1VDNeQlNVFTWMQxZUZCMDy0Q4Us=
golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1253,8 +1254,8 @@ golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfS
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1397,15 +1398,15 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
+golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
From 0951805d73de03e747d1260a2662080c85fa3581 Mon Sep 17 00:00:00 2001
From: yoosah <34054347+yoosah@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:36:19 +0900
Subject: [PATCH 4/6] feat: set MaxMetadataLen for proposals longer (#144)
---
app/keepers/keepers.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
index 45b48da..5daffaf 100644
--- a/app/keepers/keepers.go
+++ b/app/keepers/keepers.go
@@ -374,6 +374,9 @@ func NewAppKeeper(
AddRoute(erc20types.RouterKey, erc20.NewErc20ProposalHandler(&appKeepers.Erc20Keeper)).
AddRoute(volunteertypes.RouterKey, volunteerkeeper.NewVolunteerValidatorProposalHandler(appKeepers.VolunteerKeeper))
+ govConfig := govtypes.DefaultConfig()
+ // set the MaxMetadataLen for proposals to the same value as it was pre-sdk v0.47.x
+ govConfig.MaxMetadataLen = 10200
govKeeper := govkeeper.NewKeeper(
appCodec,
appKeepers.keys[govtypes.StoreKey],
@@ -381,7 +384,7 @@ func NewAppKeeper(
appKeepers.BankKeeper,
appKeepers.StakingKeeper,
bApp.MsgServiceRouter(),
- govtypes.DefaultConfig(),
+ govConfig,
govModAddress,
)
From 36a014fa8d0a62776cf49cdf356a1f589152f8b6 Mon Sep 17 00:00:00 2001
From: Joowon Yun <40225835+JoowonYun@users.noreply.github.com>
Date: Fri, 23 Aug 2024 17:58:47 +0900
Subject: [PATCH 5/6] Fix: cwa 2024 005 (#148)
* fix: CWA-2024-005
* chore: fix path of wasm ParamKeyTable()
* chore: go mod tidy
---------
Co-authored-by: sooyoung
---
app/keepers/keepers.go | 2 +-
app/upgrades/v1_5/upgrades.go | 3 ++-
go.mod | 6 ++---
go.sum | 47 ++++++++++++++++++++++++++++++++---
4 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
index 5daffaf..6ef553b 100644
--- a/app/keepers/keepers.go
+++ b/app/keepers/keepers.go
@@ -562,7 +562,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
paramsKeeper.Subspace(pfmroutertypes.ModuleName).WithKeyTable(pfmroutertypes.ParamKeyTable())
paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
paramsKeeper.Subspace(icahosttypes.SubModuleName)
- paramsKeeper.Subspace(wasmtypes.ModuleName).WithKeyTable(wasmtypes.ParamKeyTable())
+ paramsKeeper.Subspace(wasmtypes.ModuleName)
paramsKeeper.Subspace(feemarkettypes.ModuleName).WithKeyTable(feemarkettypes.ParamKeyTable())
paramsKeeper.Subspace(evmtypes.ModuleName).WithKeyTable(evmtypes.ParamKeyTable())
paramsKeeper.Subspace(erc20types.ModuleName)
diff --git a/app/upgrades/v1_5/upgrades.go b/app/upgrades/v1_5/upgrades.go
index 6ab072c..2265d1f 100644
--- a/app/upgrades/v1_5/upgrades.go
+++ b/app/upgrades/v1_5/upgrades.go
@@ -2,6 +2,7 @@ package v1_5
import (
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
+ wasmmigrationv2 "github.com/CosmWasm/wasmd/x/wasm/migrations/v2"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/codec"
@@ -95,7 +96,7 @@ func CreateUpgradeHandler(
// wasm
case wasmtypes.ModuleName:
- keyTable = wasmtypes.ParamKeyTable() //nolint:staticcheck
+ keyTable = wasmmigrationv2.ParamKeyTable() //nolint:staticcheck
// xpla
case rewardtypes.ModuleName:
diff --git a/go.mod b/go.mod
index b26b993..0cbf4f0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,13 +1,13 @@
module github.com/xpladev/xpla
-go 1.20
+go 1.21
require (
cosmossdk.io/api v0.3.1
cosmossdk.io/errors v1.0.1
cosmossdk.io/math v1.3.0
cosmossdk.io/simapp v0.0.0-20230608160436-666c345ad23d
- github.com/CosmWasm/wasmd v0.45.0
+ github.com/CosmWasm/wasmd v0.46.0
github.com/cometbft/cometbft v0.37.5
github.com/cometbft/cometbft-db v0.8.0
github.com/cosmos/cosmos-proto v1.0.0-beta.5
@@ -46,7 +46,7 @@ require (
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/99designs/keyring v1.2.1 // indirect
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
- github.com/CosmWasm/wasmvm v1.5.1 // indirect
+ github.com/CosmWasm/wasmvm v1.5.4 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
diff --git a/go.sum b/go.sum
index c045c9c..1404557 100644
--- a/go.sum
+++ b/go.sum
@@ -205,17 +205,20 @@ filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5E
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM=
github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4=
-github.com/CosmWasm/wasmd v0.45.0 h1:9zBqrturKJwC2kVsfHvbrA++EN0PS7UTXCffCGbg6JI=
-github.com/CosmWasm/wasmd v0.45.0/go.mod h1:RnSAiqbNIZu4QhO+0pd7qGZgnYAMBPGmXpzTADag944=
-github.com/CosmWasm/wasmvm v1.5.1 h1:2MHN9uFyHP6pxfvpBJ0JW6ujvAIBk9kQk283zyri0Ro=
-github.com/CosmWasm/wasmvm v1.5.1/go.mod h1:fXB+m2gyh4v9839zlIXdMZGeLAxqUdYdFQqYsTha2hc=
+github.com/CosmWasm/wasmd v0.46.0 h1:78kmiobbVE8JWBcM+ssxiFV2cS+4l9lmZQqPAQ0mA04=
+github.com/CosmWasm/wasmd v0.46.0/go.mod h1:BZFz+CFGdLNGomshb3IeccFyD4R+XbnS/mXpytOUyTA=
+github.com/CosmWasm/wasmvm v1.5.4 h1:Opqy65ubJ8bMsT08dn85VjRdsLJVPIAgIXif92qOMGc=
+github.com/CosmWasm/wasmvm v1.5.4/go.mod h1:Q0bSEtlktzh7W2hhEaifrFp1Erx11ckQZmjq8FLCyys=
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
+github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
+github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
@@ -227,6 +230,7 @@ github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNu
github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I=
+github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV9fHg=
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -288,6 +292,7 @@ github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
+github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
github.com/bytedance/sonic v1.8.0 h1:ea0Xadu+sHlu7x5O3gKhRpQ1IKiMrSiHttPF0ybECuA=
github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
@@ -299,6 +304,7 @@ github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8
github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
+github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -331,6 +337,7 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH
github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ=
+github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM=
github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E=
github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
@@ -350,6 +357,7 @@ github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3Hf
github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4=
github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak=
github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
+github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -400,6 +408,7 @@ github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsP
github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y=
+github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
@@ -420,7 +429,9 @@ github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwu
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
+github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
+github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf h1:Yt+4K30SdjOkRoRRm3vYNQgR+/ZIy0RmeUDZo7Y8zeQ=
github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=
github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
@@ -447,15 +458,19 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
+github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
+github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
+github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
@@ -470,6 +485,7 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8=
github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k=
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
+github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
@@ -505,6 +521,7 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
@@ -527,6 +544,7 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog=
+github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
@@ -603,6 +621,7 @@ github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIG
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
+github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us=
github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -676,6 +695,7 @@ github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoP
github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
+github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
@@ -740,6 +760,7 @@ github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
+github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
@@ -840,6 +861,7 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A=
+github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -863,6 +885,7 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -874,17 +897,22 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
+github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts=
github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034=
+github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w=
+github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
@@ -894,6 +922,7 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ
github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
+github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
@@ -910,6 +939,7 @@ github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761/go.mod h1:pxMtw7c
github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
+github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -997,6 +1027,7 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -1034,6 +1065,7 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -1083,6 +1115,7 @@ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb
github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
+github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
github.com/xpladev/cosmos-sdk v0.47.13-xpla h1:DsCHa2waalcw8UasF2Jb12JZucn/ueLdIDPuG8UuLqw=
@@ -1094,6 +1127,7 @@ github.com/xpladev/go-ethereum v1.10.26-xpla/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCX
github.com/xpladev/ledger-cosmos-go v0.12.2-xpla h1:+3moDTh8sybPd1CtdNNNFlJS78vuUCvGxvxDiitt2yg=
github.com/xpladev/ledger-cosmos-go v0.12.2-xpla/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -1128,6 +1162,7 @@ go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znn
go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
+go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
@@ -1139,6 +1174,7 @@ go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU=
+go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
@@ -1192,6 +1228,7 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1488,6 +1525,7 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1767,6 +1805,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
+gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
From da1d389c6083963a2c2f58c105f4e9327ba8e77d Mon Sep 17 00:00:00 2001
From: sooyoung
Date: Fri, 23 Aug 2024 18:31:17 +0900
Subject: [PATCH 6/6] chore: bump go version to 1.21.x for action
---
.github/workflows/go.yaml | 2 +-
app/upgrades/v1_5/upgrades.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml
index 4caab7c..bd35f1a 100644
--- a/.github/workflows/go.yaml
+++ b/.github/workflows/go.yaml
@@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
- go-version: [1.20.x]
+ go-version: [1.21.x]
steps:
- uses: actions/checkout@v3
diff --git a/app/upgrades/v1_5/upgrades.go b/app/upgrades/v1_5/upgrades.go
index 2265d1f..ccdb3e6 100644
--- a/app/upgrades/v1_5/upgrades.go
+++ b/app/upgrades/v1_5/upgrades.go
@@ -1,8 +1,8 @@
package v1_5
import (
- wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
wasmmigrationv2 "github.com/CosmWasm/wasmd/x/wasm/migrations/v2"
+ wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/codec"