Skip to content
This repository was archived by the owner on May 24, 2022. It is now read-only.

fix: Fix small bugs after hasty merge #498

Merged
Tbaut merged 6 commits into from
Apr 8, 2019
Merged

fix: Fix small bugs after hasty merge #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
680bff8
Revert @parity/* bump
amaury1093 Apr 8, 2019
90710f9
Fix blockscout link
amaury1093 Apr 8, 2019
42cae06
Pass down ws-origins flag
amaury1093 Apr 8, 2019
c9a4e22
Fix again: use transactionHash
amaury1093 Apr 8, 2019
f8168af
Update maintainers
amaury1093 Apr 8, 2019
eb22ff2
Fix broken image in prod
amaury1093 Apr 8, 2019
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
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
"private": true,
"author": "Parity Team <admin@parity.io>",
"maintainers": [
"Jaco Greeff",
"Amaury Martiny"
"Axel Chalon",
"Amaury Martiny",
"Thibaut Sardan",
"Luke Schoen"
],
"contributors": [],
"license": "BSD-3-Clause",
Expand Down
6 changes: 4 additions & 2 deletions packages/fether-electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
"private": true,
"author": "Parity Team <admin@parity.io>",
"maintainers": [
"Jaco Greeff",
"Amaury Martiny"
"Axel Chalon",
"Amaury Martiny",
"Thibaut Sardan",
"Luke Schoen"
],
"contributors": [],
"license": "BSD-3-Clause",
Expand Down
4 changes: 2 additions & 2 deletions packages/fether-electron/src/main/app/cli/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ cli
// We want to ignore some flags and not pass them down to Parity:
// --inspect: `electron-webpack dev` runs Electron with the `--inspect` flag for HMR
// -psn_*: https://github.com/paritytech/fether/issues/188
// --ws-interface: we don't pass down this flag, because fether only allows 127.0.0.1 as WS interface
.filter(
arg =>
!arg.startsWith('--inspect') &&
!arg.startsWith('-psn_') &&
!arg.startsWith('--ws-interface') &&
!arg.startsWith('--ws-origins')
!arg.startsWith('--ws-interface')
)
);

Expand Down
3 changes: 2 additions & 1 deletion packages/fether-electron/src/main/app/methods/setupGlobals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
//
// SPDX-License-Identifier: BSD-3-Clause

import { DEFAULT_WS_PORT, TRUSTED_LOOPBACK } from '../constants';
import { DEFAULT_WS_PORT, IS_PROD, TRUSTED_LOOPBACK } from '../constants';
import cli from '../cli';

function setupGlobals () {
// Globals for fether-react parityStore
global.IS_PROD = IS_PROD;
global.defaultWsInterface = TRUSTED_LOOPBACK;
global.defaultWsPort = DEFAULT_WS_PORT;
global.wsPort = cli.wsPort;
Expand Down
2 changes: 1 addition & 1 deletion packages/fether-electron/static/preload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

const { ipcRenderer, remote } = require('electron');

const IS_PROD = process.env.NODE_ENV === 'production';
const IS_PROD = remote.getGlobal('IS_PROD');

function init () {
console.log(
Expand Down
16 changes: 9 additions & 7 deletions packages/fether-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
"private": true,
"author": "Parity Team <admin@parity.io>",
"maintainers": [
"Jaco Greeff",
"Amaury Martiny"
"Axel Chalon",
"Amaury Martiny",
"Thibaut Sardan",
"Luke Schoen"
],
"contributors": [],
"license": "BSD-3-Clause",
Expand Down Expand Up @@ -35,11 +37,11 @@
},
"dependencies": {
"@craco/craco": "^4.0.0",
"@parity/abi": "^5.1.1",
"@parity/api": "^5.1.1",
"@parity/contracts": "^5.1.1",
"@parity/light.js": "^5.1.1",
"@parity/light.js-react": "^5.1.1",
"@parity/abi": "5.1.1",
"@parity/api": "5.1.1",
"@parity/contracts": "5.1.1",
"@parity/light.js": "5.1.1",
"@parity/light.js-react": "5.1.1",
"@parity/qr-signer": "^0.3.2",
"bignumber.js": "^8.0.1",
"bip39": "^2.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/fether-react/src/Send/Sent/Sent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ class Sent extends Component {
<a
href={blockscoutTxUrl(
chainName,
txStatus.confirmed.hash,
txStatus.confirmed.transactionHash,
token.address
)}
target='_blank'
Expand Down
8 changes: 5 additions & 3 deletions packages/fether-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
"private": true,
"author": "Parity Team <admin@parity.io>",
"maintainers": [
"Jaco Greeff",
"Amaury Martiny"
"Axel Chalon",
"Amaury Martiny",
"Thibaut Sardan",
"Luke Schoen"
],
"contributors": [],
"license": "BSD-3-Clause",
Expand Down Expand Up @@ -56,4 +58,4 @@
"prop-types": "^15.6.1",
"react": "^16.4.0"
}
}
}
60 changes: 43 additions & 17 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1640,6 +1640,15 @@
universal-user-agent "^2.0.0"
url-template "^2.0.8"

"@parity/abi@5.1.1":
version "5.1.1"
resolved "https://registry.yarnpkg.com/@parity/abi/-/abi-5.1.1.tgz#a91b1483ef969ede7c1a29c59fa5dd39b4880f51"
integrity sha512-in+1ubZq69yWgZQzjp8SLcwnhKSqV4LLpzjbDA4lJsE/BJtsCndJ8HWBjiv690Ej9v2TgggRyuyrF091j2Eluw==
dependencies:
bignumber.js "^8.0.1"
js-sha3 "0.8.0"
utf8 "^3.0.0"

"@parity/abi@^5.1.1", "@parity/abi@^5.1.3":
version "5.1.3"
resolved "https://registry.yarnpkg.com/@parity/abi/-/abi-5.1.3.tgz#0503b3e541c6e02824f86000cef6fca0a0d9ab81"
Expand All @@ -1649,7 +1658,24 @@
js-sha3 "0.8.0"
utf8 "^3.0.0"

"@parity/api@^5.1.1", "@parity/api@^5.1.3":
"@parity/api@5.1.1":
version "5.1.1"
resolved "https://registry.yarnpkg.com/@parity/api/-/api-5.1.1.tgz#3ac522262f68f23910193b5ab9a37fd261701c14"
integrity sha512-JPngq2ifejXDhAJ4Xhx7vVr5LeDRvsm6UW1QBRIlm8bpqeaAUw9nwoyvxGZC/JUI9Riq4WjaHYGIa6ZRvpd0rg==
dependencies:
"@parity/abi" "^5.1.1"
bignumber.js "^8.0.1"
blockies "0.0.2"
es6-error "4.0.2"
es6-promise "^4.1.1"
eventemitter3 "^3.1.0"
isomorphic-fetch "^2.2.1"
js-sha3 "0.8.0"
lodash "^4.17.11"
store "^2.0.12"
websocket "^1.0.25"

"@parity/api@^5.1.1":
version "5.1.3"
resolved "https://registry.yarnpkg.com/@parity/api/-/api-5.1.3.tgz#c4c1a5c0cbc41d75ad8a58f37a478a09ce5d0ea3"
integrity sha512-UiN2mdgkEIID/rsqRRBn5AMtIPvrXhJhrwGLXL3vWf9EsiF0GfTuIBYqflz0nPTZY1PySa7hi1XwOmnqprdqNg==
Expand All @@ -1666,13 +1692,13 @@
store "^2.0.12"
websocket "^1.0.25"

"@parity/contracts@^5.1.1":
version "5.1.3"
resolved "https://registry.yarnpkg.com/@parity/contracts/-/contracts-5.1.3.tgz#736cc9935117b9d1e86ed094a65fa60de085b6e5"
integrity sha512-TRq0BUUrg61MG9ByTu0UqBySYKncLtR17vx3UV1NKxi9lWS33jYlessEz5CZXr1t5ILt0tN/PYzYe+w1Brm7LQ==
"@parity/contracts@5.1.1":
version "5.1.1"
resolved "https://registry.yarnpkg.com/@parity/contracts/-/contracts-5.1.1.tgz#c00c9a194882850de9ed3646f4bd25e8610d87a8"
integrity sha512-9JFzSGjn5W4tyfpDDznVlErxZiIYRp0e4uzIqAerPQOKFvZZdw00NVHUJkwLcoXJmwIMQQxy/X2ZByQSY3x1TQ==
dependencies:
"@parity/abi" "^5.1.3"
"@parity/api" "^5.1.3"
"@parity/abi" "^5.1.1"
"@parity/api" "^5.1.1"
bignumber.js "^8.0.1"

"@parity/electron@^5.1.0":
Expand All @@ -1694,21 +1720,21 @@
resolved "https://registry.yarnpkg.com/@parity/erc681/-/erc681-0.1.1.tgz#0ade5233751011c15d5e75bd2bb583a9ba450a5e"
integrity sha512-OGDAWbAcm4mh+wzw6uBYxw0OJtqJ+39W3pOXl0W93d2p/cH7ppfvunwf7irEPw0FPiAIuR/F77nU1zMKNhm8Dg==

"@parity/light.js-react@^5.1.1":
version "5.1.3"
resolved "https://registry.yarnpkg.com/@parity/light.js-react/-/light.js-react-5.1.3.tgz#f7e28a0ecbd05246c99cc3f20b4c8cf96c44210f"
integrity sha512-t7BTy7ECrPJzoXle3gOWurK47+PEltHrfajJStvFgzVG0oyKKyrvb5ro3w2YIOc51L9tfHX0eeS1tuvUeCJLvQ==
"@parity/light.js-react@5.1.1":
version "5.1.1"
resolved "https://registry.yarnpkg.com/@parity/light.js-react/-/light.js-react-5.1.1.tgz#1b5e1b62dd04fa846e8d11971742ec793500fe0c"
integrity sha512-LD05kpHLzhgONeFiGEKrN59LBSmeBzx5NakxBXzu8vixBQt6Cyq5z1gOzg4RtbtkcTrUC7Q02H4DwOh8QJpNmw==
dependencies:
recompose "^0.30.0"
symbol-observable "^1.2.0"

"@parity/light.js@^5.1.1":
version "5.1.3"
resolved "https://registry.yarnpkg.com/@parity/light.js/-/light.js-5.1.3.tgz#cb8b5e22916234cf66d446d7eeaf0f030265f9da"
integrity sha512-SVwGb02QGqlbICqVmg6jqCDW7VMtAzl08YtH9bGFFbYDY9XRyD/bisxnujyecAk9YyduhPUrNu8gLpk+yDrW+Q==
"@parity/light.js@5.1.1":
version "5.1.1"
resolved "https://registry.yarnpkg.com/@parity/light.js/-/light.js-5.1.1.tgz#141f4c168f46208b1caa6273161ad9a8b1675862"
integrity sha512-AJ/klFpim+lKLxYKpIhJL9Btu4OuXs43lfbBK8XA0kXOV6M51vCv5n+sO5oTWVx6IJE3lXuDIc674H9BC4fcvQ==
dependencies:
"@parity/abi" "^5.1.3"
"@parity/api" "^5.1.3"
"@parity/abi" "^5.1.1"
"@parity/api" "^5.1.1"
async-retry "^1.2.3"
bignumber.js "^8.0.1"
debug "^4.1.0"
Expand Down