@@ -78,6 +78,12 @@ func (js *jsre) adminBindings() {
7878 miner .Set ("stopAutoDAG" , js .stopAutoDAG )
7979 miner .Set ("makeDAG" , js .makeDAG )
8080
81+ admin .Set ("txPool" , struct {}{})
82+ t , _ = admin .Get ("txPool" )
83+ txPool := t .Object ()
84+ txPool .Set ("pending" , js .allPendingTransactions )
85+ txPool .Set ("queued" , js .allQueuedTransactions )
86+
8187 admin .Set ("debug" , struct {}{})
8288 t , _ = admin .Get ("debug" )
8389 debug := t .Object ()
@@ -89,6 +95,7 @@ func (js *jsre) adminBindings() {
8995 debug .Set ("setHead" , js .setHead )
9096 debug .Set ("processBlock" , js .debugBlock )
9197 debug .Set ("seedhash" , js .seedHash )
98+ debug .Set ("insertBlock" , js .insertBlockRlp )
9299 // undocumented temporary
93100 debug .Set ("waitForBlocks" , js .waitForBlocks )
94101}
@@ -140,6 +147,32 @@ func (js *jsre) seedHash(call otto.FunctionCall) otto.Value {
140147 return otto .UndefinedValue ()
141148}
142149
150+ func (js * jsre ) allPendingTransactions (call otto.FunctionCall ) otto.Value {
151+ txs := js .ethereum .TxPool ().GetTransactions ()
152+
153+ ltxs := make ([]* tx , len (txs ))
154+ for i , tx := range txs {
155+ // no need to check err
156+ ltxs [i ] = newTx (tx )
157+ }
158+
159+ v , _ := call .Otto .ToValue (ltxs )
160+ return v
161+ }
162+
163+ func (js * jsre ) allQueuedTransactions (call otto.FunctionCall ) otto.Value {
164+ txs := js .ethereum .TxPool ().GetQueuedTransactions ()
165+
166+ ltxs := make ([]* tx , len (txs ))
167+ for i , tx := range txs {
168+ // no need to check err
169+ ltxs [i ] = newTx (tx )
170+ }
171+
172+ v , _ := call .Otto .ToValue (ltxs )
173+ return v
174+ }
175+
143176func (js * jsre ) pendingTransactions (call otto.FunctionCall ) otto.Value {
144177 txs := js .ethereum .TxPool ().GetTransactions ()
145178
@@ -160,7 +193,6 @@ func (js *jsre) pendingTransactions(call otto.FunctionCall) otto.Value {
160193 //ltxs := make([]*tx, len(txs))
161194 var ltxs []* tx
162195 for _ , tx := range txs {
163- // no need to check err
164196 if from , _ := tx .From (); accountSet .Has (from ) {
165197 ltxs = append (ltxs , newTx (tx ))
166198 }
@@ -238,16 +270,47 @@ func (js *jsre) debugBlock(call otto.FunctionCall) otto.Value {
238270 return otto .UndefinedValue ()
239271 }
240272
273+ tstart := time .Now ()
274+
241275 old := vm .Debug
242276 vm .Debug = true
243277 _ , err = js .ethereum .BlockProcessor ().RetryProcess (block )
244278 if err != nil {
245279 fmt .Println (err )
280+ r , _ := call .Otto .ToValue (map [string ]interface {}{"success" : false , "time" : time .Since (tstart ).Seconds ()})
281+ return r
246282 }
247283 vm .Debug = old
248284
249- fmt .Println ("ok" )
250- return otto .UndefinedValue ()
285+ r , _ := call .Otto .ToValue (map [string ]interface {}{"success" : true , "time" : time .Since (tstart ).Seconds ()})
286+ return r
287+ }
288+
289+ func (js * jsre ) insertBlockRlp (call otto.FunctionCall ) otto.Value {
290+ tstart := time .Now ()
291+
292+ var block types.Block
293+ if call .Argument (0 ).IsString () {
294+ blockRlp , _ := call .Argument (0 ).ToString ()
295+ err := rlp .DecodeBytes (common .Hex2Bytes (blockRlp ), & block )
296+ if err != nil {
297+ fmt .Println (err )
298+ return otto .UndefinedValue ()
299+ }
300+ }
301+
302+ old := vm .Debug
303+ vm .Debug = true
304+ _ , err := js .ethereum .BlockProcessor ().RetryProcess (& block )
305+ if err != nil {
306+ fmt .Println (err )
307+ r , _ := call .Otto .ToValue (map [string ]interface {}{"success" : false , "time" : time .Since (tstart ).Seconds ()})
308+ return r
309+ }
310+ vm .Debug = old
311+
312+ r , _ := call .Otto .ToValue (map [string ]interface {}{"success" : true , "time" : time .Since (tstart ).Seconds ()})
313+ return r
251314}
252315
253316func (js * jsre ) setHead (call otto.FunctionCall ) otto.Value {
0 commit comments