From 7fed4244353bb9b95b6c18fb26c039d7274bd2c8 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 5 May 2015 23:09:46 +0200 Subject: cmd/geth: implemented resending transaction with different gas settings --- cmd/geth/admin.go | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) (limited to 'cmd') diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index 31f8d4400..13efe5dd6 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -3,6 +3,7 @@ package main import ( "errors" "fmt" + "strconv" "time" "github.com/ethereum/go-ethereum/cmd/utils" @@ -22,6 +23,11 @@ node admin bindings */ func (js *jsre) adminBindings() { + ethO, _ := js.re.Get("eth") + eth := ethO.Object() + eth.Set("transactions", js.transactions) + eth.Set("resend", js.resend) + js.re.Set("admin", struct{}{}) t, _ := js.re.Get("admin") admin := t.Object() @@ -74,6 +80,83 @@ func (js *jsre) getBlock(call otto.FunctionCall) (*types.Block, error) { return nil, errors.New("requires block number or block hash as argument") } +type tx struct { + tx *types.Transaction + + To string + From string + Nonce string + Value string + Data string + GasLimit string + GasPrice string +} + +func newTx(t *types.Transaction) *tx { + from, _ := t.From() + var to string + if t := t.To(); t != nil { + to = t.Hex() + } + + return &tx{ + tx: t, + To: to, + From: from.Hex(), + Value: t.Amount.String(), + Nonce: strconv.Itoa(int(t.Nonce())), + Data: "0x" + common.Bytes2Hex(t.Data()), + GasLimit: t.GasLimit.String(), + GasPrice: t.GasPrice().String(), + } +} + +func (js *jsre) transactions(call otto.FunctionCall) otto.Value { + txs := js.ethereum.TxPool().GetTransactions() + + ltxs := make([]*tx, len(txs)) + for i, tx := range txs { + ltxs[i] = newTx(tx) + } + + return js.re.ToVal(ltxs) +} + +func (js *jsre) resend(call otto.FunctionCall) otto.Value { + if len(call.ArgumentList) == 0 { + fmt.Println("first argument must be a transaction") + return otto.FalseValue() + } + + v, err := call.Argument(0).Export() + if err != nil { + fmt.Println(err) + return otto.FalseValue() + } + + if tx, ok := v.(*tx); ok { + gl, gp := tx.GasLimit, tx.GasPrice + if len(call.ArgumentList) > 1 { + gl = call.Argument(1).String() + } + if len(call.ArgumentList) > 2 { + gp = call.Argument(2).String() + } + + ret, err := js.xeth.Transact(tx.From, tx.To, tx.Nonce, tx.Value, gl, gp, tx.Data) + if err != nil { + fmt.Println(err) + return otto.FalseValue() + } + js.ethereum.TxPool().RemoveTransactions(types.Transactions{tx.tx}) + + return js.re.ToVal(ret) + } + + fmt.Println("first argument must be a transaction") + return otto.FalseValue() +} + func (js *jsre) debugBlock(call otto.FunctionCall) otto.Value { block, err := js.getBlock(call) if err != nil { -- cgit v1.2.3 From 5ebc22807c1faa9fc6dddd79aebc974f4510af20 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 5 May 2015 23:19:59 +0200 Subject: cmd/geth: admin, switched price with limit in arguments --- cmd/geth/admin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd') diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index 13efe5dd6..2ee316580 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -137,10 +137,10 @@ func (js *jsre) resend(call otto.FunctionCall) otto.Value { if tx, ok := v.(*tx); ok { gl, gp := tx.GasLimit, tx.GasPrice if len(call.ArgumentList) > 1 { - gl = call.Argument(1).String() + gp = call.Argument(1).String() } if len(call.ArgumentList) > 2 { - gp = call.Argument(2).String() + gl = call.Argument(2).String() } ret, err := js.xeth.Transact(tx.From, tx.To, tx.Nonce, tx.Value, gl, gp, tx.Data) -- cgit v1.2.3 From eb4029257a3166c94fdf82623283e6f946bf19f2 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 6 May 2015 00:13:44 +0200 Subject: cmd/mist: updated xeth transact --- cmd/mist/bindings.go | 2 +- cmd/mist/ui_lib.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd') diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go index e7ce50c35..7512421a1 100644 --- a/cmd/mist/bindings.go +++ b/cmd/mist/bindings.go @@ -40,7 +40,7 @@ type plugin struct { func (gui *Gui) Transact(from, recipient, value, gas, gasPrice, d string) (string, error) { d = common.Bytes2Hex(utils.FormatTransactionData(d)) - return gui.xeth.Transact(from, recipient, value, gas, gasPrice, d) + return gui.xeth.Transact(from, recipient, "", value, gas, gasPrice, d) } func (self *Gui) AddPlugin(pluginPath string) { diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 34ce56e77..2de71491c 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -119,6 +119,7 @@ func (self *UiLib) Transact(params map[string]interface{}) (string, error) { return self.XEth.Transact( object["from"], object["to"], + "", object["value"], object["gas"], object["gasPrice"], -- cgit v1.2.3 From 05ac1209c731722a486fb54d3b5cc9282c760c81 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 6 May 2015 14:53:20 +0200 Subject: cmd/geth: limit `pendingTransactions` to owned accounts. --- cmd/geth/admin.go | 86 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 33 deletions(-) (limited to 'cmd') diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index 2ee316580..e7cc96ddb 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -16,6 +16,7 @@ import ( "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/xeth" "github.com/robertkrimen/otto" + "gopkg.in/fatih/set.v0" ) /* @@ -25,7 +26,7 @@ node admin bindings func (js *jsre) adminBindings() { ethO, _ := js.re.Get("eth") eth := ethO.Object() - eth.Set("transactions", js.transactions) + eth.Set("pendingTransactions", js.pendingTransactions) eth.Set("resend", js.resend) js.re.Set("admin", struct{}{}) @@ -80,43 +81,30 @@ func (js *jsre) getBlock(call otto.FunctionCall) (*types.Block, error) { return nil, errors.New("requires block number or block hash as argument") } -type tx struct { - tx *types.Transaction - - To string - From string - Nonce string - Value string - Data string - GasLimit string - GasPrice string -} +func (js *jsre) pendingTransactions(call otto.FunctionCall) otto.Value { + txs := js.ethereum.TxPool().GetTransactions() -func newTx(t *types.Transaction) *tx { - from, _ := t.From() - var to string - if t := t.To(); t != nil { - to = t.Hex() + // grab the accounts from the account manager. This will help with determening which + // transactions should be returned. + accounts, err := js.ethereum.AccountManager().Accounts() + if err != nil { + fmt.Println(err) + return otto.UndefinedValue() } - return &tx{ - tx: t, - To: to, - From: from.Hex(), - Value: t.Amount.String(), - Nonce: strconv.Itoa(int(t.Nonce())), - Data: "0x" + common.Bytes2Hex(t.Data()), - GasLimit: t.GasLimit.String(), - GasPrice: t.GasPrice().String(), + // Add the accouns to a new set + accountSet := set.New() + for _, account := range accounts { + accountSet.Add(common.BytesToAddress(account.Address)) } -} - -func (js *jsre) transactions(call otto.FunctionCall) otto.Value { - txs := js.ethereum.TxPool().GetTransactions() - ltxs := make([]*tx, len(txs)) - for i, tx := range txs { - ltxs[i] = newTx(tx) + //ltxs := make([]*tx, len(txs)) + var ltxs []*tx + for _, tx := range txs { + // no need to check err + if from, _ := tx.From(); accountSet.Has(from) { + ltxs = append(ltxs, newTx(tx)) + } } return js.re.ToVal(ltxs) @@ -504,3 +492,35 @@ func (js *jsre) dumpBlock(call otto.FunctionCall) otto.Value { return js.re.ToVal(dump) } + +// internal transaction type which will allow us to resend transactions using `eth.resend` +type tx struct { + tx *types.Transaction + + To string + From string + Nonce string + Value string + Data string + GasLimit string + GasPrice string +} + +func newTx(t *types.Transaction) *tx { + from, _ := t.From() + var to string + if t := t.To(); t != nil { + to = t.Hex() + } + + return &tx{ + tx: t, + To: to, + From: from.Hex(), + Value: t.Amount.String(), + Nonce: strconv.Itoa(int(t.Nonce())), + Data: "0x" + common.Bytes2Hex(t.Data()), + GasLimit: t.GasLimit.String(), + GasPrice: t.GasPrice().String(), + } +} -- cgit v1.2.3