diff --git a/.circleci/config.yml b/.circleci/config.yml index 936f5f2615..db7fd5560c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,14 +3,14 @@ jobs: test-node10-0: working_directory: ~/core environment: - CORE_DB_DATABASE: core_development + CORE_DB_DATABASE: core_unitnet CORE_DB_USERNAME: core docker: - image: 'circleci/node:10-browsers' - image: 'postgres:alpine' environment: POSTGRES_PASSWORD: password - POSTGRES_DB: core_development + POSTGRES_DB: core_unitnet POSTGRES_USER: core steps: - checkout @@ -113,14 +113,14 @@ jobs: test-node11-0: working_directory: ~/core environment: - CORE_DB_DATABASE: core_development + CORE_DB_DATABASE: core_unitnet CORE_DB_USERNAME: core docker: - image: 'circleci/node:11-browsers' - image: 'postgres:alpine' environment: POSTGRES_PASSWORD: password - POSTGRES_DB: core_development + POSTGRES_DB: core_unitnet POSTGRES_USER: core steps: - checkout @@ -223,14 +223,14 @@ jobs: test-node10-1: working_directory: ~/core environment: - CORE_DB_DATABASE: core_development + CORE_DB_DATABASE: core_unitnet CORE_DB_USERNAME: core docker: - image: 'circleci/node:10-browsers' - image: 'postgres:alpine' environment: POSTGRES_PASSWORD: password - POSTGRES_DB: core_development + POSTGRES_DB: core_unitnet POSTGRES_USER: core steps: - checkout @@ -343,14 +343,14 @@ jobs: test-node10-2: working_directory: ~/core environment: - CORE_DB_DATABASE: core_development + CORE_DB_DATABASE: core_unitnet CORE_DB_USERNAME: core docker: - image: 'circleci/node:10-browsers' - image: 'postgres:alpine' environment: POSTGRES_PASSWORD: password - POSTGRES_DB: core_development + POSTGRES_DB: core_unitnet POSTGRES_USER: core steps: - checkout @@ -458,14 +458,14 @@ jobs: test-node11-1: working_directory: ~/core environment: - CORE_DB_DATABASE: core_development + CORE_DB_DATABASE: core_unitnet CORE_DB_USERNAME: core docker: - image: 'circleci/node:11-browsers' - image: 'postgres:alpine' environment: POSTGRES_PASSWORD: password - POSTGRES_DB: core_development + POSTGRES_DB: core_unitnet POSTGRES_USER: core steps: - checkout @@ -578,14 +578,14 @@ jobs: test-node11-2: working_directory: ~/core environment: - CORE_DB_DATABASE: core_development + CORE_DB_DATABASE: core_unitnet CORE_DB_USERNAME: core docker: - image: 'circleci/node:11-browsers' - image: 'postgres:alpine' environment: POSTGRES_PASSWORD: password - POSTGRES_DB: core_development + POSTGRES_DB: core_unitnet POSTGRES_USER: core steps: - checkout diff --git a/.circleci/configTemplate.json b/.circleci/configTemplate.json index 6d249c90b9..a766451a67 100644 --- a/.circleci/configTemplate.json +++ b/.circleci/configTemplate.json @@ -4,7 +4,7 @@ "test-node10-0": { "working_directory": "~/core", "environment": { - "CORE_DB_DATABASE": "core_development", + "CORE_DB_DATABASE": "core_unitnet", "CORE_DB_USERNAME": "core" }, "docker": [ @@ -15,7 +15,7 @@ "image": "postgres:alpine", "environment": { "POSTGRES_PASSWORD": "password", - "POSTGRES_DB": "core_development", + "POSTGRES_DB": "core_unitnet", "POSTGRES_USER": "core" } } @@ -87,7 +87,7 @@ "test-node11-0": { "working_directory": "~/core", "environment": { - "CORE_DB_DATABASE": "core_development", + "CORE_DB_DATABASE": "core_unitnet", "CORE_DB_USERNAME": "core" }, "docker": [ @@ -98,7 +98,7 @@ "image": "postgres:alpine", "environment": { "POSTGRES_PASSWORD": "password", - "POSTGRES_DB": "core_development", + "POSTGRES_DB": "core_unitnet", "POSTGRES_USER": "core" } } diff --git a/.circleci/rebuild-db.sh b/.circleci/rebuild-db.sh index 3798325e18..b806fc292a 100755 --- a/.circleci/rebuild-db.sh +++ b/.circleci/rebuild-db.sh @@ -3,7 +3,7 @@ tables='rounds blocks transactions wallets' for table in $tables do dropcmd=$(echo "drop table if exists ${table};") - psql -h localhost -U core -d core_development -c "${dropcmd}" + psql -h localhost -U core -d core_unitnet -c "${dropcmd}" done cd ../packages/core-database-postgres/src/migrations/ @@ -11,5 +11,5 @@ cd ../packages/core-database-postgres/src/migrations/ for sqlFile in ./*.sql do sqlcmd=$(cat $sqlFile | sed 's/${schema~}\.//g') - psql -h localhost -U core -d core_development -c "${sqlcmd}" -done \ No newline at end of file + psql -h localhost -U core -d core_unitnet -c "${sqlcmd}" +done diff --git a/.gitignore b/.gitignore index a470a2cc41..2f26172e8e 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,6 @@ docker/development #Webstorm/Intellij .idea + +# Vagrant +.vagrant diff --git a/CHANGELOG.md b/CHANGELOG.md index e0f975c7b6..569272bb6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [2.1.1] - 2019-02-12 + +### Fixed + +- Configuration endpoint does not show dynamic fees ([#2082]) +- Return the correct supply for the legacy API ([#2083]) + ## [2.1.0] - 2019-02-11 ### Added @@ -177,7 +184,8 @@ Closed security vulnerabilities: - Initial Release -[unreleased]: https://github.com/ArkEcosystem/core/compare/2.0.19...develop +[unreleased]: https://github.com/ArkEcosystem/core/compare/2.1.1...develop +[2.1.1]: https://github.com/ArkEcosystem/core/compare/2.1.0..2.1.1 [2.1.0]: https://github.com/ArkEcosystem/core/compare/2.0.19...2.1.0 [2.0.19]: https://github.com/ArkEcosystem/core/compare/2.0.18...2.0.19 [2.0.18]: https://github.com/ArkEcosystem/core/compare/2.0.17...2.0.18 @@ -270,3 +278,5 @@ Closed security vulnerabilities: [#2058]: https://github.com/ArkEcosystem/core/pull/2058 [#2061]: https://github.com/ArkEcosystem/core/pull/2061 [#2080]: https://github.com/ArkEcosystem/core/pull/2080 +[#2082]: https://github.com/ArkEcosystem/core/pull/2082 +[#2083]: https://github.com/ArkEcosystem/core/pull/2083 diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000000..3c0b9182e8 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1 @@ +* @faustbrian @kristjank @supaiku0 diff --git a/install.sh b/install.sh index c8134c72bd..2fce6efec4 100644 --- a/install.sh +++ b/install.sh @@ -1,9 +1,6 @@ #!/usr/bin/env bash -# ----------------------------------- -# TYPOGRAPHY -# ----------------------------------- - +# Typography red=$(tput setaf 1) green=$(tput setaf 2) yellow=$(tput setaf 3) @@ -13,19 +10,9 @@ blue=$(tput setaf 6) white=$(tput setaf 7) black=$(tput setaf 8) -bg_red=$(tput setab 1) -bg_green=$(tput setab 2) -bg_yellow=$(tput setab 3) -bg_lila=$(tput setab 4) -bg_pink=$(tput setab 5) -bg_blue=$(tput setab 6) -bg_white=$(tput setab 7) -bg_black=$(tput setab 8) - bold=$(tput bold) reset=$(tput sgr0) -# Indicators heading () { echo " ${lila}==>${reset}${bold} $1${reset}" @@ -51,69 +38,6 @@ error () echo " ${red}==>${reset}${bold} $1${reset}" } -# Colored Text -text_red () -{ - echo "${red}$1${reset}" -} - -text_green () -{ - echo "${green}$1${reset}" -} - -text_yellow () -{ - echo "${yellow}$1${reset}" -} - -text_lila () -{ - echo "${lila}$1${reset}" -} - -text_pink () -{ - echo "${pink}$1${reset}" -} - -text_blue () -{ - echo "${blue}$1${reset}" -} - -text_white () -{ - echo "${white}$1${reset}" -} - -text_black () -{ - echo "${black}$1${reset}" -} - -# Styles -text_bold () -{ - echo "${bold}" -} - -text_reset () -{ - echo "${reset}" -} - -# Helpers -divider () -{ - text_lila " ===============================================================" -} - -paragraph () -{ - text_white "$1" | fold -w67 | paste -sd'\n' - -} - # Detect pkg type DEB=$(which apt-get) RPM=$(which yum) diff --git a/lerna.json b/lerna.json index f06def6804..b072e132b8 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "packages": ["packages/*", "plugins/*"], "useWorkspaces": true, - "version": "2.1.0" + "version": "2.1.1" } diff --git a/packages/core-api/__tests__/v2/handlers/node.test.ts b/packages/core-api/__tests__/v2/handlers/node.test.ts index 46a8179561..23a90e532b 100644 --- a/packages/core-api/__tests__/v2/handlers/node.test.ts +++ b/packages/core-api/__tests__/v2/handlers/node.test.ts @@ -1,4 +1,6 @@ import "@arkecosystem/core-test-utils"; + +import { app } from "@arkecosystem/core-container"; import { setUp, tearDown } from "../../__support__/setup"; import { utils } from "../utils"; @@ -51,7 +53,7 @@ describe("API 2.0 - Loader", () => { "using the %s header", (header, request) => { it("should GET the node configuration", async () => { - const response = await utils[request]("GET", "node/configuration"); + let response = await utils[request]("GET", "node/configuration"); expect(response).toBeSuccessfulResponse(); expect(response.data.data).toBeObject(); @@ -60,6 +62,16 @@ describe("API 2.0 - Loader", () => { expect(response.data.data.symbol).toBeString(); expect(response.data.data.explorer).toBeString(); expect(response.data.data.version).toBeNumber(); + + const dynamicFees = app.resolveOptions("transactionPool").dynamicFees; + expect(response.data.data.transactionPool.dynamicFees).toEqual(dynamicFees); + + app.resolveOptions("transactionPool").dynamicFees.enabled = false; + + response = await utils[request]("GET", "node/configuration"); + expect(response.data.data.transactionPool.dynamicFees).toEqual({ enabled: false }); + + app.resolveOptions("transactionPool").dynamicFees.enabled = true; }); }, ); diff --git a/packages/core-api/package.json b/packages/core-api/package.json index 420bd0fbc1..f574cc0c53 100644 --- a/packages/core-api/package.json +++ b/packages/core-api/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-api", "description": "Public API for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Kristjan Košič ", "Brian Faust " @@ -13,7 +13,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "bash ../../scripts/pre-test.sh", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-api/src/versions/1/blocks/controller.ts b/packages/core-api/src/versions/1/blocks/controller.ts index ef791fe30b..32206d0ad3 100644 --- a/packages/core-api/src/versions/1/blocks/controller.ts +++ b/packages/core-api/src/versions/1/blocks/controller.ts @@ -1,3 +1,4 @@ +import { supplyCalculator } from "@arkecosystem/core-utils"; import { bignumify } from "@arkecosystem/core-utils"; import Boom from "boom"; import Hapi from "hapi"; @@ -105,14 +106,8 @@ export class BlocksController extends Controller { public async supply(request: Hapi.Request, h: Hapi.ResponseToolkit) { try { - const lastBlock = this.blockchain.getLastBlock(); - const constants = this.config.getMilestone(lastBlock.data.height); - const rewards = bignumify(constants.reward).times(lastBlock.data.height - constants.height); - return super.respondWith({ - supply: +bignumify(this.config.get("genesisBlock.totalAmount")) - .plus(rewards) - .toFixed(), + supply: supplyCalculator.calculate(this.blockchain.getLastBlock().data.height), }); } catch (error) { return Boom.badImplementation(error); diff --git a/packages/core-api/src/versions/2/node/controller.ts b/packages/core-api/src/versions/2/node/controller.ts index 51c7fa7d84..4be8f9169c 100644 --- a/packages/core-api/src/versions/2/node/controller.ts +++ b/packages/core-api/src/versions/2/node/controller.ts @@ -45,6 +45,7 @@ export class NodeController extends Controller { const feeStatisticsData = await transactionsRepository.getFeeStatistics(); const network = this.config.get("network"); + const dynamicFees = app.resolveOptions("transactionPool").dynamicFees; return { data: { @@ -58,6 +59,7 @@ export class NodeController extends Controller { feeStatistics: super.toCollection(request, feeStatisticsData, "fee-statistics"), transactionPool: { maxTransactionAge: app.resolveOptions("transactionPool").maxTransactionAge, + dynamicFees: dynamicFees.enabled ? dynamicFees : { enabled: false }, }, }, }; diff --git a/packages/core-blockchain/package.json b/packages/core-blockchain/package.json index ed89405356..d8f0c87a26 100644 --- a/packages/core-blockchain/package.json +++ b/packages/core-blockchain/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-blockchain", "description": "Blockchain Manager for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "François-Xavier Thoorens ", "Kristjan Košič ", @@ -14,7 +14,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "bash ../../scripts/pre-test.sh", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-container/package.json b/packages/core-container/package.json index f0e4c9b12c..f222334a39 100644 --- a/packages/core-container/package.json +++ b/packages/core-container/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-container", "description": "Container for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -12,7 +12,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-database-postgres/__tests__/__support__/setup.ts b/packages/core-database-postgres/__tests__/__support__/setup.ts index 3300e02f17..00e4c2c9d2 100644 --- a/packages/core-database-postgres/__tests__/__support__/setup.ts +++ b/packages/core-database-postgres/__tests__/__support__/setup.ts @@ -7,7 +7,7 @@ const options = { connection: { host: "localhost", port: 5432, - database: "core_development", + database: "core_unitnet", user: "core", password: "password", }, diff --git a/packages/core-database-postgres/package.json b/packages/core-database-postgres/package.json index e3da866f71..3ecd91903d 100644 --- a/packages/core-database-postgres/package.json +++ b/packages/core-database-postgres/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-database-postgres", "description": "PostgreSQL integration for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -12,7 +12,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "bash ../../scripts/pre-test.sh", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn copy && yarn compile", diff --git a/packages/core-database/package.json b/packages/core-database/package.json index 4f8acdcc61..8d759cf736 100644 --- a/packages/core-database/package.json +++ b/packages/core-database/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-database", "description": "Database Interface for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "François-Xavier Thoorens ", "Kristjan Košič ", @@ -14,7 +14,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "bash ../../scripts/pre-test.sh", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-debugger-cli/package.json b/packages/core-debugger-cli/package.json index b7b6ba0c29..a739fc12af 100644 --- a/packages/core-debugger-cli/package.json +++ b/packages/core-debugger-cli/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-debugger-cli", "description": "Debugger CLI for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -17,7 +17,7 @@ }, "scripts": { "debugger": "./bin/run", - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "prepack": "oclif-dev manifest && npm shrinkwrap", "postpack": "rm -f oclif.manifest.json", diff --git a/packages/core-elasticsearch/package.json b/packages/core-elasticsearch/package.json index fc485a5fe2..bdc23adfc0 100644 --- a/packages/core-elasticsearch/package.json +++ b/packages/core-elasticsearch/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-elasticsearch", "description": "A powerful Elasticsearch integration for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -11,7 +11,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-error-tracker-bugsnag/package.json b/packages/core-error-tracker-bugsnag/package.json index 9e65072457..61ac939dc8 100644 --- a/packages/core-error-tracker-bugsnag/package.json +++ b/packages/core-error-tracker-bugsnag/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-error-tracker-bugsnag", "description": "Bugsnag error tracker integration for Ark Core.", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -11,7 +11,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-error-tracker-sentry/package.json b/packages/core-error-tracker-sentry/package.json index 1d53d1924e..f84d6deaf4 100644 --- a/packages/core-error-tracker-sentry/package.json +++ b/packages/core-error-tracker-sentry/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-error-tracker-sentry", "description": "Sentry error tracker integration for Ark Core.", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -11,7 +11,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-event-emitter/package.json b/packages/core-event-emitter/package.json index 0071f7f0b5..b4125d604f 100644 --- a/packages/core-event-emitter/package.json +++ b/packages/core-event-emitter/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-event-emitter", "description": "Event Manager for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -11,7 +11,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-forger/package.json b/packages/core-forger/package.json index e921091016..36fdf0e9b6 100644 --- a/packages/core-forger/package.json +++ b/packages/core-forger/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-forger", "description": "Forger for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "François-Xavier Thoorens ", "Kristjan Košič ", @@ -13,7 +13,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "bash ../../scripts/pre-test.sh", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-graphql/package.json b/packages/core-graphql/package.json index 4d04edd91f..19a13ea565 100644 --- a/packages/core-graphql/package.json +++ b/packages/core-graphql/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-graphql", "description": "GraphQL Integration for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Lúcio Rubens " ], @@ -11,7 +11,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-http-utils/package.json b/packages/core-http-utils/package.json index b15f95cc2a..e51a9ac770 100644 --- a/packages/core-http-utils/package.json +++ b/packages/core-http-utils/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-http-utils", "description": "Http Utilities for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -11,7 +11,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-interfaces/package.json b/packages/core-interfaces/package.json index 64f4e0b3f7..9502364852 100644 --- a/packages/core-interfaces/package.json +++ b/packages/core-interfaces/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-interfaces", "description": "Interface types for essential Ark core modules", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "François-Xavier Thoorens ", "Kristjan Košič ", @@ -15,7 +15,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "bash ../../scripts/pre-test.sh", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-jest-matchers/package.json b/packages/core-jest-matchers/package.json index eec87f0810..5c888772a4 100644 --- a/packages/core-jest-matchers/package.json +++ b/packages/core-jest-matchers/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-jest-matchers", "description": "Jest matchers for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust ", "Erwann Gentric ", @@ -13,7 +13,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-json-rpc/package.json b/packages/core-json-rpc/package.json index 9eea77bded..f4d40b864c 100644 --- a/packages/core-json-rpc/package.json +++ b/packages/core-json-rpc/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-json-rpc", "description": "A JSON-RPC 2.0 Specification compliant server to interact with the Ark Blockchain.", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "François-Xavier Thoorens ", "Brian Faust " @@ -12,7 +12,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "bash ../../scripts/pre-test.sh", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-logger-winston/package.json b/packages/core-logger-winston/package.json index 8ff7b4e9a0..7856577949 100644 --- a/packages/core-logger-winston/package.json +++ b/packages/core-logger-winston/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-logger-winston", "description": "Winston Logger for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "François-Xavier Thoorens ", "Brian Faust " @@ -13,7 +13,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-logger/package.json b/packages/core-logger/package.json index 3a383aaf7c..132c1c710b 100644 --- a/packages/core-logger/package.json +++ b/packages/core-logger/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-logger", "description": "Logger Manager for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -12,7 +12,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-p2p/__tests__/court/guard.test.ts b/packages/core-p2p/__tests__/court/guard.test.ts index da5b158208..5d00753d1c 100644 --- a/packages/core-p2p/__tests__/court/guard.test.ts +++ b/packages/core-p2p/__tests__/court/guard.test.ts @@ -114,7 +114,7 @@ describe("Guard", () => { const dummy = { nethash: "d9acd04bde4234a81addb8482333b4ac906bed7be5a9970ce8ada428bd083192", milestoneHash: "dummy-milestone", - version: "2.1.0", + version: "2.1.1", status: 200, state: {}, }; diff --git a/packages/core-p2p/package.json b/packages/core-p2p/package.json index 50e588ac07..bb8fe36076 100644 --- a/packages/core-p2p/package.json +++ b/packages/core-p2p/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-p2p", "description": "P2P API for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "François-Xavier Thoorens ", "Kristjan Košič ", @@ -15,7 +15,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "bash ../../scripts/pre-test.sh", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-snapshots-cli/package.json b/packages/core-snapshots-cli/package.json index 7e7d392a9a..a8923b31ad 100644 --- a/packages/core-snapshots-cli/package.json +++ b/packages/core-snapshots-cli/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-snapshots-cli", "description": "Provides live cli interface to the core-snapshots module for ARK Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Kristjan Košič " ], @@ -17,7 +17,7 @@ }, "scripts": { "snapshot": "./bin/run", - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "prepack": "oclif-dev manifest && npm shrinkwrap", "postpack": "rm -f oclif.manifest.json", diff --git a/packages/core-snapshots/package.json b/packages/core-snapshots/package.json index ebba08e4a7..40e248ff6e 100644 --- a/packages/core-snapshots/package.json +++ b/packages/core-snapshots/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-snapshots", "description": "Provides live local streamed snapshots functionality for ARK Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Kristjan Košič " ], @@ -12,7 +12,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn copy && yarn compile", diff --git a/packages/core-test-utils/package.json b/packages/core-test-utils/package.json index cc159d27b0..3524d44382 100644 --- a/packages/core-test-utils/package.json +++ b/packages/core-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-test-utils", "description": "Test Utilities for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust ", "Erwann Gentric ", @@ -14,7 +14,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-test-utils/src/config/testnet/plugins.js b/packages/core-test-utils/src/config/testnet/plugins.js index 662f1de692..05d67accb9 100644 --- a/packages/core-test-utils/src/config/testnet/plugins.js +++ b/packages/core-test-utils/src/config/testnet/plugins.js @@ -18,7 +18,7 @@ module.exports = { connection: { host: process.env.CORE_DB_HOST || "localhost", port: process.env.CORE_DB_PORT || 5432, - database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_development`, + database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_unitnet`, user: process.env.CORE_DB_USERNAME || process.env.CORE_TOKEN, password: process.env.CORE_DB_PASSWORD || "password", }, diff --git a/packages/core-test-utils/src/config/unitnet/plugins.js b/packages/core-test-utils/src/config/unitnet/plugins.js index 662f1de692..05d67accb9 100644 --- a/packages/core-test-utils/src/config/unitnet/plugins.js +++ b/packages/core-test-utils/src/config/unitnet/plugins.js @@ -18,7 +18,7 @@ module.exports = { connection: { host: process.env.CORE_DB_HOST || "localhost", port: process.env.CORE_DB_PORT || 5432, - database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_development`, + database: process.env.CORE_DB_DATABASE || `${process.env.CORE_TOKEN}_unitnet`, user: process.env.CORE_DB_USERNAME || process.env.CORE_TOKEN, password: process.env.CORE_DB_PASSWORD || "password", }, diff --git a/packages/core-test-utils/src/helpers/container.ts b/packages/core-test-utils/src/helpers/container.ts index d927478640..837af6681e 100644 --- a/packages/core-test-utils/src/helpers/container.ts +++ b/packages/core-test-utils/src/helpers/container.ts @@ -8,7 +8,7 @@ import * as path from "path"; export async function setUpContainer(options: any): Promise { options.network = options.network || "testnet"; await app.setUp( - "2.1.0", + "2.1.1", { data: options.data || "~/.core", config: options.config ? options.config : path.resolve(__dirname, `../config/${options.network}`), diff --git a/packages/core-tester-cli/package.json b/packages/core-tester-cli/package.json index e621560123..251dd161a1 100644 --- a/packages/core-tester-cli/package.json +++ b/packages/core-tester-cli/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-tester-cli", "description": "Tester CLI for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust ", "Alex Barnsley " @@ -18,7 +18,7 @@ }, "scripts": { "tester": "./bin/run", - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "bash ../../scripts/pre-test.sh", "prepack": "oclif-dev manifest && npm shrinkwrap", "postpack": "rm -f oclif.manifest.json", diff --git a/packages/core-transaction-pool/package.json b/packages/core-transaction-pool/package.json index ac05693c10..df262f00d2 100644 --- a/packages/core-transaction-pool/package.json +++ b/packages/core-transaction-pool/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-transaction-pool", "description": "Transaction Pool Manager for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Kristjan Košič ", "Brian Faust ", @@ -16,7 +16,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "bash ../../scripts/pre-test.sh", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-utils/package.json b/packages/core-utils/package.json index 1ebcbe341d..81119c6f0d 100644 --- a/packages/core-utils/package.json +++ b/packages/core-utils/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-utils", "description": "Utilities for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -11,7 +11,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core-vote-report/package.json b/packages/core-vote-report/package.json index 61de3c13e7..c9bb315219 100644 --- a/packages/core-vote-report/package.json +++ b/packages/core-vote-report/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-vote-report", "description": "Vote Report for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -11,7 +11,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile && cp -r src/templates dist/templates", diff --git a/packages/core-webhooks/package.json b/packages/core-webhooks/package.json index 2bc0ab404c..297235fcf9 100644 --- a/packages/core-webhooks/package.json +++ b/packages/core-webhooks/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-webhooks", "description": "Webhooks for Ark Core", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "Brian Faust " ], @@ -11,7 +11,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "bash ../../scripts/pre-test.sh", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/core/__tests__/__support__/config/plugins.js b/packages/core/__tests__/__support__/config/plugins.js index 19429c3bec..a93a61550c 100644 --- a/packages/core/__tests__/__support__/config/plugins.js +++ b/packages/core/__tests__/__support__/config/plugins.js @@ -18,7 +18,7 @@ module.exports = { connection: { host: process.env.CORE_DB_HOST || "localhost", port: process.env.CORE_DB_PORT || 5432, - database: process.env.CORE_DB_DATABASE || "core_development", + database: process.env.CORE_DB_DATABASE || "_unitnet", user: process.env.CORE_DB_USERNAME || "core", password: process.env.CORE_DB_PASSWORD || "password", }, diff --git a/packages/core/package.json b/packages/core/package.json index b5a667c349..4e28da0607 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core", "description": "Core of the Ark Blockchain", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "François-Xavier Thoorens ", "Kristjan Košič ", @@ -20,7 +20,7 @@ "core:snapshot": "node ./dist/index.js snapshot" }, "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && yarn compile", diff --git a/packages/crypto/package.json b/packages/crypto/package.json index cec9dd105f..72eb790f41 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/crypto", "description": "Crypto utilities for the Ark Blockchain", - "version": "2.1.0", + "version": "2.1.1", "contributors": [ "François-Xavier Thoorens ", "Brian Faust ", @@ -19,7 +19,7 @@ "dist" ], "scripts": { - "prepublishOnly": "yarn test && yarn build", + "prepublishOnly": "yarn build", "pretest": "yarn lint && yarn build", "compile": "../../node_modules/typescript/bin/tsc", "build": "yarn clean && tsc", diff --git a/scripts/release.sh b/scripts/release.sh old mode 100644 new mode 100755 diff --git a/scripts/version.sh b/scripts/version.sh old mode 100644 new mode 100755 diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh new file mode 100644 index 0000000000..cf6fc6b88c --- /dev/null +++ b/vagrant/bootstrap.sh @@ -0,0 +1,209 @@ +#!/usr/bin/env bash + +# Typography +red=$(tput setaf 1) +green=$(tput setaf 2) +yellow=$(tput setaf 3) +lila=$(tput setaf 4) +pink=$(tput setaf 5) +blue=$(tput setaf 6) +white=$(tput setaf 7) +black=$(tput setaf 8) + +bold=$(tput bold) +reset=$(tput sgr0) + +heading () +{ + echo " ${lila}==>${reset}${bold} $1${reset}" +} + +success () +{ + echo " ${green}==>${reset}${bold} $1${reset}" +} + +info () +{ + echo " ${blue}==>${reset}${bold} $1${reset}" +} + +warning () +{ + echo " ${yellow}==>${reset}${bold} $1${reset}" +} + +error () +{ + echo " ${red}==>${reset}${bold} $1${reset}" +} + +# Detect pkg type +DEB=$(which apt-get) +RPM=$(which yum) + +# Detect SystemV / SystemD +SYS=$([[ -L "/sbin/init" ]] && echo 'SystemD' || echo 'SystemV') + +if [[ ! -z $DEB ]]; then + success "Running install for Debian derivate" +elif [[ ! -z $RPM ]]; then + success "Running install for RedHat derivate" +else + heading "Not supported system" + exit 1; +fi + +if [[ $(locale -a | grep ^en_US.UTF-8) ]] || [[ $(locale -a | grep ^en_US.utf8) ]]; then + if ! $(grep -E "(en_US.UTF-8)" "$HOME/.bashrc"); then + # Setting the bashrc locale + echo "export LC_ALL=en_US.UTF-8" >> "$HOME/.bashrc" + echo "export LANG=en_US.UTF-8" >> "$HOME/.bashrc" + echo "export LANGUAGE=en_US.UTF-8" >> "$HOME/.bashrc" + + # Setting the current shell locale + export LC_ALL="en_US.UTF-8" + export LANG="en_US.UTF-8" + export LANGUAGE="en_US.UTF-8" + fi +else + # Install en_US.UTF-8 Locale + if [[ ! -z $DEB ]]; then + sudo locale-gen en_US.UTF-8 + sudo update-locale LANG=en_US.UTF-8 + elif [[ ! -z $RPM ]]; then + sudo localedef -c -i en_US -f UTF-8 en_US.UTF-8 + fi + + # Setting the current shell locale + export LC_ALL="en_US.UTF-8" + export LANG="en_US.UTF-8" + export LANGUAGE="en_US.UTF-8" + + # Setting the bashrc locale + echo "export LC_ALL=en_US.UTF-8" >> "$HOME/.bashrc" + echo "export LANG=en_US.UTF-8" >> "$HOME/.bashrc" + echo "export LANGUAGE=en_US.UTF-8" >> "$HOME/.bashrc" +fi + +heading "Installing system dependencies..." + +if [[ ! -z $DEB ]]; then + sudo apt-get update + sudo apt-get install -y git curl apt-transport-https update-notifier +elif [[ ! -z $RPM ]]; then + sudo yum update -y + sudo yum install git curl epel-release -y +fi + +success "Installed system dependencies!" + +heading "Installing node.js & npm..." + +sudo rm -rf /usr/local/{lib/node{,/.npm,_modules},bin,share/man}/{npm*,node*,man1/node*} +sudo rm -rf ~/{.npm,.forever,.node*,.cache,.nvm} + +if [[ ! -z $DEB ]]; then + sudo wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add - + (echo "deb https://deb.nodesource.com/node_10.x $(lsb_release -s -c) main" | sudo tee /etc/apt/sources.list.d/nodesource.list) + sudo apt-get update + sudo apt-get install nodejs -y +elif [[ ! -z $RPM ]]; then + sudo yum install gcc-c++ make -y + curl -sL https://rpm.nodesource.com/setup_10.x | sudo -E bash - > /dev/null 2>&1 +fi + +success "Installed node.js & npm!" + +heading "Installing Yarn..." + +if [[ ! -z $DEB ]]; then + curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - + (echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list) + + sudo apt-get update + sudo apt-get install -y yarn +elif [[ ! -z $RPM ]]; then + curl -sL https://dl.yarnpkg.com/rpm/yarn.repo | sudo tee /etc/yum.repos.d/yarn.repo + sudo yum install yarn -y +fi + +success "Installed Yarn!" + +heading "Installing PM2..." + +sudo yarn global add pm2 +pm2 install pm2-logrotate +pm2 set pm2-logrotate:max_size 500M +pm2 set pm2-logrotate:compress true +pm2 set pm2-logrotate:retain 7 + +success "Installed PM2!" + +heading "Installing program dependencies..." + +if [[ ! -z $DEB ]]; then + sudo apt-get install build-essential libcairo2-dev pkg-config libtool autoconf automake python libpq-dev jq -y +elif [[ ! -z $RPM ]]; then + sudo yum groupinstall "Development Tools" -y -q + sudo yum install postgresql-devel jq -y -q +fi + +success "Installed program dependencies!" + +heading "Installing PostgreSQL..." + +if [[ ! -z $DEB ]]; then + sudo apt-get update + sudo apt-get install postgresql postgresql-contrib -y +elif [[ ! -z $RPM ]]; then + sudo yum install postgresql-server postgresql-contrib -y + + if [[ "$SYS" == "SystemV" ]]; then + sudo service postgresql initdb + sudo service postgresql start + else + sudo postgresql-setup initdb + sudo systemctl start postgresql + fi +fi + +success "Installed PostgreSQL!" + +heading "Installing NTP..." + +sudo timedatectl set-ntp off > /dev/null 2>&1 # disable the default systemd timesyncd service + +if [[ ! -z $DEB ]]; then + sudo apt-get install ntp -yyq +elif [[ ! -z $RPM ]]; then + sudo yum install ntp -y -q +fi + +sudo ntpd -gq + +success "Installed NTP!" + +heading "Installing system updates..." + +if [[ ! -z $DEB ]]; then + sudo apt-get update + sudo apt-get upgrade -yqq + sudo apt-get dist-upgrade -yq + sudo apt-get autoremove -yyq + sudo apt-get autoclean -yq +elif [[ ! -z $RPM ]]; then + sudo yum update + sudo yum clean +fi + +success "Installed system updates!" + +heading "Installing Ark Core..." + +cd /home/vagrant +git clone https://github.com/ArkEcosystem/core.git ark-core -b develop +cd ark-core +yarn setup + +success "Installed Ark Core!" diff --git a/vagrant/centos/6/Vagrantfile b/vagrant/centos/6/Vagrantfile new file mode 100644 index 0000000000..9875fd01f9 --- /dev/null +++ b/vagrant/centos/6/Vagrantfile @@ -0,0 +1,10 @@ +Vagrant.configure("2") do |config| + config.vm.box = "centos/6" + config.vm.provision :shell, path: "../../bootstrap.sh" + config.vm.network "private_network", ip: "192.168.33.10" + config.vm.provider "virtualbox" do |vb| + vb.memory = "2048" + vb.cpus = 2 + end + config.vm.synced_folder "../../../", "/vagrant" +end diff --git a/vagrant/centos/7/Vagrantfile b/vagrant/centos/7/Vagrantfile new file mode 100644 index 0000000000..c8ff6351a0 --- /dev/null +++ b/vagrant/centos/7/Vagrantfile @@ -0,0 +1,10 @@ +Vagrant.configure("2") do |config| + config.vm.box = "centos/7" + config.vm.provision :shell, path: "../../bootstrap.sh" + config.vm.network "private_network", ip: "192.168.33.10" + config.vm.provider "virtualbox" do |vb| + vb.memory = "2048" + vb.cpus = 2 + end + config.vm.synced_folder "../../../", "/vagrant" +end diff --git a/vagrant/debian/8_10/Vagrantfile b/vagrant/debian/8_10/Vagrantfile new file mode 100644 index 0000000000..fe3da6e05a --- /dev/null +++ b/vagrant/debian/8_10/Vagrantfile @@ -0,0 +1,10 @@ +Vagrant.configure("2") do |config| + config.vm.box = "debian/jessie64" + config.vm.provision :shell, path: "../../bootstrap.sh" + config.vm.network "private_network", ip: "192.168.33.10" + config.vm.provider "virtualbox" do |vb| + vb.memory = "2048" + vb.cpus = 2 + end + config.vm.synced_folder "../../../", "/vagrant" +end diff --git a/vagrant/debian/9_4/Vagrantfile b/vagrant/debian/9_4/Vagrantfile new file mode 100644 index 0000000000..90617eb861 --- /dev/null +++ b/vagrant/debian/9_4/Vagrantfile @@ -0,0 +1,10 @@ +Vagrant.configure("2") do |config| + config.vm.box = "debian/stretch64" + config.vm.provision :shell, path: "../../bootstrap.sh" + config.vm.network "private_network", ip: "192.168.33.10" + config.vm.provider "virtualbox" do |vb| + vb.memory = "2048" + vb.cpus = 2 + end + config.vm.synced_folder "../../../", "/vagrant" +end diff --git a/vagrant/ubuntu/16_04/Vagrantfile b/vagrant/ubuntu/16_04/Vagrantfile new file mode 100644 index 0000000000..dde69cd9cd --- /dev/null +++ b/vagrant/ubuntu/16_04/Vagrantfile @@ -0,0 +1,10 @@ +Vagrant.configure("2") do |config| + config.vm.box = "ubuntu/xenial64" + config.vm.provision :shell, path: "../../bootstrap.sh" + config.vm.network "private_network", ip: "192.168.33.10" + config.vm.provider "virtualbox" do |vb| + vb.memory = "2048" + vb.cpus = 2 + end + config.vm.synced_folder "../../../", "/vagrant" +end diff --git a/vagrant/ubuntu/18_04/Vagrantfile b/vagrant/ubuntu/18_04/Vagrantfile new file mode 100644 index 0000000000..abeb29f2b2 --- /dev/null +++ b/vagrant/ubuntu/18_04/Vagrantfile @@ -0,0 +1,10 @@ +Vagrant.configure("2") do |config| + config.vm.box = "ubuntu/bionic64" + config.vm.provision :shell, path: "../../bootstrap.sh" + config.vm.network "private_network", ip: "192.168.33.10" + config.vm.provider "virtualbox" do |vb| + vb.memory = "2048" + vb.cpus = 2 + end + config.vm.synced_folder "../../../", "/vagrant" +end