From f7d95be4fd24cab0ec4bd7c5e67611b35d52967a Mon Sep 17 00:00:00 2001 From: matthewnolan Date: Thu, 7 Jul 2016 20:38:55 -0400 Subject: [PATCH] check issues on github for details. --- .bowerrc | 3 + .editorconfig | 21 ++ .gitattributes | 1 + .gitignore | 5 +- .jshintrc | 23 ++ .travis.yml | 9 + .yo-rc.json | 1 + Gruntfile.js | 464 ++++++++++++++++++++++++ Procfile | 1 + README.md | 16 +- app/.buildignore | 1 + app/.htaccess | 543 +++++++++++++++++++++++++++++ app/404.html | 157 +++++++++ app/favicon.ico | Bin 0 -> 4286 bytes app/images/ajax.gif | Bin 0 -> 15382 bytes app/images/ethersignal-logo.svg | 14 + app/index.html | 206 +++++++++++ app/package.json | 15 + app/robots.txt | 3 + app/scripts/app.js | 41 +++ app/scripts/controllers/about.js | 11 + app/scripts/controllers/main.js | 20 ++ app/scripts/newether.js | 396 +++++++++++++++++++++ app/styles/main.css | 160 +++++++++ app/views/about.html | 16 + app/views/cliquickstart.html | 103 ++++++ app/views/main.html | 32 ++ bower.json | 24 ++ cli/ethersignal2.js | 65 +++- cli/readmev2.txt | 77 ++++ contracts/ethersignal2.sol | 6 + index.js | 9 + package.json | 51 +++ publish_site.sh | 30 ++ test/.jshintrc | 28 ++ test/karma.conf.js | 120 +++++++ test/protractor/conf.js | 6 + test/protractor/spec.js | 26 ++ test/spec/controllers/about.js | 19 + test/spec/controllers/main.js | 58 +++ ui/README.md | 6 - ui/browserAction.html | 12 - ui/css/style.css | 121 ------- ui/directives/accountSelector.html | 15 - ui/directives/networkStats.html | 11 - ui/directives/proposalsList.html | 35 -- ui/etherSignal.html | 22 -- ui/img/ether128.png | Bin 4337 -> 0 bytes ui/img/ether16.png | Bin 430 -> 0 bytes ui/img/ether48.png | Bin 1313 -> 0 bytes ui/img/lock.png | Bin 1371 -> 0 bytes ui/js/browserAction.js | 16 - ui/js/etherSignal.js | 267 -------------- ui/manifest.json | 29 -- ui/package.json | 27 -- 55 files changed, 2770 insertions(+), 572 deletions(-) create mode 100644 .bowerrc create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .jshintrc create mode 100644 .travis.yml create mode 100644 .yo-rc.json create mode 100644 Gruntfile.js create mode 100644 Procfile create mode 100644 app/.buildignore create mode 100644 app/.htaccess create mode 100644 app/404.html create mode 100644 app/favicon.ico create mode 100644 app/images/ajax.gif create mode 100644 app/images/ethersignal-logo.svg create mode 100644 app/index.html create mode 100644 app/package.json create mode 100644 app/robots.txt create mode 100644 app/scripts/app.js create mode 100644 app/scripts/controllers/about.js create mode 100644 app/scripts/controllers/main.js create mode 100644 app/scripts/newether.js create mode 100644 app/styles/main.css create mode 100644 app/views/about.html create mode 100644 app/views/cliquickstart.html create mode 100644 app/views/main.html create mode 100644 bower.json create mode 100644 cli/readmev2.txt create mode 100644 index.js create mode 100644 package.json create mode 100755 publish_site.sh create mode 100644 test/.jshintrc create mode 100644 test/karma.conf.js create mode 100644 test/protractor/conf.js create mode 100644 test/protractor/spec.js create mode 100644 test/spec/controllers/about.js create mode 100644 test/spec/controllers/main.js delete mode 100644 ui/README.md delete mode 100644 ui/browserAction.html delete mode 100644 ui/css/style.css delete mode 100644 ui/directives/accountSelector.html delete mode 100644 ui/directives/networkStats.html delete mode 100644 ui/directives/proposalsList.html delete mode 100644 ui/etherSignal.html delete mode 100644 ui/img/ether128.png delete mode 100644 ui/img/ether16.png delete mode 100644 ui/img/ether48.png delete mode 100644 ui/img/lock.png delete mode 100644 ui/js/browserAction.js delete mode 100644 ui/js/etherSignal.js delete mode 100644 ui/manifest.json delete mode 100644 ui/package.json diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 0000000..69fad35 --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "bower_components" +} diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..c2cdfb8 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,21 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# editorconfig.org + +root = true + + +[*] + +# Change these settings to your own preference +indent_style = space +indent_size = 2 + +# We recommend you to keep these unchanged +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..2125666 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1bd7226..0256151 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ node_modules -*.swp +.tmp +.sass-cache +dist +bower_components diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 0000000..f750969 --- /dev/null +++ b/.jshintrc @@ -0,0 +1,23 @@ +{ + "node": true, + "browser": true, + "esnext": true, + "bitwise": true, + "camelcase": true, + "curly": true, + "eqeqeq": true, + "immed": true, + "indent": 2, + "latedef": true, + "newcap": true, + "noarg": true, + "quotmark": "single", + "undef": true, + "unused": true, + "strict": true, + "trailing": true, + "smarttabs": true, + "globals": { + "angular": false + } +} diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6fb6850 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +sudo: false +language: node_js +node_js: + - 'iojs' + - '0.12' + - '0.10' +before_script: + - 'npm install -g bower grunt-cli' + - 'bower install' diff --git a/.yo-rc.json b/.yo-rc.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/.yo-rc.json @@ -0,0 +1 @@ +{} diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 0000000..c60862c --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,464 @@ +// Generated on 2015-12-17 using generator-angular 0.11.1 +'use strict'; + +// # Globbing +// for performance reasons we're only matching one level down: +// 'test/spec/{,*/}*.js' +// use this if you want to recursively match all subfolders: +// 'test/spec/**/*.js' + +module.exports = function (grunt) { + + // Load grunt tasks automatically + require('load-grunt-tasks')(grunt); + + // Time how long tasks take. Can help when optimizing build times + require('time-grunt')(grunt); + + // Configurable paths for the application + var appConfig = { + app: require('./bower.json').appPath || 'app', + dist: 'dist' + }; + + // Define the configuration for all the tasks + grunt.initConfig({ + + // Project settings + yeoman: appConfig, + + // Watches files for changes and runs tasks based on the changed files + watch: { + bower: { + files: ['bower.json'], + tasks: ['wiredep'] + }, + js: { + files: ['<%= yeoman.app %>/scripts/{,*/}*.js'], + // tasks: ['newer:jshint:all'], + options: { + livereload: '<%= connect.options.livereload %>' + } + }, + jsTest: { + files: ['test/spec/{,*/}*.js'], + tasks: ['newer:jshint:test', 'karma'] + }, + styles: { + files: ['<%= yeoman.app %>/styles/{,*/}*.css'], + tasks: ['newer:copy:styles', 'autoprefixer'] + }, + gruntfile: { + files: ['Gruntfile.js'] + }, + livereload: { + options: { + livereload: '<%= connect.options.livereload %>' + }, + files: [ + '<%= yeoman.app %>/{,*/}*.html', + '.tmp/styles/{,*/}*.css', + '<%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}' + ] + } + }, + buildcontrol: { + options: { + dir: 'dist', + commit: true, + push: true, + message: 'Built %sourceName% from commit %sourceCommit% on branch %sourceBranch%' + }, + heroku: { + options: { + remote: 'https://stark-thicket-8728.herokuapp.com/', + branch: 'master' + } + } + }, + + // The actual grunt server settings + connect: { + options: { + port: 9000, + // Change this to '0.0.0.0' to access the server from outside. + hostname: 'localhost', + livereload: 35729 + }, + livereload: { + options: { + open: true, + middleware: function (connect) { + return [ + connect.static('.tmp'), + connect().use( + '/bower_components', + connect.static('./bower_components') + ), + connect().use( + '/app/styles', + connect.static('./app/styles') + ), + connect.static(appConfig.app) + ]; + } + } + }, + test: { + options: { + port: 9001, + middleware: function (connect) { + return [ + connect.static('.tmp'), + connect.static('test'), + connect().use( + '/bower_components', + connect.static('./bower_components') + ), + connect.static(appConfig.app) + ]; + } + } + }, + dist: { + options: { + open: true, + base: '<%= yeoman.dist %>' + } + } + }, + + // Make sure code styles are up to par and there are no obvious mistakes + jshint: { + options: { + jshintrc: '.jshintrc', + reporter: require('jshint-stylish') + }, + all: { + src: [ + 'Gruntfile.js', + '<%= yeoman.app %>/scripts/{,*/}*.js' + ] + }, + test: { + options: { + jshintrc: 'test/.jshintrc' + }, + src: ['test/spec/{,*/}*.js'] + } + }, + + // Empties folders to start fresh + clean: { + dist: { + files: [{ + dot: true, + src: [ + '.tmp', + '<%= yeoman.dist %>/*', + '!<%= yeoman.dist %>/.git{,*/}*', + '!<%= yeoman.dist %>/Procfile', + '!<%= yeoman.dist %>/package.json', + '!<%= yeoman.dist %>/web.js', + '!<%= yeoman.dist %>/node_modules' + ] + }] + }, + server: '.tmp' + }, + + // Add vendor prefixed styles + autoprefixer: { + options: { + browsers: ['last 1 version'] + }, + server: { + options: { + map: true, + }, + files: [{ + expand: true, + cwd: '.tmp/styles/', + src: '{,*/}*.css', + dest: '.tmp/styles/' + }] + }, + dist: { + files: [{ + expand: true, + cwd: '.tmp/styles/', + src: '{,*/}*.css', + dest: '.tmp/styles/' + }] + } + }, + + // Automatically inject Bower components into the app + wiredep: { + app: { + src: ['<%= yeoman.app %>/index.html'], + ignorePath: /\.\.\// + }, + test: { + devDependencies: true, + src: '<%= karma.unit.configFile %>', + ignorePath: /\.\.\//, + fileTypes:{ + js: { + block: /(([\s\t]*)\/{2}\s*?bower:\s*?(\S*))(\n|\r|.)*?(\/{2}\s*endbower)/gi, + detect: { + js: /'(.*\.js)'/gi + }, + replace: { + js: '\'{{filePath}}\',' + } + } + } + } + }, + + // Renames files for browser caching purposes + filerev: { + dist: { + src: [ + '<%= yeoman.dist %>/scripts/{,*/}*.js', + '<%= yeoman.dist %>/styles/{,*/}*.css', + '<%= yeoman.dist %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}', + '<%= yeoman.dist %>/styles/fonts/*' + ] + } + }, + + // Reads HTML for usemin blocks to enable smart builds that automatically + // concat, minify and revision files. Creates configurations in memory so + // additional tasks can operate on them + useminPrepare: { + html: '<%= yeoman.app %>/index.html', + options: { + dest: '<%= yeoman.dist %>', + flow: { + html: { + steps: { + js: ['concat', 'uglifyjs'], + css: ['cssmin'] + }, + post: {} + } + } + } + }, + + // Performs rewrites based on filerev and the useminPrepare configuration + usemin: { + html: ['<%= yeoman.dist %>/{,*/}*.html'], + css: ['<%= yeoman.dist %>/styles/{,*/}*.css'], + options: { + assetsDirs: [ + '<%= yeoman.dist %>', + '<%= yeoman.dist %>/images', + '<%= yeoman.dist %>/styles' + ] + } + }, + + // The following *-min tasks will produce minified files in the dist folder + // By default, your `index.html`'s will take care of + // minification. These next options are pre-configured if you do not wish + // to use the Usemin blocks. + // cssmin: { + // dist: { + // files: { + // '<%= yeoman.dist %>/styles/main.css': [ + // '.tmp/styles/{,*/}*.css' + // ] + // } + // } + // }, + // uglify: { + // dist: { + // files: { + // '<%= yeoman.dist %>/scripts/scripts.js': [ + // '<%= yeoman.dist %>/scripts/scripts.js' + // ] + // } + // } + // }, + // concat: { + // dist: {} + // }, + + imagemin: { + dist: { + files: [{ + expand: true, + cwd: '<%= yeoman.app %>/images', + src: '{,*/}*.{png,jpg,jpeg,gif}', + dest: '<%= yeoman.dist %>/images' + }] + } + }, + + svgmin: { + dist: { + files: [{ + expand: true, + cwd: '<%= yeoman.app %>/images', + src: '{,*/}*.svg', + dest: '<%= yeoman.dist %>/images' + }] + } + }, + + htmlmin: { + dist: { + options: { + collapseWhitespace: true, + conservativeCollapse: true, + collapseBooleanAttributes: true, + removeCommentsFromCDATA: true, + removeOptionalTags: true + }, + files: [{ + expand: true, + cwd: '<%= yeoman.dist %>', + src: ['*.html', 'views/{,*/}*.html'], + dest: '<%= yeoman.dist %>' + }] + } + }, + + // ng-annotate tries to make the code safe for minification automatically + // by using the Angular long form for dependency injection. + ngAnnotate: { + dist: { + files: [{ + expand: true, + cwd: '.tmp/concat/scripts', + src: '*.js', + dest: '.tmp/concat/scripts' + }] + } + }, + + // Replace Google CDN references + cdnify: { + dist: { + html: ['<%= yeoman.dist %>/*.html'] + } + }, + + // Copies remaining files to places other tasks can use + copy: { + dist: { + files: [{ + expand: true, + dot: true, + cwd: '<%= yeoman.app %>', + dest: '<%= yeoman.dist %>', + src: [ + '*.{ico,png,txt}', + '.htaccess', + '*.html', + 'views/{,*/}*.html', + 'images/{,*/}*.{webp}', + 'styles/fonts/{,*/}*.*' + ] + }, { + expand: true, + cwd: '.tmp/images', + dest: '<%= yeoman.dist %>/images', + src: ['generated/*'] + }, { + expand: true, + cwd: 'bower_components/bootstrap/dist', + src: 'fonts/*', + dest: '<%= yeoman.dist %>' + }] + }, + styles: { + expand: true, + cwd: '<%= yeoman.app %>/styles', + dest: '.tmp/styles/', + src: '{,*/}*.css' + } + }, + + // Run some tasks in parallel to speed up the build process + concurrent: { + server: [ + 'copy:styles' + ], + test: [ + 'copy:styles' + ], + dist: [ + 'copy:styles', + 'imagemin', + 'svgmin' + ] + }, + + // Test settings + karma: { + unit: { + configFile: 'test/karma.conf.js', + singleRun: true + } + } + }); + + + grunt.registerTask('serve', 'Compile then start a connect web server', function (target) { + if (target === 'dist') { + return grunt.task.run(['build', 'connect:dist:keepalive']); + } + + grunt.task.run([ + 'clean:server', + 'wiredep', + 'concurrent:server', + 'autoprefixer:server', + 'connect:livereload', + 'watch' + ]); + }); + + grunt.registerTask('server', 'DEPRECATED TASK. Use the "serve" task instead', function (target) { + grunt.log.warn('The `server` task has been deprecated. Use `grunt serve` to start a server.'); + grunt.task.run(['serve:' + target]); + }); + + grunt.registerTask('deploy', ['buildcontrol']); + + grunt.registerTask('test', [ + 'clean:server', + 'wiredep', + 'concurrent:test', + 'autoprefixer', + 'connect:test', + 'karma' + ]); + + grunt.registerTask('build', [ + 'clean:dist', + 'wiredep', + 'useminPrepare', + 'concurrent:dist', + 'autoprefixer', + 'concat', + 'ngAnnotate', + 'copy:dist', + 'cdnify', + 'cssmin', + 'uglify', + 'filerev', + 'usemin', + 'htmlmin' + ]); + + grunt.registerTask('default', [ + 'newer:jshint', + 'test', + 'build' + ]); +}; diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..5ec9cc2 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: node index.js \ No newline at end of file diff --git a/README.md b/README.md index a04032f..ae71621 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,18 @@ # Ether Signal Contract on Testnet: -http://testnet.etherscan.io/address/0x851a78f09511bf510ad27036f5ff7c8901fdd2e2#code +http://testnet.etherscan.io/address/0x9e75993a7a9b9f92a1978bcc15c30cbcb967bc81#code + +## Build & development + +Run `grunt` for building and `grunt serve` for preview. + +## Testing + +Running `grunt test` will run the unit tests with karma. + +To test with Protractor: +webdriver-manager start +protractor conf.js + +geth --rpc --rpccorsdomain="*" --rpcapi="db,eth,net,web3,personal" --testnet \ No newline at end of file diff --git a/app/.buildignore b/app/.buildignore new file mode 100644 index 0000000..fc98b8e --- /dev/null +++ b/app/.buildignore @@ -0,0 +1 @@ +*.coffee \ No newline at end of file diff --git a/app/.htaccess b/app/.htaccess new file mode 100644 index 0000000..cb84cb9 --- /dev/null +++ b/app/.htaccess @@ -0,0 +1,543 @@ +# Apache Configuration File + +# (!) Using `.htaccess` files slows down Apache, therefore, if you have access +# to the main server config file (usually called `httpd.conf`), you should add +# this logic there: http://httpd.apache.org/docs/current/howto/htaccess.html. + +# ############################################################################## +# # CROSS-ORIGIN RESOURCE SHARING (CORS) # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Cross-domain AJAX requests | +# ------------------------------------------------------------------------------ + +# Enable cross-origin AJAX requests. +# http://code.google.com/p/html5security/wiki/CrossOriginRequestSecurity +# http://enable-cors.org/ + +# +# Header set Access-Control-Allow-Origin "*" +# + +# ------------------------------------------------------------------------------ +# | CORS-enabled images | +# ------------------------------------------------------------------------------ + +# Send the CORS header for images when browsers request it. +# https://developer.mozilla.org/en/CORS_Enabled_Image +# http://blog.chromium.org/2011/07/using-cross-domain-images-in-webgl-and.html +# http://hacks.mozilla.org/2011/11/using-cors-to-load-webgl-textures-from-cross-domain-images/ + + + + + SetEnvIf Origin ":" IS_CORS + Header set Access-Control-Allow-Origin "*" env=IS_CORS + + + + +# ------------------------------------------------------------------------------ +# | Web fonts access | +# ------------------------------------------------------------------------------ + +# Allow access from all domains for web fonts + + + + Header set Access-Control-Allow-Origin "*" + + + + +# ############################################################################## +# # ERRORS # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | 404 error prevention for non-existing redirected folders | +# ------------------------------------------------------------------------------ + +# Prevent Apache from returning a 404 error for a rewrite if a directory +# with the same name does not exist. +# http://httpd.apache.org/docs/current/content-negotiation.html#multiviews +# http://www.webmasterworld.com/apache/3808792.htm + +Options -MultiViews + +# ------------------------------------------------------------------------------ +# | Custom error messages / pages | +# ------------------------------------------------------------------------------ + +# You can customize what Apache returns to the client in case of an error (see +# http://httpd.apache.org/docs/current/mod/core.html#errordocument), e.g.: + +ErrorDocument 404 /404.html + + +# ############################################################################## +# # INTERNET EXPLORER # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Better website experience | +# ------------------------------------------------------------------------------ + +# Force IE to render pages in the highest available mode in the various +# cases when it may not: http://hsivonen.iki.fi/doctype/ie-mode.pdf. + + + Header set X-UA-Compatible "IE=edge" + # `mod_headers` can't match based on the content-type, however, we only + # want to send this header for HTML pages and not for the other resources + + Header unset X-UA-Compatible + + + +# ------------------------------------------------------------------------------ +# | Cookie setting from iframes | +# ------------------------------------------------------------------------------ + +# Allow cookies to be set from iframes in IE. + +# +# Header set P3P "policyref=\"/w3c/p3p.xml\", CP=\"IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT\"" +# + +# ------------------------------------------------------------------------------ +# | Screen flicker | +# ------------------------------------------------------------------------------ + +# Stop screen flicker in IE on CSS rollovers (this only works in +# combination with the `ExpiresByType` directives for images from below). + +# BrowserMatch "MSIE" brokenvary=1 +# BrowserMatch "Mozilla/4.[0-9]{2}" brokenvary=1 +# BrowserMatch "Opera" !brokenvary +# SetEnvIf brokenvary 1 force-no-vary + + +# ############################################################################## +# # MIME TYPES AND ENCODING # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Proper MIME types for all files | +# ------------------------------------------------------------------------------ + + + + # Audio + AddType audio/mp4 m4a f4a f4b + AddType audio/ogg oga ogg + + # JavaScript + # Normalize to standard type (it's sniffed in IE anyways): + # http://tools.ietf.org/html/rfc4329#section-7.2 + AddType application/javascript js jsonp + AddType application/json json + + # Video + AddType video/mp4 mp4 m4v f4v f4p + AddType video/ogg ogv + AddType video/webm webm + AddType video/x-flv flv + + # Web fonts + AddType application/font-woff woff + AddType application/vnd.ms-fontobject eot + + # Browsers usually ignore the font MIME types and sniff the content, + # however, Chrome shows a warning if other MIME types are used for the + # following fonts. + AddType application/x-font-ttf ttc ttf + AddType font/opentype otf + + # Make SVGZ fonts work on iPad: + # https://twitter.com/FontSquirrel/status/14855840545 + AddType image/svg+xml svg svgz + AddEncoding gzip svgz + + # Other + AddType application/octet-stream safariextz + AddType application/x-chrome-extension crx + AddType application/x-opera-extension oex + AddType application/x-shockwave-flash swf + AddType application/x-web-app-manifest+json webapp + AddType application/x-xpinstall xpi + AddType application/xml atom rdf rss xml + AddType image/webp webp + AddType image/x-icon ico + AddType text/cache-manifest appcache manifest + AddType text/vtt vtt + AddType text/x-component htc + AddType text/x-vcard vcf + + + +# ------------------------------------------------------------------------------ +# | UTF-8 encoding | +# ------------------------------------------------------------------------------ + +# Use UTF-8 encoding for anything served as `text/html` or `text/plain`. +AddDefaultCharset utf-8 + +# Force UTF-8 for certain file formats. + + AddCharset utf-8 .atom .css .js .json .rss .vtt .webapp .xml + + + +# ############################################################################## +# # URL REWRITES # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Rewrite engine | +# ------------------------------------------------------------------------------ + +# Turning on the rewrite engine and enabling the `FollowSymLinks` option is +# necessary for the following directives to work. + +# If your web host doesn't allow the `FollowSymlinks` option, you may need to +# comment it out and use `Options +SymLinksIfOwnerMatch` but, be aware of the +# performance impact: http://httpd.apache.org/docs/current/misc/perf-tuning.html#symlinks + +# Also, some cloud hosting services require `RewriteBase` to be set: +# http://www.rackspace.com/knowledge_center/frequently-asked-question/why-is-mod-rewrite-not-working-on-my-site + + + Options +FollowSymlinks + # Options +SymLinksIfOwnerMatch + RewriteEngine On + # RewriteBase / + + +# ------------------------------------------------------------------------------ +# | Suppressing / Forcing the "www." at the beginning of URLs | +# ------------------------------------------------------------------------------ + +# The same content should never be available under two different URLs especially +# not with and without "www." at the beginning. This can cause SEO problems +# (duplicate content), therefore, you should choose one of the alternatives and +# redirect the other one. + +# By default option 1 (no "www.") is activated: +# http://no-www.org/faq.php?q=class_b + +# If you'd prefer to use option 2, just comment out all the lines from option 1 +# and uncomment the ones from option 2. + +# IMPORTANT: NEVER USE BOTH RULES AT THE SAME TIME! + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +# Option 1: rewrite www.example.com → example.com + + + RewriteCond %{HTTPS} !=on + RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC] + RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L] + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +# Option 2: rewrite example.com → www.example.com + +# Be aware that the following might not be a good idea if you use "real" +# subdomains for certain parts of your website. + +# +# RewriteCond %{HTTPS} !=on +# RewriteCond %{HTTP_HOST} !^www\..+$ [NC] +# RewriteRule ^ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L] +# + + +# ############################################################################## +# # SECURITY # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Content Security Policy (CSP) | +# ------------------------------------------------------------------------------ + +# You can mitigate the risk of cross-site scripting and other content-injection +# attacks by setting a Content Security Policy which whitelists trusted sources +# of content for your site. + +# The example header below allows ONLY scripts that are loaded from the current +# site's origin (no inline scripts, no CDN, etc). This almost certainly won't +# work as-is for your site! + +# To get all the details you'll need to craft a reasonable policy for your site, +# read: http://html5rocks.com/en/tutorials/security/content-security-policy (or +# see the specification: http://w3.org/TR/CSP). + +# +# Header set Content-Security-Policy "script-src 'self'; object-src 'self'" +# +# Header unset Content-Security-Policy +# +# + +# ------------------------------------------------------------------------------ +# | File access | +# ------------------------------------------------------------------------------ + +# Block access to directories without a default document. +# Usually you should leave this uncommented because you shouldn't allow anyone +# to surf through every directory on your server (which may includes rather +# private places like the CMS's directories). + + + Options -Indexes + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +# Block access to hidden files and directories. +# This includes directories used by version control systems such as Git and SVN. + + + RewriteCond %{SCRIPT_FILENAME} -d [OR] + RewriteCond %{SCRIPT_FILENAME} -f + RewriteRule "(^|/)\." - [F] + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +# Block access to backup and source files. +# These files may be left by some text editors and can pose a great security +# danger when anyone has access to them. + + + Order allow,deny + Deny from all + Satisfy All + + +# ------------------------------------------------------------------------------ +# | Secure Sockets Layer (SSL) | +# ------------------------------------------------------------------------------ + +# Rewrite secure requests properly to prevent SSL certificate warnings, e.g.: +# prevent `https://www.example.com` when your certificate only allows +# `https://secure.example.com`. + +# +# RewriteCond %{SERVER_PORT} !^443 +# RewriteRule ^ https://example-domain-please-change-me.com%{REQUEST_URI} [R=301,L] +# + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +# Force client-side SSL redirection. + +# If a user types "example.com" in his browser, the above rule will redirect him +# to the secure version of the site. That still leaves a window of opportunity +# (the initial HTTP connection) for an attacker to downgrade or redirect the +# request. The following header ensures that browser will ONLY connect to your +# server via HTTPS, regardless of what the users type in the address bar. +# http://www.html5rocks.com/en/tutorials/security/transport-layer-security/ + +# +# Header set Strict-Transport-Security max-age=16070400; +# + +# ------------------------------------------------------------------------------ +# | Server software information | +# ------------------------------------------------------------------------------ + +# Avoid displaying the exact Apache version number, the description of the +# generic OS-type and the information about Apache's compiled-in modules. + +# ADD THIS DIRECTIVE IN THE `httpd.conf` AS IT WILL NOT WORK IN THE `.htaccess`! + +# ServerTokens Prod + + +# ############################################################################## +# # WEB PERFORMANCE # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Compression | +# ------------------------------------------------------------------------------ + + + + # Force compression for mangled headers. + # http://developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping + + + SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding + RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding + + + + # Compress all output labeled with one of the following MIME-types + # (for Apache versions below 2.3.7, you don't need to enable `mod_filter` + # and can remove the `` and `` lines + # as `AddOutputFilterByType` is still in the core directives). + + AddOutputFilterByType DEFLATE application/atom+xml \ + application/javascript \ + application/json \ + application/rss+xml \ + application/vnd.ms-fontobject \ + application/x-font-ttf \ + application/x-web-app-manifest+json \ + application/xhtml+xml \ + application/xml \ + font/opentype \ + image/svg+xml \ + image/x-icon \ + text/css \ + text/html \ + text/plain \ + text/x-component \ + text/xml + + + + +# ------------------------------------------------------------------------------ +# | Content transformations | +# ------------------------------------------------------------------------------ + +# Prevent some of the mobile network providers from modifying the content of +# your site: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.5. + +# +# Header set Cache-Control "no-transform" +# + +# ------------------------------------------------------------------------------ +# | ETag removal | +# ------------------------------------------------------------------------------ + +# Since we're sending far-future expires headers (see below), ETags can +# be removed: http://developer.yahoo.com/performance/rules.html#etags. + +# `FileETag None` is not enough for every server. + + Header unset ETag + + +FileETag None + +# ------------------------------------------------------------------------------ +# | Expires headers (for better cache control) | +# ------------------------------------------------------------------------------ + +# The following expires headers are set pretty far in the future. If you don't +# control versioning with filename-based cache busting, consider lowering the +# cache time for resources like CSS and JS to something like 1 week. + + + + ExpiresActive on + ExpiresDefault "access plus 1 month" + + # CSS + ExpiresByType text/css "access plus 1 year" + + # Data interchange + ExpiresByType application/json "access plus 0 seconds" + ExpiresByType application/xml "access plus 0 seconds" + ExpiresByType text/xml "access plus 0 seconds" + + # Favicon (cannot be renamed!) + ExpiresByType image/x-icon "access plus 1 week" + + # HTML components (HTCs) + ExpiresByType text/x-component "access plus 1 month" + + # HTML + ExpiresByType text/html "access plus 0 seconds" + + # JavaScript + ExpiresByType application/javascript "access plus 1 year" + + # Manifest files + ExpiresByType application/x-web-app-manifest+json "access plus 0 seconds" + ExpiresByType text/cache-manifest "access plus 0 seconds" + + # Media + ExpiresByType audio/ogg "access plus 1 month" + ExpiresByType image/gif "access plus 1 month" + ExpiresByType image/jpeg "access plus 1 month" + ExpiresByType image/png "access plus 1 month" + ExpiresByType video/mp4 "access plus 1 month" + ExpiresByType video/ogg "access plus 1 month" + ExpiresByType video/webm "access plus 1 month" + + # Web feeds + ExpiresByType application/atom+xml "access plus 1 hour" + ExpiresByType application/rss+xml "access plus 1 hour" + + # Web fonts + ExpiresByType application/font-woff "access plus 1 month" + ExpiresByType application/vnd.ms-fontobject "access plus 1 month" + ExpiresByType application/x-font-ttf "access plus 1 month" + ExpiresByType font/opentype "access plus 1 month" + ExpiresByType image/svg+xml "access plus 1 month" + + + +# ------------------------------------------------------------------------------ +# | Filename-based cache busting | +# ------------------------------------------------------------------------------ + +# If you're not using a build process to manage your filename version revving, +# you might want to consider enabling the following directives to route all +# requests such as `/css/style.12345.css` to `/css/style.css`. + +# To understand why this is important and a better idea than `*.css?v231`, read: +# http://stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring + +# +# RewriteCond %{REQUEST_FILENAME} !-f +# RewriteCond %{REQUEST_FILENAME} !-d +# RewriteRule ^(.+)\.(\d+)\.(js|css|png|jpg|gif)$ $1.$3 [L] +# + +# ------------------------------------------------------------------------------ +# | File concatenation | +# ------------------------------------------------------------------------------ + +# Allow concatenation from within specific CSS and JS files, e.g.: +# Inside of `script.combined.js` you could have +# +# +# and they would be included into this single file. + +# +# +# Options +Includes +# AddOutputFilterByType INCLUDES application/javascript application/json +# SetOutputFilter INCLUDES +# +# +# Options +Includes +# AddOutputFilterByType INCLUDES text/css +# SetOutputFilter INCLUDES +# +# + +# ------------------------------------------------------------------------------ +# | Persistent connections | +# ------------------------------------------------------------------------------ + +# Allow multiple requests to be sent over the same TCP connection: +# http://httpd.apache.org/docs/current/en/mod/core.html#keepalive. + +# Enable if you serve a lot of static content but, be aware of the +# possible disadvantages! + +# +# Header set Connection Keep-Alive +# diff --git a/app/404.html b/app/404.html new file mode 100644 index 0000000..f5c3819 --- /dev/null +++ b/app/404.html @@ -0,0 +1,157 @@ + + + + + Page Not Found :( + + + +
+

