diff --git a/Dockerfile b/Dockerfile index c80e10215..df79f9de7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /go/src/github.com/ExocoreNetwork/exocore COPY go.mod go.sum ./ -RUN apk add --no-cache ca-certificates=20240226-r0 build-base=0.5-r3 git=2.43.4-r0 linux-headers=6.5-r0 +RUN apk add --no-cache ca-certificates=20240226-r0 build-base=0.5-r3 git=2.43.5-r0 linux-headers=6.5-r0 RUN --mount=type=bind,target=. --mount=type=secret,id=GITHUB_TOKEN \ git config --global url."https://$(cat /run/secrets/GITHUB_TOKEN)@github.com/".insteadOf "https://github.com/"; \ diff --git a/app/app.go b/app/app.go index 9e7e2a780..f883ecf30 100644 --- a/app/app.go +++ b/app/app.go @@ -1316,7 +1316,7 @@ func initParamsKeeper( paramsKeeper.Subspace(banktypes.ModuleName) paramsKeeper.Subspace(slashingtypes.ModuleName) paramsKeeper.Subspace(govtypes.ModuleName). - WithKeyTable(govv1.ParamKeyTable()) // nolint:staticcheck + WithKeyTable(govv1.ParamKeyTable()) //nolint:staticcheck paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) paramsKeeper.Subspace(ibcexported.ModuleName) diff --git a/local_node.sh b/local_node.sh index 04a6eacbe..25b6577f8 100755 --- a/local_node.sh +++ b/local_node.sh @@ -97,7 +97,6 @@ if [[ $overwrite == "y" || $overwrite == "Y" ]]; then jq '.app_state["assets"]["tokens"][0]["asset_basic_info"]["meta_info"]="Tether USD token"' "$GENESIS" >"$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" jq '.app_state["assets"]["tokens"][0]["asset_basic_info"]["address"]="0xdAC17F958D2ee523a2206206994597C13D831ec7"' "$GENESIS" >"$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" jq '.app_state["assets"]["tokens"][0]["asset_basic_info"]["layer_zero_chain_id"]="101"' "$GENESIS" >"$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" - jq '.app_state["assets"]["tokens"][0]["asset_basic_info"]["total_supply"]="40022689732746729"' "$GENESIS" >"$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" jq '.app_state["assets"]["tokens"][0]["staking_total_amount"]="0"' "$GENESIS" >"$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" jq '.app_state["assets"]["deposits"][0]["staker"]="0x3e108c058e8066da635321dc3018294ca82ddedf_0x65"' "$GENESIS" >"$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" jq '.app_state["assets"]["deposits"][0]["deposits"][0]["asset_id"]="0xdac17f958d2ee523a2206206994597c13d831ec7_0x65"' "$GENESIS" >"$TMP_GENESIS" && mv "$TMP_GENESIS" "$GENESIS" diff --git a/networks/local/exocore/Dockerfile b/networks/local/exocore/Dockerfile index 3fb685990..89c9f5634 100644 --- a/networks/local/exocore/Dockerfile +++ b/networks/local/exocore/Dockerfile @@ -1,5 +1,5 @@ FROM golang:1.21.12-alpine3.19 AS build -RUN apk add --no-cache build-base=0.5-r3 git=2.43.4-r0 linux-headers=6.5-r0 +RUN apk add --no-cache build-base=0.5-r3 git=2.43.5-r0 linux-headers=6.5-r0 # Set working directory for the build WORKDIR /go/work # Add source files diff --git a/x/assets/types/genesis_test.go b/x/assets/types/genesis_test.go index 903c03bd0..f9648f6ee 100644 --- a/x/assets/types/genesis_test.go +++ b/x/assets/types/genesis_test.go @@ -1,6 +1,7 @@ package types_test import ( + "fmt" "strings" "testing" @@ -480,7 +481,7 @@ func (suite *GenesisTestSuite) TestValidateGenesis() { unmalleate: func(gs *types.GenesisState) { genesisDeposit.Deposits[0].Info = types.StakerAssetInfo{ TotalDepositAmount: math.NewInt(100), - WithdrawableAmount: math.NewInt(0), + WithdrawableAmount: math.NewInt(100), PendingUndelegationAmount: math.NewInt(0), } gs.Deposits[0].Deposits[0].Info = genesisDeposit.Deposits[0].Info @@ -511,6 +512,7 @@ func (suite *GenesisTestSuite) TestValidateGenesis() { } err := tc.genState.Validate() if tc.expPass { + fmt.Println("name is:", tc.name) suite.Require().NoError(err, tc.name) } else { suite.Require().Error(err, tc.name) diff --git a/x/assets/types/tx.pb.go b/x/assets/types/tx.pb.go index d2aa735e5..08a0c2961 100644 --- a/x/assets/types/tx.pb.go +++ b/x/assets/types/tx.pb.go @@ -338,8 +338,8 @@ type StakerAssetInfo struct { TotalDepositAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=total_deposit_amount,json=totalDepositAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_deposit_amount"` // withdrawable_amount is the amount that can be withdrawn. WithdrawableAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=withdrawable_amount,json=withdrawableAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"withdrawable_amount"` - // wait_unbonding_amount is the amount that is waiting for undelegation. - WaitUnbondingAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=wait_unbonding_amount,json=waitUnbondingAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"wait_unbonding_amount"` + // pending_undelegation_amount is the amount that is waiting for undelegation. + PendingUndelegationAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=pending_undelegation_amount,json=pendingUndelegationAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"pending_undelegation_amount"` } func (m *StakerAssetInfo) Reset() { *m = StakerAssetInfo{} } @@ -427,8 +427,8 @@ func (m *StakerAllAssetsInfo) GetAllAssetsState() map[string]*StakerAssetInfo { type OperatorAssetInfo struct { // total_amount is the total amount of the asset deposited. TotalAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=total_amount,json=totalAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_amount"` - // wait_unbonding_amount is the amount that is waiting for unbonding. - WaitUnbondingAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=wait_unbonding_amount,json=waitUnbondingAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"wait_unbonding_amount"` + // pending_undelegation_amount is the amount that is waiting for unbonding. + PendingUndelegationAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=pending_undelegation_amount,json=pendingUndelegationAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"pending_undelegation_amount"` // total_share is the total share of an asset, in the formula to update the staker's share // S_j = S * T_j / T, `S` represent it. // So when the shares of staker and operator change, it also needs to add `S_j` to update. @@ -832,84 +832,84 @@ func init() { func init() { proto.RegisterFile("exocore/assets/v1/tx.proto", fileDescriptor_adb6ebd423a2c426) } var fileDescriptor_adb6ebd423a2c426 = []byte{ - // 1227 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6f, 0x13, 0xc7, - 0x17, 0xcf, 0x3a, 0xbf, 0x5f, 0x48, 0xe2, 0x8c, 0x03, 0x38, 0x06, 0x1c, 0xb4, 0x12, 0xdf, 0x6f, - 0x14, 0x35, 0x5e, 0x48, 0x55, 0x4a, 0x43, 0x2f, 0xf9, 0x01, 0x52, 0x2a, 0x68, 0xab, 0x35, 0xf4, - 0x80, 0x54, 0xad, 0xc6, 0xbb, 0x93, 0xf5, 0x2a, 0xbb, 0x33, 0xee, 0xce, 0x98, 0xd8, 0x9c, 0x2a, - 0x4e, 0x55, 0xa5, 0x4a, 0x55, 0x7b, 0xed, 0x81, 0x73, 0x4f, 0x1c, 0x38, 0xf4, 0x4f, 0x40, 0x3d, - 0x51, 0x7a, 0xa9, 0x7a, 0x40, 0x28, 0x54, 0xa2, 0xff, 0x45, 0xab, 0x99, 0x9d, 0xb5, 0xbd, 0x89, - 0x4d, 0xd4, 0xe2, 0x5e, 0x92, 0x9d, 0x79, 0xef, 0x7d, 0xde, 0xfb, 0x7c, 0xe6, 0xcd, 0x0f, 0x43, - 0x89, 0xb4, 0x98, 0xcb, 0x62, 0x62, 0x61, 0xce, 0x89, 0xe0, 0xd6, 0xfd, 0x2b, 0x96, 0x68, 0x55, - 0x1a, 0x31, 0x13, 0x0c, 0x2d, 0x68, 0x5b, 0x25, 0xb1, 0x55, 0xee, 0x5f, 0x29, 0x2d, 0xe0, 0x28, - 0xa0, 0xcc, 0x52, 0x7f, 0x13, 0xaf, 0xd2, 0x59, 0x97, 0xf1, 0x88, 0x71, 0x2b, 0xe2, 0xbe, 0x8c, - 0x8e, 0xb8, 0xaf, 0x0d, 0x4b, 0x89, 0xc1, 0x51, 0x23, 0x2b, 0x19, 0x68, 0x53, 0xf9, 0x78, 0xd6, - 0x06, 0x8e, 0x71, 0x94, 0xda, 0x17, 0x7d, 0xe6, 0xb3, 0x24, 0x4e, 0x7e, 0xe9, 0xd9, 0xf3, 0x3e, - 0x63, 0x7e, 0x48, 0x2c, 0xdc, 0x08, 0x2c, 0x4c, 0x29, 0x13, 0x58, 0x04, 0x8c, 0xea, 0x18, 0xb3, - 0x06, 0xf0, 0x19, 0x0e, 0x9b, 0xe4, 0x66, 0x40, 0x42, 0x0f, 0xdd, 0x81, 0x09, 0x1c, 0xb1, 0x26, - 0x15, 0x45, 0xe3, 0xa2, 0xb1, 0x32, 0xbd, 0xf5, 0xe1, 0xd3, 0x17, 0xcb, 0x23, 0xbf, 0xbf, 0x58, - 0xfe, 0x9f, 0x1f, 0x88, 0x7a, 0xb3, 0x56, 0x71, 0x59, 0xa4, 0x4b, 0xd2, 0xff, 0xd6, 0xb8, 0xb7, - 0x6f, 0x89, 0x76, 0x83, 0xf0, 0xca, 0x2e, 0x15, 0xcf, 0x9f, 0xac, 0x81, 0xae, 0x78, 0x97, 0x0a, - 0x5b, 0x63, 0x99, 0xbf, 0xe4, 0x60, 0x7e, 0x3b, 0x0c, 0x08, 0x15, 0xdb, 0x75, 0x1c, 0xd0, 0x5d, - 0xba, 0xc7, 0x10, 0x82, 0x31, 0x8a, 0x23, 0x92, 0xe4, 0xb1, 0xd5, 0x37, 0x3a, 0x07, 0xd3, 0x11, - 0x11, 0xd8, 0x09, 0xe8, 0x1e, 0x2b, 0xe6, 0x94, 0x61, 0x4a, 0x4e, 0xa8, 0x80, 0x25, 0x98, 0x72, - 0x65, 0xb4, 0x13, 0x78, 0xc5, 0xd1, 0x8b, 0xc6, 0xca, 0x98, 0x3d, 0xa9, 0xc6, 0xbb, 0x1e, 0xaa, - 0x40, 0x41, 0x2b, 0xe3, 0x68, 0x17, 0xea, 0x91, 0x56, 0x71, 0x4c, 0x79, 0xa5, 0xcb, 0xa1, 0x53, - 0x7b, 0xa4, 0x85, 0x2c, 0x28, 0xec, 0x05, 0x14, 0x87, 0xc1, 0x03, 0x25, 0x85, 0x53, 0x0b, 0x99, - 0xbb, 0xcf, 0x8b, 0xe3, 0xca, 0x1f, 0xf5, 0x9a, 0xb6, 0x94, 0x05, 0x6d, 0x43, 0x21, 0xc4, 0x6d, - 0x12, 0x3b, 0x0f, 0x48, 0xcc, 0x9c, 0x4e, 0x19, 0x13, 0x32, 0x60, 0x6b, 0xf1, 0xf0, 0xc5, 0x72, - 0xfe, 0x96, 0x34, 0xdf, 0x23, 0x31, 0x4b, 0xd2, 0xec, 0xd8, 0xf9, 0x30, 0x3b, 0xe3, 0xa1, 0x4b, - 0x30, 0xc7, 0x03, 0x9f, 0x62, 0xd1, 0x8c, 0x89, 0x23, 0x25, 0x2b, 0x4e, 0x2a, 0x8a, 0xb3, 0x9d, - 0xd9, 0x3b, 0xed, 0x06, 0x91, 0x6e, 0xd8, 0xf3, 0x62, 0xc2, 0xb9, 0x13, 0x12, 0xea, 0x8b, 0x7a, - 0x71, 0xea, 0xa2, 0xb1, 0x32, 0x6b, 0xcf, 0xea, 0xd9, 0x5b, 0x6a, 0xd2, 0xfc, 0xcb, 0x80, 0xe9, - 0x4d, 0xd9, 0x06, 0x03, 0xd5, 0x3c, 0x03, 0x13, 0xbc, 0x1d, 0xd5, 0x58, 0xa8, 0xa5, 0xd4, 0x23, - 0x54, 0x84, 0x49, 0x0d, 0xa5, 0x74, 0x9c, 0xb6, 0xd3, 0x21, 0x2a, 0xc1, 0x94, 0x47, 0xdc, 0x20, - 0xc2, 0x21, 0x57, 0xe2, 0xcd, 0xda, 0x9d, 0xf1, 0x20, 0x09, 0xc6, 0xff, 0x91, 0x04, 0x03, 0x16, - 0x6a, 0x62, 0xd0, 0x42, 0x65, 0x1a, 0x62, 0x32, 0xdb, 0x10, 0xe6, 0xcf, 0x06, 0xe4, 0xab, 0x02, - 0xef, 0x07, 0xd4, 0xef, 0x0a, 0x71, 0x13, 0xf2, 0x6a, 0x73, 0x38, 0x35, 0xcc, 0x03, 0x37, 0x09, - 0x94, 0xa2, 0xcc, 0xac, 0x9f, 0xaf, 0x1c, 0xdb, 0x97, 0x95, 0x4e, 0x9c, 0x3d, 0xa7, 0x26, 0xb7, - 0x64, 0x90, 0xc2, 0xa1, 0xb0, 0xc8, 0x13, 0x6c, 0x47, 0x30, 0x81, 0x43, 0x47, 0x6f, 0x8b, 0xdc, - 0x10, 0xb6, 0x05, 0xd2, 0xc8, 0x77, 0x24, 0xf0, 0x66, 0xb2, 0x45, 0x0e, 0x73, 0x30, 0x2f, 0xc9, - 0x90, 0xb8, 0xcb, 0x85, 0xc2, 0x62, 0x92, 0xdb, 0x23, 0x0d, 0xc6, 0x03, 0xe1, 0x0c, 0x71, 0x6b, - 0x22, 0x85, 0xbc, 0x93, 0x00, 0x27, 0x35, 0xa0, 0x08, 0x0a, 0x07, 0x81, 0xa8, 0x7b, 0x31, 0x3e, - 0xc0, 0xb5, 0x90, 0x0c, 0x95, 0x72, 0x2f, 0xb0, 0x4e, 0xd7, 0x80, 0xd3, 0x07, 0x38, 0x10, 0x4e, - 0x93, 0xd6, 0x18, 0xf5, 0xa4, 0xd2, 0x3a, 0xe1, 0xe8, 0x10, 0x12, 0x16, 0x24, 0xf4, 0xdd, 0x14, - 0x39, 0x15, 0xd9, 0x80, 0x82, 0x16, 0x39, 0x0c, 0x95, 0xce, 0x5c, 0x09, 0xed, 0x41, 0x1e, 0x87, - 0xa1, 0x93, 0xf4, 0x85, 0xc3, 0x05, 0x16, 0x72, 0x27, 0x8d, 0xae, 0xcc, 0xac, 0x6f, 0xf4, 0x69, - 0x9a, 0x3e, 0x08, 0x95, 0xce, 0xa8, 0x2a, 0x83, 0x6f, 0x50, 0x11, 0xb7, 0xed, 0x39, 0x9c, 0x99, - 0x2c, 0x11, 0x28, 0xf4, 0x71, 0x43, 0x79, 0x18, 0xdd, 0x27, 0x6d, 0xbd, 0x73, 0xe5, 0x27, 0xba, - 0x06, 0xe3, 0xf7, 0xe5, 0x91, 0xac, 0x94, 0x9f, 0x59, 0x37, 0x07, 0xd7, 0xd0, 0x69, 0xdf, 0x24, - 0x60, 0x23, 0x77, 0xcd, 0x30, 0x7f, 0x1c, 0x85, 0x85, 0x4f, 0x1a, 0x24, 0xc6, 0x82, 0xf5, 0xf4, - 0x92, 0x03, 0xa7, 0x32, 0x7d, 0x3c, 0x8c, 0x1e, 0x9a, 0x11, 0xdd, 0x06, 0x1e, 0xbc, 0x9a, 0xb9, - 0xff, 0x68, 0x35, 0xd1, 0xe7, 0x90, 0x14, 0xe0, 0xf0, 0x3a, 0x8e, 0xc9, 0xbf, 0xe8, 0x9a, 0x1d, - 0xe2, 0xf6, 0xe4, 0xd9, 0x21, 0xae, 0x0d, 0x0a, 0xb0, 0x2a, 0xf1, 0x90, 0x0b, 0x73, 0x4c, 0xcb, - 0xa8, 0x33, 0x8c, 0x0d, 0x21, 0xc3, 0x6c, 0x8a, 0xa9, 0x92, 0x98, 0x2f, 0x73, 0xb0, 0x70, 0x9b, - 0xfb, 0x55, 0x22, 0x6e, 0xb4, 0xd8, 0x36, 0x8b, 0xc9, 0xa6, 0xe7, 0xc5, 0xe8, 0x3a, 0x9c, 0xda, - 0x8b, 0x59, 0xe4, 0xa4, 0xc7, 0x74, 0xb2, 0x58, 0xc5, 0xe7, 0x4f, 0xd6, 0x16, 0x35, 0xd4, 0x66, - 0x62, 0xa9, 0x8a, 0x38, 0xa0, 0xbe, 0x3d, 0x23, 0xbd, 0xf5, 0x14, 0xfa, 0x00, 0x66, 0xe4, 0xf9, - 0x97, 0xc6, 0xe6, 0x4e, 0x88, 0x05, 0x4e, 0x44, 0x1a, 0xba, 0x0a, 0x0b, 0xae, 0xba, 0xa6, 0xf5, - 0xe9, 0x2c, 0x31, 0xf4, 0x1d, 0x31, 0xef, 0x76, 0xef, 0x6f, 0x55, 0xe3, 0x3b, 0x80, 0x32, 0xbe, - 0xbd, 0x57, 0x6e, 0xde, 0xed, 0xbd, 0xec, 0xe5, 0x41, 0xbe, 0x09, 0x17, 0xb8, 0x6a, 0x59, 0x27, - 0x13, 0xd4, 0xb9, 0xf9, 0xd4, 0x3d, 0x32, 0x6d, 0x97, 0x12, 0xa7, 0x9e, 0xb7, 0x42, 0x35, 0xf5, - 0xd8, 0xb8, 0xfa, 0xd5, 0xa3, 0xe5, 0x91, 0x3f, 0x1f, 0x2d, 0x8f, 0x3c, 0x7c, 0xfd, 0x78, 0xb5, - 0x97, 0xf1, 0xd7, 0xaf, 0x1f, 0xaf, 0x2e, 0xa5, 0x2f, 0xa3, 0x63, 0x62, 0x9a, 0xe7, 0x60, 0xe9, - 0xd8, 0xa4, 0x4d, 0x78, 0x83, 0x51, 0x4e, 0xe4, 0x1d, 0x72, 0xc6, 0x26, 0x7e, 0xc0, 0x45, 0x26, - 0xab, 0x4d, 0xbe, 0x78, 0xbb, 0x45, 0xb8, 0x0a, 0x63, 0x9d, 0x47, 0x4c, 0xff, 0x1d, 0x7c, 0xe4, - 0x3d, 0x64, 0x2b, 0xff, 0x8d, 0xeb, 0x19, 0x92, 0x37, 0xb3, 0x24, 0xcb, 0x3d, 0xfd, 0xd5, 0xa7, - 0x68, 0xf3, 0x02, 0x9c, 0xeb, 0xcb, 0x45, 0x73, 0xfd, 0xc9, 0x80, 0x7c, 0x6a, 0x57, 0x07, 0xc3, - 0x5b, 0xb3, 0xbc, 0x9c, 0x61, 0xf9, 0xe6, 0x0b, 0x36, 0xe1, 0xf7, 0xde, 0x9b, 0xf8, 0x15, 0xfb, - 0xf0, 0x53, 0x00, 0xe6, 0x59, 0x38, 0x7d, 0xa4, 0x72, 0xcd, 0xe9, 0x3b, 0x03, 0xe6, 0x6f, 0x73, - 0xff, 0x6e, 0xc3, 0xc3, 0x82, 0x7c, 0xaa, 0xde, 0xc2, 0xe8, 0x2a, 0x4c, 0xe3, 0xa6, 0xa8, 0xb3, - 0x38, 0x10, 0xed, 0x13, 0xf9, 0x74, 0x5d, 0xd1, 0xfb, 0x30, 0x91, 0xbc, 0xa6, 0x35, 0x9f, 0xa5, - 0x3e, 0x7c, 0x92, 0x14, 0x5b, 0x63, 0xf2, 0x0c, 0xb0, 0xb5, 0xfb, 0xc6, 0x9c, 0x24, 0xd3, 0x05, - 0x32, 0x97, 0xe0, 0xec, 0x91, 0x9a, 0xd2, 0x7a, 0xd7, 0x7f, 0x30, 0x60, 0xf4, 0x36, 0xf7, 0xd1, - 0x37, 0x06, 0x9c, 0xca, 0x14, 0xdd, 0xaf, 0x45, 0x8e, 0x80, 0x94, 0x56, 0x4f, 0xf6, 0xe9, 0x08, - 0xb3, 0xf6, 0xf0, 0xd7, 0x3f, 0xbe, 0xcf, 0xfd, 0xdf, 0xbc, 0x64, 0xf5, 0xfb, 0xa5, 0x62, 0x1d, - 0x85, 0x1e, 0xff, 0xf2, 0xf5, 0xe3, 0x55, 0x63, 0xeb, 0xa3, 0xa7, 0x87, 0x65, 0xe3, 0xd9, 0x61, - 0xd9, 0x78, 0x79, 0x58, 0x36, 0xbe, 0x7d, 0x55, 0x1e, 0x79, 0xf6, 0xaa, 0x3c, 0xf2, 0xdb, 0xab, - 0xf2, 0xc8, 0xbd, 0xcb, 0x3d, 0xa7, 0xdd, 0x8d, 0x04, 0xf1, 0x63, 0x22, 0x0e, 0x58, 0xbc, 0xdf, - 0x49, 0xd0, 0x4a, 0x53, 0xa8, 0xb3, 0xaf, 0x36, 0xa1, 0x7e, 0x5f, 0xbc, 0xfb, 0x77, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xe3, 0x9e, 0x51, 0x04, 0x2b, 0x0d, 0x00, 0x00, + // 1230 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcd, 0x6f, 0x1b, 0x45, + 0x14, 0xcf, 0x3a, 0xdf, 0x2f, 0x4d, 0xe2, 0x4c, 0x42, 0x6b, 0x3b, 0xad, 0x53, 0xad, 0x54, 0x88, + 0x22, 0xe2, 0x6d, 0x83, 0x28, 0x25, 0xe5, 0x92, 0x8f, 0x56, 0x0a, 0x6a, 0x01, 0x6d, 0x5a, 0x0e, + 0x95, 0xd0, 0x6a, 0xbc, 0x3b, 0xd9, 0xac, 0xb2, 0x3b, 0x63, 0x76, 0x26, 0x6d, 0x5c, 0x71, 0x40, + 0x3d, 0x21, 0x24, 0x24, 0x04, 0x57, 0x0e, 0xfd, 0x13, 0x7a, 0xa8, 0x10, 0x7f, 0x42, 0xc5, 0xa9, + 0x94, 0x0b, 0xe2, 0x50, 0x55, 0x29, 0x52, 0x38, 0xf1, 0x2f, 0x80, 0xe6, 0x63, 0x6d, 0x6f, 0xe2, + 0x34, 0x82, 0x9a, 0x4b, 0xb2, 0xf3, 0x3e, 0x7e, 0xef, 0xbd, 0xdf, 0xbc, 0x37, 0x33, 0x86, 0x0a, + 0xd9, 0x63, 0x3e, 0x4b, 0x89, 0x83, 0x39, 0x27, 0x82, 0x3b, 0x77, 0x2f, 0x39, 0x62, 0xaf, 0xd6, + 0x48, 0x99, 0x60, 0x68, 0xca, 0xe8, 0x6a, 0x5a, 0x57, 0xbb, 0x7b, 0xa9, 0x32, 0x85, 0x93, 0x88, + 0x32, 0x47, 0xfd, 0xd5, 0x56, 0x95, 0x33, 0x3e, 0xe3, 0x09, 0xe3, 0x4e, 0xc2, 0x43, 0xe9, 0x9d, + 0xf0, 0xd0, 0x28, 0xca, 0x5a, 0xe1, 0xa9, 0x95, 0xa3, 0x17, 0x46, 0x55, 0x3d, 0x1a, 0xb5, 0x81, + 0x53, 0x9c, 0x64, 0xfa, 0x99, 0x90, 0x85, 0x4c, 0xfb, 0xc9, 0x2f, 0x23, 0x3d, 0x1b, 0x32, 0x16, + 0xc6, 0xc4, 0xc1, 0x8d, 0xc8, 0xc1, 0x94, 0x32, 0x81, 0x45, 0xc4, 0xa8, 0xf1, 0xb1, 0xeb, 0x00, + 0x9f, 0xe2, 0x78, 0x97, 0x5c, 0x8f, 0x48, 0x1c, 0xa0, 0x5b, 0x30, 0x84, 0x13, 0xb6, 0x4b, 0x45, + 0xc9, 0x3a, 0x6f, 0xcd, 0x8f, 0xae, 0x7e, 0xf0, 0xe4, 0xf9, 0x5c, 0xdf, 0xef, 0xcf, 0xe7, 0xde, + 0x0c, 0x23, 0xb1, 0xbd, 0x5b, 0xaf, 0xf9, 0x2c, 0x31, 0x29, 0x99, 0x7f, 0x8b, 0x3c, 0xd8, 0x71, + 0x44, 0xb3, 0x41, 0x78, 0x6d, 0x83, 0x8a, 0x67, 0x8f, 0x17, 0xc1, 0x64, 0xbc, 0x41, 0x85, 0x6b, + 0xb0, 0xec, 0x5f, 0x0a, 0x30, 0xb9, 0x16, 0x47, 0x84, 0x8a, 0xb5, 0x6d, 0x1c, 0xd1, 0x0d, 0xba, + 0xc5, 0x10, 0x82, 0x01, 0x8a, 0x13, 0xa2, 0xe3, 0xb8, 0xea, 0x1b, 0xcd, 0xc2, 0x68, 0x42, 0x04, + 0xf6, 0x22, 0xba, 0xc5, 0x4a, 0x05, 0xa5, 0x18, 0x91, 0x02, 0xe5, 0x50, 0x86, 0x11, 0x5f, 0x7a, + 0x7b, 0x51, 0x50, 0xea, 0x3f, 0x6f, 0xcd, 0x0f, 0xb8, 0xc3, 0x6a, 0xbd, 0x11, 0xa0, 0x1a, 0x4c, + 0x1b, 0x66, 0x3c, 0x63, 0x42, 0x03, 0xb2, 0x57, 0x1a, 0x50, 0x56, 0xd9, 0x76, 0x98, 0xd0, 0x01, + 0xd9, 0x43, 0x0e, 0x4c, 0x6f, 0x45, 0x14, 0xc7, 0xd1, 0x7d, 0x45, 0x85, 0x57, 0x8f, 0x99, 0xbf, + 0xc3, 0x4b, 0x83, 0xca, 0x1e, 0x75, 0xaa, 0x56, 0x95, 0x06, 0xad, 0xc1, 0x74, 0x8c, 0x9b, 0x24, + 0xf5, 0xee, 0x93, 0x94, 0x79, 0xad, 0x34, 0x86, 0xa4, 0xc3, 0xea, 0xcc, 0xfe, 0xf3, 0xb9, 0xe2, + 0x0d, 0xa9, 0xbe, 0x43, 0x52, 0xa6, 0xc3, 0xac, 0xbb, 0xc5, 0x38, 0x2f, 0x09, 0xd0, 0x05, 0x98, + 0xe0, 0x51, 0x48, 0xb1, 0xd8, 0x4d, 0x89, 0x27, 0x29, 0x2b, 0x0d, 0xab, 0x12, 0xc7, 0x5b, 0xd2, + 0x5b, 0xcd, 0x06, 0x91, 0x66, 0x38, 0x08, 0x52, 0xc2, 0xb9, 0x17, 0x13, 0x1a, 0x8a, 0xed, 0xd2, + 0xc8, 0x79, 0x6b, 0x7e, 0xdc, 0x1d, 0x37, 0xd2, 0x1b, 0x4a, 0x68, 0xff, 0x6d, 0xc1, 0xe8, 0x8a, + 0x6c, 0x83, 0x63, 0xd9, 0x3c, 0x0d, 0x43, 0xbc, 0x99, 0xd4, 0x59, 0x6c, 0xa8, 0x34, 0x2b, 0x54, + 0x82, 0x61, 0x03, 0xa5, 0x78, 0x1c, 0x75, 0xb3, 0x25, 0xaa, 0xc0, 0x48, 0x40, 0xfc, 0x28, 0xc1, + 0x31, 0x57, 0xe4, 0x8d, 0xbb, 0xad, 0xf5, 0x71, 0x14, 0x0c, 0xfe, 0x2b, 0x0a, 0x8e, 0xd9, 0xa8, + 0xa1, 0xe3, 0x36, 0x2a, 0xd7, 0x10, 0xc3, 0xf9, 0x86, 0xb0, 0x7f, 0xb6, 0xa0, 0xb8, 0x29, 0xf0, + 0x4e, 0x44, 0xc3, 0x36, 0x11, 0xd7, 0xa1, 0xa8, 0x86, 0xc3, 0xab, 0x63, 0x1e, 0xf9, 0xda, 0x51, + 0x92, 0x32, 0xb6, 0x74, 0xb6, 0x76, 0x64, 0x2e, 0x6b, 0x2d, 0x3f, 0x77, 0x42, 0x09, 0x57, 0xa5, + 0x93, 0xc2, 0xa1, 0x30, 0xc3, 0x35, 0xb6, 0x27, 0x98, 0xc0, 0xb1, 0x67, 0xc6, 0xa2, 0xd0, 0x83, + 0xb1, 0x40, 0x06, 0xf9, 0x96, 0x04, 0x5e, 0xd1, 0x23, 0xf2, 0x57, 0x01, 0x26, 0x65, 0x31, 0x24, + 0x6d, 0xd7, 0x42, 0x61, 0x46, 0xc7, 0x0e, 0x48, 0x83, 0xf1, 0x48, 0x78, 0x3d, 0x1c, 0x4d, 0xa4, + 0x90, 0xd7, 0x35, 0xb0, 0xce, 0x01, 0x25, 0x30, 0x7d, 0x2f, 0x12, 0xdb, 0x41, 0x8a, 0xef, 0xe1, + 0x7a, 0x4c, 0x7a, 0x5a, 0x72, 0x27, 0xb0, 0x09, 0xf7, 0x05, 0xcc, 0x36, 0x08, 0x0d, 0x24, 0xc5, + 0xbb, 0x34, 0x20, 0x31, 0x09, 0xf5, 0x34, 0x9a, 0xb0, 0xfd, 0x3d, 0x08, 0x5b, 0x36, 0x01, 0x6e, + 0x77, 0xe0, 0x1b, 0xc2, 0xf7, 0x2d, 0x98, 0x36, 0x84, 0xc7, 0xb1, 0xe2, 0x9c, 0x2b, 0xd2, 0x03, + 0x28, 0xe2, 0x38, 0xf6, 0x74, 0x8f, 0x78, 0x5c, 0x60, 0x21, 0xa7, 0xaa, 0x7f, 0x7e, 0x6c, 0x69, + 0xb9, 0x4b, 0x03, 0x75, 0x41, 0xa8, 0xb5, 0x56, 0x9b, 0xd2, 0xf9, 0x1a, 0x15, 0x69, 0xd3, 0x9d, + 0xc0, 0x39, 0x61, 0x85, 0xc0, 0x74, 0x17, 0x33, 0x54, 0x84, 0xfe, 0x1d, 0xd2, 0x34, 0x53, 0x2c, + 0x3f, 0xd1, 0x15, 0x18, 0xbc, 0x2b, 0x8f, 0x67, 0xb5, 0x0b, 0x63, 0x4b, 0xf6, 0xf1, 0x39, 0xb4, + 0x5a, 0x59, 0x3b, 0x2c, 0x17, 0xae, 0x58, 0xf6, 0x8f, 0xfd, 0x30, 0xf5, 0x71, 0x83, 0xa4, 0x58, + 0xb0, 0x8e, 0xbe, 0xf2, 0xe0, 0x54, 0xae, 0xa7, 0x7b, 0xd1, 0x4f, 0x63, 0xa2, 0xdd, 0xcc, 0x27, + 0xed, 0x6c, 0xe1, 0x7f, 0xdd, 0x59, 0xf4, 0x19, 0xe8, 0x64, 0x3c, 0xbe, 0x8d, 0x53, 0xf2, 0x1f, + 0xfa, 0x68, 0x9d, 0xf8, 0x1d, 0xd1, 0xd6, 0x89, 0xef, 0x82, 0x02, 0xdc, 0x94, 0x78, 0xc8, 0x87, + 0x09, 0x66, 0x28, 0x35, 0x11, 0x06, 0x7a, 0x10, 0x61, 0x3c, 0xc3, 0x54, 0x41, 0xec, 0x17, 0x05, + 0x98, 0xba, 0xc9, 0xc3, 0x4d, 0x22, 0xae, 0xed, 0xb1, 0x35, 0x96, 0x92, 0x95, 0x20, 0x48, 0xd1, + 0x55, 0x38, 0xb5, 0x95, 0xb2, 0xc4, 0xcb, 0x8e, 0x6f, 0xbd, 0x71, 0xa5, 0x67, 0x8f, 0x17, 0x67, + 0x0c, 0xd4, 0x8a, 0xd6, 0x6c, 0x8a, 0x34, 0xa2, 0xa1, 0x3b, 0x26, 0xad, 0x8d, 0x08, 0xbd, 0x0f, + 0x63, 0xf2, 0x5c, 0xcc, 0x7c, 0x0b, 0x27, 0xf8, 0x02, 0x27, 0x22, 0x73, 0x5d, 0x80, 0x29, 0x5f, + 0x5d, 0xdf, 0xe6, 0xd4, 0x96, 0x18, 0xe6, 0xee, 0x98, 0xf4, 0xdb, 0xf7, 0xba, 0xca, 0xf1, 0x6d, + 0x40, 0x39, 0xdb, 0xce, 0xab, 0xb8, 0xe8, 0x77, 0x3e, 0x02, 0xe4, 0x01, 0xbf, 0x02, 0xe7, 0xb8, + 0x6a, 0x5f, 0x2f, 0xe7, 0xd4, 0xba, 0x11, 0xd5, 0xfd, 0x32, 0xea, 0x56, 0xb4, 0x51, 0xc7, 0x1b, + 0x62, 0x33, 0xb3, 0x58, 0xbe, 0xfc, 0xd5, 0xc3, 0xb9, 0xbe, 0x3f, 0x1f, 0xce, 0xf5, 0x3d, 0x38, + 0x78, 0xb4, 0xd0, 0x59, 0xf1, 0xd7, 0x07, 0x8f, 0x16, 0xca, 0xd9, 0x8b, 0xe9, 0x08, 0x99, 0xf6, + 0x2c, 0x94, 0x8f, 0x08, 0x5d, 0xc2, 0x1b, 0x8c, 0x72, 0x22, 0xef, 0x96, 0xd3, 0x2e, 0x09, 0x23, + 0x2e, 0x72, 0x51, 0x5d, 0xf2, 0xf9, 0xeb, 0x6d, 0xc2, 0x65, 0x18, 0x68, 0x3d, 0x6e, 0xba, 0x4f, + 0xf3, 0xa1, 0x77, 0x92, 0xab, 0xec, 0x97, 0xaf, 0xe6, 0x8a, 0xbc, 0x9e, 0x2f, 0xb2, 0xda, 0xd1, + 0x5f, 0x5d, 0x92, 0xb6, 0xcf, 0xc1, 0x6c, 0xd7, 0x5a, 0x4c, 0xad, 0x3f, 0x59, 0x50, 0xcc, 0xf4, + 0xea, 0x90, 0x78, 0xed, 0x2a, 0x2f, 0xe6, 0xaa, 0x7c, 0xf5, 0xc5, 0xab, 0xeb, 0x7b, 0xf7, 0x55, + 0xf5, 0x95, 0xba, 0xd4, 0xa7, 0x00, 0xec, 0x33, 0xf0, 0xc6, 0xa1, 0xcc, 0x4d, 0x4d, 0xdf, 0x59, + 0x30, 0x79, 0x93, 0x87, 0xb7, 0x1b, 0x01, 0x16, 0xe4, 0x13, 0xf5, 0x46, 0x46, 0x97, 0x61, 0x14, + 0xef, 0x8a, 0x6d, 0x96, 0x46, 0xa2, 0x79, 0x62, 0x3d, 0x6d, 0x53, 0xf4, 0x1e, 0x0c, 0xe9, 0x57, + 0xb6, 0xa9, 0xa7, 0xdc, 0xa5, 0x1e, 0x1d, 0x62, 0x75, 0x40, 0x9e, 0x01, 0xae, 0x31, 0x5f, 0x9e, + 0x90, 0xc5, 0xb4, 0x81, 0xec, 0x32, 0x9c, 0x39, 0x94, 0x53, 0x96, 0xef, 0xd2, 0x0f, 0x16, 0xf4, + 0xdf, 0xe4, 0x21, 0xfa, 0xc6, 0x82, 0x53, 0xb9, 0xa4, 0xbb, 0xb5, 0xc8, 0x21, 0x90, 0xca, 0xc2, + 0xc9, 0x36, 0x2d, 0x62, 0x16, 0x1f, 0xfc, 0xfa, 0xc7, 0xf7, 0x85, 0xb7, 0xec, 0x0b, 0x4e, 0xb7, + 0x5f, 0x30, 0xce, 0x61, 0xe8, 0xc1, 0x2f, 0x0f, 0x1e, 0x2d, 0x58, 0xab, 0x1f, 0x3e, 0xd9, 0xaf, + 0x5a, 0x4f, 0xf7, 0xab, 0xd6, 0x8b, 0xfd, 0xaa, 0xf5, 0xed, 0xcb, 0x6a, 0xdf, 0xd3, 0x97, 0xd5, + 0xbe, 0xdf, 0x5e, 0x56, 0xfb, 0xee, 0x5c, 0xec, 0x38, 0xed, 0xae, 0x69, 0xc4, 0x8f, 0x88, 0xb8, + 0xc7, 0xd2, 0x9d, 0x56, 0x80, 0xbd, 0x2c, 0x84, 0x3a, 0xfb, 0xea, 0x43, 0xea, 0x77, 0xc7, 0x3b, + 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x15, 0x4d, 0x8c, 0xa1, 0x43, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1228,9 +1228,9 @@ func (m *StakerAssetInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l { - size := m.WaitUnbondingAmount.Size() + size := m.PendingUndelegationAmount.Size() i -= size - if _, err := m.WaitUnbondingAmount.MarshalTo(dAtA[i:]); err != nil { + if _, err := m.PendingUndelegationAmount.MarshalTo(dAtA[i:]); err != nil { return 0, err } i = encodeVarintTx(dAtA, i, uint64(size)) @@ -1350,9 +1350,9 @@ func (m *OperatorAssetInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1a { - size := m.WaitUnbondingAmount.Size() + size := m.PendingUndelegationAmount.Size() i -= size - if _, err := m.WaitUnbondingAmount.MarshalTo(dAtA[i:]); err != nil { + if _, err := m.PendingUndelegationAmount.MarshalTo(dAtA[i:]); err != nil { return 0, err } i = encodeVarintTx(dAtA, i, uint64(size)) @@ -1761,7 +1761,7 @@ func (m *StakerAssetInfo) Size() (n int) { n += 1 + l + sovTx(uint64(l)) l = m.WithdrawableAmount.Size() n += 1 + l + sovTx(uint64(l)) - l = m.WaitUnbondingAmount.Size() + l = m.PendingUndelegationAmount.Size() n += 1 + l + sovTx(uint64(l)) return n } @@ -1796,7 +1796,7 @@ func (m *OperatorAssetInfo) Size() (n int) { _ = l l = m.TotalAmount.Size() n += 1 + l + sovTx(uint64(l)) - l = m.WaitUnbondingAmount.Size() + l = m.PendingUndelegationAmount.Size() n += 1 + l + sovTx(uint64(l)) l = m.TotalShare.Size() n += 1 + l + sovTx(uint64(l)) @@ -2703,7 +2703,7 @@ func (m *StakerAssetInfo) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field WaitUnbondingAmount", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PendingUndelegationAmount", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2731,7 +2731,7 @@ func (m *StakerAssetInfo) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.WaitUnbondingAmount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.PendingUndelegationAmount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3000,7 +3000,7 @@ func (m *OperatorAssetInfo) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field WaitUnbondingAmount", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PendingUndelegationAmount", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3028,7 +3028,7 @@ func (m *OperatorAssetInfo) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.WaitUnbondingAmount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.PendingUndelegationAmount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/oracle/types/nonce.pb.go b/x/oracle/types/nonce.pb.go index 3667fe3a2..2a07ba16e 100644 --- a/x/oracle/types/nonce.pb.go +++ b/x/oracle/types/nonce.pb.go @@ -25,8 +25,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Nonce is a message that contains a nonce for a feeder type Nonce struct { + // FeederID is the ID of the feeder that corresponding to the nonce FeederID uint64 `protobuf:"varint,1,opt,name=feeder_id,json=feederId,proto3" json:"feeder_id,omitempty"` - Value uint32 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"` + // value is the nonce value + Value uint32 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"` } func (m *Nonce) Reset() { *m = Nonce{} } @@ -78,7 +80,9 @@ func (m *Nonce) GetValue() uint32 { // ValidatorNonce is a message that contains the nonces for a validator type ValidatorNonce struct { - Validator string `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator,omitempty"` + // validator is the validator address + Validator string `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator,omitempty"` + // nonces is the list of nonces for the feeders NonceList []*Nonce `protobuf:"bytes,2,rep,name=nonce_list,json=nonceList,proto3" json:"nonce_list,omitempty"` }