Skip to content

Commit

Permalink
Merge remote-tracking branch 'ArkEcosystem/core/develop' into snapsho…
Browse files Browse the repository at this point in the history
…ts-nonce

* ArkEcosystem/core/develop:
  refactor(core-transaction-pool): don't accept expired v1 transactions (#2948)
  fix(core-snapshots): remove bogus skipRoundRows (#2973)
  feat(core-api): endpoints for locks/businesses/bridgechains (#2940)
  fix(core-blockchain): round deletion during rollback (#2970)
  fix: range selection in pool's getTransactions() (#2952)
  feat: expose `isValidPeer` via ajv format rule (#2960)
  chore: remove trailing whitespace (#2971)
  fix(core-transactions): update wallet nonce when applying v1 transaction (#2959)
  fix(core-blockchain): do not reset `noBlockCounter` when `downloadBlocks` succeeds (#2968)
  refactor(pool): remove unnecessary check from validateTransactions() (#2951)
  ci: temporarily disable pull_request.synchronize event (#2966)
  refactor: strengthen a nonce check in performGenericWalletChecks() (#2949)
  ci: setup github action workflow for e2e tests (#2964)
  chore: drop node 11 support (#2965)
  test(e2e): No need to run as root the chmod command when modifying own's files (#2958)
  refactor(crypto): change maximum recipients of multipayment via milestone (#2961)
  ci: split functional job into 1 job per type (#2963)
  refactor(core-p2p): make peer reply errors less verbose (#2962)
  fix(core-state): index recipient wallets during bootstrap (#2947)
  Tell git to ignore vim's temporary files (#2957)
  ci: force exit tests if there are hanging promises
  ci: use different test coverage directories for each type (#2956)
  • Loading branch information
vasild committed Sep 27, 2019
2 parents 06fb6cc + 6bccf66 commit 8e9119b
Show file tree
Hide file tree
Showing 145 changed files with 2,639 additions and 978 deletions.
96 changes: 0 additions & 96 deletions .circleci/config.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ on:
branches:
- "**"
pull_request:
types: [ready_for_review, opened] # add synchronize to trigger builds for PR merges with the base branch, currently causes duplicate builds as synchronize is treated the same as push for everything besides merges
types: [ready_for_review, synchronize, opened] # fix: synchronize triggers builds for PR merges with the base branch, currently causes duplicate builds as synchronize is treated the same as push for everything besides merges

jobs:
crypto:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [10.x, 11.x, 12.x]
node-version: [10.x, 12.x]

steps:
- uses: actions/checkout@v1
Expand Down
Loading

0 comments on commit 8e9119b

Please sign in to comment.