Not found :(

+

Sorry, but the page you were trying to view does not exist.

+

It looks like this was the result of either:

+ + + +
+ + diff --git a/app/favicon.ico b/app/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..6527905307f19ba00762f9241f7eb535fa84a2f9 GIT binary patch literal 4286 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 lG;`awKj>3GQ>=_1)RVs7?=tM%`<0#w9oJ&vm + + + Trial 2 + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/app/index.html b/app/index.html new file mode 100644 index 0000000..6eb3d07 --- /dev/null +++ b/app/index.html @@ -0,0 +1,206 @@ + + + + + EtherSignal + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+
+

EtherSignal

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/package.json b/app/package.json new file mode 100644 index 0000000..48f0bda --- /dev/null +++ b/app/package.json @@ -0,0 +1,15 @@ +{ + "name": "EtherSignal", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "dependencies": { + "express": "^4.13.3", + "gzippo": "^0.2.0" + } +} diff --git a/app/robots.txt b/app/robots.txt new file mode 100644 index 0000000..9417495 --- /dev/null +++ b/app/robots.txt @@ -0,0 +1,3 @@ +# robotstxt.org + +User-agent: * diff --git a/app/scripts/app.js b/app/scripts/app.js new file mode 100644 index 0000000..66a6945 --- /dev/null +++ b/app/scripts/app.js @@ -0,0 +1,41 @@ +'use strict'; + +/** + * @ngdoc overview + * @name nohoApp + * @description + * # nohoApp + * + * Main module of the application. + */ + + + +var app = angular.module('nohoApp', [ + 'ngAnimate', + 'ngCookies', + 'ngResource', + 'ngRoute', + 'ngSanitize', + 'ngTouch', + 'ui.bootstrap', + 'angular-scroll-animate' + ]); +app.config(function ($routeProvider) { + $routeProvider + .when('/', { + templateUrl: 'views/main.html', + controller: 'MainCtrl' + }) + .when('/about', { + templateUrl: 'views/about.html', + controller: 'AboutCtrl' + }) + .when('/cliquickstart', { + templateUrl: 'views/cliquickstart.html', + controller: 'AboutCtrl' + }) + .otherwise({ + redirectTo: '/' + }); +}); diff --git a/app/scripts/controllers/about.js b/app/scripts/controllers/about.js new file mode 100644 index 0000000..2a11da2 --- /dev/null +++ b/app/scripts/controllers/about.js @@ -0,0 +1,11 @@ +'use strict'; + +/** + * @ngdoc function + * @name nohoApp.controller:AboutCtrl + * @description + * # AboutCtrl + * Controller of the nohoApp + */ +app.controller('AboutCtrl', function ($scope) { +}); diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js new file mode 100644 index 0000000..5cb5bb6 --- /dev/null +++ b/app/scripts/controllers/main.js @@ -0,0 +1,20 @@ +'use strict'; + +/** + * @ngdoc function + * @name nohoApp.controller:MainCtrl + * @description + * # MainCtrl + * Controller of the nohoApp + */ + + +app.controller('MainCtrl', function ($scope, $rootScope) { + + $scope.title = "EtherSignal" + $rootScope.alerts = []; + $scope.closeAlert = function(index) { + $scope.alerts.splice(index, 1); + }; + +}); \ No newline at end of file diff --git a/app/scripts/newether.js b/app/scripts/newether.js new file mode 100644 index 0000000..76e42dd --- /dev/null +++ b/app/scripts/newether.js @@ -0,0 +1,396 @@ +var isMist = typeof web3 !== 'undefined'; +var obj = obj || ""; +var web3; +if (typeof web3 !== 'undefined' && typeof Web3 !== 'undefined') { + // If there's a web3 library loaded, then make your own web3 + web3 = new Web3(web3.currentProvider); +} else if (typeof Web3 !== 'undefined') { + // If there isn't then set a provider + web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:8545")); + if(!web3.isConnected()){ + var Web3 = require('web3'); + web3 = new Web3(new Web3.providers.HttpProvider("https://signal.ether.ai/proxy")); + } +} + +var ethersignalContract = web3.eth.contract([{"constant":false,"inputs":[{"name":"amount","type":"uint256"}],"name":"withdraw","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"pro","type":"bool"}],"name":"setSignal","outputs":[],"type":"function"},{"constant":false,"inputs":[],"name":"endSignal","outputs":[],"type":"function"},{"inputs":[{"name":"rAddr","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"pro","type":"bool"},{"indexed":false,"name":"addr","type":"address"}],"name":"LogSignal","type":"event"},{"anonymous":false,"inputs":[],"name":"EndSignal","type":"event"}]); + +var positionregistryContract = web3.eth.contract([{"constant":false,"inputs":[{"name":"title","type":"string"},{"name":"text","type":"string"}],"name":"registerPosition","outputs":[],"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"regAddr","type":"address"},{"indexed":true,"name":"sigAddr","type":"address"},{"indexed":false,"name":"title","type":"string"},{"indexed":false,"name":"text","type":"string"}],"name":"LogPosition","type":"event"}]); +var to = '0x9e75993a7a9b9f92a1978bcc15c30cbcb967bc81'; +var positionregistry = positionregistryContract.at(to); + + +var connected = false; + + +app.directive('networkStats', ['ethereum', '$interval','$rootScope', function(ethereum, $interval, $rootScope) { + return { + restrict: 'E', + templateUrl: 'new-networkstats.html', + link: function(scope) { + $interval(function() { + + if ($rootScope.pending) + return; + else if (scope.sinceLastBlock <= 20) + scope.syncState = 'good'; + else if (scope.sinceLastBlock > 20 && scope.sinceLastBlock < 60) + scope.syncState = 'warning'; + else + scope.syncState = 'bad'; + scope.sinceLastBlock += 1; + }, 1000); + + } + } +}]); + +app.directive('accountSelector', ['ethereum','ethSignalContract','$rootScope', function(ethereum, ethSignalContract, $rootScope) { + return { + restrict: 'E', + templateUrl: 'new-accountselector.html', + link: function(scope) { + var contract = ethSignalContract; + scope.accounts = ethereum.accounts; + scope.user = {defaultAccount:'coinbase'}; + scope.$watch('user.defaultAccount', function(newVal, oldVal) { + //console.log(contract); + if(oldVal == newVal) + return; + //console.log("Setting defaultAccount to: ", newVal); + ethereum.web3.eth.defaultAccount = newVal; + }); + + scope.newProposal = function() { + console.log("newProposal"); + $rootScope.newProposals = [] + $('#submitPositionModal').modal('show') + $rootScope.newProposals.push({name:"", description:""}); + }; + } + } +}]); + +app.directive('proposalsList', ['proposalService','ethereum','$uibModal','$rootScope', function(proposalService, ethereum, $uibModal, $rootScope) { + + return { + restrict: 'E', + templateUrl: 'new-proposalslist.html', + link: function(scope) { + scope.proposals = proposalService.proposals; + scope.percentage = function(a, b){ + return a + b; + } + scope.cancel = function() { + $('#submitPositionModal').modal('hide') + // $rootScope.newProposals = []; + } + scope.vote = function(proposalId, position) { + if(angular.isUndefined(ethereum.web3.eth.defaultAccount)){ + $rootScope.alerts = [{ type: 'danger', msg: 'Please select an account' },]; + // alert("Please select an account to from the \"Select Account\" dropdown."); + return + } + proposalService.vote(proposalId, position); + }; + + scope.createProposal = function(proposal) { + if(angular.isUndefined(ethereum.web3.eth.defaultAccount)){ + $rootScope.alerts = [{ type: 'danger', msg: 'Cannot find an account.' },]; + return + } + if (proposal.name == ""){ + scope.invalidForm = true; + return + } + + scope.invalidForm = false; + proposalService.newProposal(proposal); + }; + } + } +}]); + +app.directive('showErrors', function() { + return { + restrict: 'A', + link: function(scope, el) { + el.bind('blur', function() { + var valid = // is valid logic + el.toggleClass('has-error', valid); + }); + } + } +}); + +app.service('ethereum', function($rootScope, $interval, $timeout) { + // TODO graceful connection handling + $rootScope.isMist = isMist; + // convert block timestamps into human readable strings + function utcSecondsToString(timestamp) { + var date = new Date(0); + date.setUTCSeconds(timestamp); + return date.toString(); + } + function getCurrentNetwork(networkId) { + if (networkId == 1) + return 'Main-Net'; + if (networkId == 2) + return 'Test-Net'; + } + function getConnectionStatus(connected) { + if (connected) + return 'connected'; + return 'disconnected'; + } + + function getEtherscanUrl(networkId) { + if(networkId == 1) + return 'https://etherscan.io/tx'; + if (networkId == 2) + return 'https://testnet.etherscan.io/tx'; + } + // get blockchain stats to display to the user + function watchNetworkStats() { + var latest = web3.eth.filter('latest'); + latest.watch(function(err,blockHash){ + web3.eth.getBlock(blockHash, false, function(err, block) { + $rootScope.pending = false; + $rootScope.currentBlock = block.number; + $rootScope.currentBlockTime = utcSecondsToString(block.timestamp); + $rootScope.sinceLastBlock = -1; + }); + }); + } + + $rootScope.pending = true; + $rootScope.syncState = 'warning'; + $rootScope.currentBlock = 'SYNCING'; + $rootScope.currentBlockTime = 'SYNCING'; + $rootScope.sinceLastBlock = 0; + $rootScope.minDeposit = 0; + $interval(function() { + var newState = web3.isConnected(); + if (newState != connected){ + $rootScope.$emit('connectionStateChanged', newState); + if(newState){ + if(!$rootScope.isMist) watchNetworkStats(); + web3.eth.defaultAccount = web3.eth.accounts[0]; + $rootScope.ethereumNetwork = getCurrentNetwork(web3.version.network); + $rootScope.etherscanUrl = getEtherscanUrl(web3.version.network); + } + $rootScope.connectionStateDisplay = getConnectionStatus(newState); + $rootScope.connectionState = newState; + connected = newState; + } + }, 1000); + + var accounts = null; + return { + //make web3 available as a property of this service + web3: web3, + accounts: accounts + }; +}); + + +app.service('ethSignalContract',['ethereum', function(ethereum) { + var web3 = ethereum.web3; + var abi = [ { "constant": true, "inputs": [ { "name": "", "type": "uint256" } ], "name": "proposals", "outputs": [ { "name": "name", "type": "string", "value": "Do you support the hard fork?" }, { "name": "description", "type": "string", "value": "\"Decentralization without decentralized social responsibility is terrifying\"\\n-Vlad Zamfir" }, { "name": "creator", "type": "address", "value": "0xb2445f120a5a4fe73c4ca9b3a73f415371b5656b" }, { "name": "active", "type": "bool", "value": true } ], "type": "function" }, { "constant": true, "inputs": [], "name": "numberOfProposals", "outputs": [ { "name": "_numberOfProposals", "type": "uint256" } ], "type": "function" }, { "constant": false, "inputs": [ { "name": "proposalID", "type": "uint256" }, { "name": "position", "type": "bool" } ], "name": "vote", "outputs": [], "type": "function" }, { "constant": false, "inputs": [ { "name": "proposalName", "type": "string" }, { "name": "proposalDescription", "type": "string" } ], "name": "newProposal", "outputs": [], "type": "function" }, { "inputs": [], "type": "constructor" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "proposalID", "type": "uint256" }, { "indexed": false, "name": "position", "type": "bool" }, { "indexed": false, "name": "voter", "type": "address" } ], "name": "userVotedEvent", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "proposalName", "type": "string" }, { "indexed": false, "name": "proposalDescription", "type": "string" }, { "indexed": false, "name": "creator", "type": "address" } ], "name": "proposalCreatedEvent", "type": "event" } ]; + return web3.eth.contract(abi).at(to); +}]); + + +app.service('proposalService', ['ethSignalContract', '$q','ethereum','$rootScope', function(ethSignalContract, $q, ethereum, $rootScope) { + // get all the questions + + $rootScope.animateElementIn = function($el) { + $el.removeClass('not-visible'); + $el.addClass('animated fadeIn'); // this example leverages animate.css classes + } + $rootScope.animateElementOut = function($el) { + // $el.addClass('not-visible'); + // $el.removeClass('fadeIn'); + } + var positions = []; + $rootScope.newProposals = []; + $rootScope.$on('connectionStateChanged', function(evt, connected){ + if(connected) getPositions(); + }) + + $rootScope.minDepositChanged = function(minDeposit) { + if (typeof minDeposit !== undefined) + { + $rootScope.minDeposit = minDeposit; + if(connected) getPositions(); + } else { + $rootScope.minDeposit = 0; + } + } + + function getPositions() { + while (positions.pop()); + positionregistry.LogPosition({}, {fromBlock:1200000}).get(function(err,evt) { + if (err) console.warn() + + var obj; + var dep; + for (obj in evt) { + var block = web3.eth.getBlock(evt[obj].blockNumber); + dep = Number(web3.fromWei(web3.eth.getBalance(evt[obj].args.sigAddr), "finney")); + if (dep >= $rootScope.minDeposit) { + //console.log(evt[obj]); + getSigList(evt[obj], dep, block) + } + } + }); + } + + function getSigList(input, dep, block){ + var address = input.args.sigAddr + // console.log("getSigList", address); + var etherSig = ethersignalContract.at(address) + etherSig.LogSignal({}, {fromBlock:input.blockNumber}).get(function(err,evt) { + if (err) console.warn("warning") + + var proMap = {}; + var antiMap = {}; + + var obj; + for (obj in evt){ + if (evt[obj].args.pro) { + proMap[evt[obj].args.addr] = 1; + antiMap[evt[obj].args.addr] = 0; + } else { + proMap[evt[obj].args.addr] = 0; + antiMap[evt[obj].args.addr] = 1; + } + } + CalcSignal(proMap, antiMap, input, dep, block) + }) + } + + function calcPercent(A, B){ + var res = [] + res[0] = Math.round(A * 100.0 / (A + B)) + res[1] = Math.round(B * 100.0 / (A + B)) + return res + } + + function CalcSignal(proMap, antiMap, input, dep, block) { + var totalPro = 0; + var totalAgainst = 0; + var isMine = false; + var iHaveSignaled = false; + // call getBalance just once per address + Object.keys(proMap).map(function(a) { + var bal = web3.fromWei(web3.eth.getBalance(a)); + proMap[a] = proMap[a] * bal; + antiMap[a] = antiMap[a] * bal; + + var idx; + for (idx in web3.eth.accounts) { + if (web3.eth.accounts[idx] === a) { iHaveSignaled = true; } + } + }); + var idx; + for (idx in web3.eth.accounts) { + if (web3.eth.accounts[idx] === input.args.regAddr) { isMine = true; } + } + + // sum the pro and anti account values + Object.keys(proMap).map(function(a) { totalPro += parseFloat(proMap[a]); }); + Object.keys(antiMap).map(function(a) { totalAgainst += parseFloat(antiMap[a]); }); + + // console.log(totalPro); + // console.log(totalAgainst); + var percent = calcPercent( totalPro, totalAgainst ); + + positions.push({title: input.args.title, desc: input.args.text, regAddr: input.args.regAddr, pro: Math.round(totalPro), against: Math.round(totalAgainst), percent: percent, sigAddr: input.args.sigAddr, deposit: dep, time: block.timestamp, iHaveSignaled: iHaveSignaled, isMine: isMine}) + console.log(positions); + } + + return { + proposals: positions, + // votes: votes, + percentage: function(inP){ + //console.log(out); + }, + vote: function(posSigAddr, proBool) { + //console.log(posSigAddr, proBool); + var etherSig = ethersignalContract.at(posSigAddr) + for (idx in web3.eth.accounts) + { + var from = web3.eth.accounts[idx]; + try { + $rootScope.lastTx = etherSig.setSignal(proBool, {from: from}); + } + catch(e) { + console.log("Error submitting signal"); + console.log(e); + $rootScope.alerts.push({ type: 'danger', msg: 'Error sending signal' }); + } + $rootScope.alerts.push({ type: 'success', msg: 'Signal sent!' }); + } + }, + newProposal: function(proposal) { + console.log("newProposal proposalService"); + + //console.log(ethereum.web3.eth.defaultAccount); + from = ethereum.web3.eth.defaultAccount; + // var data = ethSignalContract.newProposal.getData(proposal.name, proposal.description); + var data = positionregistry.registerPosition.getData(proposal.name, proposal.description); + //console.log("data ", data); + var gas = ethereum.web3.eth.estimateGas({from:from, to:to, data:data}); + + //console.log("gas: ", gas); + try { + $rootScope.lastTx = positionregistry.registerPosition.sendTransaction(proposal.name, proposal.description, {from:from, to:to, gas:gas}); + } + catch(e) { + console.log("Error submitting position"); + console.log(e); + $rootScope.alerts.push({ type: 'danger', msg: 'Error sending position' }); + } + $rootScope.alerts.push({ type: 'success', msg: 'Position sent!' }); + $('#submitPositionModal').modal('hide') + $rootScope.newProposals = []; + } + } + +}]); + + +// Global search filter +app.filter('searchFilter',function($filter) { + return function(items,searchfilter) { + var isSearchFilterEmpty = true; + angular.forEach(searchfilter, function(searchstring) { + if(searchstring !=null && searchstring !=""){ + isSearchFilterEmpty= false; + } + }); + if(!isSearchFilterEmpty){ + var result = []; + angular.forEach(items, function(item) { + var isFound = false; + angular.forEach(item, function(term,key) { + if(term != null && !isFound){ + term = term.toString(); + term = term.toLowerCase(); + angular.forEach(searchfilter, function(searchstring) { + searchstring = searchstring.toLowerCase(); + if(searchstring !="" && term.indexOf(searchstring) !=-1 && !isFound){ + result.push(item); + isFound = true; + } + }); + } + }); + }); + return result; + }else{ + return items; + } + } +}); diff --git a/app/styles/main.css b/app/styles/main.css new file mode 100644 index 0000000..ee24168 --- /dev/null +++ b/app/styles/main.css @@ -0,0 +1,160 @@ +/* Sticky footer styles +-------------------------------------------------- */ +html { + position: relative; + min-height: 100%; +} +body { + /* Margin bottom by footer height */ + margin-bottom: 60px; +} +.footer { + position: absolute; + bottom: 0; + width: 100%; + /* Set the fixed height of the footer here */ + height: 60px; + background-color: #f5f5f5; +} + + + + +.browsehappy { + margin: 0.2em 0; + background: #ccc; + color: #000; + padding: 0.2em 0; +} + +body { + padding: 0; +} + +/* Everything but the jumbotron gets side spacing for mobile first views */ +.header, +.marketing, +.footer { + padding-left: 15px; + padding-right: 15px; +} + +/* Custom page header */ +.header { + /*border-bottom: 1px solid #e5e5e5;*/ + margin-bottom: 10px; +} +/* Make the masthead heading the same height as the navigation */ +.header h3 { + margin-top: 0; + margin-bottom: 0; + line-height: 40px; + padding-bottom: 19px; +} + +/* Custom page footer */ +.footer { + padding-top: 19px; + color: #777; + border-top: 1px solid #e5e5e5; +} + +.container-narrow > hr { + margin: 30px 0; +} + +/* Main marketing message and sign up button */ +.jumbotron { + text-align: center; + border-bottom: 1px solid #e5e5e5; +} +.jumbotron .btn { + font-size: 21px; + padding: 14px 24px; +} + +/* Supporting marketing content */ +.marketing { + margin: 40px 0; +} +.marketing p + h4 { + margin-top: 28px; +} + +/* Responsive: Portrait tablets and up */ +@media screen and (min-width: 768px) { + .container { + max-width: 730px; + } + + /* Remove the padding we set earlier */ + .header, + .marketing, + .footer { + padding-left: 0; + padding-right: 0; + } + /* Space out the masthead */ + .header { + margin-bottom: 30px; + } + /* Remove the bottom border on the jumbotron for visual effect */ + .jumbotron { + border-bottom: 0; + } +} + + +.question { + font-size: 1.5em; + padding:0 0 0 1em; +} + +.light { + color: #999; +} + +.navbar-brand>img.logoImg { + max-width: 17px; + display: inline-block; +} + +#voteButtons .btn span { + font-family: sans-serif; +} +.stats { + color:#666; + font-size: .8em; +} + + +.modal { + text-align: center; + padding: 0!important; +} + +.modal:before { + content: ''; + display: inline-block; + height: 100%; + vertical-align: middle; + margin-right: -4px; +} + +.modal-dialog { + display: inline-block; + text-align: left; + vertical-align: middle; +} + +.not-visible { + visibility: hidden; +} + + + + + + + + diff --git a/app/views/about.html b/app/views/about.html new file mode 100644 index 0000000..430f2cc --- /dev/null +++ b/app/views/about.html @@ -0,0 +1,16 @@ +
+
+
+

About

+

+ EtherSignal intends to allow the Ethereum community to signal on their + interests, negatively or positively in positions. +

+

+ Practically it allows for the creation and discovery of positions, along + with the monitoring of and participating in signaling on said + positions. +

+
+
+
diff --git a/app/views/cliquickstart.html b/app/views/cliquickstart.html new file mode 100644 index 0000000..91fbb00 --- /dev/null +++ b/app/views/cliquickstart.html @@ -0,0 +1,103 @@ +
+ +
+
+

EtherSignal CLI

+ +

Quick Start.

+ +
+

1. Launch a geth node if it is not already running. +

geth

+ +

2. Attach via the geth command line client +

geth attach
+

+ +

3. Load the ethersignal script. +

> loadScript("ethersignal2.js")
+true

+ +
+

Now you can either signal on a position, tally the current signal levels +for a position, list the registered positions, or register a position:

+ +

To list the registered positions run the following: +

> ListPositions()
+[Positions: cut & paste the CalcSignal(); portion to see current signal levels]
+
+
+Position CalcSignal("0x953521cfe06b48d65b64ae864abb4c808312885e", 1290010);
+registered by 0x8c2741b9bebd3c27feb7bb3356f7b04652977b78
+eth deposit: 0
+Title: will this work
+Text: will this contract factory work
+
+Position CalcSignal("0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f", 1290020);
+registered by 0x8c2741b9bebd3c27feb7bb3356f7b04652977b78
+eth deposit: 0
+Title: title
+Text: text
+Positions filtered for being under the minDeposit of 0: 0
+true
+
+

+ +
+

If you would like to filter based on the position desposit, pass a +parameter to ListPositions() as follows: +

> ListPositions(1)
+[Positions: cut & paste the CalcSignal(); portion to see current signal levels]
+Positions filtered for being under the minDeposit of 1: 2
+true
+

+
+

As you can see above, in order to get the current signal levels for a position +you can simply cut and paste the CalcSignal(); portion of the output from: +

ListPositions():
+> CalcSignal("0x953521cfe06b48d65b64ae864abb4c808312885e", 1290010);
+{
+against: 0,
+pro: 167.12471268213704
+}
+

+
+

In order to register a position you can use the following contract method: +

> positionregistry.registerPosition("title", "text", {from: web3.eth.accounts[0], gas: 300000});
+

+ +
+

If you would like to optionally submit a deposit into your position +in order to distinguish it from others you can do the following (note +your deposit will be returned when you withdraw the position): +

> web3.eth.sendTransaction({from: web3.eth.accounts[0], to:"0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f", value: web3.toWei(0.1, "ether")})
+
+

+
+

You may withdraw you position and reclaim your deposit as follows: +

> WithdrawPosition("0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f");
+

+ +
+

In order to vote on a position, you will need to use the positions +signal address. Take the following signal as an example: +

Position CalcSignal("0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f", 1290020);
+registered by 0x8c2741b9bebd3c27feb7bb3356f7b04652977b78
+eth deposit: 0
+Title: title
+Text: text
+

+ +
+

The signal address is what is within CalcSignal(); so above it is +"0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f". To vote simply run the +following command, where true means to vote for the signal, and false +would mean to vote against the signal: +

> SetSignal("0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f", true);
+

+ +
+

Enjoy.

+
+
+
diff --git a/app/views/main.html b/app/views/main.html new file mode 100644 index 0000000..fbaea74 --- /dev/null +++ b/app/views/main.html @@ -0,0 +1,32 @@ +
+
+ {{alert.msg}} +
+
+ +
+ +
+

EtherSignal

+

This is a tool to signal on positions.

+
+ +

+ +

+ + + + +
+
+
+

Can't connect.

+

Use Mist or start your local geth node

+ 
geth --rpc --rpccorsdomain="*" --rpcapi="db,eth,net,web3,personal" --testnet
+
+
+
+ +
+ diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..130da98 --- /dev/null +++ b/bower.json @@ -0,0 +1,24 @@ +{ + "name": "EtherSignal", + "version": "0.0.0", + "dependencies": { + "angular": "^1.3.0", + "bootstrap": "3.3.4", + "angular-animate": "^1.3.0", + "angular-cookies": "^1.3.0", + "angular-resource": "^1.3.0", + "angular-route": "^1.3.0", + "angular-sanitize": "^1.3.0", + "angular-touch": "^1.3.0", + "web3": "~0.16.0", + "angular-bootstrap": "~1.3.3", + "blanket": "~1.1.7", + "angular-scroll-animate": "~0.9.9", + "animate.css": "~3.5.2" + }, + "devDependencies": { + "angular-mocks": "^1.3.0" + }, + "appPath": "app", + "moduleName": "nohoApp" +} diff --git a/cli/ethersignal2.js b/cli/ethersignal2.js index 41a3069..b538d6c 100644 --- a/cli/ethersignal2.js +++ b/cli/ethersignal2.js @@ -1,27 +1,75 @@ -var ethersignalContract = web3.eth.contract([{"constant":false,"inputs":[{"name":"pro","type":"bool"}],"name":"setSignal","outputs":[],"type":"function"},{"constant":false,"inputs":[],"name":"endSignal","outputs":[],"type":"function"},{"inputs":[{"name":"rAddr","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"pro","type":"bool"},{"indexed":false,"name":"addr","type":"address"}],"name":"LogSignal","type":"event"},{"anonymous":false,"inputs":[],"name":"EndSignal","type":"event"}]); +var ethersignalContract = web3.eth.contract([{"constant":false,"inputs":[{"name":"amount","type":"uint256"}],"name":"withdraw","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"pro","type":"bool"}],"name":"setSignal","outputs":[],"type":"function"},{"constant":false,"inputs":[],"name":"endSignal","outputs":[],"type":"function"},{"inputs":[{"name":"rAddr","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"pro","type":"bool"},{"indexed":false,"name":"addr","type":"address"}],"name":"LogSignal","type":"event"},{"anonymous":false,"inputs":[],"name":"EndSignal","type":"event"}]); var positionregistryContract = web3.eth.contract([{"constant":false,"inputs":[{"name":"title","type":"string"},{"name":"text","type":"string"}],"name":"registerPosition","outputs":[],"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"regAddr","type":"address"},{"indexed":true,"name":"sigAddr","type":"address"},{"indexed":false,"name":"title","type":"string"},{"indexed":false,"name":"text","type":"string"}],"name":"LogPosition","type":"event"}]); -var positionregistry = positionregistryContract.at('0x0265a5b822625ca506c474912662617c394bbb66') +var positionregistry = positionregistryContract.at('0x9e75993a7a9b9f92a1978bcc15c30cbcb967bc81') -function ListPositions() { +function WithdrawPosition(sigAddr) { + var ethersignal = ethersignalContract.at(sigAddr); + + ethersignal.endSignal(); + + return true; +} + +function WithdrawFromPosition(sigAddr, amount) { + var ethersignal = ethersignalContract.at(sigAddr); + var gas = ethersignal.withdraw.estimateGas(web3.toWei(amount)) * 2; + + ethersignal.withdraw(web3.toWei(amount), {from: web3.eth.accounts[0], gas: gas}); + + return true; +} + +function SetSignal(sigAddr, pro) { + var ethersignal = ethersignalContract.at(sigAddr); + var gas = ethersignal.setSignal.estimateGas(pro); + + ethersignal.setSignal(pro, {from: web3.eth.accounts[0], gas: gas}); + + return true; +} + +function ListPositions(minDeposit) { var posMap = {}; + var minDeposit = typeof minDeposit !== 'undefined' ? minDeposit : 0; positionregistry.LogPosition({}, {fromBlock: 1200000}, function(error, result){ if (!error) { - posMap[result.args.sigAddr] = [result.args.title, result.args.text, result.args.regAddr]; + posMap[result.args.sigAddr] = [result.args.title, result.args.text, result.args.regAddr, result.blockNumber]; } }) - Object.keys(posMap).map(function(k) { console.log(k + ": " + posMap[k]); }); + console.log("[Positions: cut & paste the CalcSignal(); portion to see current signal levels]"); + + var numFiltered = 0; + Object.keys(posMap).map(function(k) { + var deposit = web3.fromWei(web3.eth.getBalance(k)); + + if (deposit >= minDeposit) + { + console.log("\nPosition CalcSignal(\"" + k + "\"," + posMap[k][3] + ");"); + console.log(" registered by " + posMap[k][2]); + console.log(" eth deposit: " + deposit); + console.log("Title: " + posMap[k][0]); + console.log("Text: " + posMap[k][1]); + } else { + numFiltered++; + } + }); + + console.log("Positions filtered for being under the minDeposit of " + minDeposit + ": " + numFiltered); + + return true; } -/* -function CalcSignal(positionHash) { +function CalcSignal(posAddr, startBlock) { var proMap = {}; var antiMap = {}; - ethersignal.LogSignal({positionHash: positionHash}, {fromBlock: 1200000}, function(error, result){ + var ethersignal = ethersignalContract.at(posAddr); + + ethersignal.LogSignal({}, {fromBlock: startBlock}, function(error, result){ if (!error) { if (result.args.pro) { @@ -50,4 +98,3 @@ function CalcSignal(positionHash) { return {pro: totalPro, against: totalAgainst} } -*/ diff --git a/cli/readmev2.txt b/cli/readmev2.txt new file mode 100644 index 0000000..e7b4fa9 --- /dev/null +++ b/cli/readmev2.txt @@ -0,0 +1,77 @@ +EtherSignal CLI + +Quick Start. + +1) Launch a geth node if it is not already running. +geth + +2) Attach via the geth command line client +geth attach + +3) Load the ethersignal script. +> loadScript("ethersignal2.js") +true + +Now you can either signal on a position, tally the current signal levels +for a position, list the registered positions, or register a position: + +=== To list the registered positions run the following: +> ListPositions() +[Positions: cut & paste the CalcSignal(); portion to see current signal levels] + +Position CalcSignal("0x953521cfe06b48d65b64ae864abb4c808312885e", 1297010); + registered by 0x8c2741b9bebd3c27feb7bb3356f7b04652977b78 + eth deposit: 0 +Title: will this work +Text: will this contract factory work + +Position CalcSignal("0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f", 1297014); + registered by 0x8c2741b9bebd3c27feb7bb3356f7b04652977b78 + eth deposit: 0 +Title: title +Text: text +Positions filtered for being under the minDeposit of 0: 0 +true + +=== If you would like to filter based on the position desposit, pass a +parameter to ListPositions) as follows: +> ListPositions(1) +[Positions: cut & paste the CalcSignal(); portion to see current signal levels] +Positions filtered for being under the minDeposit of 1: 2 +true + +=== As you can see above, in order to get the current signal levels for a position +you can simply cut and paste the CalcSignal(); portion of the output from +ListPositions(): +> CalcSignal("0x953521cfe06b48d65b64ae864abb4c808312885e", 1297010); +{ + against: 0, + pro: 167.12471268213704 +} + +=== In order to register a position you can use the following contract method: +> positionregistry.registerPosition("title", "text", {from: web3.eth.accounts[0], gas: 300000}); + +=== If you would like to optionally submit a deposit into your position +in order to distinguish it from others you can do the following (note +your deposit will be returned when you withdraw the position): +> web3.eth.sendTransaction({from: web3.eth.accounts[0], to:"0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f", value: web3.toWei(0.1, "ether")}) + +=== You may withdraw you position and reclaim your deposit as follows +> WithdrawPosition("0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f"); + +=== In order to vote on a position, you will need to use the positions +signal address. Take the following signal as an example: +Position CalcSignal("0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f"); + registered by 0x8c2741b9bebd3c27feb7bb3356f7b04652977b78 + eth deposit: 0 +Title: title +Text: text + +The signal address is what is within CalcSignal(); so above it is +"0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f". To vote simply run the +following command, where true means to vote for the signal, and false +would mean to vote against the signal: +> SetSignal("0xcdda0a8fe9a7a844c9d8611b2cadfe36b4bb438f", true); + +Enjoy. diff --git a/contracts/ethersignal2.sol b/contracts/ethersignal2.sol index 61b8325..874b676 100644 --- a/contracts/ethersignal2.sol +++ b/contracts/ethersignal2.sol @@ -18,6 +18,12 @@ contract EtherSignal { EndSignal(); } + function withdraw(uint amount) { + if (msg.sender != regAddr) { throw; } + if (amount > this.balance) { throw; } + if (!msg.sender.send(amount)) { throw; } + } + function () { if (msg.sender != regAddr) { throw; } // accept deposit only from the address which registered the position diff --git a/index.js b/index.js new file mode 100644 index 0000000..02881a1 --- /dev/null +++ b/index.js @@ -0,0 +1,9 @@ +var gzippo = require('gzippo'); +var express = require('express'); +var morgan = require('morgan'); +var app = express(); + + +app.use(morgan('dev')); +app.use(gzippo.staticGzip("" + __dirname + "/dist")); +app.listen(process.env.PORT || 5000); \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..72a5584 --- /dev/null +++ b/package.json @@ -0,0 +1,51 @@ +{ + "name": "etherSignal", + "version": "0.0.0", + "private": false, + "main": "index.js", + "scripts": { + "start": "node index.js" + }, + "dependencies": { + "express": "^4.13.3", + "gzippo": "^0.2.0", + "karma": "^0.13.22", + "karma-coverage": "^1.1.0" + }, + "repository": {}, + "devDependencies": { + "grunt": "^0.4.5", + "grunt-autoprefixer": "^2.0.0", + "grunt-build-control": "^0.6.2", + "grunt-cli": "1.2.0", + "grunt-concurrent": "^1.0.0", + "grunt-contrib-clean": "^0.6.0", + "grunt-contrib-concat": "^0.5.0", + "grunt-contrib-connect": "^0.9.0", + "grunt-contrib-copy": "^0.7.0", + "grunt-contrib-cssmin": "^0.12.0", + "grunt-contrib-htmlmin": "^0.4.0", + "grunt-contrib-imagemin": "^0.9.2", + "grunt-contrib-jshint": "^0.11.0", + "grunt-contrib-uglify": "^0.7.0", + "grunt-contrib-watch": "^0.6.1", + "grunt-filerev": "^2.1.2", + "grunt-google-cdn": "^0.4.3", + "grunt-karma": "*", + "grunt-newer": "^1.1.0", + "grunt-ng-annotate": "^0.9.2", + "grunt-svgmin": "^2.0.0", + "grunt-usemin": "^3.0.0", + "grunt-wiredep": "^2.0.0", + "jasmine-core": "^2.4.1", + "jshint-stylish": "^1.0.0", + "karma-jasmine": "*", + "karma-ng-html2js-preprocessor": "^1.0.0", + "karma-phantomjs-launcher": "*", + "load-grunt-tasks": "^3.1.0", + "time-grunt": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } +} diff --git a/publish_site.sh b/publish_site.sh new file mode 100755 index 0000000..4f6e0bb --- /dev/null +++ b/publish_site.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +# !!!!!!!!!! +# !!DANGER!! This script publishes whatever branch you're in to gh-pages +# !!!!!!!!!! + +# if [ "$#" -ne 1 ] +# then +# echo "Usage: please specify branch" +# exit 1 +# fi + +BRANCH=`git rev-parse --abbrev-ref HEAD` +echo "stashing current branch, 'git stash pop' after push to retrieve." +git stash save -u + +npm install +node_modules/bower/bin/bower install +node_modules/grunt-cli/bin/grunt --force + +git checkout gh-pages -f +git rm `git ls-tree -r HEAD --name-only | grep -v .git` + +mv dist/* . +rm -rf dist + +git add . +VERSION=`git rev-parse $BRANCH` +echo "Making commit..." +git commit -m"From branch $BRANCH commit $VERSION" diff --git a/test/.jshintrc b/test/.jshintrc new file mode 100644 index 0000000..e2a25d2 --- /dev/null +++ b/test/.jshintrc @@ -0,0 +1,28 @@ +{ + "node": true, + "browser": true, + "esnext": true, + "bitwise": true, + "camelcase": true, + "curly": true, + "eqeqeq": true, + "immed": true, + "indent": 2, + "latedef": true, + "newcap": true, + "noarg": true, + "quotmark": "single", + "regexp": true, + "undef": true, + "unused": true, + "strict": true, + "trailing": true, + "smarttabs": true, + "jasmine": true, + "globals": { + "angular": false, + "browser": false, + "inject": false + } +} + diff --git a/test/karma.conf.js b/test/karma.conf.js new file mode 100644 index 0000000..772bee7 --- /dev/null +++ b/test/karma.conf.js @@ -0,0 +1,120 @@ +// Karma configuration +// http://karma-runner.github.io/0.12/config/configuration-file.html +// Generated on 2015-12-17 using +// generator-karma 1.0.1 + +module.exports = function(config) { + 'use strict'; + + config.set({ + preprocessors: { + '**/*.html': ['ng-html2js'] + // 'views/**/*.html': 'html2js' + }, + + // enable / disable watching file and executing tests whenever any file changes + autoWatch: true, + + // base path, that will be used to resolve files and exclude + basePath: '../', + + // testing framework to use (jasmine/mocha/qunit/...) + // as well as any additional frameworks (requirejs/chai/sinon/...) + frameworks: [ + "jasmine" + ], + + // list of files / patterns to load in the browser + files: [ + // bower:js + 'bower_components/jquery/dist/jquery.js', + 'bower_components/angular/angular.js', + 'bower_components/bootstrap/dist/js/bootstrap.js', + 'bower_components/angular-animate/angular-animate.js', + 'bower_components/angular-cookies/angular-cookies.js', + 'bower_components/angular-resource/angular-resource.js', + 'bower_components/angular-route/angular-route.js', + 'bower_components/angular-sanitize/angular-sanitize.js', + 'bower_components/angular-touch/angular-touch.js', + 'bower_components/bignumber.js/bignumber.js', + 'bower_components/crypto-js/index.js', + 'bower_components/web3/dist/web3.js', + 'bower_components/web3/dist/web3.min.js', + 'bower_components/angular-bootstrap/ui-bootstrap-tpls.js', + 'bower_components/blanket/dist/qunit/blanket.js', + 'bower_components/angular-scroll-animate/dist/angular-scroll-animate.js', + 'bower_components/angular-mocks/angular-mocks.js', + // endbower + "app/scripts/**/*.js", + "test/mock/**/*.js", + "test/spec/**/*.js", + 'app/**/*.html', + ], + + // list of files / patterns to exclude + exclude: [ + ], + + // web server port + port: 8080, + + // Start these browsers, currently available: + // - Chrome + // - ChromeCanary + // - Firefox + // - Opera + // - Safari (only Mac) + // - PhantomJS + // - IE (only Windows) + browsers: [ + "PhantomJS" + ], + + // Which plugins to enable + plugins: [ + "karma-phantomjs-launcher", + "karma-jasmine", + 'karma-ng-html2js-preprocessor' + ], + + // Continuous Integration mode + // if true, it capture browsers, run tests and exit + singleRun: false, + + colors: true, + + // level of logging + // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG + logLevel: config.LOG_INFO, + + // Uncomment the following lines if you are using grunt's server to run the tests + // proxies: { + // '/': 'http://localhost:9000/' + // }, + // URL root prevent conflicts with the site root + // urlRoot: '_karma_' + ngHtml2JsPreprocessor: { + // strip this from the file path + // stripPrefix: 'views/', + // stripSuffix: '.ext', + // prepend this to the + // prependPrefix: 'app/', + + // or define a custom transform function + // - cacheId returned is used to load template + // module(cacheId) will return template at filepath + // moduleName: function (htmlPath, originalPath) { + // return htmlPath.split('/')[0]; + // }, + + // - setting this option will create only a single module that contains templates + // from all the files, so you can load them all with module('foo') + // - you may provide a function(htmlPath, originalPath) instead of a string + // if you'd like to generate modules dynamically + // htmlPath is a originalPath stripped and/or prepended + // with all provided suffixes and prefixes + // moduleName: 'foo' + // moduleName: "my.templates" + } + }); +}; diff --git a/test/protractor/conf.js b/test/protractor/conf.js new file mode 100644 index 0000000..14bea1b --- /dev/null +++ b/test/protractor/conf.js @@ -0,0 +1,6 @@ +// conf.js +exports.config = { + framework: 'jasmine', + seleniumAddress: 'http://localhost:4444/wd/hub', + specs: ['spec.js'] +} \ No newline at end of file diff --git a/test/protractor/spec.js b/test/protractor/spec.js new file mode 100644 index 0000000..87dc333 --- /dev/null +++ b/test/protractor/spec.js @@ -0,0 +1,26 @@ +// spec.js +describe('EtherSignal main', function() { + var herotitle = element(by.id('herotitle')); + var submitBtn = element(by.id('submitBtn')); + + beforeEach(function() { + browser.get('http://localhost:9000/'); + browser.waitForAngular(); + }); + + it('should have a title', function() { + expect(browser.getTitle()).toEqual('EtherSignal'); + }); + + it('should have a title logo', function() { + expect(herotitle.getText()).toEqual('EtherSignal'); + }); + + it('should have a submit button', function() { + expect(submitBtn.getText()).toEqual('Submit a position'); + }); + +}); + +// webdriver-manager start +// protractor conf.js \ No newline at end of file diff --git a/test/spec/controllers/about.js b/test/spec/controllers/about.js new file mode 100644 index 0000000..5aecbf2 --- /dev/null +++ b/test/spec/controllers/about.js @@ -0,0 +1,19 @@ +'use strict'; + +describe('Controller: AboutCtrl', function () { + + // load the controller's module + beforeEach(module('nohoApp')); + + var AboutCtrl, + scope; + + // Initialize the controller and a mock scope + beforeEach(inject(function ($controller, $rootScope) { + scope = $rootScope.$new(); + AboutCtrl = $controller('AboutCtrl', { + $scope: scope + }); + })); + +}); diff --git a/test/spec/controllers/main.js b/test/spec/controllers/main.js new file mode 100644 index 0000000..e338729 --- /dev/null +++ b/test/spec/controllers/main.js @@ -0,0 +1,58 @@ +'use strict'; + +describe('Controller: MainCtrl', function () { + + // load the controller's module + beforeEach(module('nohoApp')); + + var $controller; + + beforeEach(angular.mock.inject(function(_$controller_){ + $controller = _$controller_; + })); + + describe('Controller: MainCtrl', function() { + it('it should have a title', function() { + var $scope = {}; + var controller = $controller('MainCtrl', { $scope: $scope }); + expect($scope.title).toEqual('EtherSignal'); + }); + }); + +}); + + +describe('proposalService test', function(){ + + describe('when I call proposalService.proposals', function(){ + beforeEach(module('nohoApp')); + it('is is defined', inject(function(proposalService){ //parameter name = service name + expect( proposalService.proposals ).toBeDefined() + })) + }) + + describe('when I call proposalService.vote', function(){ + beforeEach(module('nohoApp')); + it('is is defined', inject(function(proposalService){ //parameter name = service name + expect( proposalService.vote ).toBeDefined() + })) + }) + +}); + +describe('ethereum service test', function(){ + + describe('when I call ethereum.web3', function(){ + beforeEach(module('nohoApp')); + it('is is defined', inject(function(ethereum){ //parameter name = service name + expect( ethereum.web3 ).toBeDefined() + })) + }) + +}); + + + + + + diff --git a/ui/README.md b/ui/README.md deleted file mode 100644 index 08da858..0000000 --- a/ui/README.md +++ /dev/null @@ -1,6 +0,0 @@ -### Installation -``` -$ npm install -``` - -Load this directory as unpacked chrome extension diff --git a/ui/browserAction.html b/ui/browserAction.html deleted file mode 100644 index 72c2ec0..0000000 --- a/ui/browserAction.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - -
- ethSignal -
- - diff --git a/ui/css/style.css b/ui/css/style.css deleted file mode 100644 index 344fb5e..0000000 --- a/ui/css/style.css +++ /dev/null @@ -1,121 +0,0 @@ -body { - background-color: #162023; - color: azure; -} - -div.stats { - text-align: center; - padding: 10px; - font-size: 15px; - margin: 10px; -} -.good { - color: lime; -} -.bad { - color: red; -} -.warning { - color: yellow; -} - -li.proposal { - padding: 10px; - min-height: 140px; - padding-left: 40px; - margin: 10px; - border-top: 1px solid white; -} -ul { - list-style-type: none; - padding: 0px; - margin: 0; -} - -ul li p { - margin: 0; - font-size: 40px; -} -ul li p.title { - font-size: 25px; -} -ul li p.description { - margin-top: 5px; - font-size: 15px; -} -ul li span { - font-size: 15px; - margin-left: 10px; -} - -h1 span { - font-size: 14px; -} -h1 span.network { - color: azure; - font-size: 20px; -} -div.stats div span { - margin-right: 25px; -} - -.right-align { - text-align: right; -} -select { - padding: 5px 5px 5px 5px; - font-size: 16px; - height: 40px; -} - -option { - color: black; -} -.proposal-action { - margin-top: 15px; -} -button { - margin: 10px; - width: 180px; - font-size: 16px; - height: 50px; - background-color: transparent; - border: 1px solid azure; - color: azure; -} -img { - vertical-align: middle; -} -pre { - background: brown; - text-align: center; - padding: 10px; - font-size: 15px; -} - -.col-2 { - display: inline-block; - width: 49%; -} -.proposal-results { - text-align: right; - width:200px; - margin: 0 auto; - border-left: 4px solid white; -} -.proposal-results p span { - font-size: 40px; -} - -.input { - margin: 10px; -} -input { - width: 350px; - height: 30px; - padding: 10px; - font-size: 15px; -} -a { - color: aqua; -} diff --git a/ui/directives/accountSelector.html b/ui/directives/accountSelector.html deleted file mode 100644 index d46314e..0000000 --- a/ui/directives/accountSelector.html +++ /dev/null @@ -1,15 +0,0 @@ -
-
-
    -
    • -
-
-
- - - -
-
diff --git a/ui/directives/networkStats.html b/ui/directives/networkStats.html deleted file mode 100644 index 315dc00..0000000 --- a/ui/directives/networkStats.html +++ /dev/null @@ -1,11 +0,0 @@ -
-

etherSignal {{ connectionStateDisplay }} ({{ ethereumNetwork }})

-
- {{ currentBlock }} - {{ currentBlockTime }} - {{ sinceLastBlock }} seconds -
-
-

Last Transmission: {{ lastTx }}

-
-
diff --git a/ui/directives/proposalsList.html b/ui/directives/proposalsList.html deleted file mode 100644 index df97ef9..0000000 --- a/ui/directives/proposalsList.html +++ /dev/null @@ -1,35 +0,0 @@ -
-
    -
  • -
    -

    Create New Proposal

    -
    - - -
    -
    - - -
    -
    -
    • -
  • - -
    -

    {{ proposal[0] }}

    - Submitted by {{proposal[2]}} -

    {{ proposal[1] }}

    -
    - - -
    -
    -
    -
    -

    {{ proposal[6] }} Ether

    -

    {{ proposal[7] }} Ether

    -
    -
    -
    • -
-
diff --git a/ui/etherSignal.html b/ui/etherSignal.html deleted file mode 100644 index 3ccba98..0000000 --- a/ui/etherSignal.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - etherSignal - - -
- - -

Please start your local geth node

- 
geth --rpc --rpccorsdomain="chrome-extension://pgfcgpgggeefgnajgbdojefgdddlgnpi" --rpcapi="db,eth,net,web3,personal" --testnet
- - - -
- - diff --git a/ui/img/ether128.png b/ui/img/ether128.png deleted file mode 100644 index 708dfa5df0657913d0e0a579a91080d74ca09ce7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4337 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 diff --git a/ui/img/ether16.png b/ui/img/ether16.png deleted file mode 100644 index e21ebeeee914e3111e356b560108b8d26b41858e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 430 zcmV;f0a5;mP)G-NOU00A0FL_t(I%axPSO2aT1g}=6&u2!9n zA~@XLAoZp%l;_J6RV2C4OGRmiI)`Irt2cjP44QR?(vY5fIX$O|@LVd>(=^SKsw{rH zG@)m42qeHvWja0?0L+0E&;SozqNro{vA_f161Ygyd{vdj`lthy=>V7jyS?cxFjtw5 z`h3C+*vPoq12w?C7oajd5+T5uIGM;e0H!L_L!W~?AO>!MYk40^4rAaPc-&twH~`$p zPEAK+5is%r7SeqH4CUFj^)6w0L;R5LH$Yq2AMh%$#98yy32@fbz_*Ckz*6oj(Ym8G zI%}5VVk=GtEznu>)%REalq}jXYiG@K@3Y{n*#U1-TL8SAbQS=rvZ&KEkAWX&&7w>9 Y4-{lfEKp^>xc~qF07*qoM6N<$f_i1CfdBvi diff --git a/ui/img/ether48.png b/ui/img/ether48.png deleted file mode 100644 index 5a1f406d17180e67cd241a038e4f6db3395e0d10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1313 zcmV++1>X9JP)G-NOU00fOmL_t(&-qo7hZ&Xzj#(&eflwN3U zdjO?K3Aeo)(=k!>LGc!iiI3`oG5hb^e*sTk5_y0~!bRc$?v0va3@9+eok9!D_|R{X zlV;k^)N?w+N=`b{+2`!_t@Z77n<*TOe4stB0Q|YmbC-er#=4<_1YoSID(Y0$S<(W^z#9VxKnJ%3tZcIMA+Xz6H#KM; zcn7F=xnD!;2O|#{>yC=wkAT9Ok1N2A4j`T;NwwUl*Y5Y#1ID^Nz$>zTFVAWM)j^=p z9^l3nJXrv)8S6gi8vtY7-jp@BA{C%%tUJ;#4=eyT|EB?;0F%bLv26ultosoO#=p4>~LR8O6~y0fl(=3*6U%tE@*AD1E67`lqA)Mje2c4 z4-dQz{Jy4GYb!pXgf`ZJHmww$MzwaQ_FlVg891D|2aI(V_&Wu-pnE4|@!~oZDa*2J zDOOb1R#xYhmYqpbebT7c9%teKV_iu~7Ick>*HcoUwZ#b7_THpCGAv*XU_ljbCKP&8 zVRKwck7?s9rKIOh=-}6tD7(6GGnoaJWbM3VNc+61{E&$UPKY`)iXN>T0ld(49XOK} zfNz0o!0D8mUv!bkdMPKK>F*M7CI){A_$Dg=KLcN@bUqLK0lcP=SIEHPD|*f^G59lp zG1h&h{yGx?e*qU|`D4IH4E{%L-i}Vq9>Fxl^~b>V82nGbjIr*x0>zye{Mk$Z#NeA6 zl}sxOmyLCw1CL|yrxnK!%KhEYWm(EE%A>c9bzjIBPn0N6^}@eyONj%b(KT8Bu(*3! z7JZ-9F=8oo(A$}}T|PXLg-;3aamD{zsf-?C@c(393pMJsdr4BA(mhS!P6|j#K!$bD zE3)(s8EITf-i*OtNRp}r=0%~UR3=}E!C%d@8V#~wQP)#>qzSwW6l3rgSe;DIvpORk z2hQsM6UMqv1o(kG(~d%OG5B*^31Pi9G_$}iDVa9FGhjC`2b_$-FB$9J0%`*Lp$1!> zhF|-D6FP7C0uYG#R3kFfp#$3w+!sZr1gx=+$IGJD;%zj@VB#W;m8og55SRBekr7=GorB!0}DX%n=)@J z)wCP}E-Lg6Hh>s>T}57d|*u^Vce;bRK@qa}M(# XIlfEYH*=gTZX!+8*5jhrGkR7DQ%NBlgW?!-n@J7aq-?vCK{Vb zQU@;Q&VA?I^PTg3=RCp|e$8eR&N<|H&eqx_P1B^)=^%uViHNP$YT@+h(_6U`v=!%T z*RDyHWs|D&I3{Z^}Wqt$9%YBU-@oH}*NJ#hfdW^<4C{(~e*&H$(_ zEiJ)X3jnBAs~8;}MWs?%nVFfnXpDL9#EBCRo(O=eSFeJZM^yEqG3NN(+#F?D24;q; zB7^`{g|(K_G{w=QN5k^+a#KX!nwXe)wAuZB0>mbM8rE1p{g1nk)>^14;y6ZW- zPw)K&dHW%3HJGJD4lJ(-tR>{RLRBFQL=hp5fH)%5c6rnr9#1tG@!pq^*Ipc>KS%(` zmPHtppeg_qUf6~qAZ+Ie9C z;nGqeO2Z0MQo>yLZA$||si;8FZ0jErm9~6F1s|$F0QKmBYDw0%DxhEr5Dp-OZoD28 z>WWp@6h(|~_%d_q`E5ajy54BtAEHu->s_fRMIlP`33o>yBSJaT2~dLeDB&K4LjBYW zM5^E(OONM&Qw{V227-bSv~0^#*g?_PibXecvsO^I9Kg0UP|kS~4`B}>^pARO56Gz>l%P=J+znCx_qb_nwfP#X`$>=;ZcR=I-cvbHMybljrOIf#I z8xCm$ASze9d$^js@%q67Pwh&R)y26eU0I22s!^K4WF44J4&!}6J2N1RAOdd$E=k}j zLvYnP=gII`9@n4A=kG40-+cG$?4!lZ0_Xt9%jKw_%2E@i&q|-|UtBKg6HVw_9)R1x dhCZtR^lv~Mk&HFv7SjL#002ovPDHLkV1h}6dLIA) diff --git a/ui/js/browserAction.js b/ui/js/browserAction.js deleted file mode 100644 index 621ff59..0000000 --- a/ui/js/browserAction.js +++ /dev/null @@ -1,16 +0,0 @@ -var Web3 = require('web3'); -var web3 = new Web3(); - -web3.setProvider(new web3.providers.HttpProvider()); - -document.addEventListener('DOMContentLoaded', function(){ - document.getElementById('openPane').addEventListener('click', function(evt) { - chrome.tabs.create({url:chrome.extension.getURL('etherSignal.html')}); - }, false); - var latest = web3.eth.filter('latest'); - latest.watch(function(err,blockHash){ - web3.eth.getBlock(blockHash, false, function(err, block) { - console.log(block); - }); - }); -}, false); diff --git a/ui/js/etherSignal.js b/ui/js/etherSignal.js deleted file mode 100644 index ec651aa..0000000 --- a/ui/js/etherSignal.js +++ /dev/null @@ -1,267 +0,0 @@ -//TODO move this out of global scope -var to = '0x3B0C2BA7A03725E0f9aC5a55CB813823053d5eBE'; -var Web3 = require('web3'); -var web3 = new Web3(); -web3.setProvider(new web3.providers.HttpProvider()); - -var connected = web3.isConnected(); - -var app = angular.module('ethSignal', []); - -app.directive('networkStats', ['ethereum', '$interval','$rootScope', function(ethereum, $interval, $rootScope) { - return { - restrict: 'E', - templateUrl: 'directives/networkStats.html', - link: function(scope) { - $interval(function() { - - if ($rootScope.pending) - return; - else if (scope.sinceLastBlock <= 20) - scope.syncState = 'good'; - else if (scope.sinceLastBlock > 20 && scope.sinceLastBlock < 60) - scope.syncState = 'warning'; - else - scope.syncState = 'bad'; - scope.sinceLastBlock += 1; - }, 1000); - - } - } -}]); - -app.directive('accountSelector', ['ethereum','ethSignalContract','$rootScope', function(ethereum, ethSignalContract, $rootScope) { - return { - restrict: 'E', - templateUrl: 'directives/accountSelector.html', - link: function(scope) { - var contract = ethSignalContract; - scope.accounts = ethereum.accounts; - scope.user = {defaultAccount:'coinbase'}; - scope.$watch('user.defaultAccount', function(newVal, oldVal) { - console.log(contract); - if(oldVal == newVal) - return; - console.log("Setting defaultAccount to: ", newVal); - ethereum.web3.eth.defaultAccount = newVal; - }); - - scope.newProposal = function() { - if ($rootScope.newProposals.length != 0) - return; - $rootScope.newProposals.push({name:"", description:""}); - }; - } - } -}]); - -app.directive('proposalsList', ['proposalService','ethereum','$rootScope', function(proposalService, ethereum, $rootScope) { - - return { - restrict: 'E', - templateUrl: 'directives/proposalsList.html', - link: function(scope) { - scope.proposals = proposalService.proposals; - scope.newProposals = $rootScope.newProposals; - scope.cancel = function() { - $rootScope.newProposals = []; - } - scope.vote = function(proposalId, position) { - if(angular.isUndefined(ethereum.web3.eth.defaultAccount)){ - alert("Please select an account to from the \"Select Account\" dropdown."); - return - } - proposalService.vote(proposalId, position); - }; - - scope.createProposal = function(proposal) { - if(angular.isUndefined(ethereum.web3.eth.defaultAccount)){ - alert("Please select an account to from the \"Select Account\" dropdown."); - return - } - proposalService.newProposal(proposal); - }; - } - } -}]); - -app.service('ethereum', function($rootScope, $interval) { - // TODO graceful connection handling - - // convert block timestamps into human readable strings - function utcSecondsToString(timestamp) { - var date = new Date(0); - date.setUTCSeconds(timestamp); - return date.toString(); - } - function getCurrentNetwork(networkId) { - if (networkId == 1) - return 'Main-Net'; - if (networkId == 2) - return 'Test-Net'; - } - function getConnectionStatus(connected) { - if (connected) - return 'connected'; - return 'disconnected'; - } - - function getEtherscanUrl(networkId) { - if(networkId == 1) - return 'https://etherscan.io/tx'; - if (networkId == 2) - return 'https://testnet.etherscan.io/tx'; - } - - $rootScope.pending = true; - $rootScope.syncState = 'warning'; - $rootScope.currentBlock = 'SYNCING'; - $rootScope.currentBlockTime = 'SYNCING'; - $rootScope.sinceLastBlock = 0; - if(connected) { - $rootScope.ethereumNetwork = getCurrentNetwork(web3.version.network); - $rootScope.etherscanUrl = getEtherscanUrl(web3.version.network); - } - var state = web3.isConnected(); - $rootScope.connectionStateDisplay = getConnectionStatus(state); - $rootScope.connectionState = state; - $interval(function() { - newState = web3.isConnected(); - if (newState != state){ - location.reload(); - } - }, 7500); - - //subscribe to all new blocks from the Ethereum blockchain - //update global network statistics on $rootScope - var accounts = null; - if(connected) { - (function pollNetworkStats() { - var latest = web3.eth.filter('latest'); - latest.watch(function(err,blockHash){ - web3.eth.getBlock(blockHash, false, function(err, block) { - $rootScope.pending = false; - $rootScope.currentBlock = block.number; - $rootScope.currentBlockTime = utcSecondsToString(block.timestamp); - $rootScope.sinceLastBlock = -1; - }); - }); - })(); - - accounts = web3.eth.accounts; - } - return { - //make web3 available as a property of this service - web3: web3, - accounts: accounts - - - }; -}); - -app.service('ethSignalContract',['ethereum', function(ethereum) { - var web3 = ethereum.web3; - var abi = [ { "constant": true, "inputs": [ { "name": "", "type": "uint256" } ], "name": "proposals", "outputs": [ { "name": "name", "type": "string", "value": "Do you support the hard fork?" }, { "name": "description", "type": "string", "value": "\"Decentralization without decentralized social responsibility is terrifying\"\\n-Vlad Zamfir" }, { "name": "creator", "type": "address", "value": "0xb2445f120a5a4fe73c4ca9b3a73f415371b5656b" }, { "name": "active", "type": "bool", "value": true } ], "type": "function" }, { "constant": true, "inputs": [], "name": "numberOfProposals", "outputs": [ { "name": "_numberOfProposals", "type": "uint256" } ], "type": "function" }, { "constant": false, "inputs": [ { "name": "proposalID", "type": "uint256" }, { "name": "position", "type": "bool" } ], "name": "vote", "outputs": [], "type": "function" }, { "constant": false, "inputs": [ { "name": "proposalName", "type": "string" }, { "name": "proposalDescription", "type": "string" } ], "name": "newProposal", "outputs": [], "type": "function" }, { "inputs": [], "type": "constructor" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "proposalID", "type": "uint256" }, { "indexed": false, "name": "position", "type": "bool" }, { "indexed": false, "name": "voter", "type": "address" } ], "name": "userVotedEvent", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "proposalName", "type": "string" }, { "indexed": false, "name": "proposalDescription", "type": "string" }, { "indexed": false, "name": "creator", "type": "address" } ], "name": "proposalCreatedEvent", "type": "event" } ]; - return web3.eth.contract(abi).at(to); -}]); - -app.service('proposalService', ['ethSignalContract', '$q','ethereum','$rootScope', function(ethSignalContract, $q, ethereum, $rootScope) { - if(connected) { - var proposals = []; - $rootScope.newProposals = []; - for (var x = 0; x < ethSignalContract.numberOfProposals(); x++){ - var p = ethSignalContract.proposals.call(x); - // add an aray to keep track of true votes - p.push([]); - // and array to keep track of valse votes - p.push([]); - // eth balance for - p.push(0); - // eth balance against - p.push(0); - proposals.push(p); - } - var votes; - // store fromBlock as global - ethSignalContract.userVotedEvent({}, {fromBlock:1187201,toBlock:'latest'}).get(function(err,evt) { - console.log(evt); - votes = evt; - // store each vote with its associated proposal - for (var v in votes) { - var vote = votes[v]; - var proposalId = vote.args.proposalID.c[0]; - // tally Ether of votes - var balance = parseInt(web3.fromWei(ethereum.web3.eth.getBalance(vote.args.voter).toNumber(), 'ether'), 10); - if (vote.args.position) { - proposals[proposalId][4].push(vote); - proposals[proposalId][6] += balance; - } - else{ - proposals[proposalId][5].push(vote); - proposals[proposalId][7] += balance; - } - console.log(proposalId,balance, vote.args.position, vote.args.voter, vote.blockNumber); - } - }); - - function mergeData(proposals, votes) { - //combine votes and proposals to display results - } - - return { - proposals: proposals, - votes: votes, - vote: function(proposalId, position) { - // make this async return promise - var deferred = $q.defer(); - var from = ethereum.web3.eth.defaultAccount; - try { - $rootScope.lastTx = ethSignalContract.vote(proposalId, position) - } - catch(e) { - var passphrase = prompt("Please enter your passphrase: "); - var unlocked = ethereum.web3.personal.unlockAccount(from, passphrase); - if (unlocked) { - console.log(from, " unlocked."); - $rootScope.lastTx = ethSignalContract.vote(proposalId, position) - console.log($rootScope.lastTx); - ethereum.web3.personal.lockAccount(from); - console.log(from, " locked."); - console.log("Voted ", position, " on proposal: ", proposalId); - } - else { - alert("Incorrect passphrase"); - throw(e); - } - } - }, - newProposal: function(proposal) { - // do wallet locking and unlocking here - from = ethereum.web3.eth.defaultAccount; - var data = ethSignalContract.newProposal.getData(proposal.name, proposal.description); - var gas = ethereum.web3.eth.estimateGas({from:from, to:to, data:data}); - try { - $rootScope.lastTx = proposalService.contract.newProposal.sendTransaction(proposal.name, proposal.description, {from:from, to:to, gas:gas}); - } - catch(e) { - var passphrase = prompt("Please enter your passphrase: "); - var unlocked = ethereum.web3.personal.unlockAccount(from, passphrase); - if (unlocked) { - console.log(from, " unlocked."); - $rootScope.lastTx = ethSignalContract.newProposal.sendTransaction(proposal.name, proposal.description, {from:from, to:to, gas:gas}); - console.log($rootScope.lastTx); - ethereum.web3.personal.lockAccount(from); - console.log(from, " locked."); - } - else { - alert("Incorrect passphrase"); - throw(e); - } - } - $rootScope.newProposals = []; - } - }; - } - return null; -}]); - diff --git a/ui/manifest.json b/ui/manifest.json deleted file mode 100644 index 5bc285c..0000000 --- a/ui/manifest.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "manifest_version": 2, - "key": "jnfcafiflcnhihjokebkadknioapkppb", - "name": "Chrome Ethereum", - "description": "Ethereum for Chrome", - "version": "0.1", - "icons": { "16": "img/ether16.png", - "48": "img/ether48.png", - "128": "img/ether128.png" }, - "background": { - "scripts": [] - }, - "browser_action": { - "default_popup": "browserAction.html" - }, - "commands" : { - "_execute_browser_action": { - "suggested_key": { - "mac": "Alt+J", - "linux": "Alt+J" - } - } - }, - "permissions": [ - "storage", - "tabs", - "https://*/*" - ] -} diff --git a/ui/package.json b/ui/package.json deleted file mode 100644 index 2d8986b..0000000 --- a/ui/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "chrome-ethereum", - "version": "1.0.0", - "description": "The most versatile and easy to use Ethereum Wallet.", - "main": "test.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/thebalaa/chrome-ethereum.git" - }, - "keywords": [ - "ethereum", - "geth" - ], - "author": "Mo Balaa", - "license": "ISC", - "bugs": { - "url": "https://github.com/thebalaa/chrome-ethereum/issues" - }, - "homepage": "https://github.com/thebalaa/chrome-ethereum#readme", - "dependencies": { - "angular": "^1.5.7", - "web3": "^0.17.0-alpha" - } -}