Skip to content

B
baas-ide
Commit 09690338 authored by Alex Beregszaszi's avatar Alex Beregszaszi
Browse files
Options

Merge pull request #68 from ethereum/codestyle-formatting

Codestyle formatting (Part 1)
parents e382840f 504e6d78
Hide whitespace changes
Inline Side-by-side
Showing with 1075 additions and 1086 deletions
assets/js/ballot.sol.js
View file @ 09690338
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
var multi = function(func) { return func.toString().match(/[^]*\/\*([^]*)\*\/\}$/)[1]; } var multi = function (func) { return func.toString().match(/[^]*\/\*([^]*)\*\/\}$/)[1]; };
var BALLOT_EXAMPLE = multi(function(){/*contract Ballot { var BALLOT_EXAMPLE = multi(function () { /*contract Ballot {
struct Voter { struct Voter {
uint weight; uint weight;
......
background.js
View file @ 09690338
chrome.browserAction.onClicked.addListener(function (tab) { /* global chrome */
chrome.storage.sync.set({ 'chrome-app-sync' : true });
chrome.browserAction.onClicked.addListener(function (tab) {
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 @ 09690338
/* global alert, confirm, prompt, Option, Worker, soljsonSources */
var $ = require('jquery'); var $ = require('jquery');
var utils = require('./app/utils'); var utils = require('./app/utils');
...@@ -13,452 +15,441 @@ var Compiler = require('./app/compiler'); ...@@ -13,452 +15,441 @@ var Compiler = require('./app/compiler');
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 = ''; while ((key + count) in window.localStorage) count = count - 1;
var otherKey = key + count; window.localStorage[key + count] = window.localStorage[key];
while ((key + count) in window.localStorage) count = count - 1; }
window.localStorage[key + count] = window.localStorage[key]; window.localStorage[key] = content;
} }
window.localStorage[key] = content; editor.setCacheFile(Object.keys(files)[0]);
} updateFiles();
editor.setCacheFile(Object.keys(files)[0]); }
updateFiles();
} loadFilesCallback = function (files) {
loadFiles(files);
loadFilesCallback = function (files) { };
loadFiles(files);
}; if (filesToLoad !== null) {
loadFiles(filesToLoad);
if (filesToLoad !== null) { }
loadFiles(filesToLoad);
// ------------------ query params (hash) ----------------
function syncQueryParams () {
$('#optimize').attr('checked', (queryParams.get().optimize === 'true'));
}
window.onhashchange = syncQueryParams;
syncQueryParams();
// -------- check file upload capabilities -------
if (!(window.File || window.FileReader || window.FileList || window.Blob)) {
$('.uploadFile').remove();
}
// ------------------ gist load ----------------
var loadingFromGist = gistHandler.handleLoad(function (gistId) {
$.ajax({
url: 'https://api.github.com/gists/' + gistId,
jsonp: 'callback',
dataType: 'jsonp',
success: function (response) {
if (response.data) {
if (!response.data.files) {
alert('Gist load error: ' + response.data.message);
return;
}
loadFiles(response.data.files);
} }
}
});
// ------------------ query params (hash) ---------------- });
function syncQueryParams () { // ----------------- storage --------------------
$('#optimize').attr('checked', (queryParams.get().optimize === 'true'));
} var storageHandler = new StorageHandler(updateFiles);
window.syncStorage = storageHandler.sync;
window.onhashchange = syncQueryParams; storageHandler.sync();
syncQueryParams();
// ----------------- editor ----------------------
// -------- check file upload capabilities -------
if (!(window.File || window.FileReader || window.FileList || window.Blob)) { var editor = new Editor(loadingFromGist);
$(".uploadFile").remove();
} // ----------------- tabbed menu -------------------
// ------------------ gist load ---------------- $('#options li').click(function (ev) {
var $el = $(this);
var loadingFromGist = gistHandler.handleLoad(function (gistId) { var match = /[a-z]+View/.exec($el.get(0).className);
$.ajax({ if (!match) return;
url: 'https://api.github.com/gists/' + gistId, var cls = match[0];
jsonp: 'callback', if (!$el.hasClass('active')) {
dataType: 'jsonp', $el.parent().find('li').removeClass('active');
success: function (response) { $('#optionViews').attr('class', '').addClass(cls);
if (response.data) { $el.addClass('active');
if (!response.data.files) { } else {
alert('Gist load error: ' + response.data.message); $el.removeClass('active');
return; $('#optionViews').removeClass(cls);
} }
loadFiles(response.data.files); });
}
} // ------------------ gist publish --------------
$('#gist').click(function () {
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 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({
url: 'https://api.github.com/gists',
type: 'POST',
data: JSON.stringify({
description: description,
public: true,
files: files
})
}).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?')) {
window.open(response.html_url, '_blank');
}
});
}
});
$('#copyOver').click(function () {
var target = prompt(
'To which other browser-solidity instance do you want to copy over all files?',
'https://ethereum.github.io/browser-solidity/'
);
if (target === null) {
return;
}
var files = editor.packageFiles();
$('<iframe/>', {src: target, style: 'display:none;', load: function () {
this.contentWindow.postMessage(['loadFiles', files], '*');
}}).appendTo('body');
});
// ----------------- file selector-------------
var $filesEl = $('#files');
var FILE_SCROLL_DELTA = 300;
$('.newFile').on('click', function () {
editor.newFile();
updateFiles();
$filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () {
reAdjust();
}); });
}); });
// ----------------- file upload -------------
// ----------------- storage --------------------
$('.inputFile').on('change', function () {
var storageHandler = new StorageHandler(updateFiles); var fileList = $('input.inputFile')[0].files;
window.syncStorage = storageHandler.sync; for (var i = 0; i < fileList.length; i++) {
storageHandler.sync(); var name = fileList[i].name;
if (!window.localStorage[utils.fileKey(name)] || confirm('The file ' + name + ' already exists! Would you like to overwrite it?')) {
editor.uploadFile(fileList[i]);
// ----------------- editor ---------------------- updateFiles();
}
var editor = new Editor(loadingFromGist); }
$filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () {
// ----------------- tabbed menu ------------------- reAdjust();
});
$('#options li').click(function (ev) { });
var $el = $(this);
var match = /[a-z]+View/.exec($el.get(0).className); $filesEl.on('click', '.file:not(.active)', showFileHandler);
if (!match) return;
var cls = match[0]; $filesEl.on('click', '.file.active', function (ev) {
if (!$el.hasClass('active')) { var $fileTabEl = $(this);
$el.parent().find('li').removeClass('active'); var originalName = $fileTabEl.find('.name').text();
$('#optionViews').attr('class', '').addClass(cls); ev.preventDefault();
$el.addClass('active'); if ($(this).find('input').length > 0) return false;
} else { var $fileNameInputEl = $('<input value="' + originalName + '"/>');
$el.removeClass('active'); $fileTabEl.html($fileNameInputEl);
$('#optionViews').removeClass(cls); $fileNameInputEl.focus();
} $fileNameInputEl.select();
}); $fileNameInputEl.on('blur', handleRename);
$fileNameInputEl.keyup(handleRename);
// ------------------ gist publish -------------- function handleRename (ev) {
ev.preventDefault();
$('#gist').click(function () { if (ev.which && ev.which !== 13) return false;
if (confirm('Are you sure you want to publish all your files anonymously as a public gist on github.com?')) { var newName = ev.target.value;
$fileNameInputEl.off('blur');
var files = editor.packageFiles(); $fileNameInputEl.off('keyup');
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=';
if (newName !== originalName && confirm('Are you sure you want to rename: ' + originalName + ' to ' + newName + '?')) {
$.ajax({ var content = window.localStorage.getItem(utils.fileKey(originalName));
url: 'https://api.github.com/gists', window.localStorage[utils.fileKey(newName)] = content;
type: 'POST', window.localStorage.removeItem(utils.fileKey(originalName));
data: JSON.stringify({ editor.setCacheFile(newName);
description: description, }
public: true,
files: files updateFiles();
}) return false;
}).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?')) {
window.open(response.html_url, '_blank'); return false;
} });
});
} $filesEl.on('click', '.file .remove', function (ev) {
}); ev.preventDefault();
var name = $(this).parent().find('.name').text();
$('#copyOver').click(function () {
var target = prompt( if (confirm('Are you sure you want to remove: ' + name + ' from local storage?')) {
'To which other browser-solidity instance do you want to copy over all files?', window.localStorage.removeItem(utils.fileKey(name));
'https://ethereum.github.io/browser-solidity/' editor.setNextFile(utils.fileKey(name));
); updateFiles();
if (target === null) { }
return; return false;
} });
var files = editor.packageFiles();
var iframe = $('<iframe/>', {src: target, style: 'display:none;', load: function () { function showFileHandler (ev) {
this.contentWindow.postMessage(['loadFiles', files], '*'); ev.preventDefault();
}}).appendTo('body'); editor.setCacheFile($(this).find('.name').text());
}); updateFiles();
return false;
// ----------------- file selector------------- }
var $filesEl = $('#files'); function activeFileTab () {
var FILE_SCROLL_DELTA = 300; var name = editor.getCacheFile();
return $('#files .file').filter(function () { return $(this).find('.name').text() === name; });
$('.newFile').on('click', function () { }
editor.newFile();
updateFiles(); function updateFiles () {
var $filesEl = $('#files');
$filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () { var files = editor.getFiles();
reAdjust();
}); $filesEl.find('.file').remove();
});
for (var f in files) {
// ----------------- file upload ------------- $filesEl.append(fileTabTemplate(files[f]));
}
$('.inputFile').on('change', function () {
var fileList = $('input.inputFile')[0].files; if (editor.cacheFileIsPresent()) {
for (var i = 0; i < fileList.length; i++) { var active = activeFileTab();
var name = fileList[i].name; active.addClass('active');
if (!window.localStorage[utils.fileKey(name)] || confirm('The file ' + name + ' already exists! Would you like to overwrite it?')) { editor.resetSession();
editor.uploadFile(fileList[i]); }
updateFiles(); $('#input').toggle(editor.cacheFileIsPresent());
} $('#output').toggle(editor.cacheFileIsPresent());
} reAdjust();
}
$filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () {
reAdjust(); function fileTabTemplate (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>');
}
$filesEl.on('click', '.file:not(.active)', showFileHandler);
var $filesWrapper = $('.files-wrapper');
$filesEl.on('click', '.file.active', function (ev) { var $scrollerRight = $('.scroller-right');
var $fileTabEl = $(this); var $scrollerLeft = $('.scroller-left');
var originalName = $fileTabEl.find('.name').text();
ev.preventDefault(); function widthOfList () {
if ($(this).find('input').length > 0) return false; var itemsWidth = 0;
var $fileNameInputEl = $('<input value="' + originalName + '"/>'); $('.file').each(function () {
$fileTabEl.html($fileNameInputEl); var itemWidth = $(this).outerWidth();
$fileNameInputEl.focus(); itemsWidth += itemWidth;
$fileNameInputEl.select(); });
$fileNameInputEl.on('blur', handleRename); return itemsWidth;
$fileNameInputEl.keyup(handleRename); }
function handleRename (ev) { // function widthOfHidden () {
ev.preventDefault(); // return ($filesWrapper.outerWidth() - widthOfList() - getLeftPosi());
if (ev.which && ev.which !== 13) return false; // }
var newName = ev.target.value;
$fileNameInputEl.off('blur'); function widthOfVisible () {
$fileNameInputEl.off('keyup'); return $filesWrapper.outerWidth();
}
if (newName !== originalName && confirm('Are you sure you want to rename: ' + originalName + ' to ' + newName + '?')) {
var content = window.localStorage.getItem(utils.fileKey(originalName)); function getLeftPosi () {
window.localStorage[utils.fileKey(newName)] = content; return $filesEl.position().left;
window.localStorage.removeItem(utils.fileKey(originalName)); }
editor.setCacheFile(newName);
} function activeFilePos () {
var el = $filesEl.find('.active');
updateFiles(); var l = el.position().left;
return false; return l;
} }
return false; function reAdjust () {
}); if (widthOfList() + getLeftPosi() > widthOfVisible()) {
$scrollerRight.fadeIn('fast');
$filesEl.on('click', '.file .remove', function (ev) { } else {
ev.preventDefault(); $scrollerRight.fadeOut('fast');
var name = $(this).parent().find('.name').text(); }
if (confirm('Are you sure you want to remove: ' + name + ' from local storage?')) { if (getLeftPosi() < 0) {
window.localStorage.removeItem(utils.fileKey(name)); $scrollerLeft.fadeIn('fast');
editor.setNextFile(utils.fileKey(name)); } else {
updateFiles(); $scrollerLeft.fadeOut('fast');
} $filesEl.animate({ left: getLeftPosi() + 'px' }, 'slow');
return false; }
}); }
function showFileHandler (ev) { $scrollerRight.click(function () {
ev.preventDefault(); var delta = (getLeftPosi() - FILE_SCROLL_DELTA);
editor.setCacheFile($(this).find('.name').text()); $filesEl.animate({ left: delta + 'px' }, 'slow', function () {
updateFiles(); reAdjust();
return false; });
} });
function activeFileTab () {
var name = editor.getCacheFile();
return $('#files .file').filter(function () { return $(this).find('.name').text() === name; });
}
function updateFiles () {
var $filesEl = $('#files');
var files = editor.getFiles();
$filesEl.find('.file').remove();
for (var f in files) {
$filesEl.append(fileTabTemplate(files[f]));
}
if (editor.cacheFileIsPresent()) {
var active = activeFileTab();
active.addClass('active');
editor.resetSession();
}
$('#input').toggle(editor.cacheFileIsPresent());
$('#output').toggle(editor.cacheFileIsPresent());
reAdjust();
}
function fileTabTemplate (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>');
}
var $filesWrapper = $('.files-wrapper');
var $scrollerRight = $('.scroller-right');
var $scrollerLeft = $('.scroller-left');
function widthOfList () {
var itemsWidth = 0;
$('.file').each(function () {
var itemWidth = $(this).outerWidth();
itemsWidth += itemWidth;
});
return itemsWidth;
}
function widthOfHidden () {
return ($filesWrapper.outerWidth() - widthOfList() - getLeftPosi());
}
function widthOfVisible () {
return $filesWrapper.outerWidth();
}
function getLeftPosi () {
return $filesEl.position().left;
}
function activeFilePos () {
var el = $filesEl.find('.active');
var l = el.position().left;
return l;
}
function reAdjust () {
if (widthOfList() + getLeftPosi() > + widthOfVisible()) {
$scrollerRight.fadeIn('fast');
} else {
$scrollerRight.fadeOut('fast');
}
if (getLeftPosi() < 0) {
$scrollerLeft.fadeIn('fast');
} else {
$scrollerLeft.fadeOut('fast');
$filesEl.animate({ left: getLeftPosi() + 'px' }, 'slow');
}
}
$scrollerRight.click(function () {
var delta = (getLeftPosi() - FILE_SCROLL_DELTA);
$filesEl.animate({ left: delta + 'px' }, 'slow', function () {
reAdjust();
});
});
$scrollerLeft.click(function () {
var delta = Math.min((getLeftPosi() + FILE_SCROLL_DELTA), 0);
$filesEl.animate({ left: delta + 'px' }, 'slow', function () {
reAdjust();
});
});
updateFiles();
// ----------------- version selector-------------
// var soljsonSources is provided by bin/list.js
$('option', '#versionSelector').remove();
$.each(soljsonSources, function (i, file) {
if (file) {
var version = file.replace(/soljson-(.*).js/, '$1');
$('#versionSelector').append(new Option(version, file));
}
});
$('#versionSelector').change(function () {
queryParams.update({ version: $('#versionSelector').val() });
loadVersion($('#versionSelector').val());
});
// ----------------- resizeable ui ---------------
var EDITOR_SIZE_CACHE_KEY = 'editor-size-cache';
var dragging = false;
$('#dragbar').mousedown(function (e) {
e.preventDefault();
dragging = true;
var main = $('#righthand-panel');
var ghostbar = $('<div id="ghostbar">', {
css: {
top: main.offset().top,
left: main.offset().left
}
}).prependTo('body');
$(document).mousemove(function (e) {
ghostbar.css('left', e.pageX + 2);
});
});
var $body = $('body');
function setEditorSize (delta) {
$('#righthand-panel').css('width', delta);
$('#editor').css('right', delta);
onResize();
}
function getEditorSize () {
window.localStorage[EDITOR_SIZE_CACHE_KEY] = $('#righthand-panel').width();
}
$(document).mouseup(function (e) {
if (dragging) {
var delta = $body.width() - e.pageX + 2;
$('#ghostbar').remove();
$(document).unbind('mousemove');
dragging = false;
setEditorSize(delta);
window.localStorage.setItem(EDITOR_SIZE_CACHE_KEY, delta);
reAdjust();
}
});
// set cached defaults
var cachedSize = window.localStorage.getItem(EDITOR_SIZE_CACHE_KEY);
if (cachedSize) setEditorSize(cachedSize);
else getEditorSize();
// ----------------- toggle right hand panel -----------------
var hidingRHP = false;
$('.toggleRHP').click(function () {
hidingRHP = !hidingRHP;
setEditorSize(hidingRHP ? 0 : window.localStorage[EDITOR_SIZE_CACHE_KEY]);
$('.toggleRHP i').toggleClass('fa-angle-double-right', !hidingRHP);
$('.toggleRHP i').toggleClass('fa-angle-double-left', hidingRHP);
if (!hidingRHP) compiler.compile();
});
function getHidingRHP () { return hidingRHP; }
// ----------------- editor resize ---------------
function onResize () {
editor.resize();
reAdjust();
}
window.onresize = onResize;
onResize();
document.querySelector('#editor').addEventListener('change', onResize);
document.querySelector('#editorWrap').addEventListener('change', onResize);
// ----------------- compiler output renderer ----------------------
$('.asmOutput button').click(function () { $(this).parent().find('pre').toggle(); });
// ----------------- compiler ----------------------
function handleGithubCall (root, path, cb) {
$('#output').append($('<div/>').append($('<pre/>').text('Loading github.com/' + root + '/' + path + ' ...')));
return $.getJSON('https://api.github.com/repos/' + root + '/contents/' + path, cb);
}
var compiler = new Compiler(editor, handleGithubCall, $('#output'), getHidingRHP, updateFiles);
function setVersionText (text) {
$('#version').text(text);
}
var loadVersion = function (version) {
setVersionText('(loading)');
queryParams.update({version: version});
var isFirefox = typeof InstallTrigger !== 'undefined';
if (document.location.protocol !== 'file:' && Worker !== undefined && isFirefox) {
// Workers cannot load js on "file:"-URLs and we get a
// "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium,
// resort to non-worker version in that case.
compiler.loadVersion(true, version, setVersionText);
} else {
compiler.loadVersion(false, version, setVersionText);
}
};
loadVersion(queryParams.get().version || 'soljson-latest.js');
document.querySelector('#optimize').addEventListener('change', function () {
queryParams.update({optimize: document.querySelector('#optimize').checked });
compiler.compile();
});
storageHandler.sync(); $scrollerLeft.click(function () {
var delta = Math.min((getLeftPosi() + FILE_SCROLL_DELTA), 0);
$filesEl.animate({ left: delta + 'px' }, 'slow', function () {
reAdjust();
});
});
updateFiles();
// ----------------- version selector-------------
// var soljsonSources is provided by bin/list.js
$('option', '#versionSelector').remove();
$.each(soljsonSources, function (i, file) {
if (file) {
var version = file.replace(/soljson-(.*).js/, '$1');
$('#versionSelector').append(new Option(version, file));
}
});
$('#versionSelector').change(function () {
queryParams.update({ version: $('#versionSelector').val() });
loadVersion($('#versionSelector').val());
});
// ----------------- resizeable ui ---------------
var EDITOR_SIZE_CACHE_KEY = 'editor-size-cache';
var dragging = false;
$('#dragbar').mousedown(function (e) {
e.preventDefault();
dragging = true;
var main = $('#righthand-panel');
var ghostbar = $('<div id="ghostbar">', {
css: {
top: main.offset().top,
left: main.offset().left
}
}).prependTo('body');
$(document).mousemove(function (e) {
ghostbar.css('left', e.pageX + 2);
});
});
var $body = $('body');
function setEditorSize (delta) {
$('#righthand-panel').css('width', delta);
$('#editor').css('right', delta);
onResize();
}
function getEditorSize () {
window.localStorage[EDITOR_SIZE_CACHE_KEY] = $('#righthand-panel').width();
}
$(document).mouseup(function (e) {
if (dragging) {
var delta = $body.width() - e.pageX + 2;
$('#ghostbar').remove();
$(document).unbind('mousemove');
dragging = false;
setEditorSize(delta);
window.localStorage.setItem(EDITOR_SIZE_CACHE_KEY, delta);
reAdjust();
}
});
// set cached defaults
var cachedSize = window.localStorage.getItem(EDITOR_SIZE_CACHE_KEY);
if (cachedSize) setEditorSize(cachedSize);
else getEditorSize();
// ----------------- toggle right hand panel -----------------
var hidingRHP = false;
$('.toggleRHP').click(function () {
hidingRHP = !hidingRHP;
setEditorSize(hidingRHP ? 0 : window.localStorage[EDITOR_SIZE_CACHE_KEY]);
$('.toggleRHP i').toggleClass('fa-angle-double-right', !hidingRHP);
$('.toggleRHP i').toggleClass('fa-angle-double-left', hidingRHP);
if (!hidingRHP) compiler.compile();
});
function getHidingRHP () { return hidingRHP; }
// ----------------- editor resize ---------------
function onResize () {
editor.resize();
reAdjust();
}
window.onresize = onResize;
onResize();
document.querySelector('#editor').addEventListener('change', onResize);
document.querySelector('#editorWrap').addEventListener('change', onResize);
// ----------------- compiler output renderer ----------------------
$('.asmOutput button').click(function () { $(this).parent().find('pre').toggle(); });
// ----------------- compiler ----------------------
function handleGithubCall (root, path, cb) {
$('#output').append($('<div/>').append($('<pre/>').text('Loading github.com/' + root + '/' + path + ' ...')));
return $.getJSON('https://api.github.com/repos/' + root + '/contents/' + path, cb);
}
var compiler = new Compiler(editor, handleGithubCall, $('#output'), getHidingRHP, updateFiles);
function setVersionText (text) {
$('#version').text(text);
}
var loadVersion = function (version) {
setVersionText('(loading)');
queryParams.update({version: version});
var isFirefox = typeof InstallTrigger !== 'undefined';
if (document.location.protocol !== 'file:' && Worker !== undefined && isFirefox) {
// Workers cannot load js on "file:"-URLs and we get a
// "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium,
// resort to non-worker version in that case.
compiler.loadVersion(true, version, setVersionText);
} else {
compiler.loadVersion(false, version, setVersionText);
}
};
loadVersion(queryParams.get().version || 'soljson-latest.js');
document.querySelector('#optimize').addEventListener('change', function () {
queryParams.update({ optimize: document.querySelector('#optimize').checked });
compiler.compile();
});
storageHandler.sync();
}; };
module.exports = { module.exports = {
'run': run 'run': run
}; };
src/app/compiler-worker.js
View file @ 09690338
var version = function() { return '(loading)'; } var version = function () { return '(loading)'; };
var compileJSON = function() { return ''; } var compileJSON = function () { return ''; };
var missingInputs = []; var missingInputs = [];
module.exports = function (self) { module.exports = function (self) {
self.addEventListener('message', function(e) { self.addEventListener('message', function (e) {
var data = e.data; var data = e.data;
switch (data.cmd) { switch (data.cmd) {
case 'loadVersion': case 'loadVersion':
delete Module; delete Module;
version = null; version = null;
compileJSON = null; compileJSON = null;
importScripts(data.data); importScripts(data.data);
version = Module.cwrap("version", "string", []); version = Module.cwrap('version', 'string', []);
if ('_compileJSONCallback' in Module) if ('_compileJSONCallback' in Module) {
{ var compileJSONInternal = Module.cwrap('compileJSONCallback', 'string', ['string', 'number', 'number']);
compileJSONInternal = Module.cwrap("compileJSONCallback", "string", ["string", "number", "number"]); var missingInputCallback = Module.Runtime.addFunction(function (path) {
var missingInputCallback = Module.Runtime.addFunction(function(path) { missingInputs.push(Module.Pointer_stringify(path));
missingInputs.push(Module.Pointer_stringify(path)); });
}); compileJSON = function (input, optimize) {
compileJSON = function(input, optimize) { return compileJSONInternal(input, optimize, missingInputCallback);
return compileJSONInternal(input, optimize, missingInputCallback); };
}; } else if ('_compileJSONMulti' in Module) {
} compileJSON = Module.cwrap('compileJSONMulti', 'string', ['string', 'number']);
else if ('_compileJSONMulti' in Module) } else {
compileJSON = Module.cwrap("compileJSONMulti", "string", ["string", "number"]); compileJSON = Module.cwrap('compileJSON', 'string', ['string', 'number']);
else }
compileJSON = Module.cwrap("compileJSON", "string", ["string", "number"]); postMessage({
postMessage({ cmd: 'versionLoaded',
cmd: 'versionLoaded', data: version(),
data: version(), acceptsMultipleFiles: ('_compileJSONMulti' in Module)
acceptsMultipleFiles: ('_compileJSONMulti' in Module) });
}); break;
break; case 'compile':
case 'compile': missingInputs.length = 0;
missingInputs.length = 0; postMessage({cmd: 'compiled', data: compileJSON(data.source, data.optimize), missingInputs: missingInputs});
postMessage({cmd: 'compiled', data: compileJSON(data.source, data.optimize), missingInputs: missingInputs}); break;
break; }
} }, false);
}, false); };
}
src/app/compiler.js
View file @ 09690338
...@@ -42,7 +42,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles ...@@ -42,7 +42,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
sourceAnnotations = []; sourceAnnotations = [];
outputField.empty(); outputField.empty();
var input = editor.getValue(); var input = editor.getValue();
editor.setCacheFileContent(input) editor.setCacheFileContent(input);
var files = {}; var files = {};
files[editor.getCacheFile()] = input; files[editor.getCacheFile()] = input;
...@@ -148,7 +148,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles ...@@ -148,7 +148,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
function loadInternal (url, setVersionText) { function loadInternal (url, setVersionText) {
Module = null; Module = null;
// Set a safe fallback until the new one is loaded // Set a safe fallback until the new one is loaded
compileJSON = function(source, optimize) { compilationFinished('{}'); }; compileJSON = function (source, optimize) { compilationFinished('{}'); };
var newScript = document.createElement('script'); var newScript = document.createElement('script');
newScript.type = 'text/javascript'; newScript.type = 'text/javascript';
...@@ -171,14 +171,14 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles ...@@ -171,14 +171,14 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
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':
compilerAcceptsMultipleFiles = !!data.acceptsMultipleFiles; compilerAcceptsMultipleFiles = !!data.acceptsMultipleFiles;
onCompilerLoaded(setVersionText, data.data); onCompilerLoaded(setVersionText, data.data);
break; break;
case 'compiled': case 'compiled':
compilationFinished(data.data, data.missingInputs); compilationFinished(data.data, data.missingInputs);
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); });
...@@ -186,7 +186,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles ...@@ -186,7 +186,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
worker.postMessage({cmd: 'compile', source: source, optimize: optimize}); worker.postMessage({cmd: 'compile', source: source, optimize: optimize});
}; };
worker.postMessage({cmd: 'loadVersion', data: url}); worker.postMessage({cmd: 'loadVersion', data: url});
}; }
function gatherImports (files, importHints, cb) { function gatherImports (files, importHints, cb) {
importHints = importHints || []; importHints = importHints || [];
...@@ -201,7 +201,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles ...@@ -201,7 +201,7 @@ 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]);
} }
} }
...@@ -219,7 +219,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles ...@@ -219,7 +219,7 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
} else if (m in cachedRemoteFiles) { } else if (m in cachedRemoteFiles) {
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);
...@@ -243,4 +243,4 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles ...@@ -243,4 +243,4 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
} }
} }
module.exports = Compiler module.exports = Compiler;
src/app/editor.js
View file @ 09690338
/* global BALLOT_EXAMPLE, FileReader */
var utils = require('./utils'); var utils = require('./utils');
var ace = require('brace'); var ace = require('brace');
......
src/app/execution-context.js
View file @ 09690338
/* global confirm */
var $ = require('jquery'); var $ = require('jquery');
var Web3 = require('web3'); var Web3 = require('web3');
......
src/app/gist-handler.js
View file @ 09690338
/* global prompt */
var queryParams = require('./query-params'); var queryParams = require('./query-params');
function handleLoad (cb) { function handleLoad (cb) {
......
src/app/query-params.js
View file @ 09690338
...@@ -34,5 +34,5 @@ function updateQueryParams (params) { ...@@ -34,5 +34,5 @@ function updateQueryParams (params) {
module.exports = { module.exports = {
get: getQueryParams, get: getQueryParams,
update: updateQueryParams, update: updateQueryParams
}; };
\ No newline at end of file
src/app/renderer.js
View file @ 09690338
...@@ -6,7 +6,6 @@ var utils = require('./utils'); ...@@ -6,7 +6,6 @@ var utils = require('./utils');
var ExecutionContext = require('./execution-context'); var ExecutionContext = require('./execution-context');
function Renderer (editor, compiler, updateFiles) { function Renderer (editor, compiler, updateFiles) {
var detailsOpen = {}; var detailsOpen = {};
var executionContext = new ExecutionContext(compiler); var executionContext = new ExecutionContext(compiler);
...@@ -33,7 +32,7 @@ function Renderer (editor, compiler, updateFiles) { ...@@ -33,7 +32,7 @@ function Renderer (editor, compiler, updateFiles) {
// 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);
}); });
...@@ -43,7 +42,7 @@ function Renderer (editor, compiler, updateFiles) { ...@@ -43,7 +42,7 @@ function Renderer (editor, compiler, updateFiles) {
return false; return false;
}); });
} }
}; }
this.error = renderError; this.error = renderError;
var combined = function (contractName, jsonInterface, bytecode) { var combined = function (contractName, jsonInterface, bytecode) {
...@@ -51,7 +50,6 @@ function Renderer (editor, compiler, updateFiles) { ...@@ -51,7 +50,6 @@ function Renderer (editor, compiler, updateFiles) {
}; };
function renderContracts (data, source) { function renderContracts (data, source) {
var udappContracts = []; var udappContracts = [];
for (var contractName in data.contracts) { for (var contractName in data.contracts) {
var contract = data.contracts[contractName]; var contract = data.contracts[contractName];
...@@ -105,7 +103,7 @@ function Renderer (editor, compiler, updateFiles) { ...@@ -105,7 +103,7 @@ function Renderer (editor, compiler, updateFiles) {
$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) {
...@@ -132,8 +130,9 @@ function Renderer (editor, compiler, updateFiles) { ...@@ -132,8 +130,9 @@ function Renderer (editor, compiler, updateFiles) {
.append(tableRow('Solidity Interface', contract.solidity_interface)) .append(tableRow('Solidity Interface', contract.solidity_interface))
.append(tableRow('Opcodes', contract.opcodes)); .append(tableRow('Opcodes', contract.opcodes));
var funHashes = ''; var funHashes = '';
for (var fun in contract.functionHashes) for (var fun in contract.functionHashes) {
funHashes += contract.functionHashes[fun] + ' ' + fun + '\n'; funHashes += contract.functionHashes[fun] + ' ' + fun + '\n';
}
details.append($('<span class="col1">Functions</span>')); details.append($('<span class="col1">Functions</span>'));
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>'));
...@@ -154,7 +153,7 @@ function Renderer (editor, compiler, updateFiles) { ...@@ -154,7 +153,7 @@ function Renderer (editor, compiler, updateFiles) {
}; };
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) {
...@@ -217,16 +216,15 @@ function Renderer (editor, compiler, updateFiles) { ...@@ -217,16 +216,15 @@ function Renderer (editor, compiler, updateFiles) {
}); });
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;
} }
...@@ -241,7 +239,6 @@ function Renderer (editor, compiler, updateFiles) { ...@@ -241,7 +239,6 @@ function Renderer (editor, compiler, updateFiles) {
} }
return funABI; return funABI;
} }
} }
module.exports = Renderer; module.exports = Renderer;
src/app/storage-handler.js
View file @ 09690338
/* global chrome, confirm, localStorage */
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) { if (typeof chrome === 'undefined' || !chrome || !chrome.storage || !chrome.storage.sync) {
return; return;
} }
var obj = {}; var obj = {};
var done = false; var done = false;
var count = 0 var count = 0;
var dont = 0;
function check (key) { function check (key) {
chrome.storage.sync.get(key, function (resp) { chrome.storage.sync.get(key, function (resp) {
...@@ -28,9 +27,9 @@ function StorageHandler (updateFiles) { ...@@ -28,9 +27,9 @@ function StorageHandler (updateFiles) {
if (done >= count) { if (done >= count) {
chrome.storage.sync.set(obj, function () { chrome.storage.sync.set(obj, function () {
console.log('updated cloud files with: ', obj, this, arguments); console.log('updated cloud files with: ', obj, this, arguments);
}) });
} }
}) });
} }
for (var y in window.localStorage) { for (var y in window.localStorage) {
......
src/index.js
View file @ 09690338
...@@ -2,4 +2,4 @@ require('es6-shim'); ...@@ -2,4 +2,4 @@ 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
src/universal-dapp.js
View file @ 09690338
/* global prompt */
var $ = require('jquery'); var $ = require('jquery');
var EthJSVM = require('ethereumjs-vm'); var EthJSVM = require('ethereumjs-vm');
var ethJSUtil = require('ethereumjs-util'); var ethJSUtil = require('ethereumjs-util');
...@@ -7,663 +9,661 @@ var EthJSBlock = require('ethereumjs-block'); ...@@ -7,663 +9,661 @@ var EthJSBlock = require('ethereumjs-block');
var BN = ethJSUtil.BN; var BN = ethJSUtil.BN;
function UniversalDApp (contracts, options) { 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 (options.mode === 'vm') { if (options.mode === 'vm') {
// FIXME: use `options.vm` or `this.vm` consistently // FIXME: use `options.vm` or `this.vm` consistently
options.vm = true; options.vm = true;
this.accounts = {}; this.accounts = {};
this.vm = new EthJSVM(null, null, { activatePrecompiles: true, enableHomestead: true }); this.vm = new EthJSVM(null, null, { activatePrecompiles: true, enableHomestead: true });
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');
} }
} }
UniversalDApp.prototype.addAccount = function (privateKey, balance) { UniversalDApp.prototype.addAccount = function (privateKey, balance) {
if (this.accounts) { if (this.accounts) {
privateKey = new Buffer(privateKey, 'hex'); privateKey = new Buffer(privateKey, 'hex');
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 };
} }
}; };
UniversalDApp.prototype.getAccounts = function (cb) { 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) { if (!this.accounts) {
return cb('No accounts?'); return cb('No accounts?');
}
cb(null, Object.keys(this.accounts));
} }
cb(null, Object.keys(this.accounts));
}
}; };
UniversalDApp.prototype.getBalance = function (address, cb) { UniversalDApp.prototype.getBalance = function (address, cb) {
address = ethJSUtil.stripHexPrefix(address); address = ethJSUtil.stripHexPrefix(address);
if (!this.vm) { if (!this.vm) {
this.web3.eth.getBalance(address, function (err, res) { this.web3.eth.getBalance(address, function (err, res) {
if (err) { if (err) {
cb(err); cb(err);
} else { } else {
cb(null, res.toString(10)); cb(null, res.toString(10));
} }
}); });
} else { } else {
if (!this.accounts) { if (!this.accounts) {
return cb('No accounts?'); return cb('No accounts?');
}
this.vm.stateManager.getAccountBalance(new Buffer(address, 'hex'), function (err, res) {
if (err) {
cb('Account not found');
} else {
cb(null, new BN(res).toString(10));
}
});
} }
this.vm.stateManager.getAccountBalance(new Buffer(address, 'hex'), function (err, res) {
if (err) {
cb('Account not found');
} else {
cb(null, new BN(res).toString(10));
}
});
}
}; };
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]));
}
this.$el.append(this.renderOutputModifier(this.contracts[c].name, $contractEl));
} }
$contractEl.append($title).append(this.getCreateInterface($contractEl, this.contracts[c]));
}
this.$el.append(this.renderOutputModifier(this.contracts[c].name, $contractEl));
} }
var $legend = $('<div class="legend" />') }
.append($('<div class="attach"/>').text('Attach')) var $legend = $('<div class="legend" />')
.append($('<div class="transact"/>').text('Transact')) .append($('<div class="attach"/>').text('Attach'))
.append($('<div class="call"/>').text('Call')); .append($('<div class="transact"/>').text('Transact'))
.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;
}; };
UniversalDApp.prototype.getCreateInterface = function ($container, contract) { UniversalDApp.prototype.getCreateInterface = function ($container, contract) {
var self = this; var self = this;
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) { if (a.name > b.name) {
return -1; return -1;
} else { } else {
return 1; return 1;
} }
}).sort(function (a, b) { }).sort(function (a, b) {
if (a.constant === true) { if (a.constant === true) {
return -1; return -1;
} else { } else {
return 1; return 1;
} }
});
var funABI = this.getConstructorInterface(abi);
var $createInterface = $('<div class="createContract"/>');
var appendFunctions = function (address, $el) {
var $instance = $('<div class="instance"/>');
if (self.options.removable_instances) {
var $close = $('<div class="udapp-close" />');
$close.click(function () { $instance.remove(); });
$instance.append($close);
}
var context = self.options.vm ? 'memory' : 'blockchain';
var $title = $('<span class="title"/>').text(contract.name + ' at ' + (self.options.vm ? '0x' : '') + address.toString('hex') + ' (' + context + ')');
$title.click(function () {
$instance.toggleClass('hide');
}); });
var funABI = this.getConstructorInterface(abi);
var $createInterface = $('<div class="createContract"/>');
var appendFunctions = function (address, $el) { var $events = $('<div class="events"/>');
var $instance = $('<div class="instance"/>'); var parseLogs = function (err, response) {
if (self.options.removable_instances) { if (err) {
var $close = $('<div class="udapp-close" />'); return;
$close.click(function () { $instance.remove(); }); }
$instance.append($close);
}
var context = self.options.vm ? 'memory' : 'blockchain';
var $title = $('<span class="title"/>').text(contract.name + ' at ' + (self.options.vm ? '0x' : '') + address.toString('hex') + ' (' + context + ')');
$title.click(function () {
$instance.toggleClass('hide');
});
var $events = $('<div class="events"/>');
var parseLogs = function (err, response) {
if (err) {
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') { if (funABI.type !== 'event') {
return; 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) {
for (var i in response.vm.logs) {
// [address, topics, mem]
var log = response.vm.logs[i];
var abi = eventABI[log[1][0].toString('hex')];
var event = abi.event;
var decoded;
try {
var types = abi.inputs.map(function (item) {
return item.type;
}); });
decoded = ethJSABI.rawDecode(types, log[2]);
decoded = ethJSABI.stringify(types, decoded);
} catch (e) {
decoded = '0x' + log[2].toString('hex');
}
self.vm.on('afterTx', function (response) { parseLogs(null, { event: event, args: decoded });
for (var i in response.vm.logs) {
// [address, topics, mem]
var log = response.vm.logs[i];
var abi = eventABI[log[1][0].toString('hex')];
var event = abi.event;
var decoded;
try {
var types = abi.inputs.map(function (item) {
return item.type;
});
decoded = ethJSABI.rawDecode(types, log[2]);
decoded = ethJSABI.stringify(types, decoded);
} catch (e) {
decoded = '0x' + log[2].toString('hex');
}
parseLogs(null, { event: event, args: decoded });
}
});
} else {
var eventFilter = this.web3.eth.contract(abi).at(address).allEvents();
eventFilter.watch(parseLogs);
} }
$instance.append($title); });
// Add the fallback function
$instance.append(self.getCallButton({
abi: { constant: false, inputs: [], name: '(fallback)', outputs: [], type: 'function' },
encode: function (args) {
return '';
},
address: address
}));
$.each(abi, function (i, funABI) {
if (funABI.type !== 'function') {
return;
}
// @todo getData cannot be used with overloaded functions
$instance.append(self.getCallButton({
abi: funABI,
encode: function (args) {
var types = [];
for (var i = 0; i < funABI.inputs.length; i++) {
types.push(funABI.inputs[i].type);
}
return Buffer.concat([ ethJSABI.methodID(funABI.name, types), ethJSABI.rawEncode(types, args) ]).toString('hex');
},
address: address
}));
});
($el || $createInterface).append($instance.append($events));
};
if (!address || !$target) {
$createInterface.append(this.getCallButton({
abi: funABI,
encode: function (args) {
var types = [];
for (var i = 0; i < funABI.inputs.length; i++) {
types.push(funABI.inputs[i].type);
}
// NOTE: the caller will concatenate the bytecode and this
// it could be done here too for consistency
return ethJSABI.rawEncode(types, args).toString('hex');
},
contractName: contract.name,
bytecode: contract.bytecode,
appendFunctions: appendFunctions
}));
} else { } else {
appendFunctions(address, $target); var eventFilter = this.web3.eth.contract(abi).at(address).allEvents();
eventFilter.watch(parseLogs);
} }
$instance.append($title);
// Add the fallback function
$instance.append(self.getCallButton({
abi: { constant: false, inputs: [], name: '(fallback)', outputs: [], type: 'function' },
encode: function (args) {
return '';
},
address: address
}));
$.each(abi, function (i, funABI) {
if (funABI.type !== 'function') {
return;
}
// @todo getData cannot be used with overloaded functions
$instance.append(self.getCallButton({
abi: funABI,
encode: function (args) {
var types = [];
for (var i = 0; i < funABI.inputs.length; i++) {
types.push(funABI.inputs[i].type);
}
return Buffer.concat([ ethJSABI.methodID(funABI.name, types), ethJSABI.rawEncode(types, args) ]).toString('hex');
},
address: address
}));
});
($el || $createInterface).append($instance.append($events));
};
if (!address || !$target) {
$createInterface.append(this.getCallButton({
abi: funABI,
encode: function (args) {
var types = [];
for (var i = 0; i < funABI.inputs.length; i++) {
types.push(funABI.inputs[i].type);
}
return $createInterface; // NOTE: the caller will concatenate the bytecode and this
// it could be done here too for consistency
return ethJSABI.rawEncode(types, args).toString('hex');
},
contractName: contract.name,
bytecode: contract.bytecode,
appendFunctions: appendFunctions
}));
} else {
appendFunctions(address, $target);
}
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 !== '') { if (inputs !== '') {
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 $gasUsed = $('<div class="gasUsed">');
var caveat = lookupOnly ? '<em>(<span class="caveat" title="Cost only applies when called by a contract">caveat</span>)</em>' : '';
var gas;
if (result.gasUsed) {
gas = result.gasUsed.toString(10);
$gasUsed.html('<strong>Transaction cost:</strong> ' + gas + ' gas. ' + caveat);
}
if (vmResult.gasUsed) {
var $callGasUsed = $('<div class="gasUsed">');
gas = vmResult.gasUsed.toString(10);
$callGasUsed.append('<strong>Execution cost:</strong> ' + gas + ' gas.');
$gasUsed.append($callGasUsed);
}
return $gasUsed;
};
var getDecodedOutput = function (result) {
var $decoded;
if (Array.isArray(result)) {
$decoded = $('<ol>');
for (var i = 0; i < result.length; i++) {
$decoded.append($('<li>').text(result[i]));
}
} else {
$decoded = result;
}
return $('<div class="decoded">').html('<strong>Decoded:</strong> ').append($decoded);
};
var getOutput = function () {
var $result = $('<div class="result" />');
var $close = $('<div class="udapp-close" />');
$close.click(function () { $result.remove(); });
$result.append($close);
return $result;
};
var clearOutput = function ($result) {
$(':not(.udapp-close)', $result).remove();
};
var replaceOutput = function ($result, message) {
clearOutput($result);
$result.append(message);
};
var handleCallButtonClick = function (ev, $result) {
if (!$result) {
$result = getOutput();
if (lookupOnly && !inputs.length) {
$outputOverride.empty().append($result);
} else {
outputSpan.append($result);
}
}
var getGasUsedOutput = function (result, vmResult) { var funArgs = '';
var $gasUsed = $('<div class="gasUsed">'); try {
var caveat = lookupOnly ? '<em>(<span class="caveat" title="Cost only applies when called by a contract">caveat</span>)</em>' : ''; funArgs = $.parseJSON('[' + inputField.val() + ']');
if (result.gasUsed) { } catch (e) {
var gas = result.gasUsed.toString(10); replaceOutput($result, $('<span/>').text('Error encoding arguments: ' + e));
$gasUsed.html('<strong>Transaction cost:</strong> ' + gas + ' gas. ' + caveat); return;
} }
if (vmResult.gasUsed) { var data = '';
var $callGasUsed = $('<div class="gasUsed">'); if (!isConstructor || funArgs.length > 0) {
var gas = vmResult.gasUsed.toString(10); try {
$callGasUsed.append('<strong>Execution cost:</strong> ' + gas + ' gas.'); data = args.encode(funArgs);
$gasUsed.append($callGasUsed); } catch (e) {
} replaceOutput($result, $('<span/>').text('Error encoding arguments: ' + e));
return $gasUsed; return;
}; }
}
if (data.slice(0, 9) === 'undefined') {
data = data.slice(9);
}
if (data.slice(0, 2) === '0x') {
data = data.slice(2);
}
var getDecodedOutput = function (result) { replaceOutput($result, $('<span>Waiting for transaction to be mined...</span>'));
var $decoded;
if (Array.isArray(result)) { if (isConstructor) {
$decoded = $('<ol>'); if (args.bytecode.indexOf('_') >= 0) {
for (var i = 0; i < result.length; i++) { replaceOutput($result, $('<span>Deploying and linking required libraries...</span>'));
$decoded.append($('<li>').text(result[i])); self.linkBytecode(args.contractName, function (err, bytecode) {
} if (err) {
} else { replaceOutput($result, $('<span/>').text('Error deploying required libraries: ' + err));
$decoded = result; } else {
} args.bytecode = bytecode;
return $('<div class="decoded">').html('<strong>Decoded:</strong> ').append($decoded); handleCallButtonClick(ev, $result);
}; }
});
return;
} else {
data = args.bytecode + data;
}
}
var getOutput = function () { self.runTx(data, args, function (err, result) {
var $result = $('<div class="result" />'); if (err) {
var $close = $('<div class="udapp-close" />'); replaceOutput($result, $('<span/>').text(err).addClass('error'));
$close.click(function () { $result.remove(); }); } else if (self.options.vm && result.vm.exception && result.vm.exceptionError) {
$result.append($close); replaceOutput($result, $('<span/>').text('VM Exception: ' + result.vm.exceptionError).addClass('error'));
return $result; } else if (self.options.vm && result.vm.return === undefined) {
}; replaceOutput($result, $('<span/>').text('Exception during execution.').addClass('error'));
var clearOutput = function ($result) { } else if (self.options.vm && isConstructor) {
$(':not(.udapp-close)', $result).remove(); replaceOutput($result, getGasUsedOutput(result, result.vm));
}; args.appendFunctions(result.createdAddress);
var replaceOutput = function ($result, message) { } else if (self.options.vm) {
var outputObj = '0x' + result.vm.return.toString('hex');
clearOutput($result); clearOutput($result);
$result.append(message); $result.append(getReturnOutput(outputObj)).append(getGasUsedOutput(result, result.vm));
};
var handleCallButtonClick = function (ev, $result) { // Only decode if there supposed to be fields
if (!$result) { if (args.abi.outputs.length > 0) {
$result = getOutput(); try {
if (lookupOnly && !inputs.length) { var i;
$outputOverride.empty().append($result);
} else { var outputTypes = [];
outputSpan.append($result); for (i = 0; i < args.abi.outputs.length; i++) {
outputTypes.push(args.abi.outputs[i].type);
} }
}
var funArgs = ''; // decode data
try { var decodedObj = ethJSABI.rawDecode(outputTypes, result.vm.return);
funArgs = $.parseJSON('[' + inputField.val() + ']');
} catch (e) { // format decoded data
replaceOutput($result, $('<span/>').text('Error encoding arguments: ' + e)); decodedObj = ethJSABI.stringify(outputTypes, decodedObj);
return; for (i = 0; i < outputTypes.length; i++) {
} var name = args.abi.outputs[i].name;
var data = ''; if (name.length > 0) {
if (!isConstructor || funArgs.length > 0) { decodedObj[i] = outputTypes[i] + ' ' + name + ': ' + decodedObj[i];
try { } else {
data = args.encode(funArgs); decodedObj[i] = outputTypes[i] + ': ' + decodedObj[i];
} catch (e) { }
replaceOutput($result, $('<span/>').text('Error encoding arguments: ' + e));
return;
} }
}
if (data.slice(0, 9) === 'undefined') {
data = data.slice(9);
}
if (data.slice(0, 2) === '0x') {
data = data.slice(2);
}
replaceOutput($result, $('<span>Waiting for transaction to be mined...</span>')); $result.append(getDecodedOutput(decodedObj));
} catch (e) {
if (isConstructor) { $result.append(getDecodedOutput('Failed to decode output: ' + e));
if (args.bytecode.indexOf('_') >= 0) { }
replaceOutput($result, $('<span>Deploying and linking required libraries...</span>'));
self.linkBytecode(args.contractName, function (err, bytecode) {
if (err) {
replaceOutput($result, $('<span/>').text('Error deploying required libraries: ' + err));
} else {
args.bytecode = bytecode;
handleCallButtonClick(ev, $result);
}
});
return;
} else {
data = args.bytecode + data;
}
} }
} else if (args.abi.constant && !isConstructor) {
self.runTx(data, args, function (err, result) { replaceOutput($result, getReturnOutput(result));
if (err) { } else {
replaceOutput($result, $('<span/>').text(err).addClass('error')); tryTillResponse(self.web3, result, function (err, result) {
} else if (self.options.vm && result.vm.exception && result.vm.exceptionError) { if (err) {
replaceOutput($result, $('<span/>').text('VM Exception: ' + result.vm.exceptionError).addClass('error')); replaceOutput($result, $('<span/>').text(err).addClass('error'));
} else if (self.options.vm && result.vm.return === undefined) { } else if (isConstructor) {
replaceOutput($result, $('<span/>').text('Exception during execution.').addClass('error')); $result.html('');
} else if (self.options.vm && isConstructor) { args.appendFunctions(result.contractAddress);
replaceOutput($result, getGasUsedOutput(result, result.vm)); } else {
args.appendFunctions(result.createdAddress); clearOutput($result);
} else if (self.options.vm) { $result.append(getReturnOutput(result)).append(getGasUsedOutput(result));
var outputObj = '0x' + result.vm.return.toString('hex'); }
clearOutput($result);
$result.append(getReturnOutput(outputObj)).append(getGasUsedOutput(result, result.vm));
// Only decode if there supposed to be fields
if (args.abi.outputs.length > 0) {
try {
var outputTypes = [];
for (var i = 0; i < args.abi.outputs.length; i++) {
outputTypes.push(args.abi.outputs[i].type);
}
// decode data
var decodedObj = ethJSABI.rawDecode(outputTypes, result.vm.return);
// format decoded data
decodedObj = ethJSABI.stringify(outputTypes, decodedObj);
for (var i = 0; i < outputTypes.length; i++) {
var name = args.abi.outputs[i].name;
if (name.length > 0) {
decodedObj[i] = outputTypes[i] + ' ' + name + ': ' + decodedObj[i];
} else {
decodedObj[i] = outputTypes[i] + ': ' + decodedObj[i];
}
}
$result.append(getDecodedOutput(decodedObj));
} catch (e) {
$result.append(getDecodedOutput('Failed to decode output: ' + e));
}
}
} else if (args.abi.constant && !isConstructor) {
replaceOutput($result, getReturnOutput(result));
} else {
tryTillResponse(self.web3, result, function (err, result) {
if (err) {
replaceOutput($result, $('<span/>').text(err).addClass('error'));
} else if (isConstructor) {
$result.html('');
args.appendFunctions(result.contractAddress);
} else {
clearOutput($result);
$result.append(getReturnOutput(result)).append(getGasUsedOutput(result));
}
});
}
}); });
}; }
});
var button = $('<button />') };
.addClass('call')
.attr('title', args.abi.name) var button = $('<button />')
.text(args.bytecode ? 'Create' : args.abi.name) .addClass('call')
.click(handleCallButtonClick); .attr('title', args.abi.name)
.text(args.bytecode ? 'Create' : args.abi.name)
if (lookupOnly && !inputs.length) { .click(handleCallButtonClick);
handleCallButtonClick();
} if (lookupOnly && !inputs.length) {
handleCallButtonClick();
var $contractProperty = $('<div class="contractProperty"/>'); }
$contractProperty
.toggleClass('constant', !isConstructor && args.abi.constant) var $contractProperty = $('<div class="contractProperty"/>');
.toggleClass('hasArgs', args.abi.inputs.length > 0) $contractProperty
.toggleClass('constructor', isConstructor) .toggleClass('constant', !isConstructor && args.abi.constant)
.append(button) .toggleClass('hasArgs', args.abi.inputs.length > 0)
.append((lookupOnly && !inputs.length) ? $outputOverride : inputField); .toggleClass('constructor', isConstructor)
return $contractProperty.append(outputSpan); .append(button)
.append((lookupOnly && !inputs.length) ? $outputOverride : inputField);
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})__/);
if (!m) {
return cb('Invalid bytecode format.');
}
var libraryName = m[1];
if (!this.getContractByName(libraryName)) {
return cb('Library ' + libraryName + ' not found.');
}
var self = this;
this.deployLibrary(libraryName, function (err, address) {
if (err) {
return cb(err);
} }
var m = bytecode.match(/__([^_]{1,36})__/); var libLabel = '__' + libraryName + Array(39 - libraryName.length).join('_');
if (!m) { var hexAddress = address.toString('hex');
return cb('Invalid bytecode format.'); if (hexAddress.slice(0, 2) === '0x') {
hexAddress = hexAddress.slice(2);
} }
var libraryName = m[1]; hexAddress = Array(40 - hexAddress.length + 1).join('0') + hexAddress;
if (!this.getContractByName(libraryName)) { while (bytecode.indexOf(libLabel) >= 0) {
return cb('Library ' + libraryName + ' not found.'); bytecode = bytecode.replace(libLabel, hexAddress);
} }
var self = this; self.getContractByName(contractName).bytecode = bytecode;
this.deployLibrary(libraryName, function (err, address) { self.linkBytecode(contractName, cb);
if (err) { });
return cb(err);
}
var libLabel = '__' + libraryName + Array(39 - libraryName.length).join('_');
var hexAddress = address.toString('hex');
if (hexAddress.slice(0, 2) === '0x') {
hexAddress = hexAddress.slice(2);
}
hexAddress = Array(40 - hexAddress.length + 1).join('0') + hexAddress;
while (bytecode.indexOf(libLabel) >= 0) {
bytecode = bytecode.replace(libLabel, hexAddress);
}
self.getContractByName(contractName).bytecode = bytecode;
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) { if (err) {
return cb(err); return cb(err);
} }
if (self.options.vm) { if (self.options.vm) {
self.getContractByName(contractName).address = result.createdAddress; self.getContractByName(contractName).address = result.createdAddress;
cb(err, result.createdAddress); cb(err, result.createdAddress);
} else { } else {
tryTillResponse(self.web3, result, function(err, finalResult) { tryTillResponse(self.web3, result, function (err, finalResult) {
if (err) return cb(err); if (err) return cb(err);
self.getContractByName(contractName).address = finalResult.contractAddress; self.getContractByName(contractName).address = finalResult.contractAddress;
cb(null, finalResult.contractAddress); cb(null, finalResult.contractAddress);
});
}
}); });
} }
});
}
}; };
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 value = 0;
if (self.options.getValue) {
try {
value = self.options.getValue();
} catch (e) {
return cb(e);
} }
}
var gas = self.options.getGas ? self.options.getGas : 1000000;
var tx;
var value = 0; if (!this.vm) {
if (self.options.getValue) { tx = {
try { from: self.options.getAddress ? self.options.getAddress() : this.web3.eth.accounts[0],
value = self.options.getValue(); to: to,
} catch (e) { data: data,
return cb(e); gas: gas,
} value: value
} };
if (constant && !isConstructor) {
var tx; this.web3.eth.call(tx, cb);
if (!this.vm) {
tx = {
from: self.options.getAddress ? self.options.getAddress() : this.web3.eth.accounts[0],
to: to,
data: data,
gas: gas,
value: value
};
if (constant && !isConstructor) {
this.web3.eth.call(tx, cb);
} else {
this.web3.eth.estimateGas(tx, function (err, resp) {
tx.gas = resp;
if (!err) {
self.web3.eth.sendTransaction(tx, cb);
} else {
cb(err, resp);
}
});
}
} else { } else {
try { this.web3.eth.estimateGas(tx, function (err, resp) {
var address = this.options.getAddress ? this.options.getAddress() : this.getAccounts()[0]; tx.gas = resp;
var account = this.accounts[address]; if (!err) {
tx = new EthJSTX({ self.web3.eth.sendTransaction(tx, cb);
nonce: new Buffer([account.nonce++]), //@todo count beyond 255 } else {
gasPrice: 1, cb(err, resp);
gasLimit: 3000000000, // plenty
to: to,
value: new BN(value, 10),
data: new Buffer(data.slice(2), 'hex')
});
tx.sign(account.privateKey);
var block = new EthJSBlock({
header: {
// FIXME: support coinbase, difficulty, number and gasLimit
timestamp: new Date().getTime() / 1000 | 0
},
transactions: [],
uncleHeaders: []
});
this.vm.runTx({block: block, tx: tx, skipBalance: true, skipNonce: true}, cb);
} catch (e) {
cb(e, null);
} }
});
} }
} else {
try {
var address = this.options.getAddress ? this.options.getAddress() : this.getAccounts()[0];
var account = this.accounts[address];
tx = new EthJSTX({
nonce: new Buffer([account.nonce++]), // @todo count beyond 255
gasPrice: 1,
gasLimit: 3000000000, // plenty
to: to,
value: new BN(value, 10),
data: new Buffer(data.slice(2), 'hex')
});
tx.sign(account.privateKey);
var block = new EthJSBlock({
header: {
// FIXME: support coinbase, difficulty, number and gasLimit
timestamp: new Date().getTime() / 1000 | 0
},
transactions: [],
uncleHeaders: []
});
this.vm.runTx({block: block, tx: tx, skipBalance: true, skipNonce: true}, cb);
} catch (e) {
cb(e, null);
}
}
}; };
function tryTillResponse (web3, txhash, done) { function tryTillResponse (web3, txhash, done) {
web3.eth.getTransactionReceipt(txhash, testResult); web3.eth.getTransactionReceipt(txhash, testResult);
function testResult (err, address) { function testResult (err, address) {
if (!err && !address) { if (!err && !address) {
setTimeout(function () { tryTillResponse(web3, txhash, done); }, 500); setTimeout(function () { tryTillResponse(web3, txhash, done); }, 500);
} else { } else {
done(err, address); done(err, address);
}
} }
}
} }
module.exports = UniversalDApp; module.exports = UniversalDApp;
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