Merge branch 'main' into dependabot/npm_and_yarn/web-ui/remixicon-4.0.1

quicksilver-zone · Dec 31, 2023 · d3e5d57 · d3e5d57
2 parents 082df53 + 8953bb0
commit d3e5d57
Show file tree

Hide file tree

Showing 59 changed files with 661 additions and 333 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,6 @@
-# build
+build
 rocksdb
 data
 Dockerfile
 scripts/tg271/data
+web-ui
diff --git a/.github/codeql/config.yml b/.github/codeql/config.yml
@@ -0,0 +1,7 @@
+packs:
+  go:
+    - crypto-com/cosmos-sdk-codeql
+
+
+
+
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,17 +4,22 @@ updates:
     directory: "web-ui"
     schedule:
       interval: daily
-    open-pull-requests-limit: 10
+    open-pull-requests-limit: 20
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
       interval: daily
-    open-pull-requests-limit: 10
+    open-pull-requests-limit: 20
+    labels:
+      - automerge
+      - dependencies
   - package-ecosystem: gomod
     directory: "/"
     schedule:
       interval: daily
-    open-pull-requests-limit: 10
+    open-pull-requests-limit: 20
+    ignore:
+      - dependency-name: "github.com/cosmos/cosmos-sdk"
     labels:
       - automerge
       - dependencies
diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml
@@ -72,6 +72,13 @@ jobs:
   test:
     runs-on: ubuntu-latest
     name: test quicksilver
+    strategy:
+      matrix:
+        arch: [amd64]
+        targetos: [linux, windows, darwin]
+        include:
+          - targetos: darwin
+            arch: arm64
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,15 +2,15 @@ name: "CodeQL"
 
 on:
   pull_request:
