Merge branch 'develop' into query-pending-nonces-by-chainID

zeta-chain · Sep 20, 2023 · 7ff2123 · 7ff2123
2 parents a9d807b + 758c366
commit 7ff2123
Show file tree

Hide file tree

Showing 64 changed files with 5,378 additions and 1,008 deletions.
diff --git a/Makefile b/Makefile
@@ -82,8 +82,8 @@ build-testnet-ubuntu: go.sum
 
 install: go.sum
 		@echo "--> Installing zetacored & zetaclientd"
-		@go install -mod=readonly $(BUILD_FLAGS) ./cmd/zetacored
-		@go install -mod=readonly $(BUILD_FLAGS) ./cmd/zetaclientd
+		@go install -race -mod=readonly $(BUILD_FLAGS) ./cmd/zetacored
+		@go install -race -mod=readonly $(BUILD_FLAGS) ./cmd/zetaclientd
 
 install-zetaclient: go.sum
 		@echo "--> Installing zetaclientd"
@@ -157,6 +157,10 @@ specs:
 	@go run ./scripts/gen-spec.go
 .PHONY: specs
 
+mocks:
+	@echo "--> Generating mocks"
+	@bash ./scripts/mocks-generate.sh
+
 generate: proto openapi specs
 .PHONY: generate
 

diff --git a/common/chain.go b/common/chain.go
@@ -102,6 +102,12 @@ func IsEVMChain(chainID int64) bool {
 		chainID == 137 // polygon mainnet
 }
 
+func IsEthereum(chainID int64) bool {
+	return chainID == 5 || // Goerli
+		chainID == 1337 || // eth privnet
+		chainID == 1 // eth mainnet
+}
+
 func (chain Chain) IsKlaytnChain() bool {
 	return chain.ChainId == 1001
 }