Skip to content

Commit 37cdcce

Browse files
committed
(fix) Updated all proto definitions, including the new Indexer version for chain upgrade v1.13
1 parent 78c813d commit 37cdcce

File tree

580 files changed

+9748
-15191
lines changed

Some content is hidden

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

580 files changed

+9748
-15191
lines changed

Makefile

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@ gen: gen-client
44

55
gen-client: clone-all copy-proto
66
mkdir -p ./pyinjective/proto
7-
@for dir in $(shell find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq); do \
8-
python3 -m grpc_tools.protoc \
9-
--proto_path=./proto \
10-
--python_out=./pyinjective/proto \
11-
--grpc_python_out=./pyinjective/proto \
12-
$$(find ./$${dir} -type f -name '*.proto'); \
13-
done
7+
cd ./proto && buf generate --template ../buf.gen.yaml
148
rm -rf proto
159
$(call clean_repos)
1610
touch pyinjective/proto/__init__.py
@@ -36,19 +30,20 @@ clean-all:
3630
$(call clean_repos)
3731

3832
clone-injective-core:
39-
git clone https://github.com/InjectiveLabs/injective-core.git -b feat-sdk-v0.50-migration --depth 1 --single-branch
33+
git clone https://github.com/InjectiveLabs/injective-core.git -b dev --depth 1 --single-branch
4034

4135
clone-injective-indexer:
42-
git clone https://github.com/InjectiveLabs/injective-indexer.git -b fix/makefile --depth 1 --single-branch
36+
git clone https://github.com/InjectiveLabs/injective-indexer.git -b release/v1.13.x --depth 1 --single-branch
4337

4438
clone-cometbft:
45-
git clone https://github.com/InjectiveLabs/cometbft.git -b v0.38.6-inj-2 --depth 1 --single-branch
39+
git clone https://github.com/InjectiveLabs/cometbft.git -b v0.38.x-inj --depth 1 --single-branch
40+
rm cometbft/buf.yaml
4641

4742
clone-wasmd:
48-
git clone https://github.com/InjectiveLabs/wasmd.git -b v0.50.x-inj --depth 1 --single-branch
43+
git clone https://github.com/InjectiveLabs/wasmd.git -b v0.51.x-inj --depth 1 --single-branch
4944

5045
clone-cosmos-sdk:
51-
git clone https://github.com/InjectiveLabs/cosmos-sdk.git -b v0.50.6 --depth 1 --single-branch
46+
git clone https://github.com/InjectiveLabs/cosmos-sdk.git -b v0.50.x-inj --depth 1 --single-branch
5247

5348
clone-ibc-go:
5449
git clone https://github.com/InjectiveLabs/ibc-go.git -b v8.3.x-inj --depth 1 --single-branch

buf.gen.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: v2
2+
managed:
3+
enabled: true
4+
plugins:
5+
- remote: buf.build/protocolbuffers/python
6+
out: ../pyinjective/proto/
7+
- remote: buf.build/grpc/python
8+
out: ../pyinjective/proto/

pyinjective/proto/amino/amino_pb2.py

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,4 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
"""Client and server classes corresponding to protobuf-defined services."""
33
import grpc
4-
import warnings
54

6-
7-
GRPC_GENERATED_VERSION = '1.64.1'
8-
GRPC_VERSION = grpc.__version__
9-
EXPECTED_ERROR_RELEASE = '1.65.0'
10-
SCHEDULED_RELEASE_DATE = 'June 25, 2024'
11-
_version_not_supported = False
12-
13-
try:
14-
from grpc._utilities import first_version_is_lower
15-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
16-
except ImportError:
17-
_version_not_supported = True
18-
19-
if _version_not_supported:
20-
warnings.warn(
21-
f'The grpc package installed is at version {GRPC_VERSION},'
22-
+ f' but the generated code in amino/amino_pb2_grpc.py depends on'
23-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
24-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
25-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
26-
+ f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
27-
+ f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
28-
RuntimeWarning
29-
)

pyinjective/proto/capability/v1/capability_pb2.py

Lines changed: 20 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,4 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
"""Client and server classes corresponding to protobuf-defined services."""
33
import grpc
4-
import warnings
54

6-
7-
GRPC_GENERATED_VERSION = '1.64.1'
8-
GRPC_VERSION = grpc.__version__
9-
EXPECTED_ERROR_RELEASE = '1.65.0'
10-
SCHEDULED_RELEASE_DATE = 'June 25, 2024'
11-
_version_not_supported = False
12-
13-
try:
14-
from grpc._utilities import first_version_is_lower
15-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
16-
except ImportError:
17-
_version_not_supported = True
18-
19-
if _version_not_supported:
20-
warnings.warn(
21-
f'The grpc package installed is at version {GRPC_VERSION},'
22-
+ f' but the generated code in capability/v1/capability_pb2_grpc.py depends on'
23-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
24-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
25-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
26-
+ f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
27-
+ f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
28-
RuntimeWarning
29-
)

pyinjective/proto/capability/v1/genesis_pb2.py

Lines changed: 18 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,4 @@
11
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
22
"""Client and server classes corresponding to protobuf-defined services."""
33
import grpc
4-
import warnings
54

6-
7-
GRPC_GENERATED_VERSION = '1.64.1'
8-
GRPC_VERSION = grpc.__version__
9-
EXPECTED_ERROR_RELEASE = '1.65.0'
10-
SCHEDULED_RELEASE_DATE = 'June 25, 2024'
11-
_version_not_supported = False
12-
13-
try:
14-
from grpc._utilities import first_version_is_lower
15-
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
16-
except ImportError:
17-
_version_not_supported = True
18-
19-
if _version_not_supported:
20-
warnings.warn(
21-
f'The grpc package installed is at version {GRPC_VERSION},'
22-
+ f' but the generated code in capability/v1/genesis_pb2_grpc.py depends on'
23-
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
24-
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
25-
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
26-
+ f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
27-
+ f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
28-
RuntimeWarning
29-
)

0 commit comments

Comments
 (0)