Default gas price and default gas for rpc
This commit is contained in:
parent
a1b4547a53
commit
db7c34a9df
@ -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);
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
package ezp
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math/big"
|
||||
"math/rand"
|
||||
"time"
|
||||
@ -60,7 +59,6 @@ func (pow *EasyPow) Search(block pow.Block, stop <-chan struct{}) []byte {
|
||||
|
||||
sha := crypto.Sha3(big.NewInt(r.Int63()).Bytes())
|
||||
if verify(hash, diff, sha) {
|
||||
fmt.Printf("HASH: %x\nDIFF %v\nSHA %x\n", hash, diff, sha)
|
||||
return sha
|
||||
}
|
||||
}
|
||||
|
10
rpc/args.go
10
rpc/args.go
@ -37,16 +37,6 @@ type NewTxArgs struct {
|
||||
Data string `json:"data"`
|
||||
}
|
||||
|
||||
func (a *NewTxArgs) requirements() error {
|
||||
if a.Gas == "" {
|
||||
return NewErrorResponse("Transact requires a 'gas' value as argument")
|
||||
}
|
||||
if a.GasPrice == "" {
|
||||
return NewErrorResponse("Transact requires a 'gasprice' value as argument")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type PushTxArgs struct {
|
||||
Tx string `json:"tx"`
|
||||
}
|
||||
|
@ -40,6 +40,11 @@ import (
|
||||
"github.com/ethereum/go-ethereum/xeth"
|
||||
)
|
||||
|
||||
const (
|
||||
defaultGasPrice = "10000000000000"
|
||||
defaultGas = "10000"
|
||||
)
|
||||
|
||||
type EthereumApi struct {
|
||||
xeth *xeth.XEth
|
||||
filterManager *filter.FilterManager
|
||||
@ -116,10 +121,14 @@ func (p *EthereumApi) GetBlock(args *GetBlockArgs, reply *interface{}) error {
|
||||
}
|
||||
|
||||
func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) error {
|
||||
err := args.requirements()
|
||||
if err != nil {
|
||||
return err
|
||||
if len(args.Gas) == 0 {
|
||||
args.Gas = defaultGas
|
||||
}
|
||||
|
||||
if len(args.GasPrice) == 0 {
|
||||
args.GasPrice = defaultGasPrice
|
||||
}
|
||||
|
||||
result, _ := p.xeth.Transact( /* TODO specify account */ args.To, args.Value, args.Gas, args.GasPrice, args.Data)
|
||||
*reply = result
|
||||
return nil
|
||||
@ -387,7 +396,7 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
|
||||
}
|
||||
return p.FilterChanged(args, reply)
|
||||
case "eth_gasPrice":
|
||||
*reply = "10000000000000"
|
||||
*reply = defaultGasPrice
|
||||
return nil
|
||||
case "web3_sha3":
|
||||
args, err := req.ToSha3Args()
|
||||
|
Loading…
Reference in New Issue
Block a user