Commit 2451b4d2 authored by roadscape's avatar roadscape
Browse files

Merge branch 'master' into eonwarped-steemkeychain

parents f11e4995 034137ed
...@@ -30,6 +30,8 @@ module.exports = { ...@@ -30,6 +30,8 @@ module.exports = {
current_reserve_ratio: 200000000, current_reserve_ratio: 200000000,
average_block_size: 15136, average_block_size: 15136,
max_virtual_bandwidth: '264241152000000000000', max_virtual_bandwidth: '264241152000000000000',
vesting_reward_percent: 1500,
// @TODO: add other extended fields from https://github.com/steemit/steem/pull/3484/commits/47dc797f59be23a9db8493958748956b8b73750a
}, },
tag_idx: { tag_idx: {
trending: [ trending: [
......
...@@ -37,6 +37,8 @@ module.exports = { ...@@ -37,6 +37,8 @@ module.exports = {
current_reserve_ratio: 200000000, current_reserve_ratio: 200000000,
average_block_size: 15410, average_block_size: 15410,
max_virtual_bandwidth: '264241152000000000000', max_virtual_bandwidth: '264241152000000000000',
vesting_reward_percent: 1500,
// @TODO: add other extended fields from https://github.com/steemit/steem/pull/3484/commits/47dc797f59be23a9db8493958748956b8b73750a
}, },
current_route: '/', current_route: '/',
}; };
...@@ -24,25 +24,36 @@ module.exports = { ...@@ -24,25 +24,36 @@ module.exports = {
'/market', '/market',
'/~witnesses', '/~witnesses',
'/submit.html', '/submit.html',
'/proposals',
].forEach(path => testHttpGet('localhost', 8080, path, browser)); ].forEach(path => testHttpGet('localhost', 8080, path, browser));
}, },
}; };
const testHttpGet = (host, port, path, browser) => { const testHttpGet = (host, port, path, browser) => {
http http.request(
.request({ {
host, host,
port, port,
path, path,
method: 'GET' method: 'GET',
}, function(res) { },
browser.assert.equal(res.statusCode, 200, `Response for ${path} is 200`); (res) => {
}) browser.assert.equal(
.setTimeout(30000, function() { res.statusCode,
browser.assert.equal(true, false, `request for ${path} took more than 30 seconds`); 200,
}) `Response for ${path} is 200`
.on('error', function (err) { );
browser.assert.equal(true, false, err); }
}) )
.end(); .setTimeout(30000, () => {
browser.assert.equal(
true,
false,
`request for ${path} took more than 30 seconds`
);
})
.on('error', (err) => {
browser.assert.equal(true, false, err);
})
.end();
}; };
...@@ -620,8 +620,8 @@ lodash.keysin@^4.0.0: ...@@ -620,8 +620,8 @@ lodash.keysin@^4.0.0:
resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-4.2.0.tgz#8cc3fb35c2d94acc443a1863e02fa40799ea6f28" resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-4.2.0.tgz#8cc3fb35c2d94acc443a1863e02fa40799ea6f28"
lodash.mergewith@^4.0.0: lodash.mergewith@^4.0.0:
version "4.6.1" version "4.6.2"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
lodash.rest@^4.0.0: lodash.rest@^4.0.0:
version "4.0.5" version "4.0.5"
...@@ -978,8 +978,8 @@ string_decoder@~1.0.3: ...@@ -978,8 +978,8 @@ string_decoder@~1.0.3:
safe-buffer "~5.1.0" safe-buffer "~5.1.0"
stringstream@~0.0.5: stringstream@~0.0.5:
version "0.0.5" version "0.0.6"
resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
supports-color@3.1.2: supports-color@3.1.2:
version "3.1.2" version "3.1.2"
......
{ {
"database_url": "mysql://root:password@127.0.0.1/steemit_dev", "database_url": "mysql://root:password@127.0.0.1/steemit_dev",
"disable_signups": false, "disable_signups": false,
"facebook_app_id": false, "facebook_app_id": false,
"google_analytics_id": false, "google_analytics_id": false,
"helmet": { "helmet": {
"directives": { "directives": {
"childSrc": "'self'", "childSrc": "'self'",
"connectSrc": "'self' steemit.com https://api.steemit.com api.blocktrades.us", "connectSrc":
"defaultSrc": "'self'", "'self' steemit.com https://api.steemit.com https://testnet.steemitdev.com api.blocktrades.us",
"fontSrc": "data: fonts.gstatic.com", "defaultSrc": "'self'",
"frameAncestors": "'none'", "fontSrc": "data: fonts.gstatic.com",
"imgSrc": "* data:", "frameAncestors": "'none'",
"objectSrc": "'none'", "imgSrc": "* data:",
"pluginTypes": "application/pdf", "objectSrc": "'none'",
"scriptSrc": "'self' www.google-analytics.com", "pluginTypes": "application/pdf",
"styleSrc": "'self' 'unsafe-inline' fonts.googleapis.com", "scriptSrc": "'self' www.google-analytics.com",
"reportUri": "/api/v1/csp_violation" "styleSrc": "'self' 'unsafe-inline' fonts.googleapis.com",
"reportUri": "/api/v1/csp_violation"
},
"reportOnly": false,
"setAllHeaders": true
}, },
"reportOnly": false, "img_proxy_prefix": "https://steemitdevimages.com/",
"setAllHeaders": true "ipfs_prefix": false,
}, "mixpanel": false,
"img_proxy_prefix": "https://steemitdevimages.com/", "newrelic": false,
"ipfs_prefix": false, "notify": {
"mixpanel": false, "gcm_key": "google secret key"
"newrelic": false, },
"notify": { "read_only_mode": false,
"gcm_key": "google secret key" "recaptcha": {
}, "secret_key": false,
"read_only_mode": false, "site_key": false
"recaptcha": { },
"secret_key": false, "registrar": {
"site_key": false "account": "-",
}, "fee": "0.5 STEEM",
"registrar": { "delegation": "150250.000000 VESTS",
"account": "-", "signing_key": "5J..."
"fee": "0.5 STEEM", },
"delegation": "150250.000000 VESTS", "requestAccountRecovery": {
"signing_key": "5J..." "recovery_account": "steem",
}, "signing_key": "5J..."
"requestAccountRecovery": { },
"recovery_account": "steem", "sendgrid": {
"signing_key": "5J..." "from": "noreply@example.com",
}, "key": "SG.xxx_yyyy",
"sendgrid": { "templates": {
"from": "noreply@example.com", "confirm_email": false,
"key": "SG.xxx_yyyy", "waiting_list_invite": false
"templates": { }
"confirm_email": false, },
"waiting_list_invite": false "server_session_secret": "exiKdyF+IwRIXJDmtGIl4vWUz4i3eVSISpfZoeYc0s4=",
} "session_cookie_key": "stm-dev",
}, "session_key": "steemses",
"server_session_secret": "exiKdyF+IwRIXJDmtGIl4vWUz4i3eVSISpfZoeYc0s4=", "site_domain": "steemitdev.com",
"session_cookie_key": "stm-dev", "tarantool": {
"session_key": "steemses", "host": "localhost",
"site_domain": "steemitdev.com", "password": "",
"tarantool": { "port": "3301",
"host": "localhost", "username": "guest"
"password": "", },
"port": "3301", "telesign": {
"username": "guest" "customer_id": false,
}, "rest_api_key": false
"telesign": { },
"customer_id": false, "twilio": {
"rest_api_key": false "account_sid": false,
}, "auth_token": false
"twilio": { },
"account_sid": false, "upload_image": false,
"auth_token": false "steemd_connection_client": "https://api.steemit.com",
}, "steemd_connection_server": "https://api.steemit.com",
"upload_image": false, "steemd_use_appbase": false,
"steemd_connection_client": "https://api.steemit.com", "chain_id":
"steemd_connection_server": "https://api.steemit.com", "0000000000000000000000000000000000000000000000000000000000000000",
"steemd_use_appbase": false, "address_prefix": "STM",
"chain_id": "0000000000000000000000000000000000000000000000000000000000000000", "conveyor_posting_wif": false,
"address_prefix": "STM", "conveyor_username": false,
"conveyor_posting_wif": false, "social_url": "https://steemit.com"
"conveyor_username": false,
"social_url": "https://steemit.com"
} }
{ {
"name": "steemit.com", "name": "steemit.com",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/steemit/steemit.com.git" "url": "https://github.com/steemit/steemit.com.git"
}, },
"version": "1.0.0", "version": "1.0.0",
"description": "steemit.com is the koa web server & middleware and react.js in-browser code for the world's first blockchain content + social media monetization platform!", "description": "steemit.com is the koa web server & middleware and react.js in-browser code for the world's first blockchain content + social media monetization platform!",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"build": "NODE_ENV=production webpack --config ./webpack/prod.config.js && rm -rf ./lib && babel src --out-dir lib -Dq", "build": "NODE_ENV=production webpack --config ./webpack/prod.config.js && rm -rf ./lib && babel src --out-dir lib -Dq",
"test": "jest", "test": "jest",
"eslint": "LIST=`git diff-index --name-only HEAD | grep .*\\.js | grep -v json`; if [ \"$LIST\" ]; then eslint $LIST; fi", "eslint": "LIST=`git diff-index --name-only HEAD | grep .*\\.js | grep -v json`; if [ \"$LIST\" ]; then eslint $LIST; fi",
"fmt": "prettier --config .prettierrc --write 'src/**/*.js*'", "fmt": "prettier --config .prettierrc --write 'src/**/*.js*'",
"precommit": "lint-staged", "precommit": "lint-staged",
"production": "NODE_ENV=production node lib/server/index.js", "production": "NODE_ENV=production node lib/server/index.js",
"start": "NODE_ENV=development babel-node ./webpack/dev-server.js", "start": "NODE_ENV=development babel-node ./webpack/dev-server.js",
"debug": "NODE_ENV=development webpack --config ./webpack/debug.config.js && rm -rf ./lib && babel src --source-maps --out-dir lib -D && node --inspect-brk lib/server/index.js", "debug": "NODE_ENV=development webpack --config ./webpack/debug.config.js && rm -rf ./lib && babel src --source-maps --out-dir lib -D && node --inspect-brk lib/server/index.js",
"checktranslations": "node scripts/check_translations.js", "checktranslations": "node scripts/check_translations.js",
"storybook": "start-storybook -p 9001 -c .storybook", "storybook": "start-storybook -p 9001 -c .storybook",
"storybook-build": "build-storybook -c .storybook -o docs" "storybook-build": "build-storybook -c .storybook -o docs"
}, },
"author": "Steemit, Inc.", "author": "Steemit, Inc.",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@steem/crypto-session": "git+https://github.com/steemit/crypto-session.git#83a90b319ce5bc6a70362d52a15a815de7e729bb", "@steem/crypto-session": "git+https://github.com/steemit/crypto-session.git#83a90b319ce5bc6a70362d52a15a815de7e729bb",
"@steemit/steem-js": "0.7.4", "@steemit/steem-js": "^0.7.6",
"assert": "1.4.1", "assert": "1.4.1",
"autoprefixer-loader": "3.2.0", "autoprefixer-loader": "3.2.0",
"babel-cli": "6.26.0", "babel-cli": "6.26.0",
"babel-core": "6.26.0", "babel-core": "6.26.0",
"babel-eslint": "6.1.2", "babel-eslint": "6.1.2",
"babel-loader": "7.1.2", "babel-loader": "7.1.2",
"babel-plugin-react-intl": "2.3.1", "babel-plugin-react-intl": "2.3.1",
"babel-plugin-transform-decorators-legacy": "1.3.4", "babel-plugin-transform-decorators-legacy": "1.3.4",
"babel-plugin-transform-inline-environment-variables": "0.2.0", "babel-plugin-transform-inline-environment-variables": "0.2.0",
"babel-plugin-transform-runtime": "6.23.0", "babel-plugin-transform-runtime": "6.23.0",
"babel-preset-es2015": "6.24.1", "babel-preset-es2015": "6.24.1",
"babel-preset-react": "6.24.1", "babel-preset-react": "6.24.1",
"babel-preset-stage-0": "6.24.1", "babel-preset-stage-0": "6.24.1",
"bigi": "1.4.2", "bigi": "1.4.2",
"blocked": "1.2.1", "blocked": "1.2.1",
"blueimp-file-upload": "9.12.6", "blueimp-file-upload": "9.22.1",
"bs58": "3.1.0", "bs58": "3.1.0",
"bytebuffer": "5.0.1", "bytebuffer": "5.0.1",
"bytes": "2.5.0", "bytes": "2.5.0",
"classnames": "2.2.5", "classnames": "2.2.5",
"cluster": "0.7.7", "cluster": "0.7.7",
"co-body": "5.1.1", "co-body": "5.1.1",
"config": "1.26.2", "config": "1.26.2",
"counterpart": "0.17.9", "counterpart": "0.17.9",
"cpu-stat": "2.0.1", "cpu-stat": "2.0.1",
"css-loader": "^2.1.1", "css-loader": "^2.1.1",
"currency-symbol-map": "3.1.0", "currency-symbol-map": "3.1.0",
"diff-match-patch": "1.0.0", "diff-match-patch": "1.0.0",
"disk-stat": "1.0.4", "disk-stat": "1.0.4",
"ecurve": "1.0.5", "ecurve": "1.0.5",
"estraverse-fb": "1.3.2", "estraverse-fb": "1.3.2",
"file-loader": "0.11.2", "file-loader": "0.11.2",
"foundation-sites": "git+https://github.com/steemit/foundation-sites.git#e8e32c715bbc4c822b80b555345f61337269ca78", "foundation-sites": "git+https://github.com/steemit/foundation-sites.git#e8e32c715bbc4c822b80b555345f61337269ca78",
"git-rev-sync": "1.9.1", "git-rev-sync": "1.9.1",
"highcharts": "4.2.7", "highcharts": "4.2.7",
"humanize-number": "0.0.2", "humanize-number": "0.0.2",
"imports-loader": "0.7.1", "imports-loader": "0.7.1",
"intl": "1.2.5", "intl": "1.2.5",
"iso": "5.2.0", "iso": "5.2.0",
"json-loader": "0.5.7", "json-loader": "0.5.7",
"koa": "1.4.1", "koa": "1.4.1",
"koa-body": "1.6.0", "koa-body": "1.6.0",
"koa-compressor": "1.0.3", "koa-compressor": "1.0.3",
"koa-conditional-get": "1.0.4", "koa-conditional-get": "1.0.4",
"koa-csrf": "2.5.0", "koa-csrf": "2.5.0",
"koa-etag": "2.1.2", "koa-etag": "2.1.2",
"koa-favicon": "1.2.1", "koa-favicon": "1.2.1",
"koa-helmet": "1.2.0", "koa-helmet": "1.2.0",
"koa-isbot": "0.1.1", "koa-isbot": "0.1.1",
"koa-locale": "1.3.0", "koa-locale": "1.3.0",
"koa-logger": "1.3.1", "koa-logger": "1.3.1",
"koa-mount": "1.3.0", "koa-mount": "1.3.0",
"koa-proxy": "0.5.0", "koa-proxy": "0.5.0",
"koa-route": "2.4.2", "koa-route": "2.4.2",
"koa-router": "5.4.2", "koa-router": "5.4.2",
"koa-session": "3.4.0", "koa-session": "3.4.0",
"koa-static-cache": "4.1.1", "koa-static-cache": "4.1.1",
"lodash.debounce": "4.0.8", "lodash.debounce": "4.0.8",
"mem-stat": "1.0.5", "mem-stat": "1.0.5",
"minimist": "1.2.0", "minimist": "1.2.0",
"mixpanel": "0.5.0", "mixpanel": "0.5.0",
"mysql": "2.15.0", "moment": "^2.24.0",
"net": "1.0.2", "mysql": "2.15.0",
"node-sass": "4.9.0", "net": "1.0.2",
"os": "0.1.1", "node-sass": "4.9.0",
"picturefill": "3.0.2", "number-abbreviate": "^2.0.0",
"raw-loader": "0.5.1", "os": "0.1.1",
"react": "15.6.2", "picturefill": "3.0.2",
"react-ab-test": "1.7.0", "raw-loader": "0.5.1",
"react-addons-pure-render-mixin": "15.4.2", "react": "15.6.2",
"react-autocomplete": "1.7.2", "react-ab-test": "1.7.0",
"react-copy-to-clipboard": "4.3.1", "react-addons-pure-render-mixin": "15.4.2",
"react-dom": "15.6.2", "react-autocomplete": "1.7.2",
"react-dropzone": "3.13.4", "react-copy-to-clipboard": "4.3.1",
"react-highcharts": "8.4.2", "react-dom": "15.6.2",
"react-intl": "2.4.0", "react-dropzone": "3.13.4",
"react-medium-editor": "1.8.1", "react-highcharts": "8.4.2",
"react-notification": "5.0.7", "react-intl": "2.4.0",
"react-overlays": "0.7.2", "react-medium-editor": "1.8.1",
"react-portal": "2.2.1", "react-notification": "5.0.7",
"react-prop-types": "0.3.2", "react-overlays": "0.7.2",
"react-qr": "0.0.2", "react-portal": "2.2.1",
"react-rangeslider": "2.2.0", "react-prop-types": "0.3.2",
"react-redux": "5.0.6", "react-qr": "0.0.2",
"react-router": "3.2.0", "react-rangeslider": "2.2.0",
"react-router-redux": "4.0.8", "react-redux": "5.0.6",
"react-router-scroll": "0.4.4", "react-router": "3.2.0",
"react-rte-image": "0.3.1", "react-router-redux": "4.0.8",
"react-timeago": "3.4.3", "react-router-scroll": "0.4.4",
"redux": "3.7.2", "react-rte-image": "0.3.1",
"redux-form": "5.3.4", "react-timeago": "3.4.3",
"redux-saga": "0.16.0", "redux": "3.7.2",
"remarkable": "1.7.1", "redux-form": "5.3.4",
"sanitize-html": "1.14.1", "redux-saga": "0.16.0",
"sass-loader": "6.0.6", "remarkable": "1.7.1",
"secure-random": "1.1.1", "sanitize-html": "1.14.1",
"sendgrid": "4.10.0", "sass-loader": "6.0.6",
"sequelize": "3.33.0", "secure-random": "1.1.1",
"sequelize-cli": "3.2.0", "sendgrid": "4.10.0",
"speakingurl": "9.0.0", "sequelize": "3.33.0",
"sqlite3": "4.0.1", "sequelize-cli": "3.2.0",
"statsd-client": "0.4.2", "speakingurl": "9.0.0",
"steemscript": "1.1.0", "sqlite3": "4.0.9",
"store": "1.3.20", "statsd-client": "0.4.2",
"style-loader": "0.18.2", "steemscript": "1.1.0",
"svg-inline-loader": "0.8.0", "store": "1.3.20",
"svg-inline-react": "1.0.3", "style-loader": "0.18.2",
"svgo-loader": "1.2.1", "svg-inline-loader": "0.8.0",
"twilio": "3.17.0", "svg-inline-react": "1.0.3",
"uncontrollable": "3.3.1", "svgo-loader": "1.2.1",
"underscore.string": "3.3.4", "twilio": "3.17.0",
"url-loader": "0.6.2", "uncontrollable": "3.3.1",
"web-push": "3.2.3", "underscore.string": "3.3.5",
"webpack": "3.7.1", "url-loader": "0.6.2",
"webpack-dev-middleware": "1.12.0", "web-push": "3.2.3",
"webpack-isomorphic-tools": "3.0.5", "webpack": "3.7.1",
"websocket": "1.0.24", "webpack-dev-middleware": "1.12.0",
"whatwg-fetch": "0.11.1", "webpack-isomorphic-tools": "3.0.5",
"xmldom": "0.1.27" "websocket": "1.0.24",
}, "whatwg-fetch": "0.11.1",
"devDependencies": { "xmldom": "0.1.27"
"babel-jest": "22.0.6", },
"babel-plugin-transform-decorators-legacy": "1.3.4", "devDependencies": {
"co-supertest": "0.0.10", "babel-jest": "22.0.6",
"dev-ip": "1.0.1", "babel-plugin-transform-decorators-legacy": "1.3.4",
"enzyme": "3.3.0", "co-supertest": "0.0.10",
"enzyme-adapter-react-15": "1.0.5", "dev-ip": "1.0.1",
"escope": "3.6.0", "enzyme": "3.3.0",
"eslint": "4.8.0", "enzyme-adapter-react-15": "1.0.5",
"eslint-config-airbnb": "15.1.0", "escope": "3.6.0",
"eslint-plugin-babel": "4.1.2", "eslint": "4.18.2",
"eslint-plugin-import": "2.7.0", "eslint-config-airbnb": "15.1.0",
"eslint-plugin-jsx-a11y": "6.0.2", "eslint-plugin-babel": "4.1.2",
"eslint-plugin-react": "7.4.0", "eslint-plugin-import": "2.7.0",
"extract-text-webpack-plugin": "3.0.1", "eslint-plugin-jsx-a11y": "6.0.2",
"husky": "0.14.3", "eslint-plugin-react": "7.4.0",
"jest": "22.0.6", "extract-text-webpack-plugin": "3.0.1",
"jsdom": "9.12.0", "husky": "0.14.3",
"koa-webpack-dev-middleware": "1.4.6", "jest": "22.0.6",