gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into miner

Browse Source
This commit is contained in:
obscuren
2015-02-05 09:13:35 -08:00
parent 9d2166a964 db7c34a9df
commit ac69538707
9 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/evm/main.go
View File

@ -128,6 +128,7 @@ func (self *VMEnv) Difficulty() *big.Int { return ethutil.Big1 }
func (self *VMEnv) BlockHash() []byte { return make([]byte, 32) }
func (self *VMEnv) Value() *big.Int { return self.value }
func (self *VMEnv) GasLimit() *big.Int { return big.NewInt(1000000000) }
func (self *VMEnv) VmType() vm.Type { return vm.StdVmTy }
func (self *VMEnv) Depth() int { return 0 }
func (self *VMEnv) SetDepth(i int) { self.depth = i }
func (self *VMEnv) GetHash(n uint64) []byte {

4
cmd/mist/assets/examples/coin.html
View File

@ -62,7 +62,7 @@
],
}];
var address = "";//web3.db.get("jevcoin", "address");
var address = web3.db.get("jevcoin", "address");
if( address.length == 0 ) {
var code = "0x60056011565b60b88060356000396000f35b64e8d4a51000600033600160a060020a0316600052602052604060002081905550560060e060020a6000350480637bb98a68146028578063d0679d34146034578063e3d670d714604657005b602e60b3565b60006000f35b60406004356024356059565b60006000f35b604f6004356091565b8060005260206000f35b8060005281600160a060020a03167fb52dda022b6c1a1f40905a85f257f689aa5d69d850e49cf939d688fbe5af594660206000a25050565b6000600082600160a060020a03166000526020526040600020549050919050565b5b60008156";
address = web3.eth.transact({
@ -77,7 +77,7 @@
contract.Changed({to: "0xaa"}).changed(function(e) {
console.log("e: " + JSON.stringify(e));
});
contract.transact({gas: "10000", gasprice: eth.gasPrice}).send( "0xaa", 10000 );
contract.send( "0xaa", 10000 );
function reflesh() {
document.querySelector("#balance").innerHTML = contract.balance(eth.coinbase);