Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump subnet evm v0 5 11 #57

Merged
merged 3 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use a base image that includes both Go and Node.js, such as the official Go image
FROM golang:1.20.10-bullseye
FROM golang:1.20.12-bullseye


ENV GOPATH=/go
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint-tests-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: '~1.20.10'
go-version: '~1.20.12'
check-latest: true
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
Expand All @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: '~1.20.10'
go-version: '~1.20.12'
check-latest: true
- run: go mod download
shell: bash
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: '~1.20.10'
go-version: '~1.20.12'
check-latest: true
- name: Use Node.js
uses: actions/setup-node@v3
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,5 @@ In order to upgrade the Subnet-EVM version, you need to change the version in `g
[v0.1.5] [email protected] (Protocol Version: 29)
[v0.1.6] [email protected] (Protocol Version: 30)
[v0.1.7] [email protected] (Protocol Version: 30)
[v0.1.8] [email protected] (Protocol Version: 31)
```
1 change: 1 addition & 0 deletions compatibility.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"rpcChainVMProtocolVersion": {
"v0.1.8": 31,
"v0.1.7": 30,
"v0.1.6": 30,
"v0.1.5": 29,
Expand Down
2 changes: 1 addition & 1 deletion contracts/hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "@nomiclabs/hardhat-waffle"
import "@nomiclabs/hardhat-ethers"
import "./tasks.ts"
import "./tasks"

// HardHat users must populate these environment variables in order to connect to their subnet-evm instance
// Since the blockchainID is not known in advance, there's no good default to use and we use the C-Chain here.
Expand Down
683 changes: 348 additions & 335 deletions contracts/package-lock.json

Large diffs are not rendered by default.

25 changes: 13 additions & 12 deletions contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"name": "@avalabs/precompile-evm-contracts",
"devDependencies": {
"@types/chai": "^4.3.5",
"@types/mocha": "^9.0.0",
"chai": "^4.3.7",
"prettier": "^2.5.1",
"prettier-plugin-solidity": "^1.1.3"
"@types/chai": "^4.3.11",
"@types/mocha": "^9.1.1",
"chai": "^4.4.1",
"prettier": "^3.2.4",
"prettier-plugin-solidity": "^1.3.1"
},
"version": "1.0.0",
"description": "",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"module": "dist/index.js",
"dependencies": {
"@avalabs/subnet-evm-contracts": "^1.1.0",
"@avalabs/subnet-evm-contracts": "^1.2.0",
"@nomiclabs/hardhat-ethers": "^2.2.3",
"@nomiclabs/hardhat-waffle": "^2.0.6",
"@types/node": "^16.7.1",
"@types/node": "^16.11.7",
"@avalabs/avalanchejs": "^3.17.0",
"ethers": "^5.4.5",
"hardhat": "2.17.1",
"ts-node": "^10.9.1",
"typescript": "^5.1.6",
"@openzeppelin/contracts": "^4.9.3",
"ethers": "^5.7.2",
"hardhat": "2.19.4",
"ts-node": "^10.9.2",
"typescript": "^5.3.3",
"@openzeppelin/contracts": "^4.9.5",
"ds-test": "https://github.com/dapphub/ds-test.git"
},
"repository": {
Expand All @@ -32,6 +32,7 @@
},
"license": "BSD-3-Clause",
"scripts": {
"build": "rm -rf dist/ && tsc -b && npx hardhat compile",
"compile": "npx hardhat compile",
"console": "npx hardhat console",
"test": "npx hardhat test",
Expand Down
31 changes: 16 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module github.com/ava-labs/precompile-evm
go 1.20

require (
github.com/ava-labs/avalanchego v1.10.17
github.com/ava-labs/subnet-evm v0.5.10
github.com/onsi/ginkgo/v2 v2.8.1
github.com/onsi/gomega v1.26.0
github.com/ava-labs/avalanchego v1.10.18
github.com/ava-labs/subnet-evm v0.5.11
github.com/onsi/ginkgo/v2 v2.13.1
github.com/onsi/gomega v1.29.0
github.com/stretchr/testify v1.8.4
)

Expand All @@ -32,15 +32,16 @@ require (
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
github.com/getsentry/sentry-go v0.18.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
github.com/google/renameio/v2 v2.0.0 // indirect
github.com/google/uuid v1.3.0 // indirect
Expand All @@ -51,7 +52,6 @@ require (
github.com/hashicorp/go-bexpr v0.1.10 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c // indirect
github.com/klauspost/compress v1.15.15 // indirect
Expand Down Expand Up @@ -101,17 +101,18 @@ require (
go.opentelemetry.io/otel/sdk v1.11.0 // indirect
go.opentelemetry.io/otel/trace v1.11.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/mock v0.2.0 // indirect
go.uber.org/mock v0.4.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.1.0 // indirect
golang.org/x/tools v0.16.0 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
Expand Down
Loading
Loading