good morning!!!!

Skip to content
Snippets Groups Projects
Commit b64ad7a2 authored by obscuren's avatar obscuren
Browse files

Merge branch 'develop' into miner

parents da2fae0e 3f6baa45
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 17 additions and 22 deletions
.travis.yml
+ 5
− 3
View file @ b64ad7a2
...@@ -11,8 +11,8 @@ install: ...@@ -11,8 +11,8 @@ install:
# - go get golang.org/x/tools/cmd/vet # - go get golang.org/x/tools/cmd/vet
- if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
- go get github.com/mattn/goveralls - go get github.com/mattn/goveralls
- go get -d github.com/obscuren/qml && cd $HOME/gopath/src/github.com/obscuren/qml && git checkout v1 && cd $TRAVIS_BUILD_DIR - go get gopkg.in/check.v1
- ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get -d $ETH_DEPS; fi - DEPS=$(go list -f '{{.Imports}}' ./... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$DEPS" ]; then go get -d -v $DEPS; fi
before_script: before_script:
- gofmt -l -w . - gofmt -l -w .
- goimports -l -w . - goimports -l -w .
...@@ -20,7 +20,9 @@ before_script: ...@@ -20,7 +20,9 @@ before_script:
# - go vet ./... # - go vet ./...
# - go test -race ./... # - go test -race ./...
script: script:
- ./gocoverage.sh && if [ "$COVERALLS_TOKEN" ]; then goveralls -coverprofile=profile.cov -service=travis-ci -repotoken $COVERALLS_TOKEN; fi - ./gocoverage.sh
after_success:
- if [ "$COVERALLS_TOKEN" ]; then goveralls -coverprofile=profile.cov -service=travis-ci -repotoken $COVERALLS_TOKEN; fi
env: env:
global: global:
- PKG_CONFIG_PATH=/opt/qt54/lib/pkgconfig - PKG_CONFIG_PATH=/opt/qt54/lib/pkgconfig
......
Dockerfile
+ 3
− 6
View file @ b64ad7a2
...@@ -21,13 +21,10 @@ RUN apt-get install -y qt54quickcontrols qt54webengine ...@@ -21,13 +21,10 @@ RUN apt-get install -y qt54quickcontrols qt54webengine
## Build and install latest Go ## Build and install latest Go
RUN git clone https://go.googlesource.com/go golang RUN git clone https://go.googlesource.com/go golang
RUN cd golang && git checkout go1.4.1 RUN cd golang && git checkout go1.4.1
RUN cd golang/src && ./all.bash && go version RUN cd golang/src && ./make.bash && go version
## Fetch and install QML # this is a workaround, to make sure that docker's cache is invalidated whenever the git repo changes
RUN go get -u -v -d github.com/obscuren/qml ADD https://api.github.com/repos/ethereum/go-ethereum/git/refs/heads/develop file_does_not_exist
WORKDIR $GOPATH/src/github.com/obscuren/qml
RUN git checkout v1
RUN go install -v
## Fetch and install go-ethereum ## Fetch and install go-ethereum
RUN go get -u -v -d github.com/ethereum/go-ethereum/... RUN go get -u -v -d github.com/ethereum/go-ethereum/...
......
README.md
+ 1
− 1
View file @ b64ad7a2
...@@ -29,7 +29,7 @@ For further, detailed, build instruction please see the [Wiki](https://github.co ...@@ -29,7 +29,7 @@ For further, detailed, build instruction please see the [Wiki](https://github.co
Automated (dev) builds Automated (dev) builds
====================== ======================
* [[OS X](http://build.ethdev.com/builds/OSX%20Go%20develop%20branch/latest/app/)] * [[OS X](http://build.ethdev.com/builds/OSX%20Go%20develop%20branch/Mist-OSX-latest.dmg)]
* [Windows] Coming soon™ * [Windows] Coming soon™
* [Linux] Coming soon™ * [Linux] Coming soon™
......
cmd/mist/assets/backButton.png 0 → 100644
+ 0
− 0
View file @ b64ad7a2
cmd/mist/assets/backButton.png

663 B

cmd/mist/assets/backButton@2x.png 0 → 100644
+ 0
− 0
View file @ b64ad7a2
cmd/mist/assets/backButton@2x.png

1.46 KiB

cmd/mist/assets/examples/coin.html
+ 7
− 12
View file @ b64ad7a2
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</head> </head>
<body> <body>
<h1>JevCoin <code id="address"></code></h1> <h1>JevCoin <code id="contract_addr"></code></h1>
<div> <div>
<strong>Balance</strong> <strong>Balance</strong>
<span id="balance"></strong> <span id="balance"></strong>
...@@ -58,29 +58,25 @@ ...@@ -58,29 +58,25 @@
}], }],
"outputs": [] "outputs": []
}, { }, {
"name":"changed", "name":"received",
"type":"event", "type":"event",
"inputs": [ "inputs": [
{"name":"to","type":"address","indexed":true},
{"name":"from","type":"address","indexed":true}, {"name":"from","type":"address","indexed":true},
{"name":"amount","type":"uint256","indexed":true},
], ],
}]; }];
var address = localStorage.getItem("address"); var address = localStorage.getItem("address");
// deploy if not exist // deploy if not exist
if (address == null) { if (address == null) {
var code = "0x60056013565b610132806100356000396000f35b620f4240600033600160a060020a0316600052602052604060002081905550560060e060020a6000350480637bb98a681461002b578063d0679d3414610039578063e3d670d71461004d57005b61003361012d565b60006000f35b610047600435602435610062565b60006000f35b61005860043561010b565b8060005260206000f35b80600033600160a060020a0316600052602052604060002054106100855761008a565b610107565b80600033600160a060020a0316600052602052604060002090815403908190555080600083600160a060020a0316600052602052604060002090815401908190555081600160a060020a031633600160a060020a03167f1863989b4bb7c5c3941722099764574df7a459f9f9c6b6cdca35ddc9731792b860006000a35b5050565b6000600082600160a060020a03166000526020526040600020549050919050565b5b60008156"; var code = "0x60056013565b61012b806100346000396000f35b6103e8600033600160a060020a0316600052602052604060002081905550560060e060020a6000350480637bb98a681461002b578063d0679d3414610039578063e3d670d71461004d57005b610033610126565b60006000f35b610047600435602435610062565b60006000f35b610058600435610104565b8060005260206000f35b80600033600160a060020a0316600052602052604060002054101561008657610100565b80600033600160a060020a0316600052602052604060002090815403908190555080600083600160a060020a0316600052602052604060002090815401908190555033600160a060020a0316600052806020527ff11e547d796cc64acdf758e7cee90439494fd886a19159454aa61e473fdbafef60406000a15b5050565b6000600082600160a060020a03166000526020526040600020549050919050565b5b60008156";
address = web3.eth.transact({ address = web3.eth.transact({data: code});
data: code,
gasPrice: "1000000000000000",
gas: "10000",
});
localStorage.setItem("address", address); localStorage.setItem("address", address);
} }
document.querySelector("#address").innerHTML = address.toUpperCase(); document.querySelector("#contract_addr").innerHTML = address.toUpperCase();
var contract = web3.eth.contract(address, desc); var contract = web3.eth.contract(address, desc);
contract.changed({from: eth.accounts[0]}).changed(function() { contract.received({from: eth.coinbase}).changed(function() {
refresh(); refresh();
}); });
eth.watch('chain').changed(function() { eth.watch('chain').changed(function() {
...@@ -102,7 +98,6 @@ ...@@ -102,7 +98,6 @@
function transact() { function transact() {
var to = document.querySelector("#address").value; var to = document.querySelector("#address").value;
if( to.length == 0 ) { if( to.length == 0 ) {
to = "0x4205b06c2cfa0e30359edcab94543266cb6fa1d3"; to = "0x4205b06c2cfa0e30359edcab94543266cb6fa1d3";
} else { } else {
......
cmd/mist/assets/examples/coin.js 0 → 100644
+ 1
− 0
View file @ b64ad7a2
var contract = web3.eth.contractFromAbi([{"constant":false,"inputs":[{"name":"_h","type":"hash256"}],"name":"confirm","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":_to","type":"address"},{"name":"_value","type":"uint256"},{"name":"_data","type":"bytes"}],"name":"execute","outputs":[{"name":"_r","type":"hash256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"}],"name":"kill","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"}],"name":"changeOwner","outputs":[],"type":"function"},{"inputs":[{"indexed":false,"name":"value","type":"uint256"}],"name":"CashIn","type":"event"},{"inputs":[{"indexed":true,"name":"out","type":"string32"},{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"value","type":"uint256"},{"indexed":false,"name":"to","type":"address"}],"name":"SingleTransact","type":"event"},{"inputs":[{"indexed":true,"name":"out","type":"string32"},{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"operation","type":"hash256"},{"indexed":false,"name":"value","type":"uint256"},{"indexed":false,"name":"to","type":"address"}],"name":"MultiTransact","type":"event"}]);
cmd/mist/assets/qml/fonts/Simple-Line-Icons.ttf 0 → 100755
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-Black.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-BlackIt.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-Bold.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-BoldIt.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-ExtraLight.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-ExtraLightIt.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-It.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-Light.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-LightIt.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-Regular.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-Semibold.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-SemiboldIt.ttf 0 → 100644
+ 0
− 0
View file @ b64ad7a2
File added
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment