diff --git a/app/app.go b/app/app.go index 2b73fb08e3..b084621256 100644 --- a/app/app.go +++ b/app/app.go @@ -145,7 +145,7 @@ import ( const ( AccountAddressPrefix = "stride" Name = "stride" - Version = "9.0.1" + Version = "9.1.1" ) // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals diff --git a/cmd/strided/config/config.go b/cmd/strided/config/config.go index 13c4b6a66b..02dcb2ac3c 100644 --- a/cmd/strided/config/config.go +++ b/cmd/strided/config/config.go @@ -42,7 +42,7 @@ func SetupConfig() { version.AppName = "stride" version.Name = "strided" - version.Version = "v9.0.1" + version.Version = "v9.1.1" } // SetBech32Prefixes sets the global prefixes to be used when serializing addresses and public keys to Bech32 strings. diff --git a/dockernet/tests/run_tests_upgrade.sh b/dockernet/tests/run_tests_upgrade.sh index 7b22afec61..b197ea6866 100755 --- a/dockernet/tests/run_tests_upgrade.sh +++ b/dockernet/tests/run_tests_upgrade.sh @@ -8,7 +8,7 @@ INTEGRATION_TEST_FILE=${SCRIPT_DIR}/integration_tests.bats if [[ "$PART" == "1" ]]; then CHAIN_NAME=GAIA TRANSFER_CHANNEL_NUMBER=0 $BATS $INTEGRATION_TEST_FILE elif [[ "$PART" == "2" ]]; then - CHAIN_NAME=OSMO TRANSFER_CHANNEL_NUMBER=1 $BATS $INTEGRATION_TEST_FILE + CHAIN_NAME=EVMOS TRANSFER_CHANNEL_NUMBER=1 $BATS $INTEGRATION_TEST_FILE NEW_BINARY=true CHAIN_NAME=HOST TRANSFER_CHANNEL_NUMBER=2 $BATS $INTEGRATION_TEST_FILE fi diff --git a/proto/stride/stakeibc/address_unbonding.proto b/proto/stride/stakeibc/address_unbonding.proto index d36a1b8738..ad44745c72 100644 --- a/proto/stride/stakeibc/address_unbonding.proto +++ b/proto/stride/stakeibc/address_unbonding.proto @@ -15,4 +15,5 @@ message AddressUnbonding { ]; string denom = 5; bool claim_is_pending = 8; + uint64 epoch_number = 9; } \ No newline at end of file diff --git a/x/stakeibc/keeper/grpc_query_address_unbondings.go b/x/stakeibc/keeper/grpc_query_address_unbondings.go index 211a7a3a67..8f857e9d16 100644 --- a/x/stakeibc/keeper/grpc_query_address_unbondings.go +++ b/x/stakeibc/keeper/grpc_query_address_unbondings.go @@ -75,6 +75,7 @@ func (k Keeper) AddressUnbondings(c context.Context, req *types.QueryAddressUnbo Amount: userRedemptionRecord.Amount, Denom: userRedemptionRecord.Denom, ClaimIsPending: userRedemptionRecord.ClaimIsPending, + EpochNumber: userRedemptionRecord.EpochNumber, } addressUnbondings = append(addressUnbondings, addressUnbonding) } diff --git a/x/stakeibc/types/address_unbonding.pb.go b/x/stakeibc/types/address_unbonding.pb.go index 947f6ab7f2..ce3aed4954 100644 --- a/x/stakeibc/types/address_unbonding.pb.go +++ b/x/stakeibc/types/address_unbonding.pb.go @@ -31,6 +31,7 @@ type AddressUnbonding struct { Amount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount"` Denom string `protobuf:"bytes,5,opt,name=denom,proto3" json:"denom,omitempty"` ClaimIsPending bool `protobuf:"varint,8,opt,name=claim_is_pending,json=claimIsPending,proto3" json:"claim_is_pending,omitempty"` + EpochNumber uint64 `protobuf:"varint,9,opt,name=epoch_number,json=epochNumber,proto3" json:"epoch_number,omitempty"` } func (m *AddressUnbonding) Reset() { *m = AddressUnbonding{} } @@ -101,6 +102,13 @@ func (m *AddressUnbonding) GetClaimIsPending() bool { return false } +func (m *AddressUnbonding) GetEpochNumber() uint64 { + if m != nil { + return m.EpochNumber + } + return 0 +} + func init() { proto.RegisterType((*AddressUnbonding)(nil), "stride.stakeibc.AddressUnbonding") } @@ -110,28 +118,29 @@ func init() { } var fileDescriptor_6491082275bcb473 = []byte{ - // 321 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x51, 0x3d, 0x4f, 0x02, 0x41, - 0x10, 0xbd, 0x43, 0x41, 0xdc, 0x42, 0xc9, 0x86, 0x98, 0x0d, 0xc5, 0x41, 0x2c, 0x94, 0x86, 0xdb, - 0x18, 0x1b, 0x2d, 0x25, 0xd1, 0x84, 0x68, 0x61, 0x50, 0x1b, 0x9b, 0xcb, 0xdd, 0xed, 0xe4, 0xdc, - 0xe0, 0xde, 0x92, 0x9b, 0x85, 0xe8, 0x5f, 0xb0, 0xf2, 0x67, 0x51, 0x52, 0x1a, 0x0b, 0x62, 0xe0, - 0x8f, 0x18, 0xf6, 0x3e, 0xb4, 0xda, 0x7d, 0xf3, 0xde, 0xbc, 0x79, 0x99, 0x21, 0xa7, 0x68, 0x32, - 0x29, 0x80, 0xa3, 0x09, 0x27, 0x20, 0xa3, 0x98, 0x87, 0x42, 0x64, 0x80, 0x18, 0xcc, 0xd2, 0x48, - 0xa7, 0x42, 0xa6, 0x89, 0x3f, 0xcd, 0xb4, 0xd1, 0xf4, 0x30, 0x17, 0xfa, 0xa5, 0xb0, 0xd3, 0x4e, - 0x74, 0xa2, 0x2d, 0xc7, 0xb7, 0xbf, 0x5c, 0x76, 0xfc, 0x51, 0x23, 0xad, 0xab, 0xdc, 0xe2, 0xa9, - 0x74, 0xa0, 0x8c, 0xec, 0x15, 0xb6, 0xcc, 0xed, 0xb9, 0xfd, 0xfd, 0x71, 0x09, 0x69, 0x87, 0x34, - 0x33, 0x88, 0x41, 0xce, 0x21, 0x63, 0x35, 0x4b, 0x55, 0x98, 0x5e, 0x10, 0x56, 0x85, 0x08, 0x00, - 0x8d, 0x54, 0xa1, 0x01, 0x11, 0x18, 0xa9, 0x80, 0xed, 0x58, 0xed, 0x51, 0xc5, 0x5f, 0x97, 0xf4, - 0xa3, 0x54, 0x40, 0x6f, 0x48, 0x23, 0x54, 0x7a, 0x96, 0x1a, 0xb6, 0xbb, 0xd5, 0x0d, 0xfd, 0xc5, - 0xaa, 0xeb, 0x7c, 0xaf, 0xba, 0x27, 0x89, 0x34, 0x2f, 0xb3, 0xc8, 0x8f, 0xb5, 0xe2, 0xb1, 0x46, - 0xa5, 0xb1, 0x78, 0x06, 0x28, 0x26, 0xdc, 0xbc, 0x4f, 0x01, 0xfd, 0x51, 0x6a, 0xc6, 0x45, 0x37, - 0x6d, 0x93, 0xba, 0x80, 0x54, 0x2b, 0x56, 0xb7, 0xe3, 0x72, 0x40, 0xfb, 0xa4, 0x15, 0xbf, 0x86, - 0x52, 0x05, 0x12, 0x83, 0x29, 0xd8, 0xf1, 0xac, 0xd9, 0x73, 0xfb, 0xcd, 0xf1, 0x81, 0xad, 0x8f, - 0xf0, 0x3e, 0xaf, 0x0e, 0x6f, 0x17, 0x6b, 0xcf, 0x5d, 0xae, 0x3d, 0xf7, 0x67, 0xed, 0xb9, 0x9f, - 0x1b, 0xcf, 0x59, 0x6e, 0x3c, 0xe7, 0x6b, 0xe3, 0x39, 0xcf, 0x67, 0xff, 0x92, 0x3c, 0xd8, 0xc5, - 0x0e, 0xee, 0xc2, 0x08, 0x79, 0x71, 0x8d, 0xf9, 0x25, 0x7f, 0xfb, 0x3b, 0x89, 0x0d, 0x16, 0x35, - 0xec, 0x82, 0xcf, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x42, 0xcc, 0x40, 0xb2, 0x01, 0x00, - 0x00, + // 346 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x51, 0xcf, 0x4a, 0xfb, 0x40, + 0x18, 0x4c, 0xfa, 0x6b, 0xfb, 0x6b, 0x57, 0xd1, 0xb2, 0x14, 0x59, 0x7a, 0x48, 0xab, 0x07, 0xcd, + 0xa5, 0x09, 0xe2, 0x45, 0x8f, 0x16, 0x14, 0x8a, 0x22, 0x12, 0xf5, 0xe2, 0x25, 0xe4, 0xcf, 0x47, + 0xba, 0xd4, 0xdd, 0x0d, 0xd9, 0x4d, 0xd1, 0xb7, 0xf0, 0x45, 0x7c, 0x8f, 0x1e, 0x7b, 0x14, 0x0f, + 0x45, 0xda, 0x17, 0x91, 0x6e, 0x92, 0xea, 0x69, 0xf7, 0x9b, 0x99, 0x9d, 0x6f, 0xd8, 0x41, 0x27, + 0x52, 0x65, 0x34, 0x06, 0x57, 0xaa, 0x60, 0x0a, 0x34, 0x8c, 0xdc, 0x20, 0x8e, 0x33, 0x90, 0xd2, + 0xcf, 0x79, 0x28, 0x78, 0x4c, 0x79, 0xe2, 0xa4, 0x99, 0x50, 0x02, 0xef, 0x17, 0x42, 0xa7, 0x12, + 0xf6, 0xba, 0x89, 0x48, 0x84, 0xe6, 0xdc, 0xcd, 0xad, 0x90, 0x1d, 0x7d, 0xd4, 0x50, 0xe7, 0xb2, + 0xb0, 0x78, 0xaa, 0x1c, 0x30, 0x41, 0xff, 0x4b, 0x5b, 0x62, 0x0e, 0x4c, 0xbb, 0xed, 0x55, 0x23, + 0xee, 0xa1, 0x56, 0x06, 0x11, 0xd0, 0x19, 0x64, 0xa4, 0xa6, 0xa9, 0xed, 0x8c, 0xcf, 0x11, 0xd9, + 0x86, 0xf0, 0x41, 0x2a, 0xca, 0x02, 0x05, 0xb1, 0xaf, 0x28, 0x03, 0xf2, 0x4f, 0x6b, 0x0f, 0xb6, + 0xfc, 0x55, 0x45, 0x3f, 0x52, 0x06, 0xf8, 0x1a, 0x35, 0x03, 0x26, 0x72, 0xae, 0x48, 0x7d, 0xa3, + 0x1b, 0x39, 0xf3, 0x65, 0xdf, 0xf8, 0x5a, 0xf6, 0x8f, 0x13, 0xaa, 0x26, 0x79, 0xe8, 0x44, 0x82, + 0xb9, 0x91, 0x90, 0x4c, 0xc8, 0xf2, 0x18, 0xca, 0x78, 0xea, 0xaa, 0xb7, 0x14, 0xa4, 0x33, 0xe6, + 0xca, 0x2b, 0x5f, 0xe3, 0x2e, 0x6a, 0xc4, 0xc0, 0x05, 0x23, 0x0d, 0xbd, 0xae, 0x18, 0xb0, 0x8d, + 0x3a, 0xd1, 0x4b, 0x40, 0x99, 0x4f, 0xa5, 0x9f, 0x82, 0x5e, 0x4f, 0x5a, 0x03, 0xd3, 0x6e, 0x79, + 0x7b, 0x1a, 0x1f, 0xcb, 0xfb, 0x02, 0xc5, 0x87, 0x68, 0x17, 0x52, 0x11, 0x4d, 0x7c, 0x9e, 0xb3, + 0x10, 0x32, 0xd2, 0x1e, 0x98, 0x76, 0xdd, 0xdb, 0xd1, 0xd8, 0x9d, 0x86, 0x46, 0x37, 0xf3, 0x95, + 0x65, 0x2e, 0x56, 0x96, 0xf9, 0xbd, 0xb2, 0xcc, 0xf7, 0xb5, 0x65, 0x2c, 0xd6, 0x96, 0xf1, 0xb9, + 0xb6, 0x8c, 0xe7, 0xd3, 0x3f, 0x61, 0x1f, 0xf4, 0xdf, 0x0f, 0x6f, 0x83, 0x50, 0xba, 0x65, 0x61, + 0xb3, 0x0b, 0xf7, 0xf5, 0xb7, 0x35, 0x9d, 0x3d, 0x6c, 0xea, 0x0e, 0xce, 0x7e, 0x02, 0x00, 0x00, + 0xff, 0xff, 0xe1, 0xd3, 0xaa, 0x50, 0xd5, 0x01, 0x00, 0x00, } func (m *AddressUnbonding) Marshal() (dAtA []byte, err error) { @@ -154,6 +163,11 @@ func (m *AddressUnbonding) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.EpochNumber != 0 { + i = encodeVarintAddressUnbonding(dAtA, i, uint64(m.EpochNumber)) + i-- + dAtA[i] = 0x48 + } if m.ClaimIsPending { i-- if m.ClaimIsPending { @@ -243,6 +257,9 @@ func (m *AddressUnbonding) Size() (n int) { if m.ClaimIsPending { n += 2 } + if m.EpochNumber != 0 { + n += 1 + sovAddressUnbonding(uint64(m.EpochNumber)) + } return n } @@ -463,6 +480,25 @@ func (m *AddressUnbonding) Unmarshal(dAtA []byte) error { } } m.ClaimIsPending = bool(v != 0) + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field EpochNumber", wireType) + } + m.EpochNumber = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAddressUnbonding + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.EpochNumber |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipAddressUnbonding(dAtA[iNdEx:])