feature/kip-87 -> release/v0.4.42

.github/workflows/merge_hook.yml

@@ -0,0 +1,44 @@
+---
+name: Release Merged Hook
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - master
+
+jobs:
+  trigger-dispatch:
+    if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/v')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Extract Version from Branch Name
+        id: version-extract
+        run: |
+          VERSION=$(echo "${{ github.event.pull_request.head.ref }}" | sed 's|release/v||')
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+
+      - name: Trigger Repository Dispatch Event
+        env:
+          VERSION: ${{ env.VERSION }}
+        run: |
+          curl -X POST -H "Accept: application/vnd.github.v3+json" \
+          -H "Authorization: Bearer ${{ secrets.REPO_ACCESS }}" \
+          "https://api.github.com/repos/KiraCore/sekin/dispatches" \
+          -d @- <<EOF
+          {
+            "event_type": "release_merged",
+            "client_payload": {
+              "version": "${VERSION}",
+              "name": "interx",
+              "authors": "KIRA",
+              "url": "https://kira.network",
+              "documentation": "https://docs.kira.network",
+              "source": "https://github.com/KiraCore/interx",
+              "vendor": "KiraCore",
+              "licenses": "CC BY-NC-SA 4.0",
+              "title": "interx",
+              "description": "INTERX is KIRA’s Content Availability Layer. It ensures rapid, scalable queries and access to on-chain (SEKAI) and off-chain (L2) RollApp data without reliance on third-party RPC service providers such as Infura (Ethereum) and DA networks such as Celestia (Cosmos). INTERX streamlines the creation and maintenance of front-end and RollApp, eliminating the complexities associated with light clients and providing out-of-the-box support for sequencing, storage, fraud-proof generation, replication, proxy, and middleware layer load-balancing. "
+            }
+          }
+          EOF

Makefile

@@ -1,4 +1,4 @@
-.PHONY: proto-gen build publish install start test test-local network-start network-stop
+.PHONY: proto-gen build build-static publish install start test test-local network-start network-stop
 
 proto-gen:
 	./scripts/proto-gen.sh
@@ -10,6 +10,10 @@ install:
 build:
 	./scripts/build.sh
 
+build-static:
+	./scripts/proto-gen.sh
+	./scripts/sbuild.sh
+
 start:
 	go run main.go
 
@@ -28,4 +32,4 @@ network-start:
 	./scripts/test-local/network-start.sh
 
 network-stop:
-	./scripts/test-local/network-stop.sh
+	./scripts/test-local/network-stop.sh

RELEASE.md

@@ -1,5 +1,4 @@
-
 Features:
 
-* Add DefaultDenom and Bech32Prefix to QueryKiraTokensAliases endpoint
-* Bump sekai version to v0.3.40
+* Implement KIP-87 : broadcast metamask coin send transaction to sekai
+* Implement KIP-87 : broadcast eip-712 signed transaction to sekai

common/api.go

