Merge pull request #199 from KiraCore/feature/undelegation

Feature/undelegation

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
       id-token: write
       pull-requests: write
     container: 
-      image: ghcr.io/kiracore/docker/base-image:v0.11.2
+      image: ghcr.io/kiracore/docker/base-image:v0.13.5
     steps:
           # Work around https://github.com/actions/checkout/issues/760
           - name: Add safe.directory
@@ -120,11 +120,13 @@ jobs:
       pull-requests: write
     steps:
           # Install the cosign tool
-          # ref.: https://github.com/sigstore/cosign-installer, v2.2.0
+          # ref.: https://github.com/sigstore/cosign-installer, v3.2.0
           - name: Install cosign
-            uses: sigstore/cosign-installer@d6a3abf1bdea83574e28d40543793018b6035605
+            uses: sigstore/cosign-installer@1fc5bd396d372bee37d608f955b336615edf79c8
             with:
-              cosign-release: 'v1.7.2'
+              cosign-release: 'v2.0.0'
+          - name: Confirm installation!
+            run: cosign version
           - name: Download artifacts
             uses: actions/[email protected]
             with:
@@ -258,4 +260,4 @@ jobs:
             env:
               MERGE_LABELS: "automerge"
               GITHUB_TOKEN: "${{ secrets.REPO_ACCESS }}"
-              LOG: "TRACE"
+              LOG: "TRACE"

.gitignore

@@ -5,8 +5,7 @@ interx.mnemonic
 proto-gen
 postman.json
 third_party/proto
-proto/cosmos
-proto/kira
+proto/
 codec/
 bin
 nfpm_*

RELEASE.md

@@ -1,4 +1,5 @@
 
 Features:
 
-* Fix minor issues for QueryTransactions endpoint
+* Implement QueryUndelegations endpoint
+* Bump sekai version to v0.3.38

common/api.go

@@ -16,11 +16,11 @@ import (
 	"github.com/KiraCore/interx/database"
 	"github.com/KiraCore/interx/global"
 	"github.com/KiraCore/interx/types"
+	tmjson "github.com/cometbft/cometbft/libs/json"
+	tmTypes "github.com/cometbft/cometbft/rpc/core/types"
+	tmJsonRPCTypes "github.com/cometbft/cometbft/rpc/jsonrpc/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
-	tmjson "github.com/tendermint/tendermint/libs/json"
-	tmTypes "github.com/tendermint/tendermint/rpc/core/types"
-	tmJsonRPCTypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
 )
 
 // MakeTendermintRPCRequest is a function to make GET request

config/constants.go