-    paths:
-      - "**.go"
+    branches:
+      - main
   push:
     branches:
       - main
       - develop
       - release/**
-    paths:
-      - "**.go"
+
+
 
 jobs:
   analyze:
@@ -33,7 +33,7 @@ jobs:
         with:
           languages: "go, javascript, typescript"
           queries: +security-and-quality,github/codeql/go/ql/src/experimental/InconsistentCode/DeferInLoop.ql@main,github/codeql/go/ql/src/experimental/Unsafe/WrongUsageOfUnsafe.ql@main,github/codeql/go/ql/src/experimental/CWE-369/DivideByZero.ql@main
-          packs: +crypto-com/cosmos-sdk-codeql
+          config-file: ./.github/codeql/config.yml
           # If you wish to specify custom queries, you can do so here or in a config file.
           # By default, queries listed here will override any specified in a config file.
           # Prefix the list here with "+" to use these queries and those in the config file.

diff --git a/.github/workflows/devskim.yml b/.github/workflows/devskim.yml
@@ -0,0 +1,34 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: DevSkim
+
+on:
+  push:
+    branches: [ "main", "develop", "feat*", "main*", "unstable*" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '37 18 * * 2'
+
+jobs:
+  lint:
+    name: DevSkim
+    runs-on: ubuntu-20.04
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run DevSkim scanner
+        uses: microsoft/DevSkim-Action@v1
+
+      - name: Upload DevSkim scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: devskim-results.sarif
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+##### Chain #######
+
 # OS
 .DS_Store
 *.swp
@@ -31,3 +33,42 @@ scripts/wallets.sh
 
 # Coverage
 coverage.txt
+
+
+##### web ui #######
+
+# dependencies
+web-ui/node_modules
+web-ui/.pnp
+web-ui/.pnp.js
+
+# testing
+web-ui/coverage
+
+# next.js
+web-ui/.next/
+web-ui//out/
+
+# production
+web-ui/build
+
+# misc
+web-ui/.DS_Store
+web-ui/*.pem
+
+# debug
+web-ui/npm-debug.log*
+web-ui/yarn-debug.log*
+web-ui/yarn-error.log*
+web-ui/.pnpm-debug.log*
+
+# local env files
+web-ui/.env*.local
+web-ui/.vscode
+
+# vercel
+web-ui/.vercel
+
+# typescript
+web-ui/*.tsbuildinfo
+web-ui/next-env.d.ts
diff --git a/Dockerfile b/Dockerfile
@@ -9,12 +9,12 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/root/go/pkg/mod \
     go mod download
 
-# Cosmwasm - download correct libwasmvm version
-RUN WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 2) && \
-    wget https://github.com/CosmWasm/wasmvm/releases/download/${WASMVM_VERSION}/libwasmvm_muslc.$(uname -m).a \
+RUN ARCH=$(uname -m) && WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | sed 's/.* //') && \
+    wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/libwasmvm_muslc.$ARCH.a \
     -O /lib/libwasmvm_muslc.a && \
-    wget https://github.com/CosmWasm/wasmvm/releases/download/${WASMVM_VERSION}/checksums.txt -O /tmp/checksums.txt && \
-    sha256sum /lib/libwasmvm_muslc.a | grep $(cat /tmp/checksums.txt | grep $(uname -m) | cut -d ' ' -f 1)
+    # verify checksum
+    wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/checksums.txt -O /tmp/checksums.txt && \
+    sha256sum /lib/libwasmvm_muslc.a | grep $(cat /tmp/checksums.txt | grep libwasmvm_muslc.$ARCH | cut -d ' ' -f 1)
 
 COPY . .
 RUN --mount=type=cache,target=/root/.cache/go-build \

diff --git a/Dockerfile.hermes b/Dockerfile.hermes
@@ -1,14 +1,14 @@
 FROM rust:1.72 as build
+ARG VERSION
 
 RUN apt update && apt install git -y
 
 WORKDIR /app/src
 
-RUN git clone https://github.com/informalsystems/ibc-rs --branch v1.5.0
+RUN git clone https://github.com/informalsystems/ibc-rs --branch $VERSION
 
 WORKDIR ibc-rs
 
-RUN sed -i 's/CHUNK_LENGTH: usize = 50;/CHUNK_LENGTH: usize = 3;/' ./crates/relayer/src/link/packet_events.rs
 RUN cargo build --release
 
 FROM debian:bullseye-slim

diff --git a/Dockerfile.osmosis b/Dockerfile.osmosis
@@ -2,32 +2,30 @@
 # Build 
 # --------------------------------------------------------
 
-FROM golang:1.21-alpine3.18 as build
+FROM golang:1.20.11-alpine3.18 as build
 
 RUN set -eux; apk add --no-cache ca-certificates build-base;
 RUN apk add git
 # Needed by github.com/zondax/hid
 RUN apk add linux-headers
 
-RUN git clone https://github.com/osmosis-labs/osmosis /osmosis --branch v12.1.0
+RUN git clone https://github.com/osmosis-labs/osmosis /osmosis --branch v21.1.2
 WORKDIR /osmosis
 
-# CosmWasm: see https://github.com/CosmWasm/wasmvm/releases
-ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
-ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
-RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 7d2239e9f25e96d0d4daba982ce92367aacf0cbd95d2facb8442268f2b1cc1fc
-RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep f6282df732a13dec836cda1f399dd874b1e3163504dbd9607c6af915b2740479
-
-# CosmWasm: copy the right library according to architecture. The final location will be found by the linker flag `-lwasmvm_muslc`
-RUN cp /lib/libwasmvm_muslc.$(uname -m).a /lib/libwasmvm_muslc.a
+RUN ARCH=$(uname -m) && WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | sed 's/.* //') && \
+    wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/libwasmvm_muslc.$ARCH.a \
+    -O /lib/libwasmvm_muslc.a && \
+    # verify checksum
+    wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/checksums.txt -O /tmp/checksums.txt && \
+    sha256sum /lib/libwasmvm_muslc.a | grep $(cat /tmp/checksums.txt | grep libwasmvm_muslc.$ARCH | cut -d ' ' -f 1)
 
 RUN BUILD_TAGS=muslc LINK_STATICALLY=true make build
 
 # --------------------------------------------------------
 # Runner
 # --------------------------------------------------------
 
-FROM debian:11
+FROM alpine:3.18
 
 RUN apt update && apt install bash -y
 COPY --from=build /osmosis/build/osmosisd /bin/osmosisd

diff --git a/Dockerfile.relayer b/Dockerfile.relayer
@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine3.18 AS builder
+FROM golang:1.21.5-alpine3.18 AS builder
 RUN apk add --no-cache make git gcc musl-dev openssl-dev linux-headers 
 
 RUN git clone https://github.com/cosmos/relayer --branch v2.1.1 /src/app
@@ -8,7 +8,7 @@ RUN go mod download
 RUN make build
 
 # Add to a distroless container
-FROM alpine:3.15
+FROM alpine:3.18
 COPY --from=builder /src/app/build/rly /usr/local/bin/rly
 RUN adduser -S -h /rly -D rly -u 1000
 USER rly
diff --git a/Makefile b/Makefile
@@ -25,6 +25,8 @@ DOCKER_TAG := $(COMMIT_HASH)
 GO_MAJOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
 GO_MINOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
 
+HERMES_VERSION=v1.7.4
+
 export GO111MODULE = on
 
 # Default target executed when no arguments are given to make.
@@ -102,10 +104,7 @@ endif
 build_tags += $(BUILD_TAGS)
 build_tags := $(strip $(build_tags))
 
-whitespace :=
-whitespace += $(whitespace)
-comma := ,
-build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))
+build_tags_comma_sep := $(shell echo $(build_tags) | sed 's/ /,/g')
 ldflags += -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)"
 
 ifeq (,$(findstring nostrip,$(COSMOS_BUILD_OPTIONS)))
@@ -147,12 +146,12 @@ $(BUILDDIR)/:
 	mkdir -p $(BUILDDIR)/
 
 build-docker:
-	DOCKER_BUILDKIT=1 $(DOCKER) build . -f Dockerfile -t quicksilverzone/quicksilver:$(DOCKER_VERSION) -t quicksilverzone/quicksilver:latest
+	$(DOCKER) build . -f Dockerfile -t quicksilverzone/quicksilver:$(DOCKER_VERSION) -t quicksilverzone/quicksilver:latest
 
-build-docker-local: build
-	DOCKER_BUILDKIT=1 $(DOCKER) build -f Dockerfile.local . -t quicksilverzone/quicksilver:$(DOCKER_VERSION)
+build-docker-xbuild:
+	$(DOCKER) buildx build --platform linux/amd64 . -f Dockerfile -t quicksilverzone/quicksilver:$(DOCKER_VERSION) -t quicksilverzone/quicksilver:latest
 
-build-docker-release: build-docker
+build-docker-release: build-docker-xbuild
 	$(DOCKER)  run -v /tmp:/tmp quicksilverzone/quicksilver:$(DOCKER_VERSION) cp /usr/local/bin/quicksilverd /tmp/quicksilverd
 	mv /tmp/quicksilverd build/quicksilverd-$(DOCKER_VERSION)-amd64
 
@@ -537,4 +536,10 @@ proto-setup:
 	@$(DOCKER) build --rm --tag quicksilver-proto:latest --file proto/Dockerfile .
 	@echo "✅ Setup protobuf environment!"
 
+### Other tools
+.PHONY: hermes-build
+
+hermes-build:
+	docker buildx build --platform linux/amd64 --build-arg VERSION=$HERMES_VERSION -f Dockerfile.hermes . -t quicksilverzone/hermes:$HERMES_VERSION
+	docker push quicksilverzone/hermes:$HERMES_VERSION
 
diff --git a/app/app.go b/app/app.go
@@ -115,6 +115,7 @@ func NewQuicksilver(
 	appOpts servertypes.AppOptions,
 	wasmOpts []wasm.Option,
 	mock bool,
+	enableSupplyEndpoint bool,
 	baseAppOptions ...func(*baseapp.BaseApp),
 ) *Quicksilver {
 	appCodec := encodingConfig.Marshaler
@@ -162,6 +163,7 @@ func NewQuicksilver(
 		wasmConfig,
 		enabledProposals,
 		wasmOpts,
+		enableSupplyEndpoint,
 	)
 
 	// ****  Module Options ****/

