Merge pull request #325 from InjectiveLabs/release/v1_58_for_chain_v1_16

Release/v1 58 for chain v1 16

Author: aarmoa

.github/workflows/golangci-lint.yml

@@ -13,16 +13,16 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
           go-version-file: "go.mod"
           check-latest: true
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: latest
+          version: v2.1.6
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .idea/
+.vscode/
 .chain_cookie
 .exchange_cookie
 coverage.out

.golangci.yml

@@ -1,62 +1,69 @@
+version: "2"
+run:
+  tests: false
 linters:
-  fast: false
   enable:
     - errcheck
     - errorlint
-    - gas
     - gocritic
-    - gofmt
-    - goimports
-    - gosimple
     - govet
     - ineffassign
-    - megacheck
     - misspell
     - nakedret
     - prealloc
     - revive
-    - staticcheck
     - unconvert
     - unparam
   disable:
     - unused
-
-linters-settings:
-  revive:
-    enable-all-rules: true
+  settings:
+    gocritic:
+      disabled-checks:
+        - singleCaseSwitch
+        - deferInLoop
+        - hugeParam
+        - unnamedResult
+      enabled-tags:
+        - performance
+        - diagnostic
+        - style
+        - opinionated
+        - experimental
+    revive:
+      enable-all-rules: true
+      rules:
+        - name: var-naming
+          arguments:
+            - - ID
+        - name: add-constant
+          disabled: true
+        - name: line-length-limit
+          arguments:
+            - 140
+        - name: cognitive-complexity
+          arguments:
+            - 20
+          disabled: false
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      - name: var-naming
-        arguments:
-          - ["ID"]
-      - name: add-constant
-        disabled: true
-      - name: line-length-limit
-        arguments:
-          - 140
-  gocritic:
-    enabled-tags:
-      - performance
-      - diagnostic
-      - style
-      - opinionated
-      - experimental
-    disabled-checks:
-      - singleCaseSwitch
-      - deferInLoop
-      - hugeParam
-      - unnamedResult
+      - linters:
+          - revive
+        text: ALL_CAPS
+    paths:
+      - chain
+      - exchange
+      - injective_data
+      - proto
+      - client/keyring/testdata
+      - client/chain/chain_test_support.go
+      - typeddata
+      - eip712_cosmos.go
+      - eip712.go
 issues:
-  exclude-rules:
-    - linters:
-        - revive
-      text: ALL_CAPS
-  exclude-dirs:
-    - chain
-    - exchange
-    - injective_data
-    - proto
-    - client/keyring/testdata
   max-issues-per-linter: 0
-
-run:
-  tests: false

Makefile

@@ -1,10 +1,10 @@
 all:
 
 clone-injective-indexer:
-	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.15.6 --depth 1 --single-branch
+	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.16.54 --depth 1 --single-branch
 
 clone-injective-core:
