m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

various things

Browse Source
This commit is contained in:
kumavis 2016-08-31 15:33:24 -07:00
parent b7aab95519
commit a3330568d9
5 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/controller.js
View File

@ -4,11 +4,9 @@ const handleRequestsFromStream = require('web3-stream-provider/handler')
const Streams = require('mississippi') const Streams = require('mississippi')
const ObjectMultiplex = require('../app/scripts/lib/obj-multiplex') const ObjectMultiplex = require('../app/scripts/lib/obj-multiplex')
console.log('yes, this is iframe')
initializeZeroClient() initializeZeroClient()
function initializeZeroClient() { function initializeZeroClient() {
var provider = ZeroClientProvider({ var provider = ZeroClientProvider({

4
library/example.sh
View File

@ -1,4 +0,0 @@
# run 2 servers and make sure they close together
beefy frame.js:bundle.js 9001 --live -- -t [ babelify --global --presets [ es2015 ] ] &
beefy example/index.js:bundle.js index.js:zero.js --cwd example/ 9002 --live --open -- -t [ babelify --global --presets [ es2015 ] ]

18
library/example/index.js
View File

@ -5,24 +5,24 @@ function web3Detect() {
if (global.web3) { if (global.web3) {
document.body.innerHTML += 'web3 detected!' document.body.innerHTML += 'web3 detected!'
console.log('web3 detected!') console.log('web3 detected!')
startApp()
} else { } else {
document.body.innerHTML += 'no web3 detected!' document.body.innerHTML += 'no web3 detected!'
console.log('no web3 detected!') console.log('no web3 detected!')
} }
startApp()
} }
var primaryAccount = null
web3.eth.getAccounts(function(err, addresses){
if (err) throw err
console.log('set address')
primaryAccount = addresses[0]
})
function startApp(){ function startApp(){
console.log('app started') console.log('app started')
var primaryAccount = null
console.log('getting main account...')
web3.eth.getAccounts(function(err, addresses){
if (err) throw err
console.log('set address')
primaryAccount = addresses[0]
})
document.querySelector('.action-button-1').addEventListener('click', function(){ document.querySelector('.action-button-1').addEventListener('click', function(){
console.log('saw click') console.log('saw click')
console.log('sending tx') console.log('sending tx')

2
library/index.js
View File

@ -6,9 +6,7 @@ const setupProvider = require('./lib/setup-provider.js')
// //
var provider = setupProvider() var provider = setupProvider()
console.log('debugger point A')
hijackProvider(provider) hijackProvider(provider)
console.log('debugger point B')
var web3 = new Web3(provider) var web3 = new Web3(provider)
web3.setProvider = function(){ web3.setProvider = function(){
console.log('MetaMask - overrode web3.setProvider') console.log('MetaMask - overrode web3.setProvider')

5
library/server.js
View File

@ -12,8 +12,6 @@ const appBundle = createBundle('./example/index.js')
// Iframe Server // Iframe Server
// //
// beefy frame.js:bundle.js 9001 --live -- -t [ babelify --global --presets [ es2015 ] ]
const iframeServer = express() const iframeServer = express()
// serve controller bundle // serve controller bundle
@ -31,8 +29,6 @@ iframeServer.listen('9001')
// Dapp Server // Dapp Server
// //
// beefy example/index.js:bundle.js index.js:zero.js --cwd example/ 9002 --live --open -- -t [ babelify --global --presets [ es2015 ] ]
const dappServer = express() const dappServer = express()
@ -64,6 +60,7 @@ function createBundle(entryPoint){
plugin: [watchify], plugin: [watchify],
}) })
// global transpile
var bablePreset = path.resolve(__dirname, '../node_modules/babel-preset-es2015') var bablePreset = path.resolve(__dirname, '../node_modules/babel-preset-es2015')
bundler.transform(babelify, { bundler.transform(babelify, {