From 07b51ba53d054099b183bec7a15960c821512722 Mon Sep 17 00:00:00 2001
From: 0xmuralik <krishna192reddy@gmail.com>
Date: Tue, 14 Mar 2023 12:24:02 +0530
Subject: [PATCH] fix lint

---
 .github/workflows/lint.yml         |  2 ++
 .github/workflows/super-linter.yml |  2 +-
 Dockerfile                         |  7 +++----
 proto/ethermint/evm/v1/evm.proto   | 11 -----------
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 24d55ba4..740150f4 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -71,6 +71,8 @@ jobs:
         if: env.GIT_DIFF
   gomod2nix:
     name: Check gomod2nix.toml file is up to date
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2.3.4
diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
index 30940e31..dd0fe7d5 100644
--- a/.github/workflows/super-linter.yml
+++ b/.github/workflows/super-linter.yml
@@ -26,7 +26,6 @@ jobs:
         uses: github/super-linter@v4
         env:
           LINTER_RULES_PATH: /
-          FILTER_REGEX_EXCLUDE: "Dockerfile"
           YAML_CONFIG_FILE: .yamllint
           VALIDATE_ALL_CODEBASE: false
           MARKDOWN_CONFIG_FILE: .markdownlint.yml
@@ -37,5 +36,6 @@ jobs:
           VALIDATE_GO: false
           VALIDATE_JAVASCRIPT_STANDARD: false
           VALIDATE_GITLEAKS: false
+          VALIDATE_DOCKERFILE_HADOLINT: false
           DEFAULT_BRANCH: "main"
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
index feba64e0..106f1206 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,9 +7,8 @@ ENV PACKAGES git build-base
 WORKDIR /go/src/github.com/cerc-io/laconicd
 
 # Install dependencies
-RUN apk add --no-cache $PACKAGES
-
-RUN apk add --no-cache linux-headers
+RUN apk add --update $PACKAGES
+RUN apk add linux-headers
 
 # Add source files
 COPY . .
@@ -21,7 +20,7 @@ RUN make build
 FROM alpine:3.17.1
 
 # Install ca-certificates
-RUN apk add --no-cache ca-certificates jq curl
+RUN apk add --update ca-certificates jq curl
 WORKDIR /
 
 # Copy over binaries from the build-env
diff --git a/proto/ethermint/evm/v1/evm.proto b/proto/ethermint/evm/v1/evm.proto
index 9caa60ac..8a7771bb 100644
--- a/proto/ethermint/evm/v1/evm.proto
+++ b/proto/ethermint/evm/v1/evm.proto
@@ -127,17 +127,6 @@ message ChainConfig {
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"cancun_block\""
   ];
-  // shanghai_block switch block (nil = no fork, 0 = already on shanghai)
-  string shanghai_block = 22 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.moretags) = "yaml:\"shanghai_block\""
-  ];
-  // cancun_block switch block (nil = no fork, 0 = already on cancun)
-  string cancun_block = 23 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.moretags) = "yaml:\"cancun_block\""
-  ];
-
 }
 
 // State represents a single Storage key value pair item.