Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Add inject.js (for web3 exposed) #2692

Merged
merged 1 commit into from
Oct 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
"store": "^1.3.20",
"utf8": "^2.1.1",
"validator": "^5.7.0",
"web3": "^0.17.0-beta",
"whatwg-fetch": "^1.0.0"
}
}
12 changes: 12 additions & 0 deletions js/src/dev.parity.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>dev::Parity.js</title>
</head>
<body>
<script src="parity.js"></script>
</body>
</html>
12 changes: 12 additions & 0 deletions js/src/dev.web3.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>dev::Web3</title>
</head>
<body>
<script src="inject.js"></script>
</body>
</html>
27 changes: 27 additions & 0 deletions js/src/inject.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2015, 2016 Ethcore (UK) Ltd.
// This file is part of Parity.

// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

import Web3 from 'web3';
import web3extensions from './util/web3.extensions';

import './dev.web3.html';

const http = new Web3.providers.HttpProvider('/rpc/');
const web3 = new Web3(http);

web3extensions(web3).map((extension) => web3._extend(extension));

global.web3 = web3;
2 changes: 2 additions & 0 deletions js/src/parity.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ es6Promise.polyfill();

import Api from './api';

import './dev.parity.html';

const api = new Api(new Api.Transport.Http('/rpc/'));

window.parity = {
Expand Down
67 changes: 67 additions & 0 deletions js/src/util/web3.extensions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// Copyright 2015, 2016 Ethcore (UK) Ltd.
// This file is part of Parity.

// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

export default function web3extensions (web3) {
const { Method, formatters } = web3._extend;

return [{
property: 'personal',
methods: [
new Method({
name: 'signAndSendTransaction',
call: 'personal_signAndSendTransaction',
params: 2,
inputFormatter: [formatters.inputTransactionFormatter, null]
}),
new Method({
name: 'signerEnabled',
call: 'personal_signerEnabled',
params: 0,
inputFormatter: []
})
],
properties: []
}, {
property: 'ethcore',
methods: [
new Method({
name: 'getNetPeers',
call: 'ethcore_netPeers',
params: 0,
outputFormatter: x => x
}),
new Method({
name: 'getNetChain',
call: 'ethcore_netChain',
params: 0,
outputFormatter: x => x
}),
new Method({
name: 'gasPriceStatistics',
call: 'ethcore_gasPriceStatistics',
params: 0,
outputFormatter: a => a.map(web3.toBigNumber)
}),
new Method({
name: 'unsignedTransactionsCount',
call: 'ethcore_unsignedTransactionsCount',
params: 0,
inputFormatter: []
})
],
properties: []
}];
}
1 change: 1 addition & 0 deletions js/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module.exports = {
'signaturereg': ['./dapps/signaturereg.js'],
'tokenreg': ['./dapps/tokenreg.js'],
// library
'inject': ['./inject.js'],
'parity': ['./parity.js'],
// app
'index': ['./index.js']
Expand Down