Merge pull request #206 from InjectiveLabs/fix/sync_dev_with_master_1…

…_50_1 Fix/sync dev with master 1.50.1
InjectiveLabs · Jan 25, 2024 · bd9ffbe · bd9ffbe
2 parents d10fa53 + a520a72
commit bd9ffbe
Show file tree

Hide file tree

Showing 126 changed files with 6,191 additions and 1,759 deletions.
diff --git a/Makefile b/Makefile
@@ -2,27 +2,31 @@ all:
 
 copy-exchange-client:
 	rm -rf exchange/*
-	mkdir -p exchange/meta_rpc
-	mkdir -p exchange/exchange_rpc
 	mkdir -p exchange/accounts_rpc
 	mkdir -p exchange/auction_rpc
-	mkdir -p exchange/oracle_rpc
-	mkdir -p exchange/insurance_rpc
-	mkdir -p exchange/explorer_rpc
-	mkdir -p exchange/spot_exchange_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
 
-	cp -r ../injective-indexer/api/gen/grpc/injective_meta_rpc/pb exchange/meta_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_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_oracle_rpc/pb exchange/oracle_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_explorer_rpc/pb exchange/explorer_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_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
 
 .PHONY: copy-exchange-client tests coverage
 

diff --git a/chain/auction/types/auction.pb.go b/chain/auction/types/auction.pb.go
diff --git a/chain/auction/types/genesis.pb.go b/chain/auction/types/genesis.pb.go
diff --git a/chain/auction/types/query.pb.go b/chain/auction/types/query.pb.go
diff --git a/chain/auction/types/tx.pb.go b/chain/auction/types/tx.pb.go
diff --git a/chain/crypto/ethsecp256k1/keys.pb.go b/chain/crypto/ethsecp256k1/keys.pb.go
diff --git a/chain/exchange/types/authz.pb.go b/chain/exchange/types/authz.pb.go
diff --git a/chain/exchange/types/events.pb.go b/chain/exchange/types/events.pb.go
diff --git a/chain/exchange/types/exchange.pb.go b/chain/exchange/types/exchange.pb.go
diff --git a/chain/exchange/types/genesis.pb.go b/chain/exchange/types/genesis.pb.go
diff --git a/chain/exchange/types/proposal.pb.go b/chain/exchange/types/proposal.pb.go
diff --git a/chain/exchange/types/query.pb.go b/chain/exchange/types/query.pb.go
diff --git a/chain/exchange/types/tx.pb.go b/chain/exchange/types/tx.pb.go
diff --git a/chain/insurance/types/genesis.pb.go b/chain/insurance/types/genesis.pb.go
diff --git a/chain/insurance/types/insurance.pb.go b/chain/insurance/types/insurance.pb.go
diff --git a/chain/insurance/types/query.pb.go b/chain/insurance/types/query.pb.go
diff --git a/chain/insurance/types/tx.pb.go b/chain/insurance/types/tx.pb.go
diff --git a/chain/ocr/types/genesis.pb.go b/chain/ocr/types/genesis.pb.go
diff --git a/chain/ocr/types/ocr.pb.go b/chain/ocr/types/ocr.pb.go