diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3540dda246..1ac7f92a04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: - master tags: - 'v[0-9]+.[0-9]+.[0-9]+' - # pull_request: + pull_request: jobs: lint_test: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000000..35cd46622d --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,71 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ master ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ master ] + schedule: + - cron: '44 11 * * 4' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'go' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Learn more about CodeQL language support at https://git.io/codeql-language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + queries: security-extended + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d81e81967e..a7ca8b7633 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,5 @@ jobs: shell: bash - run: go test github.com/ava-labs/subnet-evm/plugin/evm/... shell: bash - - run: go test github.com/ava-labs/subnet-evm/precompile/contracts/ticks - shell: bash - - run: go test github.com/ava-labs/subnet-evm/precompile/contracts/juror + - run: go test github.com/ava-labs/subnet-evm/precompile/... shell: bash diff --git a/.gitignore b/.gitignore index 3fc6248003..8d6f0ebd91 100644 --- a/.gitignore +++ b/.gitignore @@ -17,9 +17,6 @@ awscpu # Test binary, build with `go test -c` *.test -# orderbook tests dependencies -tests/orderbook/node_modules - # Output of the go coverage tool, specifically when used with LiteIDE *.out @@ -55,13 +52,9 @@ cmd/simulator/simulator # goreleaser dist/ -# generator rpc file for e2e tests -contract-examples/dynamic_rpc.json - -#sqlite -plugins/evm/hubble.db +# orderbook tests dependencies +tests/orderbook/node_modules *.bin local_status.sh - networks/*/*.env diff --git a/miner/miner.go b/miner/miner.go index 3990194dbb..14e5ba8d75 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -68,11 +68,6 @@ func (miner *Miner) GenerateBlock(predicateContext *precompileconfig.PredicateCo return miner.worker.commitNewWork(predicateContext) } -func (miner *Miner) GetLastBlockTime() uint64 { - // the timestamp for the new block will be >= this value - return miner.worker.chain.CurrentBlock().Time -} - // SubscribePendingLogs starts delivering logs from pending transactions // to the given channel. func (miner *Miner) SubscribePendingLogs(ch chan<- []*types.Log) event.Subscription { diff --git a/plugin/evm/syncervm_test.go b/plugin/evm/syncervm_test.go index 0908fd8e43..451af4a949 100644 --- a/plugin/evm/syncervm_test.go +++ b/plugin/evm/syncervm_test.go @@ -55,7 +55,6 @@ func TestSkipStateSync(t *testing.T) { } func TestStateSyncFromScratch(t *testing.T) { - t.Skip() rand.Seed(1) test := syncTest{ syncableInterval: 256, @@ -69,7 +68,6 @@ func TestStateSyncFromScratch(t *testing.T) { } func TestStateSyncToggleEnabledToDisabled(t *testing.T) { - t.Skip() rand.Seed(1) // Hack: registering metrics uses global variables, so we need to disable metrics here so that we can initialize the VM twice. metrics.Enabled = false