@@ -145,10 +145,10 @@ func GetAccountNumberSequence(gwCosmosmux *runtime.ServeMux, r *http.Request, be
 
 	type QueryAccountResponse struct {
 		Account struct {
-			Address       string `json:"addresss"`
-			PubKey        string `json:"pubKey"`
-			AccountNumber string `json:"accountNumber"`
-			Sequence      string `json:"sequence"`
+			Address       string      `json:"addresss"`
+			PubKey        interface{} `json:"pubKey"`
+			AccountNumber string      `json:"accountNumber"`
+			Sequence      string      `json:"sequence"`
 		} `json:"account"`
 	}
 	result := QueryAccountResponse{}
@@ -331,7 +331,6 @@ func GetTokenAliases(gwCosmosmux *runtime.ServeMux, r *http.Request) ([]types.To
 	}
 
 	result := TokenAliasesResponse{}
-
 	err := json.NewDecoder(resp.Body).Decode(&result)
 	if err != nil {
 		GetLogger().Error("[grpc-call] Unable to decode response: ", err)
@@ -346,6 +345,31 @@ func GetTokenAliases(gwCosmosmux *runtime.ServeMux, r *http.Request) ([]types.To
 	return result.Data, result.DefaultDenom, result.Bech32Prefix
 }
 
+// GetAllBalances is a function to get all balances with full limitation
+func GetAllBalances(gwCosmosmux *runtime.ServeMux, r *http.Request, bech32Addr string) []types.Coin {
+	r.URL.Path = fmt.Sprintf("/cosmos/bank/v1beta1/balances/%s", bech32Addr)
+	r.URL.RawQuery = "pagination.limit=100000"
+	r.Method = "GET"
+
+	// GetLogger().Info("[grpc-call] Entering grpc call: ", r.URL.Path)
+
+	recorder := httptest.NewRecorder()
+	gwCosmosmux.ServeHTTP(recorder, r)
+	resp := recorder.Result()
+
+	type AllBalancesResponse struct {
+		Balances []types.Coin `json:"balances"`
+	}
+
+	result := AllBalancesResponse{}
+	err := json.NewDecoder(resp.Body).Decode(&result)
+	if err != nil {
+		GetLogger().Error("[grpc-call] Unable to decode response: ", err)
+	}
+
+	return result.Balances
+}
+
 // GetTokenSupply is a function to get token supply
 func GetTokenSupply(gwCosmosmux *runtime.ServeMux, r *http.Request) []types.TokenSupply {
 	r.URL.Path = strings.Replace(config.QueryTotalSupply, "/api/kira", "/cosmos/bank/v1beta1", -1)

config/constants.go

@@ -1,10 +1,18 @@
 package config
 
 const (
-	InterxVersion = "v0.4.42"
-	SekaiVersion  = "v0.3.40"
+	InterxVersion = "v0.4.49"
+	SekaiVersion  = "v0.3.45"
 	CosmosVersion = "v0.47.6"
 
+	DefaultChainID           = 8789
+	DefaultKiraAddrPrefix    = "kira"
+	DefaultKiraValAddrPrefix = "kiravaloper"
+	DefaultKiraDenom         = "ukex"
+
+	MetamaskEndpoint     = "/api/kira/evm"
+	RegisterAddrEndpoint = "/api/kira/evm/register_address/{eth_addr}{cosmos_addr}"
+
 	QueryDashboard = "/api/dashboard"
 
 	QueryAccounts        = "/api/kira/accounts/{address}"

config/init.go

@@ -231,6 +231,7 @@ func InitConfig(
 	nodeDiscoveryTendermintPort string,
 	nodeDiscoveryTimeout string,
 	nodeKey string,
+	snapshotInterval uint64,
 ) {
 	configFromFile := defaultConfig()
 
@@ -290,6 +291,8 @@ func InitConfig(
 		configFromFile.Faucet.FeeAmounts[denom] = amount
 	}
 
+	configFromFile.SnapshotInterval = snapshotInterval
+
 	bytes, err := json.MarshalIndent(&configFromFile, "", "  ")
 	if err != nil {
 		panic(err)

config/load.go

@@ -328,6 +328,8 @@ func LoadConfig(configFilePath string) {
 
 	Config.Evm = configFromFile.Evm
 	Config.Bitcoin = configFromFile.Bitcoin
+
+	Config.SnapshotInterval = configFromFile.SnapshotInterval
 }
 
 // GenPrivKey is a function to generate a privKey

config/type.go

@@ -89,27 +89,28 @@ type BitcoinConfig struct {
 
 // InterxConfig is a struct to be used for interx configuration
 type InterxConfig struct {
-	InterxVersion string                   `json:"interx_version"`
-	SekaiVersion  string                   `json:"sekai_version"`
-	ServeHTTPS    bool                     `json:"serve_https"`
-	GRPC          string                   `json:"grpc"`
-	RPC           string                   `json:"rpc"`
-	PORT          string                   `json:"port"`
-	Node          types.NodeConfig         `json:"node"`
-	Mnemonic      string                   `json:"mnemonic"`
-	AddrBooks     []string                 `json:"addrbooks"`
-	NodeKey       *p2p.NodeKey             `json:"node_key"`
-	TxModes       []string                 `json:"tx_modes"`
-	PrivKey       crypto.PrivKey           `json:"privkey"`
-	PubKey        crypto.PubKey            `json:"pubkey"`
-	Address       string                   `json:"address"`
-	NodeDiscovery NodeDiscoveryConfig      `json:"node_discovery"`
-	Block         BlockConfig              `json:"block"`
-	Cache         CacheConfig              `json:"cache"`
-	Faucet        FaucetConfig             `json:"faucet"`
-	RPCMethods    RPCConfig                `json:"rpc_methods"`
-	Evm           map[string]EVMConfig     `json:"evm"`
-	Bitcoin       map[string]BitcoinConfig `json:"bitcoin"`
+	InterxVersion    string                   `json:"interx_version"`
+	SekaiVersion     string                   `json:"sekai_version"`
+	ServeHTTPS       bool                     `json:"serve_https"`
+	GRPC             string                   `json:"grpc"`
+	RPC              string                   `json:"rpc"`
+	PORT             string                   `json:"port"`
+	Node             types.NodeConfig         `json:"node"`
+	Mnemonic         string                   `json:"mnemonic"`
+	AddrBooks        []string                 `json:"addrbooks"`
+	NodeKey          *p2p.NodeKey             `json:"node_key"`
+	TxModes          []string                 `json:"tx_modes"`
+	PrivKey          crypto.PrivKey           `json:"privkey"`
+	PubKey           crypto.PubKey            `json:"pubkey"`
+	Address          string                   `json:"address"`
+	NodeDiscovery    NodeDiscoveryConfig      `json:"node_discovery"`
+	Block            BlockConfig              `json:"block"`
+	Cache            CacheConfig              `json:"cache"`
+	Faucet           FaucetConfig             `json:"faucet"`
+	RPCMethods       RPCConfig                `json:"rpc_methods"`
+	Evm              map[string]EVMConfig     `json:"evm"`
+	Bitcoin          map[string]BitcoinConfig `json:"bitcoin"`
+	SnapshotInterval uint64                   `json:"snapshot_interval"`
 }
 
 // InterxConfigFromFile is a struct to be used for interx configuration file
@@ -138,6 +139,7 @@ type InterxConfigFromFile struct {
 		FeeAmounts           map[string]string `json:"fee_amounts"`
 		TimeLimit            int64             `json:"time_limit"`
 	} `json:"faucet"`
-	Evm     map[string]EVMConfig     `json:"evm"`
-	Bitcoin map[string]BitcoinConfig `json:"bitcoin"`
+	Evm              map[string]EVMConfig     `json:"evm"`
+	Bitcoin          map[string]BitcoinConfig `json:"bitcoin"`
+	SnapshotInterval uint64                   `json:"snapshot_interval"`
 }

gateway/cosmos/bank.go

@@ -3,10 +3,12 @@ package cosmos
 import (
 	"fmt"
 	"net/http"
+	"strconv"
 	"strings"
 
 	"github.com/KiraCore/interx/common"
 	"github.com/KiraCore/interx/config"
+	"github.com/KiraCore/interx/types"
 	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 )
@@ -58,26 +60,119 @@ func QuerySupplyRequest(gwCosmosmux *runtime.ServeMux, rpcAddr string) http.Hand
 func queryBalancesHandle(r *http.Request, gwCosmosmux *runtime.ServeMux) (interface{}, interface{}, int) {
 	params := mux.Vars(r)
 	bech32addr := params["address"]
-	queries := r.URL.Query()
-	offset := queries["offset"]
-	limit := queries["limit"]
-	countTotal := queries["count_total"]
-
-	var events = make([]string, 0, 3)
-	if len(offset) == 1 {
-		events = append(events, fmt.Sprintf("pagination.offset=%s", offset[0]))
+
+	// request could have tokens list if so, returns those
+	tokensParam := r.URL.Query().Get("tokens")
+	excludedParam := r.URL.Query().Get("excluded")
+	derivedParam := r.URL.Query().Get("derived")
+
+	// use default balances query when no custom params set
+	if tokensParam == "" && excludedParam == "" && (derivedParam != "true" && derivedParam != "false") {
+		queries := r.URL.Query()
+		offset := queries["offset"]
+		limit := queries["limit"]
+		countTotal := queries["count_total"]
+		var events = make([]string, 0, 3)
+		if len(offset) == 1 {
+			events = append(events, fmt.Sprintf("pagination.offset=%s", offset[0]))
+		}
+		if len(limit) == 1 {
+			events = append(events, fmt.Sprintf("pagination.limit=%s", limit[0]))
+		}
+		if len(countTotal) == 1 {
+			events = append(events, fmt.Sprintf("pagination.count_total=%s", countTotal[0]))
+		} else if len(limit) == 1 { // set count_total flag to true as default when limit flag's set
+			events = append(events, "pagination.count_total=true")
+		}
+
+		r.URL.RawQuery = strings.Join(events, "&")
+		r.URL.Path = fmt.Sprintf("/cosmos/bank/v1beta1/balances/%s", bech32addr)
+		return common.ServeGRPC(r, gwCosmosmux)
 	}
-	if len(limit) == 1 {
-		events = append(events, fmt.Sprintf("pagination.limit=%s", limit[0]))
+
+	type Pagination struct {
+		NextKey string `json:"next_key"`
+		Total   string `json:"total"`
 	}
-	if len(countTotal) == 1 {
-		events = append(events, fmt.Sprintf("pagination.count_total=%s", countTotal[0]))
+
+	type BalancesResult struct {
+		Balances   []types.Coin `json:"balances"`
+		Pagination *Pagination  `json:"pagination,omitempty"`
 	}
 
-	r.URL.RawQuery = strings.Join(events, "&")
+	allBalances := common.GetAllBalances(gwCosmosmux, r.Clone(r.Context()), bech32addr)
 
-	r.URL.Path = fmt.Sprintf("/cosmos/bank/v1beta1/balances/%s", bech32addr)
-	return common.ServeGRPC(r, gwCosmosmux)
+	data := make([]types.Coin, 0)
+	if tokensParam != "" {
+		tokensList := strings.Split(tokensParam, ",")
+		tokensMap := make(map[string]bool)
+		for _, token := range tokensList {
+			tokensMap[token] = true
+		}
+
+		for _, balance := range allBalances {
+			if tokensMap[balance.Denom] {
+				data = append(data, balance)
+			}
+		}
+		result := BalancesResult{
+			Balances: data,
+		}
+
+		return result, nil, http.StatusOK
+	}
+
+	excludedList := strings.Split(excludedParam, ",")
+	excludedMap := make(map[string]bool)
+	for _, token := range excludedList {
+		excludedMap[token] = true
+	}
+
+	filteredData := make([]types.Coin, 0)
+	for _, balance := range allBalances {
+		denom := balance.Denom
+		if excludedMap[denom] {
+			continue
+		}
+
+		isDerivedDenom := len(denom) > 2 && denom[0] == 'v' && strings.Contains(denom, "/")
+		if derivedParam == "true" && !isDerivedDenom {
+			continue
+		}
+		if derivedParam == "false" && isDerivedDenom {
+			continue
+		}
+
+		filteredData = append(filteredData, balance)
+	}
+
+	// if request does not have tokens list, return with pagination
+	offsetParam := r.URL.Query().Get("offset")
+	offset, err := strconv.Atoi(offsetParam)
+	if err != nil {
+		offset = 0
+	}
+	limitParam := r.URL.Query().Get("limit")
+	limit, err := strconv.Atoi(limitParam)
+	if err != nil {
+		limit = 100
+	}
+
+	lastIndex := offset + limit
+	if lastIndex > len(filteredData) {
+		lastIndex = len(filteredData)
+	}
+	data = filteredData[offset:lastIndex]
+
+	result := BalancesResult{
+		Balances: data,
+		Pagination: &Pagination{
+			NextKey: fmt.Sprintf("%d", lastIndex),
+			Total:   fmt.Sprintf("%d", len(filteredData)),
+		},
+	}
+
+	return result, nil, http.StatusOK
 }
 
 // QueryBalancesRequest is a function to query balances.