grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into ng-accounts-backup

Browse Source
This commit is contained in:
Nicolas Gotchac
2016-10-26 18:43:05 +02:00
parent e018739ba9 e449477f23
commit 6b2cffd312
76 changed files with 824 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/src/api/contract/contract.spec.js
View File

@@ -173,12 +173,12 @@ describe('api/contract/Contract', () => {
expect(log.event).to.equal('Message');
expect(log.address).to.equal('0x22bff18ec62281850546a664bb63a5c06ac5f76c');
expect(log.params).to.deep.equal({
at: new BigNumber('1457965151'),
message: 'post(message)',
messageId: new BigNumber('281474976731085'),
parentId: new BigNumber(0),
postId: new BigNumber('281474976731104'),
sender: '0x63Cf90D3f0410092FC0fca41846f596223979195'
at: { type: 'uint', value: new BigNumber('1457965151') },
message: { type: 'string', value: 'post(message)' },
messageId: { type: 'uint', value: new BigNumber('281474976731085') },
parentId: { type: 'uint', value: new BigNumber(0) },
postId: { type: 'uint', value: new BigNumber('281474976731104') },
sender: { type: 'address', value: '0x63Cf90D3f0410092FC0fca41846f596223979195' }
});
});
});
@@ -464,12 +464,12 @@ describe('api/contract/Contract', () => {
event: 'Message',
logIndex: new BigNumber(0),
params: {
at: new BigNumber(1457965151),
message: 'post(message)',
messageId: new BigNumber(281474976731085),
parentId: new BigNumber(0),
postId: new BigNumber(281474976731104),
sender: '0x63Cf90D3f0410092FC0fca41846f596223979195'
at: { type: 'uint', value: new BigNumber(1457965151) },
message: { type: 'string', value: 'post(message)' },
messageId: { type: 'uint', value: new BigNumber(281474976731085) },
parentId: { type: 'uint', value: new BigNumber(0) },
postId: { type: 'uint', value: new BigNumber(281474976731104) },
sender: { type: 'address', value: '0x63Cf90D3f0410092FC0fca41846f596223979195' }
},
topics: [
'0x954ba6c157daf8a26539574ffa64203c044691aa57251af95f4b48d85ec00dd5', '0x0000000000000000000000000000000000000000000000000001000000004fe0'

35
js/src/api/transport/ws/ws.js
View File

@@ -93,21 +93,30 @@ export default class Ws extends JsonRpcBase {
}
_onMessage = (event) => {
const result = JSON.parse(event.data);
const { method, params, json, resolve, reject } = this._messages[result.id];
Logging.send(method, params, { json, result });
if (result.error) {
this.error(event.data);
reject(new Error(`${result.error.code}: ${result.error.message}`));
delete this._messages[result.id];
return;
// Event sent by Signer Broadcaster
if (event.data === 'new_message') {
return false;
}
resolve(result.result);
delete this._messages[result.id];
try {
const result = JSON.parse(event.data);
const { method, params, json, resolve, reject } = this._messages[result.id];
Logging.send(method, params, { json, result });
if (result.error) {
this.error(event.data);
reject(new Error(`${result.error.code}: ${result.error.message}`));
delete this._messages[result.id];
return;
}
resolve(result.result);
delete this._messages[result.id];
} catch (e) {
console.error('ws::_onMessage', event.data, e);
}
}
_send = (id) => {

2
js/src/dapps/basiccoin.html
View File

@@ -10,7 +10,7 @@
<div id="container"></div>
<script src="vendor.js"></script>
<script src="commons.js"></script>
<script src="parity.js"></script>
<script src="/parity-utils/parity.js"></script>
<script src="basiccoin.js"></script>
</body>
</html>

2
js/src/dapps/gavcoin.html
View File

@@ -10,7 +10,7 @@
<div id="container"></div>
<script src="vendor.js"></script>
<script src="commons.js"></script>
<script src="parity.js"></script>
<script src="/parity-utils/parity.js"></script>
<script src="gavcoin.js"></script>
</body>
</html>

2
js/src/dapps/gavcoin/Loading/loading.js
View File

@@ -24,7 +24,7 @@ export default class Loading extends Component {
render () {
return (
<div className={ styles.loading }>
<CircularProgress size={ 2 } />
<CircularProgress size={ 120 } thickness={ 7 } />
</div>
);
}

2
js/src/dapps/githubhint.html
View File

@@ -10,7 +10,7 @@
<div id="container"></div>
<script src="vendor.js"></script>
<script src="commons.js"></script>
<script src="parity.js"></script>
<script src="/parity-utils/parity.js"></script>
<script src="githubhint.js"></script>
</body>
</html>

2
js/src/dapps/registry.html
View File

@@ -10,7 +10,7 @@
<div id="container"></div>
<script src="vendor.js"></script>
<script src="commons.js"></script>
<script src="parity.js"></script>
<script src="/parity-utils/parity.js"></script>
<script src="registry.js"></script>
</body>
</html>

2
js/src/dapps/registry/Application/application.js
View File

@@ -79,7 +79,7 @@ export default class Application extends Component {
</p>
</div>
) : (
<CircularProgress size={ 1 } />
<CircularProgress size={ 60 } />
) }
</div>
);

2
js/src/dapps/signaturereg.html
View File

@@ -10,7 +10,7 @@
<div id="container"></div>
<script src="vendor.js"></script>
<script src="commons.js"></script>
<script src="parity.js"></script>
<script src="/parity-utils/parity.js"></script>
<script src="signaturereg.js"></script>
</body>
</html>

2
js/src/dapps/tokenreg.html
View File

@@ -10,7 +10,7 @@
<div id="container"></div>
<script src="vendor.js"></script>
<script src="commons.js"></script>
<script src="parity.js"></script>
<script src="/parity-utils/parity.js"></script>
<script src="tokenreg.js"></script>
</body>
</html>

4
js/src/dapps/tokenreg/Loading/loading.js
View File

@@ -25,9 +25,11 @@ export default class Loading extends Component {
};
render () {
const size = (this.props.size || 2) * 60;
return (
<div className={ styles.loading }>
<CircularProgress size={ this.props.size || 2 } />
<CircularProgress size={ size } />
</div>
);
}

2
js/src/dev.parity.html
View File

@@ -7,6 +7,6 @@
<title>dev::Parity.js</title>
</head>
<body>
<script src="parity.js"></script>
<script src="/parity-utils/parity.js"></script>
</body>
</html>

2
js/src/dev.web3.html
View File

@@ -7,6 +7,6 @@
<title>dev::Web3</title>
</head>
<body>
<script src="inject.js"></script>
<script src="/parity-utils/web3.js"></script>
</body>
</html>

8
js/src/environment/index.js
View File

@@ -19,7 +19,13 @@
import './tests';
const parityNode = process.env.NODE_ENV === 'production' ? 'http://127.0.0.1:8080' : '';
const parityNode = (
process.env.PARITY_URL && `http://${process.env.PARITY_URL}`
) || (
process.env.NODE_ENV === 'production'
? 'http://127.0.0.1:8080'
: ''
);
export {
parityNode

2
js/src/modals/EditMeta/editMeta.js
View File

@@ -137,7 +137,7 @@ export default class EditMeta extends Component {
onTagsInputChange = (value) => {
const { meta } = this.state;
const { tags } = meta || [];
const { tags = [] } = meta;
const tokens = value.split(/[\s,;]+/);

4
js/src/ui/Container/container.css
View File

@@ -15,15 +15,17 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.container {
flex: 1;
padding: 0em;
background: rgba(0, 0, 0, 0.8) !important;
}
.compact,
.padded {
background: rgba(0, 0, 0, 0.8) !important;
border-radius: 0 !important;
position: relative;
overflow: auto;
background-color: transparent !important;
}
.compact {

4
js/src/views/Dapps/Summary/summary.js
View File

@@ -39,8 +39,8 @@ export default class Summary extends Component {
}
const url = `/app/${app.builtin ? 'global' : 'local'}/${app.url || app.id}`;
const image = app.image
? <img src={ app.image } className={ styles.image } />
const image = app.image || app.iconUrl
? <img src={ app.image || `http://127.0.0.1:8080/${app.id}/${app.iconUrl}` } className={ styles.image } />
: <div className={ styles.image }>&nbsp;</div>;
return (

3
js/src/views/ParityBar/parityBar.css
View File

@@ -43,7 +43,7 @@
.expanded {
right: 16px;
width: 964px;
height: 288px;
height: 300px;
border-radius: 4px 4px 0 0;
overflow-y: auto;
display: flex;
@@ -53,6 +53,7 @@
.expanded .content {
flex: 1;
overflow: auto;
display: flex;
}
.corner {

2
js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
View File

@@ -80,7 +80,7 @@ export default class TransactionFinished extends Component {
if (!chain || !fromBalance || !toBalance) {
return (
<div className={ `${styles.container} ${className}` }>
<CircularProgress size={ 1 } />
<CircularProgress size={ 60 } />
</div>
);
}

2
js/src/views/Signer/components/TransactionPending/TransactionPending.js
View File

@@ -81,7 +81,7 @@ export default class TransactionPending extends Component {
if (!this.state.chain) {
return (
<div className={ `${styles.container} ${className}` }>
<CircularProgress size={ 1 } />
<CircularProgress size={ 60 } />
</div>
);
}

0
js/src/inject.js → js/src/web3.js
View File