diff --git a/app/app_test.go b/app/app_test.go
@@ -56,6 +56,7 @@ func TestQuicksilverExport(t *testing.T) {
 		app.EmptyAppOptions{},
 		app.GetWasmOpts(app.EmptyAppOptions{}),
 		false,
+		false,
 	)
 
 	genesisState := app.NewDefaultGenesisState()
@@ -87,6 +88,7 @@ func TestQuicksilverExport(t *testing.T) {
 		app.EmptyAppOptions{},
 		app.GetWasmOpts(app.EmptyAppOptions{}),
 		false,
+		false,
 	)
 	_, err = app2.ExportAppStateAndValidators(false, []string{})
 	require.NoError(t, err, "ExportAppStateAndValidators should not have an error")

diff --git a/app/config.go b/app/config.go
@@ -59,6 +59,7 @@ func NewAppConstructor(encCfg EncodingConfig) network.AppConstructor {
 			EmptyAppOptions{},
 			GetWasmOpts(EmptyAppOptions{}),
 			false,
+			false,
 			baseapp.SetPruning(purningtypes.NewPruningOptionsFromString(val.AppConfig.Pruning)),
 			// baseapp.SetMinGasPrices(val.AppConfig.MinGasPrices),
 		)

diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -154,6 +154,7 @@ func NewAppKeepers(
 	wasmConfig wasm.Config,
 	wasmEnabledProposals []wasm.ProposalType,
 	wasmOpts []wasm.Option,
+	supplyEndpointEnabled bool,
 ) AppKeepers {
 	appKeepers := AppKeepers{}
 
@@ -183,6 +184,7 @@ func NewAppKeepers(
 		wasmConfig,
 		wasmEnabledProposals,
 		wasmOpts,
+		supplyEndpointEnabled,
 	)
 
 	appKeepers.SetupHooks()
@@ -206,6 +208,7 @@ func (appKeepers *AppKeepers) InitKeepers(
 	wasmConfig wasm.Config,
 	wasmEnabledProposals []wasm.ProposalType,
 	wasmOpts []wasm.Option,
+	supplyEndpointEnabled bool,
 ) {
 	// Add 'normal' keepers
 	proofOpsFn := utils.ValidateProofOps
@@ -352,6 +355,7 @@ func (appKeepers *AppKeepers) InitKeepers(
 		appKeepers.BankKeeper,
 		appKeepers.StakingKeeper,
 		utils.Keys[[]string](maccPerms),
+		supplyEndpointEnabled,
 	)
 	appKeepers.PacketForwardKeeper.SetTransferKeeper(appKeepers.TransferKeeper)
 	appKeepers.TransferModule = transfer.NewAppModule(appKeepers.TransferKeeper)