@@ -1,9 +1,9 @@
 package config
 
 const (
-	InterxVersion = "v0.4.40"
-	SekaiVersion  = "v0.3.29"
-	CosmosVersion = "v0.45.10"
+	InterxVersion = "v0.4.41"
+	SekaiVersion  = "v0.3.38"
+	CosmosVersion = "v0.47.5"
 
 	QueryDashboard = "/api/dashboard"
 
@@ -44,6 +44,7 @@ const (
 
 	QueryStakingPool           = "/api/kira/staking-pool"
 	QueryDelegations           = "/api/kira/delegations"
+	QueryUndelegations         = "/api/kira/undelegations"
 	QuerySpendingPools         = "/api/kira/spending-pools"
 	QuerySpendingPoolProposals = "/api/kira/spending-pool-proposals"
 

config/load.go

@@ -12,14 +12,14 @@ import (
 	"github.com/KiraCore/interx/types"
 	sekaiapp "github.com/KiraCore/sekai/app"
 	sekaiappparams "github.com/KiraCore/sekai/app/params"
+	"github.com/cometbft/cometbft/crypto"
+	"github.com/cometbft/cometbft/crypto/sr25519"
+	"github.com/cometbft/cometbft/p2p"
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	bytesize "github.com/inhies/go-bytesize"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/sr25519"
-	"github.com/tendermint/tendermint/p2p"
 	"github.com/tyler-smith/go-bip39"
 )
 

config/type.go

@@ -2,8 +2,8 @@ package config
 
 import (
 	"github.com/KiraCore/interx/types"
+	"github.com/cometbft/cometbft/p2p"
 	crypto "github.com/cosmos/cosmos-sdk/crypto/types"
-	"github.com/tendermint/tendermint/p2p"
 )
 
 // FaucetConfig is a struct to be used for Faucet configuration

database/transactions.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/KiraCore/interx/config"
 	"github.com/KiraCore/interx/global"
-	tmTypes "github.com/tendermint/tendermint/rpc/core/types"
+	tmTypes "github.com/cometbft/cometbft/rpc/core/types"
 )
 
 // GetTransactions is a function to get user transactions from cache

functions/interx.go

@@ -1639,6 +1639,91 @@ func RegisterInterxFunctions() {
 		}`,
 	)
 
+	AddInterxFunction(
+		"QueryUndelegations",
+		config.QueryUndelegations,
+		`{
+			"description": "QueryUnelegations is a function to query all undelegation records for a delegator.",
+			"parameters": {
+				"undelegatorAddress": {
+					"type":        "string",
+					"description": "This is the delegator's address.",
+					"optional": true
+				},
+				"offset": {
+					"type":        "string",
+					"description": "This is an option for pagination. offset is a numeric offset that specifies the starting point of the result set. If left empty it will default to a value to be set by each app.",
+					"optional": true
+				},
+				"limit": {
+					"type":        "string",
+					"description": "This is an option for pagination. limit is the total number of results to be returned in the result page. If left empty it will default to a value to be set by each app.",
+					"optional": true
+				},
+				"countTotal": {
+					"type":        "string",
+					"description": "This is an option for pagination. count_total is set to true  to indicate that the result set should include a count of the total number of items available for pagination in UIs.",
+					"optional": true
+				}
+			},
+			"response": {
+				"undelegations": {
+					"type": "array",
+					"description": "The undelegations records info",
+					"fields": {
+						"validator_info": {
+							"type":        "struct",
+							"description": "The validator information",
+							"fields": {
+								"moniker": {
+									"type":        "string",
+									"description": "The validator's moniker"
+								},
+								"address": {
+									"type":        "string",
+									"description": "The validator's address"
+								},
+								"logo_url": {
+									"type":        "string",
+									"description": "The validator's logo"
+								},
+								"valkey": {
+									"type":        "string",
+									"description": "Validator’s valkey, required for MsgClaimUndelegation"
+								}
+							}
+						},
+						"tokens": {
+							"type": "array",
+							"description": "The token information",
+							"fields": {
+								"denom": {
+									"type": "string",
+									"description": "The token name"
+								},
+								"amount": {
+									"type": "number",
+									"description": "The token amount"
+								}
+							}
+						},
+						"expiry": {
+                            "type": "string",
+                            "description": "Epoch time value. After it passes, the tokens can be claimed"
+						},
+						"id": {
+                            "type": "number",
+                            "description": "Unique record marking, required for MsgClaimUndelegation"
+						}
+					}
+				},
+				"pagination": {
+					"description": "The pagination response information that includes total count"
+				}
+			}
+		}`,
+	)
+
 	AddInterxFunction(
 		"QueryDelegations",
 		config.QueryDelegations,

gateway/cosmos/tx.go

@@ -10,7 +10,7 @@ import (
 	"github.com/KiraCore/interx/common"
 	"github.com/KiraCore/interx/config"
 	"github.com/KiraCore/interx/types"
-	legacytx "github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
+	legacytx "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
 	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 )
@@ -160,7 +160,7 @@ func encodeTransactionHandle(r *http.Request, request types.InterxRequest, rpcAd
 		return common.ServeError(0, "failed to unmarshal", err.Error(), http.StatusBadRequest)
 	}
 
-	signBytes := legacytx.StdSignBytes(req.ChainID, req.AccountNumber, req.Sequence, 0, req.Tx.Fee, req.Tx.Msgs, req.Tx.Memo)
+	signBytes := legacytx.StdSignBytes(req.ChainID, req.AccountNumber, req.Sequence, 0, req.Tx.Fee, req.Tx.Msgs, req.Tx.Memo, req.Tx.GetTip())
 
 	// TxEncodeResponse defines base64 encoded transaction.
 	type TxEncodeResponse struct {

gateway/interx/block.go

@@ -12,15 +12,15 @@ import (
 	"github.com/KiraCore/interx/types"
 	kiratypes "github.com/KiraCore/sekai/types"
 	multistaking "github.com/KiraCore/sekai/x/multistaking/types"
+	abciTypes "github.com/cometbft/cometbft/abci/types"
+	tmTypes "github.com/cometbft/cometbft/rpc/core/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/types"
 	distribution "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	staking "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
-	abciTypes "github.com/tendermint/tendermint/abci/types"
-	tmTypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 // RegisterBlockRoutes registers block/transaction query routers.

gateway/interx/block_test.go

@@ -12,11 +12,11 @@ import (
 	"github.com/KiraCore/interx/database"
 	"github.com/KiraCore/interx/test"
 	"github.com/KiraCore/interx/types"
+	tmjson "github.com/cometbft/cometbft/libs/json"
+	tmRPCTypes "github.com/cometbft/cometbft/rpc/core/types"
+	tmJsonRPCTypes "github.com/cometbft/cometbft/rpc/jsonrpc/types"
+	tmTypes "github.com/cometbft/cometbft/types"
 	"github.com/stretchr/testify/suite"
-	tmjson "github.com/tendermint/tendermint/libs/json"
-	tmRPCTypes "github.com/tendermint/tendermint/rpc/core/types"
-	tmJsonRPCTypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
-	tmTypes "github.com/tendermint/tendermint/types"
 )
 
 type BlockQueryTestSuite struct {

gateway/interx/faucet.go

@@ -11,7 +11,8 @@ import (
 	"github.com/KiraCore/interx/database"
 	"github.com/KiraCore/interx/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	legacytx "github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
+	"github.com/cosmos/cosmos-sdk/types/tx"
+	legacytx "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
@@ -158,9 +159,10 @@ func serveFaucet(r *http.Request, gwCosmosmux *runtime.ServeMux, request types.I
 	msgs := []sdk.Msg{msgSend}
 	fee := legacytx.NewStdFee(200000, sdk.NewCoins(feeAmount)) //Fee handling
 	memo := "Faucet Transfer"
+	tip := &tx.Tip{Amount: msgSend.Amount, Tipper: "test"}
 
 	sigs := make([]legacytx.StdSignature, 1)
-	signBytes := legacytx.StdSignBytes(common.NodeStatus.Chainid, accountNumber, sequence, 0, fee, msgs, memo)
+	signBytes := legacytx.StdSignBytes(common.NodeStatus.Chainid, accountNumber, sequence, 0, fee, msgs, memo, tip)
 
 	sig, err := config.Config.Faucet.PrivKey.Sign(signBytes)
 	if err != nil {

gateway/interx/genesis.go

@@ -10,10 +10,10 @@ import (
 	"github.com/KiraCore/interx/common"
 	"github.com/KiraCore/interx/config"
 	"github.com/KiraCore/interx/global"
+	tmjson "github.com/cometbft/cometbft/libs/json"
+	tmtypes "github.com/cometbft/cometbft/types"
 	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
-	tmjson "github.com/tendermint/tendermint/libs/json"
-	tmtypes "github.com/tendermint/tendermint/types"
 )
 
 // RegisterGenesisQueryRoutes registers genesis query routers.

gateway/interx/genesis_test.go

@@ -9,11 +9,11 @@ import (
 
 	"github.com/KiraCore/interx/config"
 	"github.com/KiraCore/interx/test"
+	tmjson "github.com/cometbft/cometbft/libs/json"
+	tmRPCTypes "github.com/cometbft/cometbft/rpc/core/types"
+	tmJsonRPCTypes "github.com/cometbft/cometbft/rpc/jsonrpc/types"
+	tmTypes "github.com/cometbft/cometbft/types"
 	"github.com/stretchr/testify/suite"
-	tmjson "github.com/tendermint/tendermint/libs/json"
-	tmRPCTypes "github.com/tendermint/tendermint/rpc/core/types"
-	tmJsonRPCTypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
-	tmTypes "github.com/tendermint/tendermint/types"
 )
 
 type GenesisChecksumResponse struct {

gateway/interx/interx.tx.go

@@ -17,12 +17,12 @@ import (
 	"github.com/KiraCore/interx/database"
 	"github.com/KiraCore/interx/types"
 	kiratypes "github.com/KiraCore/sekai/types"
+	tmjson "github.com/cometbft/cometbft/libs/json"
+	tmTypes "github.com/cometbft/cometbft/rpc/core/types"
+	tmJsonRPCTypes "github.com/cometbft/cometbft/rpc/jsonrpc/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"
 	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
-	tmjson "github.com/tendermint/tendermint/libs/json"
-	tmTypes "github.com/tendermint/tendermint/rpc/core/types"
-	tmJsonRPCTypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
 	"golang.org/x/exp/slices"
 )
 

gateway/interx/interx.tx_test.go

@@ -12,11 +12,11 @@ import (
 	"github.com/KiraCore/interx/database"
 	"github.com/KiraCore/interx/test"
 	"github.com/KiraCore/interx/types"
+	tmjson "github.com/cometbft/cometbft/libs/json"
+	tmRPCTypes "github.com/cometbft/cometbft/rpc/core/types"
+	tmJsonRPCTypes "github.com/cometbft/cometbft/rpc/jsonrpc/types"
+	tmTypes "github.com/cometbft/cometbft/types"
 	"github.com/stretchr/testify/suite"
-	tmjson "github.com/tendermint/tendermint/libs/json"
-	tmRPCTypes "github.com/tendermint/tendermint/rpc/core/types"
-	tmJsonRPCTypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
-	tmTypes "github.com/tendermint/tendermint/types"
 )
 
 type InterxTxTestSuite struct {

gateway/interx/query_test.go

@@ -18,15 +18,15 @@ import (
 	"github.com/KiraCore/interx/test"
 	"github.com/KiraCore/interx/types"
 	"github.com/KiraCore/interx/types/kira"
+	tmjson "github.com/cometbft/cometbft/libs/json"
+	tmRPCTypes "github.com/cometbft/cometbft/rpc/core/types"
+	tmJsonRPCTypes "github.com/cometbft/cometbft/rpc/jsonrpc/types"
+	tmTypes "github.com/cometbft/cometbft/types"
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/go-bip39"
 	"github.com/stretchr/testify/suite"
-	tmjson "github.com/tendermint/tendermint/libs/json"
-	tmRPCTypes "github.com/tendermint/tendermint/rpc/core/types"
-	tmJsonRPCTypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
-	tmTypes "github.com/tendermint/tendermint/types"
 	"google.golang.org/grpc"
 )
 

gateway/interx/validators.go

@@ -13,10 +13,10 @@ import (
 	"github.com/KiraCore/interx/tasks"
 	"github.com/KiraCore/interx/types"
 	"github.com/KiraCore/interx/types/kira"
+	tmRPCTypes "github.com/cometbft/cometbft/rpc/core/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
-	tmRPCTypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 // RegisterValidatorsQueryRoutes registers validators query routers.

gateway/interx/validators_test.go

@@ -17,8 +17,8 @@ import (
 	multiStakingTypes "github.com/KiraCore/sekai/x/multistaking/types"
 	slashingTypes "github.com/KiraCore/sekai/x/slashing/types"
 	stakingTypes "github.com/KiraCore/sekai/x/staking/types"
+	tmJsonRPCTypes "github.com/cometbft/cometbft/rpc/jsonrpc/types"
 	"github.com/stretchr/testify/suite"
-	tmJsonRPCTypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
 	"google.golang.org/grpc"
 )