Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/permissions module support #268

Merged
merged 8 commits into from
Jan 20, 2025
Merged

Feat/permissions module support #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f9bc6f4
(feat) Added support for the latest version of Permissions module. Up…
aarmoa Dec 10, 2024
7829d00
(feat) Added support for the latest version of Permissions module. Up…
aarmoa Dec 10, 2024
910af33
Merge branch 'feat/permissions_module_support' of https://github.com/…
aarmoa Dec 10, 2024
8712c31
(fix) Fixed pre-commit issues
aarmoa Dec 10, 2024
485932c
(fix) Updated devnet, devnet-1 and local Network configuration to sol…
aarmoa Dec 19, 2024
b88e0b1
(fix) Updated compiled protos from the latest core and indexer versio…
aarmoa Jan 10, 2025
050f833
Merge branch 'dev' of https://github.com/InjectiveLabs/sdk-go into fe…
aarmoa Jan 16, 2025
af88ac0
(feat) Updated proto definitions with the chain and indexer versions …
aarmoa Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
],
"disabled-checks": [
"hugeParam",
"unnamedResult",
]
}
},
Expand Down
202 changes: 141 additions & 61 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,154 @@
all:

copy-exchange-client:
clone-injective-indexer:
git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.13.117_RC1 --depth 1 --single-branch

clone-injective-core:
git clone https://github.com/InjectiveLabs/injective-core.git -b testnet --depth 1 --single-branch

