Skip to content
This repository has been archived by the owner on Oct 28, 2022. It is now read-only.

Commit

Permalink
Add rlp to support new version of testnet (MetaMask#57)
Browse files Browse the repository at this point in the history 
* Add: new version of local lite

* Add: missing svg file

* Add: use new version of testnet

* Fix: e2e test
  • Loading branch information
@yqrashawn
yqrashawn committed Mar 27, 2020
1 parent 4860e5f commit fe145ed
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 40 deletions.
3 changes: 3 additions & 0 deletions app/images/broken-line.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions app/images/permissions-check.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion app/scripts/controllers/transactions/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,8 @@ class TransactionController extends EventEmitter {
code = await this.query.getCode(to)
} catch (e) {
code = null
log.warn(e)
// conflux fullnode will return a error here if it's not a contract addr
// log.warn(e)
}

const codeIsEmpty = !code || code === '0x' || code === '0x0'
Expand Down
2 changes: 1 addition & 1 deletion development/local-node.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const ganacheserver = new Ganache({ verbose: true, genBlockInterval: 300 })
{
secretKey:
'0xCA17316C298AC00F746B5F90330191EB08FC446A1A8A91D1F97E1F9588DBDD91',
balance: 100000000000000000000000,
balance: 1e23,
},
],
})
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
"gaba": "^1.9.3",
"human-standard-token-abi": "^2.0.0",
"jazzicon": "^2.0.0",
"js-conflux-sdk": "^0.7.5",
"js-conflux-sdk": "^0.8.0-alpha",
"json-rpc-engine": "^5.1.6",
"json-rpc-middleware-stream": "^2.1.1",
"jsonschema": "^1.2.4",
Expand Down Expand Up @@ -198,7 +198,7 @@
"@storybook/addon-knobs": "^5.2.8",
"@storybook/react": "^5.2.8",
"@storybook/storybook-deployer": "^2.8.1",
"@yqrashawn/conflux-local-network-lite": "^1.0.4",
"@yqrashawn/conflux-local-network-lite": "^2.0.0-beta",
"@yqrashawn/conflux-portal-onboarding": "^0.2.0-alpha",
"addons-linter": "1.14.0",
"babel-eslint": "^10.0.2",
Expand Down
1 change: 0 additions & 1 deletion test/e2e/metamask-ui.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,6 @@ describe('MetaMask', function () {
const navigationElement = await driver.findElement(
By.css('.confirm-page-container-navigation')
)
await driver.delay(tinyDelayMs / 2)
const navigationText = await navigationElement.getText()
assert.equal(navigationText.includes('3'), true, 'transaction confirmed')
await driver.clickElement(By.xpath(`//a[contains(text(), 'Reject 3')]`))
Expand Down
89 changes: 54 additions & 35 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2731,23 +2731,23 @@
pify "^3.0.0"
safe-event-emitter "^1.0.1"

"@yqrashawn/conflux-local-network-lite@^1.0.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@yqrashawn/conflux-local-network-lite/-/conflux-local-network-lite-1.0.4.tgz#c8792a46729f6fec4627711efe54f0ad47c49805"
integrity sha512-8Ewdcs1eWFeFFLoc8iJoaYl95y5f8KYiUQc8J5FRiLvd8dtsgi6GYTnymZa/JjIKpp40y90sLVSc82Zz1wHI+Q==
"@yqrashawn/conflux-local-network-lite@^2.0.0-beta":
version "2.0.0-beta"
resolved "https://registry.yarnpkg.com/@yqrashawn/conflux-local-network-lite/-/conflux-local-network-lite-2.0.0-beta.tgz#c00e449b62726eaed768bfa2123086ec228a6458"
integrity sha512-b6qa3HTNRoIWocwIKz9ey2UvHnH+4JshCChkdGm1MSPcyp08WY+QcvDgwJfZ4C0Mr7qLzfSEFnfnOxm+jYxd9w==
dependencies:
ethereumjs-util "^6.2.0"
express "^4.17.1"
express-async-errors "^3.1.1"
got "^10.2.2"
jayson "^3.2.0"
js-conflux-sdk "^0.4.0-beta"
make-dir "^3.0.0"
js-conflux-sdk "^0.8.0-alpha"
make-dir "^3.0.2"
platform-is "^1.0.4"
rimraf "^3.0.1"
sleep-promise "^8.0.1"
tmp "^0.1.0"
unzip-stream "^0.3.0"
unzipper "^0.10.10"

"@yqrashawn/conflux-portal-inpage-provider@^4.0.8":
version "4.0.8"
Expand Down Expand Up @@ -5015,6 +5015,11 @@ better-assert@~1.0.0:
dependencies:
callsite "1.0.0"

big-integer@^1.6.17:
version "1.6.48"
resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==

big.js@^3.1.3:
version "3.2.0"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
Expand All @@ -5030,11 +5035,6 @@ bignumber.js@^4.1.0:
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1"
integrity sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==

bignumber.js@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075"
integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==

"bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2":
version "2.0.7"
resolved "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
Expand Down Expand Up @@ -5101,7 +5101,7 @@ binary-extensions@^2.0.0:
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==

binary@^0.3.0:
binary@~0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"
integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=
Expand Down Expand Up @@ -5192,6 +5192,11 @@ bluebird@^3.5.5:
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==

bluebird@~3.4.1:
version "3.4.7"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=

bn.js@4.11.6:
version "4.11.6"
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
Expand Down Expand Up @@ -5645,6 +5650,11 @@ buffer-from@^1.0.0:
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==

buffer-indexof-polyfill@~1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.1.tgz#a9fb806ce8145d5428510ce72f278bb363a638bf"
integrity sha1-qfuAbOgUXVQoUQznLyeLs2OmOL8=

buffer-to-arraybuffer@^0.0.5:
version "0.0.5"
resolved "https://registry.yarnpkg.com/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz#6064a40fa76eb43c723aba9ef8f6e1216d10511a"
Expand Down Expand Up @@ -15145,21 +15155,10 @@ js-beautify@^1.10.2:
mkdirp "~0.5.1"
nopt "~4.0.1"

js-conflux-sdk@^0.4.0-beta:
version "0.4.1"
resolved "https://registry.yarnpkg.com/js-conflux-sdk/-/js-conflux-sdk-0.4.1.tgz#2c961c27ac0e59ea9050c36eaf76f01c007842d9"
integrity sha512-D6dfrHDz5lfRb2Ufn40M8KNESql4Vd3wmqJ108sK30+3lWhxMfG5i5PUPpNq1+j0kLNcoKOPmS0081LR/1wP5w==
dependencies:
bignumber.js "^9.0.0"
keccak "^2.0.0"
lodash "^4.17.15"
secp256k1 "^3.7.1"
superagent "^5.1.0"

js-conflux-sdk@^0.7.5:
version "0.7.5"
resolved "https://registry.yarnpkg.com/js-conflux-sdk/-/js-conflux-sdk-0.7.5.tgz#5d47c33664156f16f61ad18e70ab172f97760e4e"
integrity sha512-NCo3b10+KDlXDlioKrPPk4DrYehX85+vVb944c0+uSPcy6ZHSWMu0vM7O5vu6M4o27rYhcfEJHxz7F2Au8N3pw==
js-conflux-sdk@^0.8.0-alpha:
version "0.8.0-alpha"
resolved "https://registry.yarnpkg.com/js-conflux-sdk/-/js-conflux-sdk-0.8.0-alpha.tgz#7d76ee0c0b658d9080489cbc84be48b0ce2b42fe"
integrity sha512-BAWAs2xL8mN5GsqNQGAACz47J/seXfwM4v4S9BNms5tOvfHNOE2vgGlae0fQVyvrDzhVDBUxsQqvPyWkc7uYNw==
dependencies:
"@babel/runtime" "^7.8.4"
esm "^3.2.25"
Expand Down Expand Up @@ -16234,6 +16233,11 @@ lint-staged@>=8:
string-argv "0.3.1"
stringify-object "^3.3.0"

listenercount@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"
integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=

listr-silent-renderer@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
Expand Down Expand Up @@ -16878,6 +16882,13 @@ make-dir@^3.0.0:
dependencies:
semver "^6.0.0"

make-dir@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz#04a1acbf22221e1d6ef43559f43e05a90dbb4392"
integrity sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==
dependencies:
semver "^6.0.0"

make-iterator@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
Expand Down Expand Up @@ -22828,7 +22839,7 @@ setimmediate@1.0.4:
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.4.tgz#20e81de622d4a02588ce0c8da8973cbcf1d3138f"
integrity sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=

setimmediate@^1.0.4, setimmediate@^1.0.5:
setimmediate@^1.0.4, setimmediate@^1.0.5, setimmediate@~1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
Expand Down Expand Up @@ -25534,13 +25545,21 @@ unzip-response@^2.0.1:
resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=

unzip-stream@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/unzip-stream/-/unzip-stream-0.3.0.tgz#c30c054cd6b0d64b13a23cd3ece911eb0b2b52d8"
integrity sha512-NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A==
unzipper@^0.10.10:
version "0.10.10"
resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.10.10.tgz#d82d41fbdfa1f0731123eb11c2cfc028b45d3d42"
integrity sha512-wEgtqtrnJ/9zIBsQb8UIxOhAH1eTHfi7D/xvmrUoMEePeI6u24nq1wigazbIFtHt6ANYXdEVTvc8XYNlTurs7A==
dependencies:
binary "^0.3.0"
mkdirp "^0.5.1"
big-integer "^1.6.17"
binary "~0.3.0"
bluebird "~3.4.1"
buffer-indexof-polyfill "~1.0.0"
duplexer2 "~0.1.4"
fstream "^1.0.12"
graceful-fs "^4.2.2"
listenercount "~1.0.1"
readable-stream "~2.3.6"
setimmediate "~1.0.4"

upath@1.2.0:
version "1.2.0"
Expand Down

0 comments on commit fe145ed

Please sign in to comment.