Merge branch 'develop' into test/settings-tests

Author: AYAHASSAN287

.gitignore

@@ -63,7 +63,8 @@ coverage.html
 
 Session.vim
 .undodir/*
-/.idea/
+.idea/*
+!.idea/codeStyles/
 /.vscode/
 /cmd/*/.ethereum/
 *.iml

.golangci.yml

@@ -63,9 +63,7 @@ formatters:
       simplify: true
     goimports:
       local-prefixes:
-        - github.com/ethereum/go-ethereum
         - github.com/status-im/status-go
-        - github.com/waku-org/go-waku
   exclusions:
     generated: strict
     paths:

.idea/codeStyles/Project.xml

@@ -1,11 +1,14 @@
 {
-  "go.formatFlags": [
-    "-local",
-    "github.com/ethereum/go-ethereum,github.com/status-im/status-go",
-    "-w"
-  ],
   "go.testTags": "gowaku_skip_migrations,gowaku_no_rln",
   "cSpell.words": [
     "unmarshalling"
   ],
+  "gopls": {
+    "formatting.local": "github.com/status-im/status-go"
+  },
+  // format all files on save if a formatter is available
+  "editor.formatOnSave": true,
+  // I use "goimports" instead of "gofmt"
+  // because it does the same thing but also formats imports
+  "go.formatTool": "goimports",
 }

.idea/codeStyles/codeStyleConfig.xml

@@ -309,19 +309,7 @@ clean-release:
 	rm -rf $(RELEASE_DIR)
 
 lint-fix:
-	find . \
-		-name '*.go' \
-		-and -not -name '*.pb.go' \
-		-and -not -name 'bindata*' \
-		-and -not -name 'migrations.go' \
-		-and -not -name 'messenger_handlers.go' \
-		-and -not -name '*/mock/*' \
-		-and -not -name 'mock.go' \
-		-and -not -wholename '*/vendor/*' \
-		-exec goimports \
-		-local 'github.com/ethereum/go-ethereum,github.com/status-im/status-go,github.com/status-im/markdown' \
-		-w {} \;
-	$(MAKE) vendor
+	golangci-lint --build-tags '$(BUILD_TAGS)' run --fix ./...
 
 docker-test: ##@tests Run tests in a docker container with golang.
 	docker run --privileged --rm -it -v "$(PWD):$(DOCKER_TEST_WORKDIR)" -w "$(DOCKER_TEST_WORKDIR)" $(DOCKER_TEST_IMAGE) go test ${ARGS}

.vscode/settings.json

@@ -3,10 +3,11 @@
 set -euo pipefail
 
 # Get latest tag
-latest_tag=$(git describe --tags develop)
+latest_tag=$(git describe --tags)
+branch_name="generated/${latest_tag}"
 
 # Create branch
-git checkout -b "generated/${latest_tag}"
+git checkout -b "${branch_name}"
 
 # Un-gitignore generated files
 sed -i '' '/# generated files/,/^$/ s/^/#/' .gitignore
@@ -21,4 +22,4 @@ sed -i '' 's/-dirty$//' pkg/version/VERSION
 git add .gitignore
 git add .
 git commit -m "feat_: version ${latest_tag} with generated files included"
-git push origin
+git push origin "${branch_name}"

Makefile

@@ -11,6 +11,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/ethereum/go-ethereum/common"
+
 	gocommon "github.com/status-im/status-go/common"
 	"github.com/status-im/status-go/crypto"
 	"github.com/status-im/status-go/logutils"

_assets/scripts/branch_version_generated.sh

@@ -9,6 +9,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts"
 	gethkeystore "github.com/ethereum/go-ethereum/accounts/keystore"
+
 	"github.com/status-im/status-go/accounts-management/keystore/internal/geth"
 	"github.com/status-im/status-go/crypto"
 	cryptotypes "github.com/status-im/status-go/crypto/types"

abi-spec/utils.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/status-im/status-go/accounts-management/keystore/internal/geth"
 	"github.com/status-im/status-go/accounts-management/types"
 	cryptotypes "github.com/status-im/status-go/crypto/types"