copy-exchange-client: clone-injective-indexer
rm -rf exchange/*
mkdir -p exchange/health_rpc
mkdir -p exchange/accounts_rpc
mkdir -p exchange/auction_rpc
mkdir -p exchange/campaign_rpc
mkdir -p exchange/derivative_exchange_rpc
mkdir -p exchange/exchange_rpc
mkdir -p exchange/explorer_rpc
mkdir -p exchange/insurance_rpc
mkdir -p exchange/meta_rpc
mkdir -p exchange/oracle_rpc
mkdir -p exchange/portfolio_rpc
mkdir -p exchange/spot_exchange_rpc
mkdir -p exchange/trading_rpc
mkdir -p exchange/event_provider_api/pb
mkdir -p exchange/health_rpc/pb
mkdir -p exchange/accounts_rpc/pb
mkdir -p exchange/auction_rpc/pb
mkdir -p exchange/campaign_rpc/pb
mkdir -p exchange/derivative_exchange_rpc/pb
mkdir -p exchange/exchange_rpc/pb
mkdir -p exchange/explorer_rpc/pb
mkdir -p exchange/insurance_rpc/pb
mkdir -p exchange/meta_rpc/pb
mkdir -p exchange/oracle_rpc/pb
mkdir -p exchange/portfolio_rpc/pb
mkdir -p exchange/spot_exchange_rpc/pb
mkdir -p exchange/trading_rpc/pb

cp -r ../injective-indexer/api/gen/grpc/health/pb exchange/health_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_accounts_rpc/pb exchange/accounts_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_accounts_rpc/pb exchange/accounts_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_auction_rpc/pb exchange/auction_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_campaign_rpc/pb exchange/campaign_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_derivative_exchange_rpc/pb exchange/derivative_exchange_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_exchange_rpc/pb exchange/exchange_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_explorer_rpc/pb exchange/explorer_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_insurance_rpc/pb exchange/insurance_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_meta_rpc/pb exchange/meta_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_oracle_rpc/pb exchange/oracle_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_portfolio_rpc/pb exchange/portfolio_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_spot_exchange_rpc/pb exchange/spot_exchange_rpc/pb
cp -r ../injective-indexer/api/gen/grpc/injective_trading_rpc/pb exchange/trading_rpc/pb
cp -r injective-indexer/api/gen/grpc/event_provider_api/pb/*.pb.go exchange/event_provider_api/pb
cp -r injective-indexer/api/gen/grpc/health/pb/*.pb.go exchange/health_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_accounts_rpc/pb/*.pb.go exchange/accounts_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_auction_rpc/pb/*.pb.go exchange/auction_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_campaign_rpc/pb/*.pb.go exchange/campaign_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_derivative_exchange_rpc/pb/*.pb.go exchange/derivative_exchange_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_exchange_rpc/pb/*.pb.go exchange/exchange_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_explorer_rpc/pb/*.pb.go exchange/explorer_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_insurance_rpc/pb/*.pb.go exchange/insurance_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_meta_rpc/pb/*.pb.go exchange/meta_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_oracle_rpc/pb/*.pb.go exchange/oracle_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_portfolio_rpc/pb/*.pb.go exchange/portfolio_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_spot_exchange_rpc/pb/*.pb.go exchange/spot_exchange_rpc/pb
cp -r injective-indexer/api/gen/grpc/injective_trading_rpc/pb/*.pb.go exchange/trading_rpc/pb

.PHONY: copy-exchange-client tests coverage
rm -rf injective-indexer

copy-chain-types:
cp ../injective-core/injective-chain/crypto/ethsecp256k1/*.go chain/crypto/ethsecp256k1
copy-chain-types: clone-injective-core
cp -r injective-core/injective-chain/codec chain
mkdir -p chain/crypto/codec && cp injective-core/injective-chain/crypto/codec/*.go chain/crypto/codec
rm -rf chain/crypto/codec/*test.go rm -rf chain/crypto/codec/*gw.go
mkdir -p chain/crypto/ethsecp256k1 && cp injective-core/injective-chain/crypto/ethsecp256k1/*.go chain/crypto/ethsecp256k1
rm -rf chain/crypto/ethsecp256k1/*test.go rm -rf chain/crypto/ethsecp256k1/*gw.go
cp ../injective-core/injective-chain/codec/types/*.go chain/codec/types
rm -rf chain/codec/types/*test.go rm -rf chain/codec/types/*gw.go
cp ../injective-core/injective-chain/modules/auction/types/*.go chain/auction/types
rm -rf chain/auction/types/*test.go rm -rf chain/auction/types/*gw.go
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
cp ../injective-core/injective-chain/modules/insurance/types/*.go chain/insurance/types
rm -rf chain/insurance/types/*test.go rm -rf chain/insurance/types/*gw.go
cp ../injective-core/injective-chain/modules/ocr/types/*.go chain/ocr/types
rm -rf chain/ocr/types/*test.go rm -rf chain/ocr/types/*gw.go
cp ../injective-core/injective-chain/modules/oracle/types/*.go chain/oracle/types
cp -r ../injective-core/injective-chain/modules/oracle/bandchain chain/oracle
rm -rf chain/oracle/types/*test.go rm -rf chain/oracle/types/*gw.go
cp ../injective-core/injective-chain/modules/peggy/types/*.go chain/peggy/types
rm -rf chain/peggy/types/*test.go rm -rf chain/peggy/types/*gw.go
cp ../injective-core/injective-chain/modules/permissions/types/*.go chain/permissions/types
rm -rf chain/permissions/types/*test.go rm -rf chain/permissions/types/*gw.go
cp ../injective-core/injective-chain/modules/tokenfactory/types/*.go chain/tokenfactory/types
rm -rf chain/tokenfactory/types/*test.go rm -rf chain/tokenfactory/types/*gw.go
cp ../injective-core/injective-chain/modules/wasmx/types/*.go chain/wasmx/types
rm -rf chain/wasmx/types/*test.go rm -rf chain/wasmx/types/*gw.go
cp ../injective-core/injective-chain/stream/types/*.go chain/stream/types
rm -rf chain/stream/types/*test.go rm -rf chain/stream/types/*gw.go
cp ../injective-core/injective-chain/types/*.go chain/types
rm -rf chain/types/*test.go rm -rf chain/types/*gw.go
mkdir -p chain/crypto/hd && cp injective-core/injective-chain/crypto/hd/*.go chain/crypto/hd
rm -rf chain/crypto/hd/*test.go rm -rf chain/crypto/hd/*gw.go
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/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/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
mkdir -p chain/ocr/types && \
cp injective-core/injective-chain/modules/ocr/types/*.pb.go chain/ocr/types && \
cp injective-core/injective-chain/modules/ocr/types/errors.go chain/ocr/types && \
cp injective-core/injective-chain/modules/ocr/types/key.go chain/ocr/types && \
cp injective-core/injective-chain/modules/ocr/types/params.go chain/ocr/types && \
cp injective-core/injective-chain/modules/ocr/types/proposal.go chain/ocr/types && \
cp injective-core/injective-chain/modules/ocr/types/types.go chain/ocr/types && \
cp injective-core/injective-chain/modules/ocr/types/codec.go chain/ocr/types
mkdir -p chain/oracle/types && \
cp injective-core/injective-chain/modules/oracle/types/*.pb.go chain/oracle/types && \
cp injective-core/injective-chain/modules/oracle/types/codec.go chain/oracle/types && \
cp injective-core/injective-chain/modules/oracle/types/errors.go chain/oracle/types && \
cp injective-core/injective-chain/modules/oracle/types/msgs.go chain/oracle/types && \
cp injective-core/injective-chain/modules/oracle/types/oracle.go chain/oracle/types && \
cp injective-core/injective-chain/modules/oracle/types/params.go chain/oracle/types && \
cp injective-core/injective-chain/modules/oracle/types/proposal.go chain/oracle/types && \
cp injective-core/injective-chain/modules/oracle/types/stork_oracle.go chain/oracle/types && \
cp -r injective-core/injective-chain/modules/oracle/bandchain chain/oracle
mkdir -p chain/peggy/types && \
cp injective-core/injective-chain/modules/peggy/types/*.pb.go chain/peggy/types && \
cp injective-core/injective-chain/modules/peggy/types/abi_json.go chain/peggy/types && \
cp injective-core/injective-chain/modules/peggy/types/codec.go chain/peggy/types && \
cp injective-core/injective-chain/modules/peggy/types/ethereum.go chain/peggy/types && \
cp injective-core/injective-chain/modules/peggy/types/ethereum_signer.go chain/peggy/types && \
cp injective-core/injective-chain/modules/peggy/types/errors.go chain/peggy/types && \
cp injective-core/injective-chain/modules/peggy/types/key.go chain/peggy/types && \
cp injective-core/injective-chain/modules/peggy/types/msgs.go chain/peggy/types && \
cp injective-core/injective-chain/modules/peggy/types/params.go chain/peggy/types && \
cp injective-core/injective-chain/modules/peggy/types/types.go chain/peggy/types
mkdir -p chain/permissions/types && \
cp injective-core/injective-chain/modules/permissions/types/*.pb.go chain/permissions/types && \
cp injective-core/injective-chain/modules/permissions/types/codec.go chain/permissions/types
mkdir -p chain/tokenfactory/types && \
cp injective-core/injective-chain/modules/tokenfactory/types/*.pb.go chain/tokenfactory/types && \
cp injective-core/injective-chain/modules/tokenfactory/types/codec.go chain/tokenfactory/types
mkdir -p chain/wasmx/types && \
cp injective-core/injective-chain/modules/wasmx/types/*.pb.go chain/wasmx/types && \
cp injective-core/injective-chain/modules/wasmx/types/authz.go chain/wasmx/types && \
cp injective-core/injective-chain/modules/wasmx/types/codec.go chain/wasmx/types && \
cp injective-core/injective-chain/modules/wasmx/types/custom_execution.go chain/wasmx/types && \
cp injective-core/injective-chain/modules/wasmx/types/errors.go chain/wasmx/types && \
cp injective-core/injective-chain/modules/wasmx/types/key.go chain/wasmx/types && \
cp injective-core/injective-chain/modules/wasmx/types/msgs.go chain/wasmx/types && \
cp injective-core/injective-chain/modules/wasmx/types/params.go chain/wasmx/types && \
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/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

@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" {} \;

@echo "👉 Replace injective-core/injective-chain/modules with sdk-go/chain"
@echo "👉 Replace injective-core/injective-chain/codec with sdk-go/chain/codec"
@echo "👉 Replace injective-core/injective-chain/codec/types with sdk-go/chain/codec/types"
@echo "👉 Replace injective-core/injective-chain/types with sdk-go/chain/types"
@echo "👉 Replace injective-core/injective-chain/crypto with sdk-go/chain/crypto"
rm -rf proto
cp -r injective-core/proto ./

rm -rf injective-core

#gen: gen-proto
#
#gen-proto: clone-all copy-proto
# buf generate --template buf.gen.chain.yaml
# buf generate --template buf.gen.indexer.yaml
# rm -rf local_proto
# $(call clean_repos)
#
#define clean_repos
# rm -Rf injective-indexer
#endef
#
#clean-all:
# $(call clean_repos)
#
#clone-injective-indexer:
# git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.13.4 --depth 1 --single-branch
#
#clone-all: clone-injective-indexer
#
#copy-proto:
# rm -rf local_proto
# mkdir -p local_proto
# find ./injective-indexer/api/gen/grpc -type f -name "*.proto" | while read -r file; do \
# dest="local_proto/$$(basename $$(dirname $$(dirname "$$file")))/$$(basename $$(dirname "$$file"))"; \
# mkdir -p "$$dest"; \
# cp "$$file" "$$dest"; \
# done

tests:
go test -race ./client/... ./ethereum/...
coverage:
go test -race -coverprofile=coverage.out -covermode=atomic ./client/... ./ethereum/...

.PHONY: copy-exchange-client tests coverage
20 changes: 20 additions & 0 deletions buf.gen.chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: v2
managed:
enabled: true
disable:
- module: buf.build/googleapis/googleapis
file_option: go_package_prefix
plugins:
- local: protoc-gen-go-grpc
out: ./chain/
opt: paths=source_relative
- local: protoc-gen-gogo
out: ./chain/
opt: paths=source_relative
inputs:
# - git_repo: https://github.com/InjectiveLabs/injective-core
# tag: v1.13.0
# subdir: proto
- git_repo: https://github.com/InjectiveLabs/injective-core
branch: f/permissions-rework
subdir: proto
21 changes: 21 additions & 0 deletions buf.gen.indexer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
version: v2
managed:
enabled: true
disable:
- module: buf.build/googleapis/googleapis
file_option: go_package_prefix
plugins:
- remote: buf.build/protocolbuffers/go:v1.34.0
out: ./exchange/
opt: paths=source_relative
- remote: buf.build/grpc/go:v1.3.0
out: ./exchange/
opt: paths=source_relative
# - local: protoc-gen-go
# out: ./exchange/
# opt: paths=source_relative
# - local: protoc-gen-go-grpc
# out: ./exchange/
# opt: paths=source_relative
inputs:
- directory: local_proto
Loading
Loading