-	git clone https://github.com/InjectiveLabs/injective-core.git -b v1.15.0 --depth 1 --single-branch
+	git clone https://github.com/InjectiveLabs/injective-core.git -b v1.16.0 --depth 1 --single-branch
 
 copy-exchange-client: clone-injective-indexer
 	rm -rf exchange/*
@@ -51,9 +51,34 @@ copy-chain-types: clone-injective-core
 	mkdir -p chain/auction/types && \
 		cp injective-core/injective-chain/modules/auction/types/*.pb.go chain/auction/types && \
 		cp injective-core/injective-chain/modules/auction/types/codec.go chain/auction/types
+	mkdir -p chain/erc20/types && \
+		cp injective-core/injective-chain/modules/erc20/types/*.pb.go chain/erc20/types && \
+		cp injective-core/injective-chain/modules/erc20/types/codec.go chain/erc20/types
+	mkdir -p chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/*.pb.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/access_list.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/access_list_tx.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/chain_config.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/codec.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/dynamic_fee_tx.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/errors.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/eth.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/events.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/key.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/legacy_tx.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/logs.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/msg.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/params.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/storage.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/tx.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/tx_data.go chain/evm/types && \
+		cp injective-core/injective-chain/modules/evm/types/utils.go chain/evm/types
 	mkdir -p chain/exchange/types && \
 		cp injective-core/injective-chain/modules/exchange/types/*.go chain/exchange/types && \
 		rm -rf chain/exchange/types/*test.go && rm -rf chain/exchange/types/*gw.go
+	mkdir -p chain/exchange/types/v2 && \
+    		cp injective-core/injective-chain/modules/exchange/types/v2/*.go chain/exchange/types/v2 && \
+    		rm -rf chain/exchange/types/v2/*test.go && rm -rf chain/exchange/types/v2/*gw.go
 	mkdir -p chain/insurance/types && \
 		cp injective-core/injective-chain/modules/insurance/types/*.pb.go chain/insurance/types && \
 		cp injective-core/injective-chain/modules/insurance/types/codec.go chain/insurance/types
@@ -109,18 +134,41 @@ copy-chain-types: clone-injective-core
 		cp injective-core/injective-chain/modules/wasmx/types/proposal.go chain/wasmx/types
 	mkdir -p chain/stream/types && \
 		cp injective-core/injective-chain/stream/types/*.pb.go chain/stream/types
+	mkdir -p chain/stream/types/v2 && \
+    		cp injective-core/injective-chain/stream/types/v2/*.pb.go chain/stream/types/v2
 	mkdir -p chain/types && \
 		cp injective-core/injective-chain/types/*.pb.go injective-core/injective-chain/types/config.go chain/types && \
+		cp injective-core/injective-chain/types/chain_id.go chain/types && \
 		cp injective-core/injective-chain/types/codec.go chain/types && \
-		cp injective-core/injective-chain/types/util.go chain/types
+		cp injective-core/injective-chain/types/errors.go chain/types && \
+		cp injective-core/injective-chain/types/int.go chain/types && \
+		cp injective-core/injective-chain/types/util.go chain/types && \
+		cp injective-core/injective-chain/types/validation.go chain/types
 
 	@find ./chain -type f -name "*.go" -exec sed -i "" -e "s|github.com/InjectiveLabs/injective-core/injective-chain/modules|github.com/InjectiveLabs/sdk-go/chain|g" {} \;
 	@find ./chain -type f -name "*.go" -exec sed -i "" -e "s|github.com/InjectiveLabs/injective-core/injective-chain|github.com/InjectiveLabs/sdk-go/chain|g" {} \;
 
+	mkdir -p chain/evm/precompiles/bank && mkdir -p chain/evm/precompiles/exchange && mkdir -p chain/evm/precompiles/staking && \
+		cp injective-core/injective-chain/modules/evm/precompiles/bindings/cosmos/precompile/bank/*.go chain/evm/precompiles/bank && \
+		cp injective-core/injective-chain/modules/evm/precompiles/bindings/cosmos/precompile/exchange/*.go chain/evm/precompiles/exchange && \
+		cp injective-core/injective-chain/modules/evm/precompiles/bindings/cosmos/precompile/staking/*.go chain/evm/precompiles/staking
+
 	rm -rf proto
 	cp -r injective-core/proto ./
 
 	rm -rf injective-core
+	make extract-message-names
+
+extract-message-names:
+	@echo "Extracting message names from tx.pb.go files..."
+	@mkdir -p injective_data
+	@find ./chain -name "tx.pb.go" -exec grep -h "proto\.RegisterType" {} \; | \
+		sed -n 's/.*proto\.RegisterType([^"]*"\([^"]*\)".*/\1/p' | \
+		grep -v 'Response$$' | \
+		sort -u | \
+		jq -R -s 'split("\n")[:-1]' > injective_data/chain_messages_list.json
+	@echo "Message names extracted to injective_data/chain_messages_list.json (excluding Response messages)"
+	@echo "Total messages found: $$(jq length injective_data/chain_messages_list.json)"
 
 #gen: gen-proto
 #
@@ -168,4 +216,8 @@ lint-master: export GOPROXY=direct
 lint-master:
 	golangci-lint run --timeout=15m -v --new-from-rev=master
 
-.PHONY: copy-exchange-client tests coverage lint lint-last-commit lint-master
+lint-all: export GOPROXY=direct
+lint-all:
+	golangci-lint run --timeout=15m -v
+
+.PHONY: copy-exchange-client tests coverage lint lint-last-commit lint-master lint-all extract-message-names

README.md

@@ -28,6 +28,60 @@ go run examples/exchange/derivatives/4_Orderbook/example.go
 
 ---
 
