Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 65a4400

Browse files
authoredJan 9, 2025··
Merge branch 'master' into libevm-avalanchegov.1.12
Signed-off-by: Darioush Jalali <darioush.jalali@avalabs.org>
2 parents d82a884 + 72af1d8 commit 65a4400

File tree

11 files changed

+155
-17
lines changed

11 files changed

+155
-17
lines changed
 

‎.github/labels.yml

+108
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
# Lifecycle labels
2+
- name: "DO NOT MERGE"
3+
color: "ba1b48"
4+
description: "This PR must not be merged in its current state"
5+
- name: "lifecycle/frozen"
6+
color: "2476B2"
7+
- name: "lifecycle/stale"
8+
color: "ededed"
9+
10+
# General category labels
11+
- name: "bug"
12+
color: "d73a4a"
13+
description: "Something isn't working"
14+
- name: "documentation"
15+
color: "0075ca"
16+
description: "Improvements or additions to documentation or examples"
17+
- name: "enhancement"
18+
color: "a2eeef"
19+
description: "New feature or request"
20+
- name: "needs information"
21+
color: "d876e3"
22+
description: "Further information is needed"
23+
- name: "needs investigation"
24+
color: "147F45"
25+
description: "It is currently unclear if there is an issue"
26+
- name: "good first issue"
27+
color: "7057ff"
28+
description: "Good for newcomers"
29+
- name: "help wanted"
30+
color: "008672"
31+
description: "Looking for someone to address this"
32+
- name: "ci"
33+
color: "e99695"
34+
description: "This focuses on changes to the CI process"
35+
- name: "cleanup"
36+
color: "BFD4F2"
37+
description: "Code quality improvement"
38+
- name: "dependencies"
39+
color: "0366d6"
40+
description: "This primarily focuses on changing a dependency"
41+
- name: "testing"
42+
color: "220233"
43+
description: "This primarily focuses on testing"
44+
- name: "monitoring"
45+
color: "97450A"
46+
description: "This primarily focuses on logs, metrics, and/or tracing"
47+
- name: "incident response"
48+
color: "BE3D15"
49+
- name: "github_actions"
50+
color: "000000"
51+
description: "Pull requests that update GitHub Actions code"
52+
- name: "go"
53+
color: "16e2e2"
54+
description: "Pull requests that update Go code"
55+
- name: "needs Go upgrade"
56+
color: "16e2e2"
57+
description: "This requires a minor upgrade of Go to be supported"
58+
59+
# Avalanchego specific labels
60+
- name: "antithesis"
61+
color: "1d76db"
62+
description: "Related to an issue reported by Antithesis"
63+
- name: "bubble votes"
64+
color: "3C9CDD"
65+
- name: "consensus"
66+
color: "4444ff"
67+
description: "This involves consensus"
68+
- name: "continuous staking"
69+
color: "f9d0c4"
70+
- name: "Durango"
71+
color: "DAF894"
72+
description: "durango fork"
73+
- name: "gossiping upgrade"
74+
color: "c2e0c6"
75+
- name: "merkledb"
76+
color: "0e8a16"
77+
- name: "networking"
78+
color: "88E841"
79+
description: "This involves networking"
80+
- name: "sdk"
81+
color: "72ED25"
82+
description: "This involves SDK tooling or frameworks"
83+
- name: "storage"
84+
color: "3F2A70"
85+
description: "This involves storage primitives"
86+
- name: "Uptime Tracking"
87+
color: "d4c5f9"
88+
- name: "vm"
89+
color: "d1f7a0"
90+
description: "This involves virtual machines"
91+
- name: "warp"
92+
color: "4FC611"
93+
- name: "Warp Signature API"
94+
color: "68A7EA"
95+
96+
# ACP labels
97+
- name: "acp103"
98+
color: "AB2C58"
99+
- name: "acp113"
100+
color: "3359BA"
101+
- name: "acp118"
102+
color: "DFC715"
103+
- name: "acp125"
104+
color: "bfdadc"
105+
- name: "acp20"
106+
color: "DB7D37"
107+
- name: "acp77"
108+
color: "45CDF2"

‎.github/workflows/buf-push.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
18-
- uses: bufbuild/buf-setup-action@v1.31.0
19-
- uses: bufbuild/buf-push-action@v1
18+
- uses: bufbuild/buf-action@v1
2019
with:
2120
input: "proto"
22-
buf_token: ${{ secrets.BUF_TOKEN }}
21+
token: ${{ secrets.BUF_TOKEN }}
22+
version: 1.35.0

‎.github/workflows/ci.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -129,21 +129,25 @@ jobs:
129129
runs-on: ubuntu-latest
130130
steps:
131131
- uses: actions/checkout@v4
132-
- uses: bufbuild/buf-setup-action@v1.31.0
133-
with:
134-
github_token: ${{ github.token }}
135-
- uses: bufbuild/buf-lint-action@v1
132+
- uses: bufbuild/buf-action@v1
136133
with:
137134
input: "proto"
135+
pr_comment: false
136+
# buf-action defaults to pushing on non-fork branch pushes
137+
# which is never desirable for this job. The buf-push job is
138+
# responsible for pushes.
139+
push: false
140+
version: 1.35.0
138141
check_generated_protobuf:
139142
name: Up-to-date protobuf
140143
runs-on: ubuntu-latest
141144
steps:
142145
- uses: actions/checkout@v4
143146
- uses: ./.github/actions/setup-go-for-project
144-
- uses: bufbuild/buf-setup-action@v1.31.0
147+
- uses: bufbuild/buf-action@v1
145148
with:
146-
github_token: ${{ github.token }}
149+
setup_only: true
150+
version: 1.35.0
147151
- shell: bash
148152
run: scripts/protobuf_codegen.sh
149153
- shell: bash

