Skip to content

G
Geth-Modification
Commit ddf17d93 authored by obscuren's avatar obscuren
Browse files
Options

Samples and disams cmd for evm code

parent 84adf77b
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 5 deletions
cmd/disasm/main.go 0 → 100644
View file @ ddf17d93
package main
import (
"fmt"
"io/ioutil"
"os"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/vm"
)
func main() {
code, err := ioutil.ReadAll(os.Stdin)
if err != nil {
fmt.Println(err)
os.Exit(1)
}
code = ethutil.Hex2Bytes(string(code[:len(code)-1]))
fmt.Printf("%x\n", code)
for pc := uint64(0); pc < uint64(len(code)); pc++ {
op := vm.OpCode(code[pc])
fmt.Printf("%-5d %v", pc, op)
switch op {
case vm.PUSH1, vm.PUSH2, vm.PUSH3, vm.PUSH4, vm.PUSH5, vm.PUSH6, vm.PUSH7, vm.PUSH8, vm.PUSH9, vm.PUSH10, vm.PUSH11, vm.PUSH12, vm.PUSH13, vm.PUSH14, vm.PUSH15, vm.PUSH16, vm.PUSH17, vm.PUSH18, vm.PUSH19, vm.PUSH20, vm.PUSH21, vm.PUSH22, vm.PUSH23, vm.PUSH24, vm.PUSH25, vm.PUSH26, vm.PUSH27, vm.PUSH28, vm.PUSH29, vm.PUSH30, vm.PUSH31, vm.PUSH32:
a := uint64(op) - uint64(vm.PUSH1) + 1
fmt.Printf(" => %x", code[pc+1:pc+1+a])
pc += a
}
fmt.Println()
}
}
cmd/mist/assets/examples/test.html → cmd/mist/assets/examples/abi.html
View file @ ddf17d93
...@@ -20,11 +20,10 @@ ...@@ -20,11 +20,10 @@
}] }]
}]; }];
var address = web3.eth.transact({ var address = web3.eth.transact({
data: "0x603880600c6000396000f3006001600060e060020a600035048063c6888fa114601857005b6021600435602b565b8060005260206000f35b6000816007029050", data: "0x603880600c6000396000f3006001600060e060020a600035048063c6888fa114601857005b6021600435602b565b8060005260206000f35b600081600702905091905056",
gasprice: "1000000000000000", gasprice: "1000000000000000",
gas: "10000", gas: "10000",
}); });
console.log("created contract with addr:"+ address);
var contract = web3.eth.contract(address, desc); var contract = web3.eth.contract(address, desc);
function calculate() { function calculate() {
...@@ -36,9 +35,21 @@ ...@@ -36,9 +35,21 @@
</script> </script>
</head> </head>
<body> <body>
<h3>Contract content</h3>
<textarea style="height:100px; width: 300px;" disabled="disabled">
contract test {
function multiply(uint a) returns(uint d) {
return a * 7;
}
}
</textarea>
<code><pre>
603880600c6000396000f3006001600060e060020a600035048063c6888fa1140
05b6021600435602b565b8060005260206000f35b600081600702905091905056</pre></code>
<div><input type="number" id="value" onkeyup='calculate()'></input></div> <hr>
<div id="result"></div> <div>7 x <input type="number" id="value" onkeyup='calculate()'></input> =
<span id="result"></spa>
</body> </body>
</html> </html>
cmd/mist/assets/examples/balance.html 0 → 100644
View file @ ddf17d93
<!doctype>
<html>
<head>
<script src="../ext/bignumber.min.js"></script>
<script src="../ext/ethereum.js/dist/ethereum.js"></script>
<script type="text/javascript">
var web3 = require('web3');
web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080'));
function watchBalance() {
var coinbase = web3.eth.coinbase;
var originalBalance = 0;
var balance = web3.eth.balanceAt(coinbase);
var originalBalance = web3.toDecimal(balance);
document.getElementById('original').innerText = 'original balance: ' + originalBalance + ' watching...';
web3.eth.watch({altered: coinbase}).changed(function() {
balance = web3.eth.balanceAt(coinbase)
var currentBalance = web3.toDecimal(balance);
document.getElementById("current").innerText = 'current: ' + currentBalance;
document.getElementById("diff").innerText = 'diff: ' + (currentBalance - originalBalance);
});
}
</script>
</head>
<body>
<h1>coinbase balance</h1>
<button type="button" onClick="watchBalance();">watch balance</button>
<div></div>
<div id="original"></div>
<div id="current"></div>
<div id="diff"></div>
</body>
</html>
rpc/packages.go
View file @ ddf17d93
...@@ -35,6 +35,19 @@ import ( ...@@ -35,6 +35,19 @@ import (
"github.com/ethereum/go-ethereum/xeth" "github.com/ethereum/go-ethereum/xeth"
) )
func toHex(b []byte) string {
return "0x" + ethutil.Bytes2Hex(b)
}
func fromHex(s string) []byte {
if len(s) > 1 {
if s[0:2] == "0x" {
s = s[2:]
}
return ethutil.Hex2Bytes(s)
}
return nil
}
type RpcServer interface { type RpcServer interface {
Start() Start()
Stop() Stop()
...@@ -163,7 +176,7 @@ func (p *EthereumApi) GetCodeAt(args *GetCodeAtArgs, reply *interface{}) error { ...@@ -163,7 +176,7 @@ func (p *EthereumApi) GetCodeAt(args *GetCodeAtArgs, reply *interface{}) error {
} }
func (p *EthereumApi) Sha3(args *Sha3Args, reply *interface{}) error { func (p *EthereumApi) Sha3(args *Sha3Args, reply *interface{}) error {
*reply = ethutil.Bytes2Hex(crypto.Sha3(ethutil.Hex2Bytes(args.Data))) *reply = toHex(crypto.Sha3(fromHex(args.Data)))
return nil return nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment