Feat/add exchange v2 support

.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

.golangci.yml

@@ -1,62 +1,66 @@
+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
 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

@@ -4,7 +4,7 @@ clone-injective-indexer:
 	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.15.6 --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 master --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,10 +134,14 @@ 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/codec.go chain/types && \
-		cp injective-core/injective-chain/types/util.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" {} \;
@@ -168,4 +197,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

auth_vote/authz_vote.go

@@ -14,9 +14,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 )
 
+//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)
 	}

chain/crypto/ethsecp256k1/ethsecp256k1.go

@@ -73,7 +73,7 @@ func (privKey *PrivKey) Equals(other cryptotypes.LedgerPrivKey) bool {
 }
 
 // Type returns eth_secp256k1
-func (privKey *PrivKey) Type() string {
+func (*PrivKey) Type() string {
 	return KeyType
 }
 
@@ -153,7 +153,7 @@ func (pubKey *PubKey) String() string {
 }
 
 // Type returns eth_secp256k1
-func (pubKey *PubKey) Type() string {
+func (*PubKey) Type() string {
 	return KeyType
 }
 

chain/crypto/hd/algorithm.go

@@ -20,11 +20,11 @@ const (
 )
 
 var (
-	// SupportedAlgorithms defines the list of signing algorithms used on Ethermint:
+	// SupportedAlgorithms defines the list of signing algorithms used on Injective:
 	//  - eth_secp256k1 (Ethereum)
 	//  - secp256k1 (Tendermint)
 	SupportedAlgorithms = keyring.SigningAlgoList{EthSecp256k1, hd.Secp256k1}
-	// SupportedAlgorithmsLedger defines the list of signing algorithms used on Ethermint for the Ledger device:
+	// SupportedAlgorithmsLedger defines the list of signing algorithms used on Injective for the Ledger device:
 	//  - eth_secp256k1 (Ethereum)
 	//  - secp256k1 (Tendermint)
 	SupportedAlgorithmsLedger = keyring.SigningAlgoList{EthSecp256k1, hd.Secp256k1}
@@ -49,7 +49,7 @@ type ethSecp256k1Algo struct {
 }
 
 // Name returns eth_secp256k1
-func (s ethSecp256k1Algo) Name() hd.PubKeyType {
+func (ethSecp256k1Algo) Name() hd.PubKeyType {
 	return EthSecp256k1Type
 }
 
@@ -94,7 +94,7 @@ func (s ethSecp256k1Algo) Derive() hd.DeriveFn {
 }
 
 // Generate generates a secp256k1 private key from the given bytes.
-func (s ethSecp256k1Algo) Generate() hd.GenerateFn {
+func (ethSecp256k1Algo) Generate() hd.GenerateFn {
 	return func(bz []byte) cryptotypes.PrivKey {
 		var bzArr = make([]byte, ethsecp256k1.PrivKeySize)
 		copy(bzArr, bz)