‎.github/workflows/labels.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: labels
2+
on:
3+
push:
4+
branches:
5+
- main
6+
paths:
7+
- .github/labels.yml
8+
- .github/workflows/labels.yml
9+
pull_request: # dry run only
10+
paths:
11+
- .github/labels.yml
12+
- .github/workflows/labels.yml
13+
14+
jobs:
15+
labeler:
16+
permissions:
17+
contents: read
18+
issues: write
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v4
22+
- uses: crazy-max/ghaction-github-labeler@v5
23+
with:
24+
dry-run: ${{ github.event_name == 'pull_request' }}

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/DataDog/zstd v1.5.2
1414
github.com/NYTimes/gziphandler v1.1.1
1515
github.com/antithesishq/antithesis-sdk-go v0.3.8
16-
github.com/ava-labs/coreth v0.13.9-0.20250109181626-6493558fa52c
16+
github.com/ava-labs/coreth v0.14.1-0.20241230191223-351149733d35
1717
github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60
1818
github.com/ava-labs/libevm v1.13.14-0.1.0.rc-2
1919
github.com/btcsuite/btcd/btcutil v1.1.3

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl
6666
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
6767
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
6868
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
69-
github.com/ava-labs/coreth v0.13.9-0.20250109181626-6493558fa52c h1:R6p+y6mKdowDOvAbxG4xw3eawVc3547PwV9JbK5qdRQ=
70-
github.com/ava-labs/coreth v0.13.9-0.20250109181626-6493558fa52c/go.mod h1:RHovHXYBauSKgWEg0wlu37kL0vFXDdINGTwbdiQn5EE=
69+
github.com/ava-labs/coreth v0.14.1-0.20241230191223-351149733d35 h1:qBNnMleaJ7yWjNiDdV7wIf/e/PxubB+Ww7Mfx4QN4p8=
70+
github.com/ava-labs/coreth v0.14.1-0.20241230191223-351149733d35/go.mod h1:nvQqJem4MuE0pU93aqBPsaEZx9NnXT0lI8d6rrQS5uY=
7171
github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60 h1:EL66gtXOAwR/4KYBjOV03LTWgkEXvLePribLlJNu4g0=
7272
github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60/go.mod h1:/7qKobTfbzBu7eSTVaXMTr56yTYk4j2Px6/8G+idxHo=
7373
github.com/ava-labs/libevm v1.13.14-0.1.0.rc-2 h1:CVbn0hSsPCl6gCkTCnqwuN4vtJgdVbkCqLXzYAE7qF8=

‎scripts/protobuf_codegen.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if ! [[ "$0" =~ scripts/protobuf_codegen.sh ]]; then
88
fi
99

1010
## ensure the correct version of "buf" is installed
11-
BUF_VERSION='1.31.0'
11+
BUF_VERSION='1.35.0'
1212
if [[ $(buf --version | cut -f2 -d' ') != "${BUF_VERSION}" ]]; then
1313
echo "could not find buf ${BUF_VERSION}, is it installed + in PATH?"
1414
exit 255

‎tests/e2e/c/dynamic_fees.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/ava-labs/coreth/core/types"
1111
"github.com/ava-labs/coreth/params"
12-
"github.com/ava-labs/libevm/accounts/abi"
13-
"github.com/ava-labs/libevm/common"
12+
"github.com/ethereum/go-ethereum/accounts/abi"
13+
"github.com/ethereum/go-ethereum/common"
1414
"github.com/onsi/ginkgo/v2"
1515
"github.com/stretchr/testify/require"
1616
"go.uber.org/zap"

‎utils/crypto/secp256k1/secp256k1.go

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import (
1111
"github.com/ava-labs/libevm/common"
1212
"github.com/ava-labs/libevm/crypto"
1313
"github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa"
14+
"github.com/ethereum/go-ethereum/common"
15+
"github.com/ethereum/go-ethereum/crypto"
1416

1517
"github.com/ava-labs/avalanchego/cache"
1618
"github.com/ava-labs/avalanchego/ids"

‎vms/secp256k1fx/keychain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"strings"
1010

11-
"github.com/ava-labs/libevm/common"
11+
"github.com/ethereum/go-ethereum/common"
1212

1313
"github.com/ava-labs/avalanchego/ids"
1414
"github.com/ava-labs/avalanchego/utils/crypto/keychain"

‎wallet/chain/c/signer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010

1111
"github.com/ava-labs/coreth/plugin/evm/atomic"
12-
"github.com/ava-labs/libevm/common"
12+
"github.com/ethereum/go-ethereum/common"
1313

1414
"github.com/ava-labs/avalanchego/database"
1515
"github.com/ava-labs/avalanchego/ids"

0 commit comments

Comments
 (0)
Please sign in to comment.