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

Merge pull request #3518 from ethcore/ng-solc-combined-fix

Browse Source 
ABI can be empty and auto-fill contract name
This commit is contained in:
Gav Wood 2016-11-19 02:50:23 +08:00 committed by GitHub
commit c9d1eb085c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/modals/DeployContract/DetailsStep/detailsStep.js
View File

@ -103,7 +103,7 @@ export default class DetailsStep extends Component {
label='contract name' label='contract name'
hint='a name for the deployed contract' hint='a name for the deployed contract'
error={ nameError } error={ nameError }
value={ name } value={ name || '' }
onChange={ this.onNameChange } /> onChange={ this.onNameChange } />
<Input <Input
@ -169,6 +169,10 @@ export default class DetailsStep extends Component {
const contractName = Object.keys(contracts)[index]; const contractName = Object.keys(contracts)[index];
const contract = contracts[contractName]; const contract = contracts[contractName];
if (!this.props.name || this.props.name.trim() === '') {
this.onNameChange(null, contractName);
}
const { abi, bin } = contract; const { abi, bin } = contract;
const code = /^0x/.test(bin) ? bin : `0x${bin}`; const code = /^0x/.test(bin) ? bin : `0x${bin}`;

2
js/src/util/validation.js
View File

@ -37,7 +37,7 @@ export function validateAbi (abi, api) {
try { try {
abiParsed = JSON.parse(abi); abiParsed = JSON.parse(abi);
if (!api.util.isArray(abiParsed) || !abiParsed.length) { if (!api.util.isArray(abiParsed)) {
abiError = ERRORS.invalidAbi; abiError = ERRORS.invalidAbi;
return { abi, abiError, abiParsed }; return { abi, abiError, abiParsed };
} }