Skip to content

Commit 576110a

Browse files
committed
Merge remote-tracking branch 'origin/aptos-version' into aptos-version
2 parents 0ae0bb2 + 9b93b59 commit 576110a

File tree

311 files changed

+26904
-23534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

311 files changed

+26904
-23534
lines changed

.githooks/detect-ethereum-keys

Lines changed: 0 additions & 18 deletions
This file was deleted.

.githooks/detect-rpc-urls

Lines changed: 0 additions & 17 deletions
This file was deleted.

.githooks/go-lint

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,2 @@
11
#!/bin/bash
2-
3-
# Find all 'go.mod' files, get their directories, and run 'go mod tidy'
4-
find "./" -type f -name 'go.mod' -print0 | while IFS= read -r -d $'\0' file; do
5-
directory=$(dirname "$file")
6-
cd "$directory" || exit 1
7-
8-
# Run linter and capture exit status
9-
set +e
10-
golangci-lint run -v
11-
linting_result=$?
12-
set -e
13-
14-
# Check linting result
15-
if [[ $linting_result -ne 0 ]]; then
16-
echo -e "Executing linters in $directory... \e[31mNOK!\e[0m\n"
17-
echo -e "Run \`cd $directory && golangci-lint run --fix -v\` and fix the issues\n"
18-
exit 1
19-
else
20-
echo -e "Executing linters in $directory... \e[32mOK!\e[0m\n"
21-
fi
22-
cd - || exit 1
23-
done
2+
devbox run -- just lint-all

.githooks/go-mod-local-replace

Lines changed: 0 additions & 14 deletions
This file was deleted.

.githooks/go-mod-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ find "./" -type f -name 'go.mod' -print0 | while IFS= read -r -d $'\0' file; do
1010
go mod tidy
1111
cd - || exit 1
1212
done
13+
1314
# pre-commit stashes changes before running the hooks so we can use git to check for changes here
1415
# Run git diff and capture output
1516
output=$(git diff --stat)

.githooks/go-test-build

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
set -e
44

5-
# Find all 'go.mod' files, get their directories, and run an empty 'go test' in them to compile the tests.
6-
find "./" -type f -name 'go.mod' -print0 | while IFS= read -r -d $'\0' file; do
5+
# Find all 'go.mod' files, excluding the 'seth' directory, get their directories, and run an empty 'go test' in them to compile the tests.
6+
# Seth is excluded because it can't be tested like this, env vars are required and setup
7+
find "./" -path "./seth" -prune -o -type f -name 'go.mod' -print0 | while IFS= read -r -d $'\0' file; do
78
dir=$(dirname "$file")
89
echo "Executing cd \"$dir\" && go test -run=^# ./..."
910
cd "$dir"
1011
go test -run=^# ./...
1112
cd -
12-
done
13+
done

.githooks/goimports

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
devbox run -- just goimports-all

.githooks/run-unit-tests

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Dependency Review
2+
3+
on:
4+
pull_request:
5+
6+
permissions: {}
7+
8+
jobs:
9+
dependency-review:
10+
permissions:
11+
contents: read
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 1
17+
persist-credentials: false
18+
- name: Vulnerability Check
19+
uses: smartcontractkit/.github/actions/dependency-review@0cc355785130a83a540187b609c5521094baed92 # [email protected]
20+
with:
21+
config-preset: default-vulnerability-check-high
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Checkout the Repo
2727
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
2828
- name: Install Go
29-
uses: smartcontractkit/.github/actions/setup-golang@01d931b0455a754d12e7143cc54a5a3521a8f6f6 #v 0.3.1
29+
uses: smartcontractkit/.github/actions/setup-golang@setup-golang/0.3.2
3030
with:
3131
# test_download_vendor_packages_command: cd lib && go mod download
3232
go-version-file: ./lib/go.mod

0 commit comments

Comments
 (0)