Skip to content

B
baas-ide
Commit f738864d authored by chriseth's avatar chriseth
Browse files
Options

Merge pull request #51 from ethereum/use-standard-js

Use formatting according to 'istandard'
parents 7cd61b16 60ebbee3
Show whitespace changes
Inline Side-by-side
Showing with 519 additions and 433 deletions
background.js
View file @ f738864d
chrome.browserAction.onClicked.addListener(function(tab) { chrome.browserAction.onClicked.addListener(function (tab) {
chrome.storage.sync.set({"chrome-app-sync": true}); chrome.storage.sync.set({ 'chrome-app-sync' : true });
chrome.tabs.create({'url': chrome.extension.getURL('index.html')}, function(tab) { chrome.tabs.create({ 'url': chrome.extension.getURL('index.html') }, function (tab) {
// tab opened // tab opened
}); });
......
src/app.js
View file @ f738864d
...@@ -11,20 +11,20 @@ var Compiler = require('./app/compiler'); ...@@ -11,20 +11,20 @@ var Compiler = require('./app/compiler');
// The event listener needs to be registered as early as possible, because the // The event listener needs to be registered as early as possible, because the
// parent will send the message upon the "load" event. // parent will send the message upon the "load" event.
var filesToLoad = null; var filesToLoad = null;
var loadFilesCallback = function(files) { filesToLoad = files; }; // will be replaced later var loadFilesCallback = function (files) { filesToLoad = files; }; // will be replaced later
window.addEventListener("message", function(ev) { window.addEventListener('message', function (ev) {
if (typeof ev.data == typeof [] && ev.data[0] === "loadFiles") { if (typeof ev.data === typeof [] && ev.data[0] === 'loadFiles') {
loadFilesCallback(ev.data[1]); loadFilesCallback(ev.data[1]);
} }
}, false); }, false);
var run = function() { var run = function () {
function loadFiles(files) { function loadFiles (files) {
for (var f in files) { for (var f in files) {
var key = utils.fileKey(f); var key = utils.fileKey(f);
var content = files[f].content; var content = files[f].content;
if (key in window.localStorage && window.localStorage[key] != content) { if (key in window.localStorage && window.localStorage[key] !== content) {
var count = ''; var count = '';
var otherKey = key + count; var otherKey = key + count;
while ((key + count) in window.localStorage) count = count - 1; while ((key + count) in window.localStorage) count = count - 1;
...@@ -36,18 +36,19 @@ var run = function() { ...@@ -36,18 +36,19 @@ var run = function() {
updateFiles(); updateFiles();
} }
loadFilesCallback = function(files) { loadFilesCallback = function (files) {
loadFiles(files); loadFiles(files);
}; };
if (filesToLoad !== null) if (filesToLoad !== null) {
loadFiles(filesToLoad); loadFiles(filesToLoad);
}
// ------------------ query params (hash) ---------------- // ------------------ query params (hash) ----------------
function syncQueryParams() { function syncQueryParams () {
$('#optimize').attr( 'checked', (queryParams.get().optimize == "true") ); $('#optimize').attr('checked', (queryParams.get().optimize === 'true'));
} }
window.onhashchange = syncQueryParams; window.onhashchange = syncQueryParams;
...@@ -56,15 +57,15 @@ var run = function() { ...@@ -56,15 +57,15 @@ var run = function() {
// ------------------ gist load ---------------- // ------------------ gist load ----------------
var loadingFromGist = gistHandler.handleLoad(function(gistId) { var loadingFromGist = gistHandler.handleLoad(function (gistId) {
$.ajax({ $.ajax({
url: 'https://api.github.com/gists/'+gistId, url: 'https://api.github.com/gists/' + gistId,
jsonp: 'callback', jsonp: 'callback',
dataType: 'jsonp', dataType: 'jsonp',
success: function(response) { success: function (response) {
if (response.data) { if (response.data) {
if (!response.data.files) { if (!response.data.files) {
alert( "Gist load error: " + response.data.message ); alert('Gist load error: ' + response.data.message);
return; return;
} }
loadFiles(response.data.files); loadFiles(response.data.files);
...@@ -88,9 +89,9 @@ var run = function() { ...@@ -88,9 +89,9 @@ var run = function() {
// ----------------- tabbed menu ------------------- // ----------------- tabbed menu -------------------
$('#options li').click(function(ev){ $('#options li').click(function (ev) {
var $el = $(this); var $el = $(this);
var match = /[a-z]+View/.exec( $el.get(0).className ); var match = /[a-z]+View/.exec($el.get(0).className);
if (!match) return; if (!match) return;
var cls = match[0]; var cls = match[0];
if (!$el.hasClass('active')) { if (!$el.hasClass('active')) {
...@@ -106,11 +107,11 @@ var run = function() { ...@@ -106,11 +107,11 @@ var run = function() {
// ------------------ gist publish -------------- // ------------------ gist publish --------------
$('#gist').click(function(){ $('#gist').click(function () {
if (confirm("Are you sure you want to publish all your files anonymously as a public gist on github.com?")) { if (confirm('Are you sure you want to publish all your files anonymously as a public gist on github.com?')) {
var files = editor.packageFiles(); var files = editor.packageFiles();
var description = "Created using browser-solidity: Realtime Ethereum Contract Compiler and Runtime. \n Load this file by pasting this gists URL or ID at https://ethereum.github.io/browser-solidity/#version=" + queryParams.get().version + "&optimize="+ queryParams.get().optimize +"&gist="; var description = 'Created using browser-solidity: Realtime Ethereum Contract Compiler and Runtime. \n Load this file by pasting this gists URL or ID at https://ethereum.github.io/browser-solidity/#version=' + queryParams.get().version + '&optimize=' + queryParams.get().optimize + '&gist=';
$.ajax({ $.ajax({
url: 'https://api.github.com/gists', url: 'https://api.github.com/gists',
...@@ -120,24 +121,25 @@ var run = function() { ...@@ -120,24 +121,25 @@ var run = function() {
public: true, public: true,
files: files files: files
}) })
}).done(function(response) { }).done(function (response) {
if (response.html_url && confirm("Created a gist at " + response.html_url + " Would you like to open it in a new window?")) { if (response.html_url && confirm('Created a gist at ' + response.html_url + ' Would you like to open it in a new window?')) {
window.open( response.html_url, '_blank' ); window.open(response.html_url, '_blank');
} }
}); });
} }
}); });
$('#copyOver').click(function(){ $('#copyOver').click(function () {
var target = prompt( var target = prompt(
"To which other browser-solidity instance do you want to copy over all files?", 'To which other browser-solidity instance do you want to copy over all files?',
"https://ethereum.github.io/browser-solidity/" 'https://ethereum.github.io/browser-solidity/'
); );
if (target === null) if (target === null) {
return; return;
}
var files = editor.packageFiles(); var files = editor.packageFiles();
var iframe = $('<iframe/>', {src: target, style: "display:none;", load: function() { var iframe = $('<iframe/>', {src: target, style: 'display:none;', load: function () {
this.contentWindow.postMessage(["loadFiles", files], "*"); this.contentWindow.postMessage(['loadFiles', files], '*');
}}).appendTo('body'); }}).appendTo('body');
}); });
...@@ -146,40 +148,40 @@ var run = function() { ...@@ -146,40 +148,40 @@ var run = function() {
var $filesEl = $('#files'); var $filesEl = $('#files');
var FILE_SCROLL_DELTA = 300; var FILE_SCROLL_DELTA = 300;
$('.newFile').on('click', function() { $('.newFile').on('click', function () {
editor.newFile(); editor.newFile();
updateFiles(); updateFiles();
$filesEl.animate({left: Math.max( (0 - activeFilePos() + (FILE_SCROLL_DELTA/2)), 0)+ "px"}, "slow", function(){ $filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () {
reAdjust(); reAdjust();
}); });
}); });
$filesEl.on('click', '.file:not(.active)', showFileHandler); $filesEl.on('click', '.file:not(.active)', showFileHandler);
$filesEl.on('click', '.file.active', function(ev) { $filesEl.on('click', '.file.active', function (ev) {
var $fileTabEl = $(this); var $fileTabEl = $(this);
var originalName = $fileTabEl.find('.name').text(); var originalName = $fileTabEl.find('.name').text();
ev.preventDefault(); ev.preventDefault();
if ($(this).find('input').length > 0) return false; if ($(this).find('input').length > 0) return false;
var $fileNameInputEl = $('<input value="'+originalName+'"/>'); var $fileNameInputEl = $('<input value="' + originalName + '"/>');
$fileTabEl.html($fileNameInputEl); $fileTabEl.html($fileNameInputEl);
$fileNameInputEl.focus(); $fileNameInputEl.focus();
$fileNameInputEl.select(); $fileNameInputEl.select();
$fileNameInputEl.on('blur', handleRename); $fileNameInputEl.on('blur', handleRename);
$fileNameInputEl.keyup(handleRename); $fileNameInputEl.keyup(handleRename);
function handleRename(ev) { function handleRename (ev) {
ev.preventDefault(); ev.preventDefault();
if (ev.which && ev.which !== 13) return false; if (ev.which && ev.which !== 13) return false;
var newName = ev.target.value; var newName = ev.target.value;
$fileNameInputEl.off('blur'); $fileNameInputEl.off('blur');
$fileNameInputEl.off('keyup'); $fileNameInputEl.off('keyup');
if (newName !== originalName && confirm("Are you sure you want to rename: " + originalName + " to " + newName + '?')) { if (newName !== originalName && confirm('Are you sure you want to rename: ' + originalName + ' to ' + newName + '?')) {
var content = window.localStorage.getItem( utils.fileKey(originalName) ); var content = window.localStorage.getItem(utils.fileKey(originalName));
window.localStorage[utils.fileKey( newName )] = content; window.localStorage[utils.fileKey(newName)] = content;
window.localStorage.removeItem( utils.fileKey( originalName) ); window.localStorage.removeItem(utils.fileKey(originalName));
editor.setCacheFile(newName); editor.setCacheFile(newName);
} }
...@@ -190,32 +192,32 @@ var run = function() { ...@@ -190,32 +192,32 @@ var run = function() {
return false; return false;
}); });
$filesEl.on('click', '.file .remove', function(ev) { $filesEl.on('click', '.file .remove', function (ev) {
ev.preventDefault(); ev.preventDefault();
var name = $(this).parent().find('.name').text(); var name = $(this).parent().find('.name').text();
if (confirm("Are you sure you want to remove: " + name + " from local storage?")) { if (confirm('Are you sure you want to remove: ' + name + ' from local storage?')) {
window.localStorage.removeItem( utils.fileKey( name ) ); window.localStorage.removeItem(utils.fileKey(name));
editor.setNextFile(utils.fileKey(name)); editor.setNextFile(utils.fileKey(name));
updateFiles(); updateFiles();
} }
return false; return false;
}); });
function showFileHandler(ev) { function showFileHandler (ev) {
ev.preventDefault(); ev.preventDefault();
editor.setCacheFile($(this).find('.name').text()); editor.setCacheFile($(this).find('.name').text());
updateFiles(); updateFiles();
return false; return false;
} }
function activeFileTab() { function activeFileTab () {
var name = editor.getCacheFile(); var name = editor.getCacheFile();
return $('#files .file').filter(function(){ return $(this).find('.name').text() == name; }); return $('#files .file').filter(function () { return $(this).find('.name').text() === name; });
} }
function updateFiles() { function updateFiles () {
var $filesEl = $('#files'); var $filesEl = $('#files');
var files = editor.getFiles(); var files = editor.getFiles();
...@@ -230,72 +232,72 @@ var run = function() { ...@@ -230,72 +232,72 @@ var run = function() {
active.addClass('active'); active.addClass('active');
editor.resetSession(); editor.resetSession();
} }
$('#input').toggle( editor.cacheFileIsPresent() ); $('#input').toggle(editor.cacheFileIsPresent());
$('#output').toggle( editor.cacheFileIsPresent() ); $('#output').toggle(editor.cacheFileIsPresent());
reAdjust(); reAdjust();
} }
function fileTabTemplate(key) { function fileTabTemplate (key) {
var name = utils.fileNameFromKey(key); var name = utils.fileNameFromKey(key);
return $('<li class="file"><span class="name">'+name+'</span><span class="remove"><i class="fa fa-close"></i></span></li>'); return $('<li class="file"><span class="name">' + name + '</span><span class="remove"><i class="fa fa-close"></i></span></li>');
} }
var $filesWrapper = $('.files-wrapper'); var $filesWrapper = $('.files-wrapper');
var $scrollerRight = $('.scroller-right'); var $scrollerRight = $('.scroller-right');
var $scrollerLeft = $('.scroller-left'); var $scrollerLeft = $('.scroller-left');
function widthOfList (){ function widthOfList () {
var itemsWidth = 0; var itemsWidth = 0;
$('.file').each(function(){ $('.file').each(function () {
var itemWidth = $(this).outerWidth(); var itemWidth = $(this).outerWidth();
itemsWidth += itemWidth; itemsWidth += itemWidth;
}); });
return itemsWidth; return itemsWidth;
} }
function widthOfHidden(){ function widthOfHidden () {
return ($filesWrapper.outerWidth() - widthOfList() - getLeftPosi()); return ($filesWrapper.outerWidth() - widthOfList() - getLeftPosi());
} }
function widthOfVisible(){ function widthOfVisible () {
return $filesWrapper.outerWidth(); return $filesWrapper.outerWidth();
} }
function getLeftPosi(){ function getLeftPosi () {
return $filesEl.position().left; return $filesEl.position().left;
} }
function activeFilePos() { function activeFilePos () {
var el = $filesEl.find('.active'); var el = $filesEl.find('.active');
var l = el.position().left; var l = el.position().left;
return l; return l;
} }
function reAdjust (){ function reAdjust () {
if (widthOfList() + getLeftPosi() > + widthOfVisible()) { if (widthOfList() + getLeftPosi() > + widthOfVisible()) {
$scrollerRight.fadeIn('fast'); $scrollerRight.fadeIn('fast');
} else { } else {
$scrollerRight.fadeOut('fast'); $scrollerRight.fadeOut('fast');
} }
if (getLeftPosi()<0) { if (getLeftPosi() < 0) {
$scrollerLeft.fadeIn('fast'); $scrollerLeft.fadeIn('fast');
} else { } else {
$scrollerLeft.fadeOut('fast'); $scrollerLeft.fadeOut('fast');
$filesEl.animate({left: getLeftPosi() + "px"},'slow'); $filesEl.animate({ left: getLeftPosi() + 'px' }, 'slow');
} }
} }
$scrollerRight.click(function() { $scrollerRight.click(function () {
var delta = (getLeftPosi() - FILE_SCROLL_DELTA); var delta = (getLeftPosi() - FILE_SCROLL_DELTA);
$filesEl.animate({left: delta + "px"},'slow',function(){ $filesEl.animate({ left: delta + 'px' }, 'slow', function () {
reAdjust(); reAdjust();
}); });
}); });
$scrollerLeft.click(function() { $scrollerLeft.click(function () {
var delta = Math.min( (getLeftPosi() + FILE_SCROLL_DELTA), 0 ); var delta = Math.min((getLeftPosi() + FILE_SCROLL_DELTA), 0);
$filesEl.animate({left: delta + "px"},'slow',function(){ $filesEl.animate({ left: delta + 'px' }, 'slow', function () {
reAdjust(); reAdjust();
}); });
}); });
...@@ -307,22 +309,22 @@ var run = function() { ...@@ -307,22 +309,22 @@ var run = function() {
// var soljsonSources is provided by bin/list.js // var soljsonSources is provided by bin/list.js
$('option', '#versionSelector').remove(); $('option', '#versionSelector').remove();
$.each(soljsonSources, function(i, file) { $.each(soljsonSources, function (i, file) {
if (file) { if (file) {
var version = file.replace(/soljson-(.*).js/, "$1"); var version = file.replace(/soljson-(.*).js/, '$1');
$('#versionSelector').append(new Option(version, file)); $('#versionSelector').append(new Option(version, file));
} }
}); });
$('#versionSelector').change(function() { $('#versionSelector').change(function () {
queryParams.update({version: $('#versionSelector').val() }); queryParams.update({ version: $('#versionSelector').val() });
loadVersion($('#versionSelector').val()); loadVersion($('#versionSelector').val());
}); });
// ----------------- resizeable ui --------------- // ----------------- resizeable ui ---------------
var EDITOR_SIZE_CACHE_KEY = "editor-size-cache"; var EDITOR_SIZE_CACHE_KEY = 'editor-size-cache';
var dragging = false; var dragging = false;
$('#dragbar').mousedown(function(e){ $('#dragbar').mousedown(function (e) {
e.preventDefault(); e.preventDefault();
dragging = true; dragging = true;
var main = $('#righthand-panel'); var main = $('#righthand-panel');
...@@ -333,26 +335,26 @@ var run = function() { ...@@ -333,26 +335,26 @@ var run = function() {
} }
}).prependTo('body'); }).prependTo('body');
$(document).mousemove(function(e){ $(document).mousemove(function (e) {
ghostbar.css("left",e.pageX+2); ghostbar.css('left', e.pageX + 2);
}); });
}); });
var $body = $('body'); var $body = $('body');
function setEditorSize (delta) { function setEditorSize (delta) {
$('#righthand-panel').css("width", delta); $('#righthand-panel').css('width', delta);
$('#editor').css("right", delta); $('#editor').css('right', delta);
onResize(); onResize();
} }
function getEditorSize(){ function getEditorSize () {
window.localStorage[EDITOR_SIZE_CACHE_KEY] = $('#righthand-panel').width(); window.localStorage[EDITOR_SIZE_CACHE_KEY] = $('#righthand-panel').width();
} }
$(document).mouseup(function(e){ $(document).mouseup(function (e) {
if (dragging) { if (dragging) {
var delta = $body.width() - e.pageX+2; var delta = $body.width() - e.pageX + 2;
$('#ghostbar').remove(); $('#ghostbar').remove();
$(document).unbind('mousemove'); $(document).unbind('mousemove');
dragging = false; dragging = false;
...@@ -371,19 +373,19 @@ var run = function() { ...@@ -371,19 +373,19 @@ var run = function() {
// ----------------- toggle right hand panel ----------------- // ----------------- toggle right hand panel -----------------
var hidingRHP = false; var hidingRHP = false;
$('.toggleRHP').click(function(){ $('.toggleRHP').click(function () {
hidingRHP = !hidingRHP; hidingRHP = !hidingRHP;
setEditorSize( hidingRHP ? 0 : window.localStorage[EDITOR_SIZE_CACHE_KEY] ); setEditorSize(hidingRHP ? 0 : window.localStorage[EDITOR_SIZE_CACHE_KEY]);
$('.toggleRHP i').toggleClass('fa-angle-double-right', !hidingRHP); $('.toggleRHP i').toggleClass('fa-angle-double-right', !hidingRHP);
$('.toggleRHP i').toggleClass('fa-angle-double-left', hidingRHP); $('.toggleRHP i').toggleClass('fa-angle-double-left', hidingRHP);
if (!hidingRHP) compiler.compile(); if (!hidingRHP) compiler.compile();
}); });
function getHidingRHP() { return hidingRHP; } function getHidingRHP () { return hidingRHP; }
// ----------------- editor resize --------------- // ----------------- editor resize ---------------
function onResize() { function onResize () {
editor.resize(); editor.resize();
reAdjust(); reAdjust();
} }
...@@ -396,27 +398,27 @@ var run = function() { ...@@ -396,27 +398,27 @@ var run = function() {
// ----------------- compiler output renderer ---------------------- // ----------------- compiler output renderer ----------------------
$('.asmOutput button').click(function() {$(this).parent().find('pre').toggle(); }); $('.asmOutput button').click(function () { $(this).parent().find('pre').toggle(); });
// ----------------- compiler ---------------------- // ----------------- compiler ----------------------
function handleGithubCall(root, path, cb) { function handleGithubCall (root, path, cb) {
$('#output').append($('<div/>').append($('<pre/>').text("Loading github.com/" + root + "/" + path + " ..."))); $('#output').append($('<div/>').append($('<pre/>').text('Loading github.com/' + root + '/' + path + ' ...')));
return $.getJSON('https://api.github.com/repos/' + root + '/contents/' + path, cb); return $.getJSON('https://api.github.com/repos/' + root + '/contents/' + path, cb);
} }
var compiler = new Compiler(editor, handleGithubCall, $('#output'), getHidingRHP, updateFiles); var compiler = new Compiler(editor, handleGithubCall, $('#output'), getHidingRHP, updateFiles);
function setVersionText(text) { function setVersionText (text) {
$('#version').text(text); $('#version').text(text);
} }
var loadVersion = function(version) { var loadVersion = function (version) {
setVersionText("(loading)"); setVersionText('(loading)');
queryParams.update({version: version}); queryParams.update({version: version});
var isFirefox = typeof InstallTrigger !== 'undefined'; var isFirefox = typeof InstallTrigger !== 'undefined';
if (document.location.protocol != 'file:' && Worker !== undefined && isFirefox) { if (document.location.protocol !== 'file:' && Worker !== undefined && isFirefox) {
// Workers cannot load js on "file:"-URLs and we get a // Workers cannot load js on "file:"-URLs and we get a
// "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium, // "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium,
// resort to non-worker version in that case. // resort to non-worker version in that case.
...@@ -427,8 +429,8 @@ var run = function() { ...@@ -427,8 +429,8 @@ var run = function() {
var newScript = document.createElement('script'); var newScript = document.createElement('script');
newScript.type = 'text/javascript'; newScript.type = 'text/javascript';
newScript.src = 'https://ethereum.github.io/solc-bin/bin/' + version; newScript.src = 'https://ethereum.github.io/solc-bin/bin/' + version;
document.getElementsByTagName("head")[0].appendChild(newScript); document.getElementsByTagName('head')[0].appendChild(newScript);
var check = window.setInterval(function() { var check = window.setInterval(function () {
if (!Module) return; if (!Module) return;
window.clearInterval(check); window.clearInterval(check);
compiler.onCompilerLoaded(setVersionText); compiler.onCompilerLoaded(setVersionText);
...@@ -436,9 +438,9 @@ var run = function() { ...@@ -436,9 +438,9 @@ var run = function() {
} }
}; };
loadVersion( queryParams.get().version || 'soljson-latest.js'); loadVersion(queryParams.get().version || 'soljson-latest.js');
document.querySelector('#optimize').addEventListener('change', function(){ document.querySelector('#optimize').addEventListener('change', function () {
queryParams.update({optimize: document.querySelector('#optimize').checked }); queryParams.update({optimize: document.querySelector('#optimize').checked });
compiler.compile(); compiler.compile();
}); });
......
src/app/compiler.js
View file @ f738864d
...@@ -4,7 +4,7 @@ var Renderer = require('./renderer'); ...@@ -4,7 +4,7 @@ var Renderer = require('./renderer');
var Base64 = require('js-base64').Base64; var Base64 = require('js-base64').Base64;
function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles) { function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles) {
var renderer = new Renderer(editor, this, updateFiles); var renderer = new Renderer(editor, this, updateFiles);
var compileJSON; var compileJSON;
...@@ -18,22 +18,25 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles) ...@@ -18,22 +18,25 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles)
var compileTimeout = null; var compileTimeout = null;
function onChange() { function onChange () {
var input = editor.getValue(); var input = editor.getValue();
if (input === "") { if (input === '') {
editor.setCacheFileContent(''); editor.setCacheFileContent('');
return; return;
} }
if (input === previousInput) if (input === previousInput) {
return; return;
}
previousInput = input; previousInput = input;
if (compileTimeout) window.clearTimeout(compileTimeout); if (compileTimeout) {
window.clearTimeout(compileTimeout);
}
compileTimeout = window.setTimeout(compile, 300); compileTimeout = window.setTimeout(compile, 300);
} }
editor.onChangeSetup(onChange); editor.onChangeSetup(onChange);
var compile = function(missingInputs) { var compile = function (missingInputs) {
editor.clearAnnotations(); editor.clearAnnotations();
sourceAnnotations = []; sourceAnnotations = [];
outputField.empty(); outputField.empty();
...@@ -42,7 +45,7 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles) ...@@ -42,7 +45,7 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles)
var files = {}; var files = {};
files[editor.getCacheFile()] = input; files[editor.getCacheFile()] = input;
gatherImports(files, missingInputs, function(input, error) { gatherImports(files, missingInputs, function (input, error) {
outputField.empty(); outputField.empty();
if (input === null) { if (input === null) {
renderer.error(error); renderer.error(error);
...@@ -54,52 +57,52 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles) ...@@ -54,52 +57,52 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles)
}; };
this.compile = compile; this.compile = compile;
this.addAnnotation = function(annotation) { this.addAnnotation = function (annotation) {
sourceAnnotations[sourceAnnotations.length] = annotation; sourceAnnotations[sourceAnnotations.length] = annotation;
editor.setAnnotations(sourceAnnotations); editor.setAnnotations(sourceAnnotations);
}; };
this.setCompileJSON = function() { this.setCompileJSON = function () {
compileJSON = function(source, optimize) { compilationFinished('{}'); }; compileJSON = function (source, optimize) { compilationFinished('{}'); };
}; };
function onCompilerLoaded(setVersionText) { function onCompilerLoaded (setVersionText) {
if (worker === null) { if (worker === null) {
var compile; var compile;
var missingInputs = []; var missingInputs = [];
if ('_compileJSONCallback' in Module) { if ('_compileJSONCallback' in Module) {
compilerAcceptsMultipleFiles = true; compilerAcceptsMultipleFiles = true;
var missingInputsCallback = Module.Runtime.addFunction(function(path, contents, error) { var missingInputsCallback = Module.Runtime.addFunction(function (path, contents, error) {
missingInputs.push(Module.Pointer_stringify(path)); missingInputs.push(Module.Pointer_stringify(path));
}); });
var compileInternal = Module.cwrap("compileJSONCallback", "string", ["string", "number", "number"]); var compileInternal = Module.cwrap('compileJSONCallback', 'string', [ 'string', 'number', 'number' ]);
compile = function(input, optimize) { compile = function (input, optimize) {
missingInputs.length = 0; missingInputs.length = 0;
return compileInternal(input, optimize, missingInputsCallback); return compileInternal(input, optimize, missingInputsCallback);
}; };
} else if ('_compileJSONMulti' in Module) { } else if ('_compileJSONMulti' in Module) {
compilerAcceptsMultipleFiles = true; compilerAcceptsMultipleFiles = true;
compile = Module.cwrap("compileJSONMulti", "string", ["string", "number"]); compile = Module.cwrap('compileJSONMulti', 'string', [ 'string', 'number' ]);
} else { } else {
compilerAcceptsMultipleFiles = false; compilerAcceptsMultipleFiles = false;
compile = Module.cwrap("compileJSON", "string", ["string", "number"]); compile = Module.cwrap('compileJSON', 'string', [ 'string', 'number' ]);
} }
compileJSON = function(source, optimize, cb) { compileJSON = function (source, optimize, cb) {
try { try {
var result = compile(source, optimize); var result = compile(source, optimize);
} catch (exception) { } catch (exception) {
result = JSON.stringify({error: 'Uncaught JavaScript exception:\n' + exception}); result = JSON.stringify({ error: 'Uncaught JavaScript exception:\n' + exception });
} }
compilationFinished(result, missingInputs); compilationFinished(result, missingInputs);
}; };
setVersionText(Module.cwrap("version", "string", [])()); setVersionText(Module.cwrap('version', 'string', [])());
} }
previousInput = ''; previousInput = '';
onChange(); onChange();
}; };
this.onCompilerLoaded = onCompilerLoaded; this.onCompilerLoaded = onCompilerLoaded;
function compilationFinished(result, missingInputs) { function compilationFinished (result, missingInputs) {
var data; var data;
var noFatalErrors = true; // ie warnings are ok var noFatalErrors = true; // ie warnings are ok
...@@ -112,26 +115,32 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles) ...@@ -112,26 +115,32 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles)
if (data['error'] !== undefined) { if (data['error'] !== undefined) {
renderer.error(data['error']); renderer.error(data['error']);
if (utils.errortype(data['error']) !== 'warning') noFatalErrors = false; if (utils.errortype(data['error']) !== 'warning') {
noFatalErrors = false;
}
} }
if (data['errors'] != undefined) { if (data['errors'] !== undefined) {
data['errors'].forEach(function(err) { data['errors'].forEach(function (err) {
renderer.error(err); renderer.error(err);
if (utils.errortype(err) !== 'warning') noFatalErrors = false; if (utils.errortype(err) !== 'warning') {
noFatalErrors = false;
}
}); });
} }
if (missingInputs !== undefined && missingInputs.length > 0) if (missingInputs !== undefined && missingInputs.length > 0) {
compile(missingInputs); compile(missingInputs);
else if (noFatalErrors && !hidingRHP()) } else if (noFatalErrors && !hidingRHP()) {
renderer.contracts(data, editor.getValue()); renderer.contracts(data, editor.getValue());
} }
}
this.initializeWorker = function(version, setVersionText) { this.initializeWorker = function (version, setVersionText) {
if (worker !== null) if (worker !== null) {
worker.terminate(); worker.terminate();
}
worker = new Worker('worker.js'); worker = new Worker('worker.js');
worker.addEventListener('message', function(msg) { worker.addEventListener('message', function (msg) {
var data = msg.data; var data = msg.data;
switch (data.cmd) { switch (data.cmd) {
case 'versionLoaded': case 'versionLoaded':
...@@ -144,18 +153,17 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles) ...@@ -144,18 +153,17 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles)
break; break;
}; };
}); });
worker.onerror = function(msg) { console.log(msg.data); }; worker.onerror = function (msg) { console.log(msg.data); };
worker.addEventListener('error', function(msg) { console.log(msg.data); }); worker.addEventListener('error', function (msg) { console.log(msg.data); });
compileJSON = function(source, optimize) { compileJSON = function (source, optimize) {
worker.postMessage({cmd: 'compile', source: source, optimize: optimize}); worker.postMessage({cmd: 'compile', source: source, optimize: optimize});
}; };
worker.postMessage({cmd: 'loadVersion', data: 'https://ethereum.github.io/solc-bin/bin/' + version}); worker.postMessage({cmd: 'loadVersion', data: 'https://ethereum.github.io/solc-bin/bin/' + version});
}; };
function gatherImports(files, importHints, cb) { function gatherImports (files, importHints, cb) {
importHints = importHints || []; importHints = importHints || [];
if (!compilerAcceptsMultipleFiles) if (!compilerAcceptsMultipleFiles) {
{
cb(files[editor.getCacheFile()]); cb(files[editor.getCacheFile()]);
return; return;
} }
...@@ -166,12 +174,15 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles) ...@@ -166,12 +174,15 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles)
reloop = false; reloop = false;
for (var fileName in files) { for (var fileName in files) {
var match; var match;
while (match = importRegex.exec(files[fileName])) while (match = importRegex.exec(files[fileName])) {
importHints.push(match[1]); importHints.push(match[1]);
} }
}
while (importHints.length > 0) { while (importHints.length > 0) {
var m = importHints.pop(); var m = importHints.pop();
if (m in files) continue; if (m in files) {
continue;
}
if (editor.hasFile(m)) { if (editor.hasFile(m)) {
files[m] = window.localStorage[utils.fileKey(m)]; files[m] = window.localStorage[utils.fileKey(m)];
reloop = true; reloop = true;
...@@ -182,27 +193,26 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles) ...@@ -182,27 +193,26 @@ function Compiler(editor, handleGithubCall, outputField, hidingRHP, updateFiles)
files[m] = cachedRemoteFiles[m]; files[m] = cachedRemoteFiles[m];
reloop = true; reloop = true;
} else if (githubMatch = /^(https?:\/\/)?(www.)?github.com\/([^\/]*\/[^\/]*)\/(.*)/.exec(m)) { } else if (githubMatch = /^(https?:\/\/)?(www.)?github.com\/([^\/]*\/[^\/]*)\/(.*)/.exec(m)) {
handleGithubCall(githubMatch[3], githubMatch[4], function(result) { handleGithubCall(githubMatch[3], githubMatch[4], function (result) {
if ('content' in result) if ('content' in result) {
{
var content = Base64.decode(result.content); var content = Base64.decode(result.content);
cachedRemoteFiles[m] = content; cachedRemoteFiles[m] = content;
files[m] = content; files[m] = content;
gatherImports(files, importHints, cb); gatherImports(files, importHints, cb);
} else {
cb(null, 'Unable to import "' + m + '"');
} }
else }).fail(function () {
cb(null, "Unable to import \"" + m + "\""); cb(null, 'Unable to import "' + m + '"');
}).fail(function(){
cb(null, "Unable to import \"" + m + "\"");
}); });
return; return;
} else { } else {
cb(null, "Unable to import \"" + m + "\""); cb(null, 'Unable to import "' + m + '"');
return; return;
} }
} }
} while (reloop); } while (reloop);
cb(JSON.stringify({'sources':files})); cb(JSON.stringify({ 'sources': files }));
} }
} }
......
src/app/editor.js
View file @ f738864d
...@@ -3,51 +3,52 @@ var utils = require('./utils'); ...@@ -3,51 +3,52 @@ var utils = require('./utils');
var ace = require('brace'); var ace = require('brace');
require('../mode-solidity.js'); require('../mode-solidity.js');
function Editor(loadingFromGist) { function Editor (loadingFromGist) {
this.newFile = function() { this.newFile = function () {
untitledCount = ''; untitledCount = '';
while (window.localStorage[SOL_CACHE_UNTITLED + untitledCount]) while (window.localStorage[SOL_CACHE_UNTITLED + untitledCount]) {
untitledCount = (untitledCount - 0) + 1; untitledCount = (untitledCount - 0) + 1;
}
SOL_CACHE_FILE = SOL_CACHE_UNTITLED + untitledCount; SOL_CACHE_FILE = SOL_CACHE_UNTITLED + untitledCount;
sessions[SOL_CACHE_FILE] = null; sessions[SOL_CACHE_FILE] = null;
this.setCacheFileContent(''); this.setCacheFileContent('');
}; };
this.setCacheFileContent = function(content) { this.setCacheFileContent = function (content) {
window.localStorage.setItem(SOL_CACHE_FILE, content); window.localStorage.setItem(SOL_CACHE_FILE, content);
}; };
this.setCacheFile = function(cacheFile) { this.setCacheFile = function (cacheFile) {
SOL_CACHE_FILE = utils.fileKey(cacheFile); SOL_CACHE_FILE = utils.fileKey(cacheFile);
}; };
this.getCacheFile = function() { this.getCacheFile = function () {
return utils.fileNameFromKey(SOL_CACHE_FILE); return utils.fileNameFromKey(SOL_CACHE_FILE);
}; };
this.cacheFileIsPresent = function() { this.cacheFileIsPresent = function () {
return !!SOL_CACHE_FILE; return !!SOL_CACHE_FILE;
}; };
this.setNextFile = function(fileKey) { this.setNextFile = function (fileKey) {
var index = this.getFiles().indexOf( fileKey ); var index = this.getFiles().indexOf(fileKey);
this.setCacheFile(this.getFiles()[ Math.max(0, index - 1)]); this.setCacheFile(this.getFiles()[ Math.max(0, index - 1) ]);
}; };
this.resetSession = function() { this.resetSession = function () {
editor.setSession( sessions[SOL_CACHE_FILE] ); editor.setSession(sessions[SOL_CACHE_FILE]);
editor.focus(); editor.focus();
}; };
this.hasFile = function(name) { this.hasFile = function (name) {
return this.getFiles().indexOf(utils.fileKey(name)) !== -1 return this.getFiles().indexOf(utils.fileKey(name)) !== -1
}; };
this.getFiles = function() { this.getFiles = function () {
var files = []; var files = [];
for (var f in localStorage ) { for (var f in localStorage) {
if (f.indexOf( utils.getCacheFilePrefix(), 0 ) === 0) { if (f.indexOf(utils.getCacheFilePrefix(), 0) === 0) {
files.push(f); files.push(f);
if (!sessions[f]) sessions[f] = newEditorSession(f); if (!sessions[f]) sessions[f] = newEditorSession(f);
} }
...@@ -55,7 +56,7 @@ function Editor(loadingFromGist) { ...@@ -55,7 +56,7 @@ function Editor(loadingFromGist) {
return files; return files;
} }
this.packageFiles = function() { this.packageFiles = function () {
var files = {}; var files = {};
var filesArr = this.getFiles(); var filesArr = this.getFiles();
...@@ -67,47 +68,47 @@ function Editor(loadingFromGist) { ...@@ -67,47 +68,47 @@ function Editor(loadingFromGist) {
return files; return files;
}; };
this.resize = function() { this.resize = function () {
editor.resize(); editor.resize();
var session = editor.getSession(); var session = editor.getSession();
session.setUseWrapMode(document.querySelector('#editorWrap').checked); session.setUseWrapMode(document.querySelector('#editorWrap').checked);
if(session.getUseWrapMode()) { if (session.getUseWrapMode()) {
var characterWidth = editor.renderer.characterWidth; var characterWidth = editor.renderer.characterWidth;
var contentWidth = editor.container.ownerDocument.getElementsByClassName("ace_scroller")[0].clientWidth; var contentWidth = editor.container.ownerDocument.getElementsByClassName('ace_scroller')[0].clientWidth;
if(contentWidth > 0) { if (contentWidth > 0) {
session.setWrapLimit(parseInt(contentWidth / characterWidth, 10)); session.setWrapLimit(parseInt(contentWidth / characterWidth, 10));
} }
} }
}; };
this.getValue = function() { this.getValue = function () {
return editor.getValue(); return editor.getValue();
}; };
this.clearAnnotations = function() { this.clearAnnotations = function () {
editor.getSession().clearAnnotations(); editor.getSession().clearAnnotations();
}; };
this.setAnnotations = function(sourceAnnotations) { this.setAnnotations = function (sourceAnnotations) {
editor.getSession().setAnnotations(sourceAnnotations); editor.getSession().setAnnotations(sourceAnnotations);
}; };
this.onChangeSetup = function(onChange) { this.onChangeSetup = function (onChange) {
editor.getSession().on('change', onChange); editor.getSession().on('change', onChange);
editor.on('changeSession', function(){ editor.on('changeSession', function () {
editor.getSession().on('change', onChange); editor.getSession().on('change', onChange);
onChange(); onChange();
}) })
}; };
this.handleErrorClick = function(errLine, errCol) { this.handleErrorClick = function (errLine, errCol) {
editor.focus(); editor.focus();
editor.gotoLine(errLine + 1, errCol - 1, true); editor.gotoLine(errLine + 1, errCol - 1, true);
}; };
function newEditorSession(filekey) { function newEditorSession (filekey) {
var s = new ace.EditSession(window.localStorage[filekey], "ace/mode/javascript") var s = new ace.EditSession(window.localStorage[filekey], 'ace/mode/javascript')
s.setUndoManager(new ace.UndoManager()); s.setUndoManager(new ace.UndoManager());
s.setTabSize(4); s.setTabSize(4);
s.setUseSoftTabs(true); s.setUseSoftTabs(true);
...@@ -115,13 +116,14 @@ function Editor(loadingFromGist) { ...@@ -115,13 +116,14 @@ function Editor(loadingFromGist) {
return s; return s;
} }
function setupStuff(files) { function setupStuff (files) {
var untitledCount = ''; var untitledCount = '';
if (!files.length || window.localStorage['sol-cache']) { if (!files.length || window.localStorage['sol-cache']) {
if(loadingFromGist) return; if (loadingFromGist) return;
// Backwards-compatibility // Backwards-compatibility
while (window.localStorage[SOL_CACHE_UNTITLED + untitledCount]) while (window.localStorage[SOL_CACHE_UNTITLED + untitledCount]) {
untitledCount = (untitledCount - 0) + 1; untitledCount = (untitledCount - 0) + 1;
}
SOL_CACHE_FILE = SOL_CACHE_UNTITLED + untitledCount; SOL_CACHE_FILE = SOL_CACHE_UNTITLED + untitledCount;
window.localStorage[SOL_CACHE_FILE] = window.localStorage['sol-cache'] || BALLOT_EXAMPLE; window.localStorage[SOL_CACHE_FILE] = window.localStorage['sol-cache'] || BALLOT_EXAMPLE;
window.localStorage.removeItem('sol-cache'); window.localStorage.removeItem('sol-cache');
...@@ -133,14 +135,14 @@ function Editor(loadingFromGist) { ...@@ -133,14 +135,14 @@ function Editor(loadingFromGist) {
sessions[files[x]] = newEditorSession(files[x]) sessions[files[x]] = newEditorSession(files[x])
} }
editor.setSession( sessions[SOL_CACHE_FILE] ); editor.setSession(sessions[SOL_CACHE_FILE]);
editor.resize(true); editor.resize(true);
} }
var SOL_CACHE_UNTITLED = utils.getCacheFilePrefix() + 'Untitled'; var SOL_CACHE_UNTITLED = utils.getCacheFilePrefix() + 'Untitled';
var SOL_CACHE_FILE = null; var SOL_CACHE_FILE = null;
var editor = ace.edit("input"); var editor = ace.edit('input');
var sessions = {}; var sessions = {};
setupStuff(this.getFiles()); setupStuff(this.getFiles());
......
src/app/gist-handler.js
View file @ f738864d
var queryParams = require('./query-params'); var queryParams = require('./query-params');
function handleLoad(cb) { function handleLoad (cb) {
var params = queryParams.get(); var params = queryParams.get();
var loadingFromGist = false; var loadingFromGist = false;
if (typeof params['gist'] != undefined) { if (typeof params['gist'] !== undefined) {
var gistId; var gistId;
if (params['gist'] === '') { if (params['gist'] === '') {
var str = prompt("Enter the URL or ID of the Gist you would like to load."); var str = prompt('Enter the URL or ID of the Gist you would like to load.');
if (str !== '') { if (str !== '') {
gistId = getGistId( str ); gistId = getGistId(str);
loadingFromGist = !!gistId; loadingFromGist = !!gistId;
} }
} else { } else {
gistId = params['gist']; gistId = params['gist'];
loadingFromGist = !!gistId; loadingFromGist = !!gistId;
} }
if (loadingFromGist) cb(gistId); if (loadingFromGist) {
cb(gistId);
}
} }
return loadingFromGist; return loadingFromGist;
} }
function getGistId(str) { function getGistId (str) {
var idr = /[0-9A-Fa-f]{8,}/; var idr = /[0-9A-Fa-f]{8,}/;
var match = idr.exec(str); var match = idr.exec(str);
return match ? match[0] : null; return match ? match[0] : null;
......
src/app/query-params.js
View file @ f738864d
function getQueryParams() { function getQueryParams () {
var qs = window.location.hash.substr(1); var qs = window.location.hash.substr(1);
if (window.location.search.length > 0) { if (window.location.search.length > 0) {
// use legacy query params instead of hash // use legacy query params instead of hash
window.location.hash = window.location.search.substr(1); window.location.hash = window.location.search.substr(1);
window.location.search = ""; window.location.search = '';
} }
var params = {}; var params = {};
var parts = qs.split("&"); var parts = qs.split('&');
for (var x in parts) { for (var x in parts) {
var keyValue = parts[x].split("="); var keyValue = parts[x].split('=');
if (keyValue[0] !== "") params[keyValue[0]] = keyValue[1]; if (keyValue[0] !== '') {
params[keyValue[0]] = keyValue[1];
}
} }
return params; return params;
} }
function updateQueryParams(params) { function updateQueryParams (params) {
var currentParams = getQueryParams(); var currentParams = getQueryParams();
var keys = Object.keys(params); var keys = Object.keys(params);
for (var x in keys) { for (var x in keys) {
currentParams[keys[x]] = params[keys[x]]; currentParams[keys[x]] = params[keys[x]];
} }
var queryString = "#"; var queryString = '#';
var updatedKeys = Object.keys(currentParams); var updatedKeys = Object.keys(currentParams);
for( var y in updatedKeys) { for (var y in updatedKeys) {
queryString += updatedKeys[y] + "=" + currentParams[updatedKeys[y]] + "&"; queryString += updatedKeys[y] + '=' + currentParams[updatedKeys[y]] + '&';
} }
window.location.hash = queryString.slice(0, -1); window.location.hash = queryString.slice(0, -1);
} }
......
src/app/renderer.js
View file @ f738864d
...@@ -5,15 +5,15 @@ var UniversalDApp = require('../universal-dapp.js'); ...@@ -5,15 +5,15 @@ var UniversalDApp = require('../universal-dapp.js');
var utils = require('./utils'); var utils = require('./utils');
function Renderer(editor, compiler, updateFiles) { function Renderer (editor, compiler, updateFiles) {
var detailsOpen = {}; var detailsOpen = {};
var executionContext = 'vm'; var executionContext = 'vm';
// Forcing all of this setup into its own scope. // Forcing all of this setup into its own scope.
(function(){ (function () {
function executionContextChange (ev) { function executionContextChange (ev) {
if (ev.target.value == 'web3' && !confirm("Are you sure you want to connect to a local ethereum node?") ) { if (ev.target.value === 'web3' && !confirm('Are you sure you want to connect to a local ethereum node?')) {
$vmToggle.get(0).checked = true; $vmToggle.get(0).checked = true;
executionContext = 'vm'; executionContext = 'vm';
} else { } else {
...@@ -23,42 +23,46 @@ function Renderer(editor, compiler, updateFiles) { ...@@ -23,42 +23,46 @@ function Renderer(editor, compiler, updateFiles) {
compiler.compile(); compiler.compile();
} }
function setProviderFromEndpoint() { function setProviderFromEndpoint () {
var endpoint = $web3endpoint.val(); var endpoint = $web3endpoint.val();
if (endpoint == 'ipc') if (endpoint === 'ipc') {
web3.setProvider(new web3.providers.IpcProvider()); web3.setProvider(new web3.providers.IpcProvider());
else } else {
web3.setProvider(new web3.providers.HttpProvider(endpoint)); web3.setProvider(new web3.providers.HttpProvider(endpoint));
} }
}
var $vmToggle = $('#vm'); var $vmToggle = $('#vm');
var $web3Toggle = $('#web3'); var $web3Toggle = $('#web3');
var $web3endpoint = $('#web3Endpoint'); var $web3endpoint = $('#web3Endpoint');
if (web3.providers && web3.currentProvider instanceof web3.providers.IpcProvider) if (web3.providers && web3.currentProvider instanceof web3.providers.IpcProvider) {
$web3endpoint.val('ipc'); $web3endpoint.val('ipc');
}
$vmToggle.get(0).checked = true; $vmToggle.get(0).checked = true;
$vmToggle.on('change', executionContextChange ); $vmToggle.on('change', executionContextChange);
$web3Toggle.on('change', executionContextChange ); $web3Toggle.on('change', executionContextChange);
$web3endpoint.on('change', function() { $web3endpoint.on('change', function () {
setProviderFromEndpoint(); setProviderFromEndpoint();
if (executionContext == 'web3') compiler.compile(); if (executionContext === 'web3') {
compiler.compile();
}
}); });
})(); })();
function renderError(message) { function renderError (message) {
var type = utils.errortype(message); var type = utils.errortype(message);
var $pre = $("<pre />").text(message); var $pre = $('<pre />').text(message);
var $error = $('<div class="sol ' + type + '"><div class="close"><i class="fa fa-close"></i></div></div>').prepend($pre); var $error = $('<div class="sol ' + type + '"><div class="close"><i class="fa fa-close"></i></div></div>').prepend($pre);
$('#output').append( $error ); $('#output').append($error);
var err = message.match(/^([^:]*):([0-9]*):(([0-9]*):)? /); var err = message.match(/^([^:]*):([0-9]*):(([0-9]*):)? /);
if (err) { if (err) {
var errFile = err[1]; var errFile = err[1];
var errLine = parseInt(err[2], 10) - 1; var errLine = parseInt(err[2], 10) - 1;
var errCol = err[4] ? parseInt(err[4], 10) : 0; var errCol = err[4] ? parseInt(err[4], 10) : 0;
if (errFile == '' || errFile == editor.getCacheFile()) { if (errFile === '' || errFile === editor.getCacheFile()) {
compiler.addAnnotation({ compiler.addAnnotation({
row: errLine, row: errLine,
column: errCol, column: errCol,
...@@ -66,16 +70,16 @@ function Renderer(editor, compiler, updateFiles) { ...@@ -66,16 +70,16 @@ function Renderer(editor, compiler, updateFiles) {
type: type type: type
}); });
} }
$error.click(function(ev){ $error.click(function (ev) {
if (errFile != '' && errFile != editor.getCacheFile() && editor.hasFile(errFile)) { if (errFile !== '' && errFile !== editor.getCacheFile() && editor.hasFile(errFile)) {
// Switch to file // Switch to file
editor.setCacheFile(errFile); editor.setCacheFile(errFile);
updateFiles(); updateFiles();
//@TODO could show some error icon in files with errors // @TODO could show some error icon in files with errors
} }
editor.handleErrorClick(errLine, errCol); editor.handleErrorClick(errLine, errCol);
}); });
$error.find('.close').click(function(ev){ $error.find('.close').click(function (ev) {
ev.preventDefault(); ev.preventDefault();
$error.remove(); $error.remove();
return false; return false;
...@@ -84,11 +88,11 @@ function Renderer(editor, compiler, updateFiles) { ...@@ -84,11 +88,11 @@ function Renderer(editor, compiler, updateFiles) {
}; };
this.error = renderError; this.error = renderError;
var combined = function(contractName, jsonInterface, bytecode){ var combined = function (contractName, jsonInterface, bytecode) {
return JSON.stringify([{name: contractName, interface: jsonInterface, bytecode: bytecode}]); return JSON.stringify([{ name: contractName, interface: jsonInterface, bytecode: bytecode }]);
}; };
function renderContracts(data, source) { function renderContracts (data, source) {
var udappContracts = []; var udappContracts = [];
for (var contractName in data.contracts) { for (var contractName in data.contracts) {
...@@ -104,19 +108,19 @@ function Renderer(editor, compiler, updateFiles) { ...@@ -104,19 +108,19 @@ function Renderer(editor, compiler, updateFiles) {
mode: executionContext === 'vm' ? 'vm' : 'web3', mode: executionContext === 'vm' ? 'vm' : 'web3',
web3: web3, web3: web3,
removable: false, removable: false,
getAddress: function(){ return $('#txorigin').val(); }, getAddress: function () { return $('#txorigin').val(); },
getValue: function(){ getValue: function () {
var comp = $('#value').val().split(' '); var comp = $('#value').val().split(' ');
return web3.toWei(comp[0], comp.slice(1).join(' ')); return web3.toWei(comp[0], comp.slice(1).join(' '));
}, },
removable_instances: true, removable_instances: true,
renderOutputModifier: function(contractName, $contractOutput) { renderOutputModifier: function (contractName, $contractOutput) {
var contract = data.contracts[contractName]; var contract = data.contracts[contractName];
return $contractOutput return $contractOutput
.append(textRow('Bytecode', contract.bytecode)) .append(textRow('Bytecode', contract.bytecode))
.append(textRow('Interface', contract['interface'])) .append(textRow('Interface', contract['interface']))
.append(textRow('Web3 deploy', gethDeploy(contractName.toLowerCase(),contract['interface'],contract.bytecode), 'deploy')) .append(textRow('Web3 deploy', gethDeploy(contractName.toLowerCase(), contract['interface'], contract.bytecode), 'deploy'))
.append(textRow('uDApp', combined(contractName,contract['interface'],contract.bytecode), 'deploy')) .append(textRow('uDApp', combined(contractName, contract['interface'], contract.bytecode), 'deploy'))
.append(getDetails(contract, source, contractName)); .append(getDetails(contract, source, contractName));
} }
}); });
...@@ -125,43 +129,46 @@ function Renderer(editor, compiler, updateFiles) { ...@@ -125,43 +129,46 @@ function Renderer(editor, compiler, updateFiles) {
var $txOrigin = $('#txorigin'); var $txOrigin = $('#txorigin');
function renderAccounts(err, accounts) { function renderAccounts (err, accounts) {
if (err) if (err) {
renderError(err.message); renderError(err.message);
if (accounts && accounts[0]){ }
if (accounts && accounts[0]) {
$txOrigin.empty(); $txOrigin.empty();
for( var a in accounts) { $txOrigin.append($('<option />').val(accounts[a]).text(accounts[a])); } for (var a in accounts) { $txOrigin.append($('<option />').val(accounts[a]).text(accounts[a])); }
$txOrigin.val(accounts[0]); $txOrigin.val(accounts[0]);
} else $txOrigin.val('unknown'); } else {
$txOrigin.val('unknown');
}
} }
dapp.getAccounts(renderAccounts); dapp.getAccounts(renderAccounts);
$contractOutput.find('.title').click(function(ev){ $(this).closest('.contract').toggleClass('hide'); }); $contractOutput.find('.title').click(function (ev) { $(this).closest('.contract').toggleClass('hide'); });
$('#output').append( $contractOutput ); $('#output').append($contractOutput);
$('.col2 input,textarea').click(function() { this.select(); }); $('.col2 input,textarea').click(function () { this.select(); });
}; };
this.contracts = renderContracts; this.contracts = renderContracts;
var tableRowItems = function(first, second, cls) { var tableRowItems = function (first, second, cls) {
return $('<div class="crow"/>') return $('<div class="crow"/>')
.addClass(cls) .addClass(cls)
.append($('<div class="col1">').append(first)) .append($('<div class="col1">').append(first))
.append($('<div class="col2">').append(second)); .append($('<div class="col2">').append(second));
}; };
var tableRow = function(description, data) { var tableRow = function (description, data) {
return tableRowItems( return tableRowItems(
$('<span/>').text(description), $('<span/>').text(description),
$('<input readonly="readonly"/>').val(data)); $('<input readonly="readonly"/>').val(data));
}; };
var textRow = function(description, data, cls) { var textRow = function (description, data, cls) {
return tableRowItems( return tableRowItems(
$('<strong/>').text(description), $('<strong/>').text(description),
$('<textarea readonly="readonly" class="gethDeployText"/>').val(data), $('<textarea readonly="readonly" class="gethDeployText"/>').val(data),
cls); cls);
}; };
var getDetails = function(contract, source, contractName) { var getDetails = function (contract, source, contractName) {
var button = $('<button>Toggle Details</button>'); var button = $('<button>Toggle Details</button>');
var details = $('<div style="display: none;"/>') var details = $('<div style="display: none;"/>')
.append(tableRow('Solidity Interface', contract.solidity_interface)) .append(tableRow('Solidity Interface', contract.solidity_interface))
...@@ -173,97 +180,107 @@ function Renderer(editor, compiler, updateFiles) { ...@@ -173,97 +180,107 @@ function Renderer(editor, compiler, updateFiles) {
details.append($('<pre/>').text(funHashes)); details.append($('<pre/>').text(funHashes));
details.append($('<span class="col1">Gas Estimates</span>')); details.append($('<span class="col1">Gas Estimates</span>'));
details.append($('<pre/>').text(formatGasEstimates(contract.gasEstimates))); details.append($('<pre/>').text(formatGasEstimates(contract.gasEstimates)));
if (contract.runtimeBytecode && contract.runtimeBytecode.length > 0) if (contract.runtimeBytecode && contract.runtimeBytecode.length > 0) {
details.append(tableRow('Runtime Bytecode', contract.runtimeBytecode)); details.append(tableRow('Runtime Bytecode', contract.runtimeBytecode));
if (contract.assembly !== null) }
{ if (contract.assembly !== null) {
details.append($('<span class="col1">Assembly</span>')); details.append($('<span class="col1">Assembly</span>'));
var assembly = $('<pre/>').text(formatAssemblyText(contract.assembly, '', source)); var assembly = $('<pre/>').text(formatAssemblyText(contract.assembly, '', source));
details.append(assembly); details.append(assembly);
} }
button.click(function() { detailsOpen[contractName] = !detailsOpen[contractName]; details.toggle(); }); button.click(function () { detailsOpen[contractName] = !detailsOpen[contractName]; details.toggle(); });
if (detailsOpen[contractName]) if (detailsOpen[contractName]) {
details.show(); details.show();
}
return $('<div class="contractDetails"/>').append(button).append(details); return $('<div class="contractDetails"/>').append(button).append(details);
}; };
var formatGasEstimates = function(data) { var formatGasEstimates = function (data) {
var gasToText = function(g) { return g === null ? 'unknown' : g; } var gasToText = function (g) { return g === null ? 'unknown' : g; }
var text = ''; var text = '';
var fun; var fun;
if ('creation' in data) if ('creation' in data) {
text += 'Creation: ' + gasToText(data.creation[0]) + ' + ' + gasToText(data.creation[1]) + '\n'; text += 'Creation: ' + gasToText(data.creation[0]) + ' + ' + gasToText(data.creation[1]) + '\n';
}
text += 'External:\n'; text += 'External:\n';
for (fun in data.external) for (fun in data.external) {
text += ' ' + fun + ': ' + gasToText(data.external[fun]) + '\n'; text += ' ' + fun + ': ' + gasToText(data.external[fun]) + '\n';
}
text += 'Internal:\n'; text += 'Internal:\n';
for (fun in data.internal) for (fun in data.internal) {
text += ' ' + fun + ': ' + gasToText(data.internal[fun]) + '\n'; text += ' ' + fun + ': ' + gasToText(data.internal[fun]) + '\n';
}
return text; return text;
}; };
var formatAssemblyText = function(asm, prefix, source) { var formatAssemblyText = function (asm, prefix, source) {
if (typeof(asm) == typeof('') || asm === null || asm === undefined) if (typeof asm === typeof '' || asm === null || asm === undefined) {
return prefix + asm + '\n'; return prefix + asm + '\n';
}
var text = prefix + '.code\n'; var text = prefix + '.code\n';
$.each(asm['.code'], function(i, item) { $.each(asm['.code'], function (i, item) {
var v = item.value === undefined ? '' : item.value; var v = item.value === undefined ? '' : item.value;
var src = ''; var src = '';
if (item.begin !== undefined && item.end != undefined) if (item.begin !== undefined && item.end !== undefined) {
src = source.slice(item.begin, item.end).replace('\n', '\\n', 'g'); src = source.slice(item.begin, item.end).replace('\n', '\\n', 'g');
if (src.length > 30) }
if (src.length > 30) {
src = src.slice(0, 30) + '...'; src = src.slice(0, 30) + '...';
if (item.name != 'tag') }
if (item.name !== 'tag') {
text += ' '; text += ' ';
}
text += prefix + item.name + ' ' + v + '\t\t\t' + src + '\n'; text += prefix + item.name + ' ' + v + '\t\t\t' + src + '\n';
}); });
text += prefix + '.data\n'; text += prefix + '.data\n';
if (asm['.data']) if (asm['.data']) {
$.each(asm['.data'], function(i, item) { $.each(asm['.data'], function (i, item) {
text += ' ' + prefix + '' + i + ':\n'; text += ' ' + prefix + '' + i + ':\n';
text += formatAssemblyText(item, prefix + ' ', source); text += formatAssemblyText(item, prefix + ' ', source);
}); });
}
return text; return text;
}; };
function gethDeploy(contractName, jsonInterface, bytecode){ function gethDeploy (contractName, jsonInterface, bytecode) {
var code = ""; var code = '';
var funABI = getConstructorInterface(JSON.parse(jsonInterface)); var funABI = getConstructorInterface(JSON.parse(jsonInterface));
funABI.inputs.forEach(function(inp) { funABI.inputs.forEach(function (inp) {
code += "var " + inp.name + " = /* var of type " + inp.type + " here */ ;\n"; code += 'var ' + inp.name + ' = /* var of type ' + inp.type + ' here */ ;\n';
}); });
code += "var " + contractName + "Contract = web3.eth.contract(" + jsonInterface.replace("\n","") + ");" code += 'var ' + contractName + 'Contract = web3.eth.contract(' + jsonInterface.replace('\n', '') + ');' +
+"\nvar " + contractName + " = " + contractName + "Contract.new("; '\nvar ' + contractName + ' = ' + contractName + 'Contract.new(';
funABI.inputs.forEach(function(inp) { funABI.inputs.forEach(function (inp) {
code += "\n " + inp.name + ","; code += '\n ' + inp.name + ',';
}); });
code += "\n {"+ code += '\n {' +
"\n from: web3.eth.accounts[0], "+ '\n from: web3.eth.accounts[0], ' +
"\n data: '"+bytecode+"', "+ '\n data: \'' + bytecode + '\', ' +
"\n gas: 3000000"+ '\n gas: 3000000' +
"\n }, function(e, contract){"+ '\n }, function (e, contract){' +
"\n console.log(e, contract);"+ '\n console.log(e, contract);' +
"\n if (typeof contract.address != 'undefined') {"+ '\n if (typeof contract.address !== \'undefined\') {' +
"\n console.log('Contract mined! address: ' + contract.address + ' transactionHash: ' + contract.transactionHash);" + '\n console.log(\'Contract mined! address: \' + contract.address + \' transactionHash: \' + contract.transactionHash);' +
"\n }" + '\n }' +
"\n })"; '\n })';
return code; return code;
} }
function getConstructorInterface(abi) { function getConstructorInterface (abi) {
var funABI = {'name':'','inputs':[],'type':'constructor','outputs':[]}; var funABI = { 'name': '', 'inputs': [], 'type': 'constructor', 'outputs': [] };
for (var i = 0; i < abi.length; i++) for (var i = 0; i < abi.length; i++) {
if (abi[i].type == 'constructor') { if (abi[i].type === 'constructor') {
funABI.inputs = abi[i].inputs || []; funABI.inputs = abi[i].inputs || [];
break; break;
} }
}
return funABI; return funABI;
} }
......
src/app/storage-handler.js
View file @ f738864d
var utils = require('./utils'); var utils = require('./utils');
function StorageHandler(updateFiles) { function StorageHandler (updateFiles) {
this.sync = function() { this.sync = function () {
if (typeof chrome === 'undefined' || !chrome || !chrome.storage || !chrome.storage.sync) return; if (typeof chrome === 'undefined' || !chrome || !chrome.storage || !chrome.storage.sync) {
return;
}
var obj = {}; var obj = {};
var done = false; var done = false;
var count = 0 var count = 0
var dont = 0; var dont = 0;
function check(key){ function check (key) {
chrome.storage.sync.get( key, function(resp){ chrome.storage.sync.get(key, function (resp) {
console.log("comparing to cloud", key, resp); console.log('comparing to cloud', key, resp);
if (typeof resp[key] != 'undefined' && obj[key] !== resp[key] && confirm("Overwrite '" + fileNameFromKey(key) + "'? Click Ok to overwrite local file with file from cloud. Cancel will push your local file to the cloud.")) { if (typeof resp[key] !== 'undefined' && obj[key] !== resp[key] && confirm('Overwrite "' + fileNameFromKey(key) + '"? Click Ok to overwrite local file with file from cloud. Cancel will push your local file to the cloud.')) {
console.log("Overwriting", key ); console.log('Overwriting', key);
localStorage.setItem( key, resp[key] ); localStorage.setItem(key, resp[key]);
updateFiles(); updateFiles();
} else { } else {
console.log( "add to obj", obj, key); console.log('add to obj', obj, key);
obj[key] = localStorage[key]; obj[key] = localStorage[key];
} }
done++; done++;
if (done >= count) chrome.storage.sync.set( obj, function(){ if (done >= count) {
console.log( "updated cloud files with: ", obj, this, arguments); chrome.storage.sync.set(obj, function () {
console.log('updated cloud files with: ', obj, this, arguments);
}) })
}
}) })
} }
for (var y in window.localStorage) { for (var y in window.localStorage) {
console.log("checking", y); console.log('checking', y);
obj[y] = window.localStorage.getItem(y); obj[y] = window.localStorage.getItem(y);
if (y.indexOf(utils.getCacheFilePrefix()) !== 0) continue; if (y.indexOf(utils.getCacheFilePrefix()) !== 0) {
continue;
}
count++; count++;
check(y); check(y);
} }
......
src/app/utils.js
View file @ f738864d
var SOL_CACHE_FILE_PREFIX = 'sol-cache-file-'; var SOL_CACHE_FILE_PREFIX = 'sol-cache-file-';
function getCacheFilePrefix() { function getCacheFilePrefix () {
return SOL_CACHE_FILE_PREFIX; return SOL_CACHE_FILE_PREFIX;
} }
function fileKey( name ) { function fileKey (name) {
return getCacheFilePrefix() + name; return getCacheFilePrefix() + name;
} }
function fileNameFromKey(key) { function fileNameFromKey (key) {
return key.replace( getCacheFilePrefix(), '' ); return key.replace(getCacheFilePrefix(), '');
} }
function errortype(message) { function errortype (message) {
return message.match(/^.*:[0-9]*:[0-9]* Warning: /) ? 'warning' : 'error'; return message.match(/^.*:[0-9]*:[0-9]* Warning: /) ? 'warning' : 'error';
} }
......
src/index.js
View file @ f738864d
require('es6-shim'); require('es6-shim');
var app = require("./app.js"); var app = require('./app.js');
var $ = require("jquery"); var $ = require('jquery');
$(document).ready(function() { app.run(); }); $(document).ready(function () { app.run(); });
\ No newline at end of file \ No newline at end of file
src/universal-dapp.js
View file @ f738864d
...@@ -10,7 +10,7 @@ function UniversalDApp (contracts, options) { ...@@ -10,7 +10,7 @@ function UniversalDApp (contracts, options) {
this.options = options || {}; this.options = options || {};
this.$el = $('<div class="udapp" />'); this.$el = $('<div class="udapp" />');
this.contracts = contracts; this.contracts = contracts;
this.renderOutputModifier = options.renderOutputModifier || function(name, content) { return content; }; this.renderOutputModifier = options.renderOutputModifier || function (name, content) { return content; };
this.web3 = options.web3; this.web3 = options.web3;
if (!this.web3) { if (!this.web3) {
...@@ -30,7 +30,7 @@ function UniversalDApp (contracts, options) { ...@@ -30,7 +30,7 @@ function UniversalDApp (contracts, options) {
this.addAccount('3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511'); this.addAccount('3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511');
this.addAccount('2ac6c190b09897cd8987869cc7b918cfea07ee82038d492abce033c75c1b1d0c'); this.addAccount('2ac6c190b09897cd8987869cc7b918cfea07ee82038d492abce033c75c1b1d0c');
} else if (options.mode !== 'web3') { } else if (options.mode !== 'web3') {
throw new Error("Either VM or Web3 mode must be selected"); throw new Error('Either VM or Web3 mode must be selected');
} }
} }
...@@ -40,7 +40,7 @@ UniversalDApp.prototype.addAccount = function (privateKey, balance) { ...@@ -40,7 +40,7 @@ UniversalDApp.prototype.addAccount = function (privateKey, balance) {
var address = ethJSUtil.privateToAddress(privateKey); var address = ethJSUtil.privateToAddress(privateKey);
// FIXME: we don't care about the callback, but we should still make this proper // FIXME: we don't care about the callback, but we should still make this proper
this.vm.stateManager.putAccountBalance(address, balance || 'f00000000000000001', function cb() {} ); this.vm.stateManager.putAccountBalance(address, balance || 'f00000000000000001', function cb () {});
this.accounts['0x' + address.toString('hex')] = { privateKey: privateKey, nonce: 0 }; this.accounts['0x' + address.toString('hex')] = { privateKey: privateKey, nonce: 0 };
} }
...@@ -50,7 +50,9 @@ UniversalDApp.prototype.getAccounts = function (cb) { ...@@ -50,7 +50,9 @@ UniversalDApp.prototype.getAccounts = function (cb) {
if (!this.vm) { if (!this.vm) {
this.web3.eth.getAccounts(cb); this.web3.eth.getAccounts(cb);
} else { } else {
if (!this.accounts) return cb("No accounts?"); if (!this.accounts) {
return cb('No accounts?');
}
cb(null, Object.keys(this.accounts)); cb(null, Object.keys(this.accounts));
} }
...@@ -68,11 +70,13 @@ UniversalDApp.prototype.getBalance = function (address, cb) { ...@@ -68,11 +70,13 @@ UniversalDApp.prototype.getBalance = function (address, cb) {
} }
}); });
} else { } else {
if (!this.accounts) return cb("No accounts?"); if (!this.accounts) {
return cb('No accounts?');
}
this.vm.stateManager.getAccountBalance(new Buffer(address, 'hex'), function (err, res) { this.vm.stateManager.getAccountBalance(new Buffer(address, 'hex'), function (err, res) {
if (err) { if (err) {
cb("Account not found"); cb('Account not found');
} else { } else {
cb(null, new ethJSUtil.BN(res).toString(10)); cb(null, new ethJSUtil.BN(res).toString(10));
} }
...@@ -81,66 +85,68 @@ UniversalDApp.prototype.getBalance = function (address, cb) { ...@@ -81,66 +85,68 @@ UniversalDApp.prototype.getBalance = function (address, cb) {
}; };
UniversalDApp.prototype.render = function () { UniversalDApp.prototype.render = function () {
if (this.contracts.length == 0) { if (this.contracts.length === 0) {
this.$el.append( this.getABIInputForm() ); this.$el.append(this.getABIInputForm());
} else { } else {
for (var c in this.contracts) { for (var c in this.contracts) {
var $contractEl = $('<div class="contract"/>'); var $contractEl = $('<div class="contract"/>');
if (this.contracts[c].address) { if (this.contracts[c].address) {
this.getInstanceInterface(this.contracts[c], this.contracts[c].address, $contractEl ); this.getInstanceInterface(this.contracts[c], this.contracts[c].address, $contractEl);
} else { } else {
var $title = $('<span class="title"/>').text( this.contracts[c].name ); var $title = $('<span class="title"/>').text(this.contracts[c].name);
if (this.contracts[c].bytecode) { if (this.contracts[c].bytecode) {
$title.append($('<div class="size"/>').text((this.contracts[c].bytecode.length / 2) + ' bytes')); $title.append($('<div class="size"/>').text((this.contracts[c].bytecode.length / 2) + ' bytes'));
} }
$contractEl.append( $title ).append( this.getCreateInterface( $contractEl, this.contracts[c]) ); $contractEl.append($title).append(this.getCreateInterface($contractEl, this.contracts[c]));
} }
this.$el.append(this.renderOutputModifier(this.contracts[c].name, $contractEl)); this.$el.append(this.renderOutputModifier(this.contracts[c].name, $contractEl));
} }
} }
var $legend = $('<div class="legend" />') var $legend = $('<div class="legend" />')
.append( $('<div class="attach"/>').text('Attach') ) .append($('<div class="attach"/>').text('Attach'))
.append( $('<div class="transact"/>').text('Transact') ) .append($('<div class="transact"/>').text('Transact'))
.append( $('<div class="call"/>').text('Call') ); .append($('<div class="call"/>').text('Call'));
this.$el.append( $('<div class="poweredBy" />') this.$el.append($('<div class="poweredBy" />')
.html("<a href='http://github.com/d11e9/universal-dapp'>Universal ÐApp</a> powered by The Blockchain") ); .html('<a href="http://github.com/d11e9/universal-dapp">Universal ÐApp</a> powered by The Blockchain'));
this.$el.append( $legend ); this.$el.append($legend);
return this.$el; return this.$el;
}; };
UniversalDApp.prototype.getContractByName = function(contractName) { UniversalDApp.prototype.getContractByName = function (contractName) {
for (var c in this.contracts) for (var c in this.contracts) {
if (this.contracts[c].name == contractName) if (this.contracts[c].name === contractName) {
return this.contracts[c]; return this.contracts[c];
}
}
return null; return null;
}; };
UniversalDApp.prototype.getABIInputForm = function (cb){ UniversalDApp.prototype.getABIInputForm = function (cb) {
var self = this; var self = this;
var $el = $('<div class="udapp-setup" />'); var $el = $('<div class="udapp-setup" />');
var $jsonInput = $('<textarea class="json" placeholder=\'[ { "name": name, "bytecode": bytecode, "interface": abi }, { ... } ]\'/>'); var $jsonInput = $('<textarea class="json" placeholder=\'[ { "name": name, "bytecode": bytecode, "interface": abi }, { ... } ]\'/>');
var $createButton = $('<button class="udapp-create"/>').text('Create a Universal ÐApp'); var $createButton = $('<button class="udapp-create"/>').text('Create a Universal ÐApp');
$createButton.click(function(ev){ $createButton.click(function (ev) {
var contracts = $.parseJSON( $jsonInput.val() ); var contracts = $.parseJSON($jsonInput.val());
if (cb) { if (cb) {
var err = null; var err = null;
var dapp = null; var dapp = null;
try { try {
dapp = new UniversalDApp( contracts, self.options ); dapp = new UniversalDApp(contracts, self.options);
} catch(e) { } catch (e) {
err = e; err = e;
} }
cb( err, dapp ); cb(err, dapp);
} else { } else {
self.contracts = contracts; self.contracts = contracts;
self.$el.empty().append( self.render() ); self.$el.empty().append(self.render());
} }
}); });
$el.append( $jsonInput ).append( $createButton ); $el.append($jsonInput).append($createButton);
return $el; return $el;
}; };
...@@ -150,72 +156,81 @@ UniversalDApp.prototype.getCreateInterface = function ($container, contract) { ...@@ -150,72 +156,81 @@ UniversalDApp.prototype.getCreateInterface = function ($container, contract) {
var $createInterface = $('<div class="create"/>'); var $createInterface = $('<div class="create"/>');
if (this.options.removable) { if (this.options.removable) {
var $close = $('<div class="udapp-close" />'); var $close = $('<div class="udapp-close" />');
$close.click( function(){ self.$el.remove(); } ); $close.click(function () { self.$el.remove(); });
$createInterface.append( $close ); $createInterface.append($close);
} }
var $newButton = this.getInstanceInterface( contract ); var $newButton = this.getInstanceInterface(contract);
var $atButton = $('<button class="atAddress"/>').text('At Address').click( function(){ self.clickContractAt( self, $container.find('.createContract'), contract ); } ); var $atButton = $('<button class="atAddress"/>').text('At Address').click(function () { self.clickContractAt(self, $container.find('.createContract'), contract); });
$createInterface.append( $atButton ).append( $newButton ); $createInterface.append($atButton).append($newButton);
return $createInterface; return $createInterface;
}; };
UniversalDApp.prototype.getInstanceInterface = function (contract, address, $target) { UniversalDApp.prototype.getInstanceInterface = function (contract, address, $target) {
var self = this; var self = this;
var abi = JSON.parse(contract.interface).sort(function(a,b){ var abi = JSON.parse(contract.interface).sort(function (a, b) {
if (a.name > b.name) return -1; if (a.name > b.name) {
else return 1; return -1;
}).sort(function(a,b){ } else {
if (a.constant == true) return -1; return 1;
else return 1; }
}).sort(function (a, b) {
if (a.constant === true) {
return -1;
} else {
return 1;
}
}); });
var web3contract = this.web3.eth.contract(abi); var web3contract = this.web3.eth.contract(abi);
var funABI = this.getConstructorInterface(abi); var funABI = this.getConstructorInterface(abi);
var $createInterface = $('<div class="createContract"/>'); var $createInterface = $('<div class="createContract"/>');
var appendFunctions = function (address, $el){ var appendFunctions = function (address, $el) {
var $instance = $('<div class="instance"/>'); var $instance = $('<div class="instance"/>');
if (self.options.removable_instances) { if (self.options.removable_instances) {
var $close = $('<div class="udapp-close" />'); var $close = $('<div class="udapp-close" />');
$close.click( function(){ $instance.remove(); } ); $close.click(function () { $instance.remove(); });
$instance.append( $close ); $instance.append($close);
} }
var context = self.options.vm ? 'memory' : 'blockchain'; var context = self.options.vm ? 'memory' : 'blockchain';
var $title = $('<span class="title"/>').text( contract.name + " at " + (self.options.vm ? '0x' : '') + address.toString('hex') + ' (' + context + ')'); var $title = $('<span class="title"/>').text(contract.name + ' at ' + (self.options.vm ? '0x' : '') + address.toString('hex') + ' (' + context + ')');
$title.click(function(){ $title.click(function () {
$instance.toggleClass('hide'); $instance.toggleClass('hide');
}); });
var $events = $('<div class="events"/>'); var $events = $('<div class="events"/>');
var parseLogs = function(err,response) { var parseLogs = function (err, response) {
if (err) if (err) {
return; return;
}
var $event = $('<div class="event" />'); var $event = $('<div class="event" />');
var $close = $('<div class="udapp-close" />'); var $close = $('<div class="udapp-close" />');
$close.click( function(){ $event.remove(); } ); $close.click(function () { $event.remove(); });
$event.append( $('<span class="name"/>').text(response.event) ) $event.append($('<span class="name"/>').text(response.event))
.append( $('<span class="args" />').text( JSON.stringify(response.args, null, 2) ) ) .append($('<span class="args" />').text(JSON.stringify(response.args, null, 2)))
.append( $close ); .append($close);
$events.append( $event ); $events.append($event);
}; };
if (self.options.vm){ if (self.options.vm) {
// FIXME: support indexed events // FIXME: support indexed events
var eventABI = {}; var eventABI = {};
$.each(abi, function(i, funABI) { $.each(abi, function (i, funABI) {
if (funABI.type !== 'event') return; if (funABI.type !== 'event') {
return;
}
var hash = ethJSABI.eventID(funABI.name, funABI.inputs.map(function(item) { return item.type; })); var hash = ethJSABI.eventID(funABI.name, funABI.inputs.map(function (item) { return item.type; }));
eventABI[hash.toString('hex')] = { event: funABI.name, inputs: funABI.inputs }; eventABI[hash.toString('hex')] = { event: funABI.name, inputs: funABI.inputs };
}); });
self.vm.on('afterTx', function(response){ self.vm.on('afterTx', function (response) {
for (var i in response.vm.logs) { for (var i in response.vm.logs) {
// [address, topics, mem] // [address, topics, mem]
var log = response.vm.logs[i]; var log = response.vm.logs[i];
...@@ -240,36 +255,38 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar ...@@ -240,36 +255,38 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
var eventFilter = web3contract.at(address).allEvents(); var eventFilter = web3contract.at(address).allEvents();
eventFilter.watch(parseLogs); eventFilter.watch(parseLogs);
} }
$instance.append( $title ); $instance.append($title);
// Add the fallback function // Add the fallback function
$instance.append(self.getCallButton({ $instance.append(self.getCallButton({
abi: { constant: false, inputs:[], name: '(fallback)', outputs: [], type: 'function' }, abi: { constant: false, inputs: [], name: '(fallback)', outputs: [], type: 'function' },
encode: function(args) { encode: function (args) {
return ''; return '';
}, },
address: address address: address
})); }));
$.each(abi, function(i, funABI) { $.each(abi, function (i, funABI) {
if (funABI.type != 'function') return; if (funABI.type !== 'function') {
return;
}
// @todo getData cannot be used with overloaded functions // @todo getData cannot be used with overloaded functions
$instance.append(self.getCallButton({ $instance.append(self.getCallButton({
abi: funABI, abi: funABI,
encode: function(args) { encode: function (args) {
var obj = web3contract.at('0x00')[funABI.name]; var obj = web3contract.at('0x00')[funABI.name];
return obj.getData.apply(obj, args); return obj.getData.apply(obj, args);
}, },
address: address address: address
})); }));
}); });
($el || $createInterface ).append( $instance.append( $events ) ); ($el || $createInterface).append($instance.append($events));
}; };
if (!address || !$target) { if (!address || !$target) {
$createInterface.append( this.getCallButton({ $createInterface.append(this.getCallButton({
abi: funABI, abi: funABI,
encode: function(args) { encode: function (args) {
var obj = web3contract.new; var obj = web3contract.new;
return obj.getData.apply(obj, args); return obj.getData.apply(obj, args);
}, },
...@@ -278,42 +295,45 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar ...@@ -278,42 +295,45 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
appendFunctions: appendFunctions appendFunctions: appendFunctions
})); }));
} else { } else {
appendFunctions( address, $target ); appendFunctions(address, $target);
} }
return $createInterface; return $createInterface;
}; };
UniversalDApp.prototype.getConstructorInterface = function(abi) { UniversalDApp.prototype.getConstructorInterface = function (abi) {
var funABI = {'name':'','inputs':[],'type':'constructor','outputs':[]}; var funABI = { 'name': '', 'inputs': [], 'type': 'constructor', 'outputs': [] };
for (var i = 0; i < abi.length; i++) for (var i = 0; i < abi.length; i++) {
if (abi[i].type == 'constructor') { if (abi[i].type === 'constructor') {
funABI.inputs = abi[i].inputs || []; funABI.inputs = abi[i].inputs || [];
break; break;
} }
}
return funABI; return funABI;
}; };
UniversalDApp.prototype.getCallButton = function(args) { UniversalDApp.prototype.getCallButton = function (args) {
var self = this; var self = this;
// args.abi, args.encode, args.bytecode [constr only], args.address [fun only] // args.abi, args.encode, args.bytecode [constr only], args.address [fun only]
// args.contractName [constr only], args.appendFunctions [constr only] // args.contractName [constr only], args.appendFunctions [constr only]
var isConstructor = args.bytecode !== undefined; var isConstructor = args.bytecode !== undefined;
var lookupOnly = ( args.abi.constant && !isConstructor ); var lookupOnly = (args.abi.constant && !isConstructor);
var inputs = ''; var inputs = '';
$.each(args.abi.inputs, function(i, inp) { $.each(args.abi.inputs, function (i, inp) {
if (inputs != '') inputs += ', '; if (inputs !== '') {
inputs += ', ';
}
inputs += inp.type + ' ' + inp.name; inputs += inp.type + ' ' + inp.name;
}); });
var inputField = $('<input/>').attr('placeholder', inputs).attr('title', inputs); var inputField = $('<input/>').attr('placeholder', inputs).attr('title', inputs);
var $outputOverride = $('<div class="value" />'); var $outputOverride = $('<div class="value" />');
var outputSpan = $('<div class="output"/>'); var outputSpan = $('<div class="output"/>');
var getReturnOutput = function(result) { var getReturnOutput = function (result) {
var returnName = lookupOnly ? 'Value' : 'Result'; var returnName = lookupOnly ? 'Value' : 'Result';
var returnCls = lookupOnly ? 'value' : 'returned'; var returnCls = lookupOnly ? 'value' : 'returned';
return $('<div class="' + returnCls + '">').html('<strong>' + returnName + ':</strong> ' + JSON.stringify( result, null, 2 ) ); return $('<div class="' + returnCls + '">').html('<strong>' + returnName + ':</strong> ' + JSON.stringify(result, null, 2));
}; };
var getGasUsedOutput = function (result, vmResult) { var getGasUsedOutput = function (result, vmResult) {
...@@ -321,12 +341,12 @@ UniversalDApp.prototype.getCallButton = function(args) { ...@@ -321,12 +341,12 @@ UniversalDApp.prototype.getCallButton = function(args) {
var caveat = lookupOnly ? '<em>(<span class="caveat" title="Cost only applies when called by a contract">caveat</span>)</em>' : ''; var caveat = lookupOnly ? '<em>(<span class="caveat" title="Cost only applies when called by a contract">caveat</span>)</em>' : '';
if (result.gasUsed) { if (result.gasUsed) {
var gas = result.gasUsed.toString(10); var gas = result.gasUsed.toString(10);
$gasUsed.html('<strong>Transaction cost:</strong> ' + gas + ' gas. ' + caveat ); $gasUsed.html('<strong>Transaction cost:</strong> ' + gas + ' gas. ' + caveat);
} }
if (vmResult.gasUsed) { if (vmResult.gasUsed) {
var $callGasUsed = $('<div class="gasUsed">'); var $callGasUsed = $('<div class="gasUsed">');
var gas = vmResult.gasUsed.toString(10); var gas = vmResult.gasUsed.toString(10);
$callGasUsed.append('<strong>Execution cost:</strong> ' + gas + ' gas.' ); $callGasUsed.append('<strong>Execution cost:</strong> ' + gas + ' gas.');
$gasUsed.append($callGasUsed); $gasUsed.append($callGasUsed);
} }
return $gasUsed; return $gasUsed;
...@@ -345,28 +365,29 @@ UniversalDApp.prototype.getCallButton = function(args) { ...@@ -345,28 +365,29 @@ UniversalDApp.prototype.getCallButton = function(args) {
return $('<div class="decoded">').html('<strong>Decoded:</strong> ').append($decoded); return $('<div class="decoded">').html('<strong>Decoded:</strong> ').append($decoded);
}; };
var getOutput = function() { var getOutput = function () {
var $result = $('<div class="result" />'); var $result = $('<div class="result" />');
var $close = $('<div class="udapp-close" />'); var $close = $('<div class="udapp-close" />');
$close.click( function(){ $result.remove(); } ); $close.click(function () { $result.remove(); });
$result.append( $close ); $result.append($close);
return $result; return $result;
}; };
var clearOutput = function($result) { var clearOutput = function ($result) {
$(':not(.udapp-close)', $result).remove(); $(':not(.udapp-close)', $result).remove();
}; };
var replaceOutput = function($result, message) { var replaceOutput = function ($result, message) {
clearOutput($result); clearOutput($result);
$result.append(message); $result.append(message);
}; };
var handleCallButtonClick = function(ev, $result) { var handleCallButtonClick = function (ev, $result) {
if (!$result) { if (!$result) {
$result = getOutput(); $result = getOutput();
if (lookupOnly && !inputs.length) if (lookupOnly && !inputs.length) {
$outputOverride.empty().append( $result ); $outputOverride.empty().append($result);
else } else {
outputSpan.append( $result ); outputSpan.append($result);
}
} }
var funArgs = ''; var funArgs = '';
...@@ -380,37 +401,42 @@ UniversalDApp.prototype.getCallButton = function(args) { ...@@ -380,37 +401,42 @@ UniversalDApp.prototype.getCallButton = function(args) {
if (!isConstructor || funArgs.length > 0) { if (!isConstructor || funArgs.length > 0) {
try { try {
data = args.encode(funArgs); data = args.encode(funArgs);
} catch(e) { } catch (e) {
replaceOutput($result, $('<span/>').text('Error encoding arguments: ' + e)); replaceOutput($result, $('<span/>').text('Error encoding arguments: ' + e));
return; return;
} }
} }
if (data.slice(0, 9) == 'undefined') if (data.slice(0, 9) === 'undefined') {
data = data.slice(9); data = data.slice(9);
if (data.slice(0, 2) == '0x') data = data.slice(2); }
if (data.slice(0, 2) === '0x') {
data = data.slice(2);
}
replaceOutput($result, $('<span>Waiting for transaction to be mined...</span>')); replaceOutput($result, $('<span>Waiting for transaction to be mined...</span>'));
if (isConstructor) { if (isConstructor) {
if (args.bytecode.indexOf('_') >= 0) { if (args.bytecode.indexOf('_') >= 0) {
replaceOutput($result, $('<span>Deploying and linking required libraries...</span>')); replaceOutput($result, $('<span>Deploying and linking required libraries...</span>'));
if (self.options.vm) if (self.options.vm) {
self.linkBytecode(args.contractName, function(err, bytecode) { self.linkBytecode(args.contractName, function (err, bytecode) {
if (err) if (err) {
replaceOutput($result, $('<span/>').text('Error deploying required libraries: ' + err)); replaceOutput($result, $('<span/>').text('Error deploying required libraries: ' + err));
else { } else {
args.bytecode = bytecode; args.bytecode = bytecode;
handleCallButtonClick(ev, $result); handleCallButtonClick(ev, $result);
} }
}); });
else } else {
replaceOutput($result, $('<span>Contract needs to be linked to a library, this is only supported in the JavaScript VM for now.</span>')); replaceOutput($result, $('<span>Contract needs to be linked to a library, this is only supported in the JavaScript VM for now.</span>'));
}
return; return;
} else } else {
data = args.bytecode + data; data = args.bytecode + data;
} }
}
self.runTx(data, args, function(err, result) { self.runTx(data, args, function (err, result) {
if (err) { if (err) {
replaceOutput($result, $('<span/>').text(err).addClass('error')); replaceOutput($result, $('<span/>').text(err).addClass('error'));
} else if (self.options.vm && result.vm.exception && result.vm.exceptionError) { } else if (self.options.vm && result.vm.exception && result.vm.exceptionError) {
...@@ -420,7 +446,7 @@ UniversalDApp.prototype.getCallButton = function(args) { ...@@ -420,7 +446,7 @@ UniversalDApp.prototype.getCallButton = function(args) {
} else if (self.options.vm && isConstructor) { } else if (self.options.vm && isConstructor) {
replaceOutput($result, getGasUsedOutput(result, result.vm)); replaceOutput($result, getGasUsedOutput(result, result.vm));
args.appendFunctions(result.createdAddress); args.appendFunctions(result.createdAddress);
} else if (self.options.vm){ } else if (self.options.vm) {
var outputObj = '0x' + result.vm.return.toString('hex'); var outputObj = '0x' + result.vm.return.toString('hex');
clearOutput($result); clearOutput($result);
$result.append(getReturnOutput(outputObj)).append(getGasUsedOutput(result, result.vm)); $result.append(getReturnOutput(outputObj)).append(getGasUsedOutput(result, result.vm));
...@@ -457,18 +483,21 @@ UniversalDApp.prototype.getCallButton = function(args) { ...@@ -457,18 +483,21 @@ UniversalDApp.prototype.getCallButton = function(args) {
} else { } else {
function tryTillResponse (txhash, done) { function tryTillResponse (txhash, done) {
this.web3.eth.getTransactionReceipt(result, testResult ); this.web3.eth.getTransactionReceipt(result, testResult);
function testResult (err, address) { function testResult (err, address) {
if (!err && !address) { if (!err && !address) {
setTimeout( function(){ tryTillResponse(txhash, done); }, 500); setTimeout(function () { tryTillResponse(txhash, done); }, 500);
} else done( err, address ); } else {
done(err, address);
}
} }
} }
tryTillResponse( result, function(err, result) { tryTillResponse(result, function (err, result) {
if (err) replaceOutput($result, $('<span/>').text(err).addClass('error')); if (err) {
else if (isConstructor) { replaceOutput($result, $('<span/>').text(err).addClass('error'));
} else if (isConstructor) {
$result.html(''); $result.html('');
args.appendFunctions(result.contractAddress); args.appendFunctions(result.contractAddress);
} else { } else {
...@@ -482,10 +511,10 @@ UniversalDApp.prototype.getCallButton = function(args) { ...@@ -482,10 +511,10 @@ UniversalDApp.prototype.getCallButton = function(args) {
}; };
var button = $('<button />') var button = $('<button />')
.addClass( 'call' ) .addClass('call')
.attr('title', args.abi.name) .attr('title', args.abi.name)
.text(args.bytecode ? 'Create' : args.abi.name) .text(args.bytecode ? 'Create' : args.abi.name)
.click( handleCallButtonClick ); .click(handleCallButtonClick);
if (lookupOnly && !inputs.length) { if (lookupOnly && !inputs.length) {
handleCallButtonClick(); handleCallButtonClick();
...@@ -493,69 +522,81 @@ UniversalDApp.prototype.getCallButton = function(args) { ...@@ -493,69 +522,81 @@ UniversalDApp.prototype.getCallButton = function(args) {
var $contractProperty = $('<div class="contractProperty"/>'); var $contractProperty = $('<div class="contractProperty"/>');
$contractProperty $contractProperty
.toggleClass( 'constant', !isConstructor && args.abi.constant ) .toggleClass('constant', !isConstructor && args.abi.constant)
.toggleClass( 'hasArgs', args.abi.inputs.length > 0) .toggleClass('hasArgs', args.abi.inputs.length > 0)
.toggleClass( 'constructor', isConstructor) .toggleClass('constructor', isConstructor)
.append(button) .append(button)
.append( (lookupOnly && !inputs.length) ? $outputOverride : inputField ); .append((lookupOnly && !inputs.length) ? $outputOverride : inputField);
return $contractProperty.append(outputSpan); return $contractProperty.append(outputSpan);
}; };
UniversalDApp.prototype.linkBytecode = function(contractName, cb) { UniversalDApp.prototype.linkBytecode = function (contractName, cb) {
var bytecode = this.getContractByName(contractName).bytecode; var bytecode = this.getContractByName(contractName).bytecode;
if (bytecode.indexOf('_') < 0) if (bytecode.indexOf('_') < 0) {
return cb(null, bytecode); return cb(null, bytecode);
}
var m = bytecode.match(/__([^_]{1,36})__/); var m = bytecode.match(/__([^_]{1,36})__/);
if (!m) if (!m) {
return cb("Invalid bytecode format."); return cb('Invalid bytecode format.');
}
var libraryName = m[1]; var libraryName = m[1];
if (!this.getContractByName(libraryName)) if (!this.getContractByName(libraryName)) {
return cb("Library " + libraryName + " not found."); return cb('Library ' + libraryName + ' not found.');
}
var self = this; var self = this;
this.deployLibrary(libraryName, function(err, address) { this.deployLibrary(libraryName, function (err, address) {
if (err) return cb(err); if (err) {
return cb(err);
}
var libLabel = '__' + libraryName + Array(39 - libraryName.length).join('_'); var libLabel = '__' + libraryName + Array(39 - libraryName.length).join('_');
var hexAddress = address.toString('hex'); var hexAddress = address.toString('hex');
if (hexAddress.slice(0, 2) == '0x') hexAddress = hexAddress.slice(2); if (hexAddress.slice(0, 2) === '0x') {
hexAddress = hexAddress.slice(2);
}
hexAddress = Array(40 - hexAddress.length + 1).join('0') + hexAddress; hexAddress = Array(40 - hexAddress.length + 1).join('0') + hexAddress;
while (bytecode.indexOf(libLabel) >= 0) while (bytecode.indexOf(libLabel) >= 0) {
bytecode = bytecode.replace(libLabel, hexAddress); bytecode = bytecode.replace(libLabel, hexAddress);
}
self.getContractByName(contractName).bytecode = bytecode; self.getContractByName(contractName).bytecode = bytecode;
self.linkBytecode(contractName, cb); self.linkBytecode(contractName, cb);
}); });
}; };
UniversalDApp.prototype.deployLibrary = function(contractName, cb) { UniversalDApp.prototype.deployLibrary = function (contractName, cb) {
if (this.getContractByName(contractName).address) if (this.getContractByName(contractName).address) {
return cb(null, this.getContractByName(contractName).address); return cb(null, this.getContractByName(contractName).address);
}
var self = this; var self = this;
var bytecode = this.getContractByName(contractName).bytecode; var bytecode = this.getContractByName(contractName).bytecode;
if (bytecode.indexOf('_') >= 0) if (bytecode.indexOf('_') >= 0) {
this.linkBytecode(contractName, function(err, bytecode) { this.linkBytecode(contractName, function (err, bytecode) {
if (err) cb(err); if (err) cb(err);
else self.deployLibrary(contractName, cb); else self.deployLibrary(contractName, cb);
}); });
else { } else {
this.runTx(bytecode, {abi: {constant: false}, bytecode: bytecode}, function(err, result) { this.runTx(bytecode, { abi: { constant: false }, bytecode: bytecode }, function (err, result) {
if (err) return cb(err); if (err) {
return cb(err);
}
self.getContractByName(contractName).address = result.createdAddress; self.getContractByName(contractName).address = result.createdAddress;
cb(err, result.createdAddress); cb(err, result.createdAddress);
}); });
} }
}; };
UniversalDApp.prototype.clickContractAt = function ( self, $output, contract ) { UniversalDApp.prototype.clickContractAt = function (self, $output, contract) {
var address = prompt( "What Address is this contract at in the Blockchain? ie: '0xdeadbeaf...'" ); var address = prompt('What Address is this contract at in the Blockchain? ie: 0xdeadbeaf...');
self.getInstanceInterface(contract, address, $output ); self.getInstanceInterface(contract, address, $output);
}; };
UniversalDApp.prototype.runTx = function( data, args, cb) { UniversalDApp.prototype.runTx = function (data, args, cb) {
var self = this; var self = this;
var to = args.address; var to = args.address;
var constant = args.abi.constant; var constant = args.abi.constant;
var isConstructor = args.bytecode !== undefined; var isConstructor = args.bytecode !== undefined;
if (data.slice(0, 2) != '0x') if (data.slice(0, 2) !== '0x') {
data = '0x' + data; data = '0x' + data;
}
var gas = self.options.getGas ? self.options.getGas : 1000000; var gas = self.options.getGas ? self.options.getGas : 1000000;
...@@ -578,12 +619,15 @@ UniversalDApp.prototype.runTx = function( data, args, cb) { ...@@ -578,12 +619,15 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
value: value value: value
}; };
if (constant && !isConstructor) { if (constant && !isConstructor) {
this.web3.eth.call( tx, cb ); this.web3.eth.call(tx, cb);
} else { } else {
this.web3.eth.estimateGas( tx, function(err, resp){ this.web3.eth.estimateGas(tx, function (err, resp) {
tx.gas = resp; tx.gas = resp;
if (!err) self.web3.eth.sendTransaction( tx, cb ); if (!err) {
else cb( err, resp); self.web3.eth.sendTransaction(tx, cb);
} else {
cb(err, resp);
}
}); });
} }
} else { } else {
...@@ -593,7 +637,7 @@ UniversalDApp.prototype.runTx = function( data, args, cb) { ...@@ -593,7 +637,7 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
tx = new EthJSTX({ tx = new EthJSTX({
nonce: new Buffer([account.nonce++]), //@todo count beyond 255 nonce: new Buffer([account.nonce++]), //@todo count beyond 255
gasPrice: 1, gasPrice: 1,
gasLimit: 3000000000, //plenty gasLimit: 3000000000, // plenty
to: to, to: to,
value: new this.BN(value, 10), value: new this.BN(value, 10),
data: new Buffer(data.slice(2), 'hex') data: new Buffer(data.slice(2), 'hex')
...@@ -609,7 +653,7 @@ UniversalDApp.prototype.runTx = function( data, args, cb) { ...@@ -609,7 +653,7 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
}); });
this.vm.runTx({block: block, tx: tx, skipBalance: true, skipNonce: true, enableHomestead: true}, cb); this.vm.runTx({block: block, tx: tx, skipBalance: true, skipNonce: true, enableHomestead: true}, cb);
} catch (e) { } catch (e) {
cb( e, null ); cb(e, null);
} }
} }
}; };
......
src/web3-adapter.js
View file @ f738864d
// This mainly extracts the provider that might be // This mainly extracts the provider that might be
// supplied through mist. // supplied through mist.
var Web3 = require("web3"); var Web3 = require('web3');
if (typeof web3 !== 'undefined') if (typeof web3 !== 'undefined') {
web3 = new Web3(web3.currentProvider); web3 = new Web3(web3.currentProvider);
else } else {
web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:8545")); web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545'));
}
module.exports = web3; module.exports = web3;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment