aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-06 01:13:35 +0800
committerobscuren <geffobscura@gmail.com>2015-02-06 02:58:43 +0800
commitac695387075fdd9214ef8de71ac6897136a50ce8 (patch)
tree5a4bce7c79eebe56b3573892e30e96b1ed0936fd /cmd
parent9d2166a964d83c09481dea6ef30889f260249295 (diff)
parentdb7c34a9df19d5a8a3a02a5e3d4cafcffa18dcb8 (diff)
downloadgo-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar
go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.gz
go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.bz2
go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.lz
go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.xz
go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.zst
go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.zip
Merge branch 'develop' into miner
Diffstat (limited to 'cmd')
-rw-r--r--cmd/evm/main.go1
-rw-r--r--cmd/mist/assets/examples/coin.html4
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index f819386fe..432cbd001 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -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 {
diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html
index 9d1a83171..149c51a47 100644
--- a/cmd/mist/assets/examples/coin.html
+++ b/cmd/mist/assets/examples/coin.html
@@ -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);