Skip to content

Commit

Permalink
dev2master (#228)
Browse files Browse the repository at this point in the history
* App: Support new subscriptions module (#220)

* app: support new subscriptions module

* shared: add fs import on artifacts

* shared: fix artifacts paths generation

* chore: changed URLs from *.eth.aragon.network to *.backend.aragon.org

* removing heartbeat (#223)

* removing heartbeat

* [cicd] updates github container registry
removes deployment step

Co-authored-by: Mathias Scherer <[email protected]>

* [cicd] adds workflow for rinkeby image (#224)

* updates yarn.lock file (#226)

* adds etherumjs-wallet as dependency (#227)

fixes import of etherumjs-wallet in get-wallet-from-pk.js

Co-authored-by: Facu Spagnuolo <[email protected]>
Co-authored-by: Martynas Prokopas <[email protected]>
Co-authored-by: Ramon Canales <[email protected]>
  • Loading branch information
4 people authored Oct 14, 2021
1 parent b8f57c3 commit c108f22
Show file tree
Hide file tree
Showing 3 changed files with 2,939 additions and 2,835 deletions.
4 changes: 2 additions & 2 deletions packages/shared/helpers/get-wallet-from-pk.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const { isValidPrivate } = require('ethereumjs-util')
const { fromPrivateKey } = require('ethereumjs-wallet')
const Wallet = require('ethereumjs-wallet')

module.exports = function (key) {
const privateKey = Buffer.from(key.replace('0x', ''), 'hex')
if (!isValidPrivate(privateKey)) throw Error('Given private key is not valid')
return fromPrivateKey(privateKey)
return Wallet.default.fromPrivateKey(privateKey)
}
3 changes: 2 additions & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@
"author": "Aragon One",
"license": "(GPL-3.0-or-later OR AGPL-3.0-or-later)",
"dependencies": {
"@aragon/contract-helpers-test": "^0.1.0",
"@aragon/court": "1.2.0-rc.0",
"@aragon/minime": "1.0.0",
"@aragon/contract-helpers-test": "^0.1.0",
"@aragon/truffle-config-v5": "^1.0.1",
"@aragonone/erc20-faucet": "^1.0.0",
"@aragonone/precedence-campaign-arbitrable": "^1.0.0",
"@truffle/config": "1.2.7",
"axios": "^0.19.0",
"chalk": "^2.4.2",
"dotenv": "^8.2.0",
"ethereumjs-wallet": "^1.0.2",
"ethers": "^4.0.46",
"graphql-request": "^1.8.2",
"postmark": "^2.5.3",
Expand Down
Loading

0 comments on commit c108f22

Please sign in to comment.