+## Choose Exchange V1 or Exchange V2 queries
+
+The SDK provides two different clients for interacting with the Injective Exchange:
+
+- `ChainClient`: Use this client if you need to interact with Exchange V1. This client maintains compatibility with the original exchange implementation and is suitable for existing applications that haven't migrated to V2 yet. Note that this client will not include any new endpoints added to the Exchange module - for access to new features, you should migrate to V2.
+
+- `ChainClientV2`: Use this client for all new applications or when you need to interact with Exchange V2 features. This client provides access to the latest exchange functionality and improvements, including all new endpoints added to the Exchange module.
+
+Example usage:
+```go
+// For Exchange V1
+client := chainclient.NewChainClient(...)
+
+// For Exchange V2
+clientV2 := chainclient.NewChainClientV2(...)
+```
+
+### Markets Assistant
+
+The SDK provides a Markets Assistant to help you interact with markets in both V1 and V2. Here's how to create instances for each version:
+
+```go
+// For Exchange V1 markets
+marketsAssistant, err := chain.NewMarketsAssistant(ctx, client)  // ChainClient instance
+if err != nil {
+    // Handle error
+}
+
+// For Exchange V2 markets
+marketsAssistantV2, err := chain.NewHumanReadableMarketsAssistant(ctx, clientV2)  // ChainClientV2 instance
+if err != nil {
+    // Handle error
+}
+```
+
+The Markets Assistant provides helper methods to:
+- Fetch market information
+- Get market prices
+- Query orderbooks
+- Access market statistics
+
+Make sure to use the correct version of the Markets Assistant that matches your ChainClient version to ensure compatibility. The V1 assistant (`NewMarketsAssistant`) will only work with V1 markets, while the V2 assistant (`NewHumanReadableMarketsAssistant`) provides access to V2 markets and their features.
+
+### Format Differences
+
+There are important format differences between V1 and V2 endpoints:
+
+- **Exchange V1**: All values (amounts, prices, margins, notionals) are returned in chain format (raw numbers)
+- **Exchange V2**: Most values are returned in human-readable format for better usability:
+  - Amounts, prices, margins, and notionals are in human-readable format
+  - Deposit-related information remains in chain format to maintain consistency with the Bank module
+
+This format difference is one of the key improvements in V2, making it easier to work with market data without manual conversion.
+
 ## Updating Exchange API proto and client
 
 ```bash

auth_vote/authz_vote.go

@@ -1,22 +1,26 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"os"
+	"time"
 
-	chainclient "github.com/InjectiveLabs/sdk-go/client/chain"
-	"github.com/InjectiveLabs/sdk-go/client/common"
 	rpchttp "github.com/cometbft/cometbft/rpc/client/http"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authztypes "github.com/cosmos/cosmos-sdk/x/authz"
 	"github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
+
+	chainclient "github.com/InjectiveLabs/sdk-go/client/chain"
+	"github.com/InjectiveLabs/sdk-go/client/common"
 )
 
+//revive:disable:function-length // this is an example script
 func main() {
 	network := common.LoadNetwork("testnet", "lb")
-	tmClient, err := rpchttp.New(network.TmEndpoint, "/websocket")
+	tmClient, err := rpchttp.New(network.TmEndpoint)
 	if err != nil {
 		panic(err)
 	}
@@ -48,7 +52,7 @@ func main() {
 	clientCtx = clientCtx.WithNodeURI(network.TmEndpoint).WithClient(tmClient)
 
 	txFactory := chainclient.NewTxFactory(clientCtx)
-	chainClient, err := chainclient.NewChainClient(
+	chainClient, err := chainclient.NewChainClientV2(
 		clientCtx,
 		network,
 		common.OptionTxFactory(&txFactory),
@@ -58,7 +62,10 @@ func main() {
 		panic(err)
 	}
 
-	gasPrice := chainClient.CurrentChainGasPrice()
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	gasPrice := chainClient.CurrentChainGasPrice(ctx)
 	// adjust gas price to make it valid even if it changes between the time it is requested and the TX is broadcasted
 	gasPrice = int64(float64(gasPrice) * 1.1)
 	chainClient.SetGasPrice(gasPrice)
@@ -92,16 +99,16 @@ func main() {
 	}
 
 	// AsyncBroadcastMsg, SyncBroadcastMsg, QueueBroadcastMsg
-	response, err := chainClient.AsyncBroadcastMsg(msgs...)
+	response, err := chainClient.AsyncBroadcastMsg(ctx, msgs...)
 
 	if err != nil {
 		panic(err)
 	}
 
-	str, _ := json.MarshalIndent(response, "", " ")
+	str, _ := json.MarshalIndent(response, "", "\t")
 	fmt.Print(string(str))
 
-	gasPrice = chainClient.CurrentChainGasPrice()
+	gasPrice = chainClient.CurrentChainGasPrice(ctx)
 	// adjust gas price to make it valid even if it changes between the time it is requested and the TX is broadcasted
 	gasPrice = int64(float64(gasPrice) * 1.1)
 	chainClient.SetGasPrice(gasPrice)