Skip to content

Commit 99c9e91

Browse files
aarmoaaarmoa
authored
Merge pull request #288 from InjectiveLabs/feat/release_v1_56
Feat/release v1.56
2 parents e9ea79e + 096cb61 commit 99c9e91

File tree

244 files changed

+33122
-44481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+33122
-44481
lines changed

‎.github/workflows/pre-commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
check-latest: true
1919
- run: go install golang.org/x/tools/cmd/goimports@latest
2020
- run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.59.0
21-
- uses: pre-commit/action@v2.0.2
21+
- uses: pre-commit/action@v3.0.1

‎.golangci.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
22
"run": {
33
"tests": false,
4+
"skip-dirs": [
5+
"chain",
6+
"exchange",
7+
"proto",
8+
"client/keyring/testdata"
9+
]
410
},
511
"linters": {
612
"fast": false,
@@ -47,6 +53,7 @@
4753
],
4854
"disabled-checks": [
4955
"hugeParam",
56+
"unnamedResult",
5057
]
5158
}
5259
},

‎Makefile‎

Lines changed: 141 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,154 @@
11
all:
22

3-
copy-exchange-client:
3+
clone-injective-indexer:
4+
git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.14.1-RC.6 --depth 1 --single-branch
5+
6+
clone-injective-core:
7+
git clone https://github.com/InjectiveLabs/injective-core.git -b v1.14.0 --depth 1 --single-branch
8+
9+
copy-exchange-client: clone-injective-indexer
410
rm -rf exchange/*
5-
mkdir -p exchange/health_rpc
6-
mkdir -p exchange/accounts_rpc
7-
mkdir -p exchange/auction_rpc
8-
mkdir -p exchange/campaign_rpc
9-
mkdir -p exchange/derivative_exchange_rpc
10-
mkdir -p exchange/exchange_rpc
11-
mkdir -p exchange/explorer_rpc
12-
mkdir -p exchange/insurance_rpc
13-
mkdir -p exchange/meta_rpc
14-
mkdir -p exchange/oracle_rpc
15-
mkdir -p exchange/portfolio_rpc
16-
mkdir -p exchange/spot_exchange_rpc
17-
mkdir -p exchange/trading_rpc
11+
mkdir -p exchange/event_provider_api/pb
12+
mkdir -p exchange/health_rpc/pb
13+
mkdir -p exchange/accounts_rpc/pb
14+
mkdir -p exchange/auction_rpc/pb
15+
mkdir -p exchange/campaign_rpc/pb
16+
mkdir -p exchange/derivative_exchange_rpc/pb
17+
mkdir -p exchange/exchange_rpc/pb
18+
mkdir -p exchange/explorer_rpc/pb
19+
mkdir -p exchange/insurance_rpc/pb
20+
mkdir -p exchange/meta_rpc/pb
21+
mkdir -p exchange/oracle_rpc/pb
22+
mkdir -p exchange/portfolio_rpc/pb
23+
mkdir -p exchange/spot_exchange_rpc/pb
24+
mkdir -p exchange/trading_rpc/pb
1825

19-
cp -r ../injective-indexer/api/gen/grpc/health/pb exchange/health_rpc/pb
20-
cp -r ../injective-indexer/api/gen/grpc/injective_accounts_rpc/pb exchange/accounts_rpc/pb
21-
cp -r ../injective-indexer/api/gen/grpc/injective_accounts_rpc/pb exchange/accounts_rpc/pb
22-
cp -r ../injective-indexer/api/gen/grpc/injective_auction_rpc/pb exchange/auction_rpc/pb
23-
cp -r ../injective-indexer/api/gen/grpc/injective_campaign_rpc/pb exchange/campaign_rpc/pb
24-
cp -r ../injective-indexer/api/gen/grpc/injective_derivative_exchange_rpc/pb exchange/derivative_exchange_rpc/pb
25-
cp -r ../injective-indexer/api/gen/grpc/injective_exchange_rpc/pb exchange/exchange_rpc/pb
26-
cp -r ../injective-indexer/api/gen/grpc/injective_explorer_rpc/pb exchange/explorer_rpc/pb
27-
cp -r ../injective-indexer/api/gen/grpc/injective_insurance_rpc/pb exchange/insurance_rpc/pb
28-
cp -r ../injective-indexer/api/gen/grpc/injective_meta_rpc/pb exchange/meta_rpc/pb
29-
cp -r ../injective-indexer/api/gen/grpc/injective_oracle_rpc/pb exchange/oracle_rpc/pb
30-
cp -r ../injective-indexer/api/gen/grpc/injective_portfolio_rpc/pb exchange/portfolio_rpc/pb
31-
cp -r ../injective-indexer/api/gen/grpc/injective_spot_exchange_rpc/pb exchange/spot_exchange_rpc/pb
32-
cp -r ../injective-indexer/api/gen/grpc/injective_trading_rpc/pb exchange/trading_rpc/pb
26+
cp -r injective-indexer/api/gen/grpc/event_provider_api/pb/*.pb.go exchange/event_provider_api/pb
27+
cp -r injective-indexer/api/gen/grpc/health/pb/*.pb.go exchange/health_rpc/pb
28+
cp -r injective-indexer/api/gen/grpc/injective_accounts_rpc/pb/*.pb.go exchange/accounts_rpc/pb
29+
cp -r injective-indexer/api/gen/grpc/injective_auction_rpc/pb/*.pb.go exchange/auction_rpc/pb
30+
cp -r injective-indexer/api/gen/grpc/injective_campaign_rpc/pb/*.pb.go exchange/campaign_rpc/pb
31+
cp -r injective-indexer/api/gen/grpc/injective_derivative_exchange_rpc/pb/*.pb.go exchange/derivative_exchange_rpc/pb
32+
cp -r injective-indexer/api/gen/grpc/injective_exchange_rpc/pb/*.pb.go exchange/exchange_rpc/pb
33+
cp -r injective-indexer/api/gen/grpc/injective_explorer_rpc/pb/*.pb.go exchange/explorer_rpc/pb
34+
cp -r injective-indexer/api/gen/grpc/injective_insurance_rpc/pb/*.pb.go exchange/insurance_rpc/pb
35+
cp -r injective-indexer/api/gen/grpc/injective_meta_rpc/pb/*.pb.go exchange/meta_rpc/pb
36+
cp -r injective-indexer/api/gen/grpc/injective_oracle_rpc/pb/*.pb.go exchange/oracle_rpc/pb
37+
cp -r injective-indexer/api/gen/grpc/injective_portfolio_rpc/pb/*.pb.go exchange/portfolio_rpc/pb
38+
cp -r injective-indexer/api/gen/grpc/injective_spot_exchange_rpc/pb/*.pb.go exchange/spot_exchange_rpc/pb
39+
cp -r injective-indexer/api/gen/grpc/injective_trading_rpc/pb/*.pb.go exchange/trading_rpc/pb
3340

34-
.PHONY: copy-exchange-client tests coverage
41+
rm -rf injective-indexer
3542

36-
copy-chain-types:
37-
cp ../injective-core/injective-chain/crypto/ethsecp256k1/*.go chain/crypto/ethsecp256k1
43+
copy-chain-types: clone-injective-core
44+
cp -r injective-core/injective-chain/codec chain
45+
mkdir -p chain/crypto/codec && cp injective-core/injective-chain/crypto/codec/*.go chain/crypto/codec
46+
rm -rf chain/crypto/codec/*test.go rm -rf chain/crypto/codec/*gw.go
47+
mkdir -p chain/crypto/ethsecp256k1 && cp injective-core/injective-chain/crypto/ethsecp256k1/*.go chain/crypto/ethsecp256k1
3848
rm -rf chain/crypto/ethsecp256k1/*test.go rm -rf chain/crypto/ethsecp256k1/*gw.go
39-
cp ../injective-core/injective-chain/codec/types/*.go chain/codec/types
40-
rm -rf chain/codec/types/*test.go rm -rf chain/codec/types/*gw.go
41-
cp ../injective-core/injective-chain/modules/auction/types/*.go chain/auction/types
42-
rm -rf chain/auction/types/*test.go rm -rf chain/auction/types/*gw.go
43-
cp ../injective-core/injective-chain/modules/exchange/types/*.go chain/exchange/types
44-
rm -rf chain/exchange/types/*test.go rm -rf chain/exchange/types/*gw.go
45-
cp ../injective-core/injective-chain/modules/insurance/types/*.go chain/insurance/types
46-
rm -rf chain/insurance/types/*test.go rm -rf chain/insurance/types/*gw.go
47-
cp ../injective-core/injective-chain/modules/ocr/types/*.go chain/ocr/types
48-
rm -rf chain/ocr/types/*test.go rm -rf chain/ocr/types/*gw.go
49-
cp ../injective-core/injective-chain/modules/oracle/types/*.go chain/oracle/types
50-
cp -r ../injective-core/injective-chain/modules/oracle/bandchain chain/oracle
51-
rm -rf chain/oracle/types/*test.go rm -rf chain/oracle/types/*gw.go
52-
cp ../injective-core/injective-chain/modules/peggy/types/*.go chain/peggy/types
53-
rm -rf chain/peggy/types/*test.go rm -rf chain/peggy/types/*gw.go
54-
cp ../injective-core/injective-chain/modules/permissions/types/*.go chain/permissions/types
55-
rm -rf chain/permissions/types/*test.go rm -rf chain/permissions/types/*gw.go
56-
cp ../injective-core/injective-chain/modules/tokenfactory/types/*.go chain/tokenfactory/types
57-
rm -rf chain/tokenfactory/types/*test.go rm -rf chain/tokenfactory/types/*gw.go
58-
cp ../injective-core/injective-chain/modules/wasmx/types/*.go chain/wasmx/types
59-
rm -rf chain/wasmx/types/*test.go rm -rf chain/wasmx/types/*gw.go
60-
cp ../injective-core/injective-chain/stream/types/*.go chain/stream/types
61-
rm -rf chain/stream/types/*test.go rm -rf chain/stream/types/*gw.go
62-
cp ../injective-core/injective-chain/types/*.go chain/types
63-
rm -rf chain/types/*test.go rm -rf chain/types/*gw.go
49+
mkdir -p chain/crypto/hd && cp injective-core/injective-chain/crypto/hd/*.go chain/crypto/hd
50+
rm -rf chain/crypto/hd/*test.go rm -rf chain/crypto/hd/*gw.go
51+
mkdir -p chain/auction/types && \
52+
cp injective-core/injective-chain/modules/auction/types/*.pb.go chain/auction/types && \
53+
cp injective-core/injective-chain/modules/auction/types/codec.go chain/auction/types
54+
mkdir -p chain/exchange/types && \
55+
cp injective-core/injective-chain/modules/exchange/types/*.go chain/exchange/types && \
56+
rm -rf chain/exchange/types/*test.go && rm -rf chain/exchange/types/*gw.go
57+
mkdir -p chain/insurance/types && \
58+
cp injective-core/injective-chain/modules/insurance/types/*.pb.go chain/insurance/types && \
59+
cp injective-core/injective-chain/modules/insurance/types/codec.go chain/insurance/types
60+
mkdir -p chain/ocr/types && \
61+
cp injective-core/injective-chain/modules/ocr/types/*.pb.go chain/ocr/types && \
62+
cp injective-core/injective-chain/modules/ocr/types/errors.go chain/ocr/types && \
63+
cp injective-core/injective-chain/modules/ocr/types/key.go chain/ocr/types && \
64+
cp injective-core/injective-chain/modules/ocr/types/params.go chain/ocr/types && \
65+
cp injective-core/injective-chain/modules/ocr/types/proposal.go chain/ocr/types && \
66+
cp injective-core/injective-chain/modules/ocr/types/types.go chain/ocr/types && \
67+
cp injective-core/injective-chain/modules/ocr/types/codec.go chain/ocr/types
68+
mkdir -p chain/oracle/types && \
69+
cp injective-core/injective-chain/modules/oracle/types/*.pb.go chain/oracle/types && \
70+
cp injective-core/injective-chain/modules/oracle/types/codec.go chain/oracle/types && \
71+
cp injective-core/injective-chain/modules/oracle/types/errors.go chain/oracle/types && \
72+
cp injective-core/injective-chain/modules/oracle/types/msgs.go chain/oracle/types && \
73+
cp injective-core/injective-chain/modules/oracle/types/oracle.go chain/oracle/types && \
74+
cp injective-core/injective-chain/modules/oracle/types/params.go chain/oracle/types && \
75+
cp injective-core/injective-chain/modules/oracle/types/proposal.go chain/oracle/types && \
76+
cp injective-core/injective-chain/modules/oracle/types/stork_oracle.go chain/oracle/types && \
77+
cp -r injective-core/injective-chain/modules/oracle/bandchain chain/oracle
78+
mkdir -p chain/peggy/types && \
79+
cp injective-core/injective-chain/modules/peggy/types/*.pb.go chain/peggy/types && \
80+
cp injective-core/injective-chain/modules/peggy/types/abi_json.go chain/peggy/types && \
81+
cp injective-core/injective-chain/modules/peggy/types/codec.go chain/peggy/types && \
82+
cp injective-core/injective-chain/modules/peggy/types/ethereum.go chain/peggy/types && \
83+
cp injective-core/injective-chain/modules/peggy/types/ethereum_signer.go chain/peggy/types && \
84+
cp injective-core/injective-chain/modules/peggy/types/errors.go chain/peggy/types && \
85+
cp injective-core/injective-chain/modules/peggy/types/key.go chain/peggy/types && \
86+
cp injective-core/injective-chain/modules/peggy/types/msgs.go chain/peggy/types && \
87+
cp injective-core/injective-chain/modules/peggy/types/params.go chain/peggy/types && \
88+
cp injective-core/injective-chain/modules/peggy/types/types.go chain/peggy/types
89+
mkdir -p chain/permissions/types && \
90+
cp injective-core/injective-chain/modules/permissions/types/*.pb.go chain/permissions/types && \
91+
cp injective-core/injective-chain/modules/permissions/types/codec.go chain/permissions/types
92+
mkdir -p chain/tokenfactory/types && \
93+
cp injective-core/injective-chain/modules/tokenfactory/types/*.pb.go chain/tokenfactory/types && \
94+
cp injective-core/injective-chain/modules/tokenfactory/types/codec.go chain/tokenfactory/types
95+
mkdir -p chain/wasmx/types && \
96+
cp injective-core/injective-chain/modules/wasmx/types/*.pb.go chain/wasmx/types && \
97+
cp injective-core/injective-chain/modules/wasmx/types/authz.go chain/wasmx/types && \
98+
cp injective-core/injective-chain/modules/wasmx/types/codec.go chain/wasmx/types && \
99+
cp injective-core/injective-chain/modules/wasmx/types/custom_execution.go chain/wasmx/types && \
100+
cp injective-core/injective-chain/modules/wasmx/types/errors.go chain/wasmx/types && \
101+
cp injective-core/injective-chain/modules/wasmx/types/key.go chain/wasmx/types && \
102+
cp injective-core/injective-chain/modules/wasmx/types/msgs.go chain/wasmx/types && \
103+
cp injective-core/injective-chain/modules/wasmx/types/params.go chain/wasmx/types && \
104+
cp injective-core/injective-chain/modules/wasmx/types/proposal.go chain/wasmx/types
105+
mkdir -p chain/stream/types && \
106+
cp injective-core/injective-chain/stream/types/*.pb.go chain/stream/types
107+
mkdir -p chain/types && \
108+
cp injective-core/injective-chain/types/*.pb.go injective-core/injective-chain/types/config.go chain/types && \
109+
cp injective-core/injective-chain/types/codec.go chain/types && \
110+
cp injective-core/injective-chain/types/util.go chain/types
111+
112+
@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" {} \;
113+
@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" {} \;
64114

65-
@echo "👉 Replace injective-core/injective-chain/modules with sdk-go/chain"
66-
@echo "👉 Replace injective-core/injective-chain/codec with sdk-go/chain/codec"
67-
@echo "👉 Replace injective-core/injective-chain/codec/types with sdk-go/chain/codec/types"
68-
@echo "👉 Replace injective-core/injective-chain/types with sdk-go/chain/types"
69-
@echo "👉 Replace injective-core/injective-chain/crypto with sdk-go/chain/crypto"
115+
rm -rf proto
116+
cp -r injective-core/proto ./
117+
118+
rm -rf injective-core
119+
120+
#gen: gen-proto
121+
#
122+
#gen-proto: clone-all copy-proto
123+
# buf generate --template buf.gen.chain.yaml
124+
# buf generate --template buf.gen.indexer.yaml
125+
# rm -rf local_proto
126+
# $(call clean_repos)
127+
#
128+
#define clean_repos
129+
# rm -Rf injective-indexer
130+
#endef
131+
#
132+
#clean-all:
133+
# $(call clean_repos)
134+
#
135+
#clone-injective-indexer:
136+
# git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.13.4 --depth 1 --single-branch
137+
#
138+
#clone-all: clone-injective-indexer
139+
#
140+
#copy-proto:
141+
# rm -rf local_proto
142+
# mkdir -p local_proto
143+
# find ./injective-indexer/api/gen/grpc -type f -name "*.proto" | while read -r file; do \
144+
# dest="local_proto/$$(basename $$(dirname $$(dirname "$$file")))/$$(basename $$(dirname "$$file"))"; \
145+
# mkdir -p "$$dest"; \
146+
# cp "$$file" "$$dest"; \
147+
# done
70148

71149
tests:
72150
go test -race ./client/... ./ethereum/...
73151
coverage:
74152
go test -race -coverprofile=coverage.out -covermode=atomic ./client/... ./ethereum/...
153+
154+
.PHONY: copy-exchange-client tests coverage

‎buf.gen.chain.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: v2
2+
managed:
3+
enabled: true
4+
disable:
5+
- module: buf.build/googleapis/googleapis
6+
file_option: go_package_prefix
7+
plugins:
8+
- local: protoc-gen-go-grpc
9+
out: ./chain/
10+
opt: paths=source_relative
11+
- local: protoc-gen-gogo
12+
out: ./chain/
13+
opt: paths=source_relative
14+
inputs:
15+
# - git_repo: https://github.com/InjectiveLabs/injective-core
16+
# tag: v1.13.0
17+
# subdir: proto
18+
- git_repo: https://github.com/InjectiveLabs/injective-core
19+
branch: f/permissions-rework
20+
subdir: proto

‎buf.gen.indexer.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
version: v2
2+
managed:
3+
enabled: true
4+
disable:
5+
- module: buf.build/googleapis/googleapis
6+
file_option: go_package_prefix
7+
plugins:
8+
- remote: buf.build/protocolbuffers/go:v1.34.0
9+
out: ./exchange/
10+
opt: paths=source_relative
11+
- remote: buf.build/grpc/go:v1.3.0
12+
out: ./exchange/
13+
opt: paths=source_relative
14+
# - local: protoc-gen-go
15+
# out: ./exchange/
16+
# opt: paths=source_relative
17+
# - local: protoc-gen-go-grpc
18+
# out: ./exchange/
19+
# opt: paths=source_relative
20+
inputs:
21+
- directory: local_proto

0 commit comments

Comments
 (0)