Use Network transactions in les protocol (ethereum#69)

Inphi · Dec 2, 2022 · f2d8e79 · f2d8e79
1 parent d5563a1
commit f2d8e79
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/les/protocol.go b/les/protocol.go
@@ -131,7 +131,7 @@ type GetHelperTrieProofsPacket struct {
 // SendTxPacket represents a transaction propagation request
 type SendTxPacket struct {
 	ReqID uint64
-	Txs   []*types.Transaction
+	Txs   []*types.NetworkTransaction
 }
 
 // GetTxStatusPacket represents a transaction status query

diff --git a/les/server_requests.go b/les/server_requests.go
@@ -523,7 +523,7 @@ func handleSendTx(msg Decoder) (serveRequestFn, uint64, uint64, error) {
 				if backend.AddTxsSync() {
 					addFn = backend.TxPool().AddRemotesSync
 				}
-				if errs := addFn([]*types.Transaction{tx}); errs[0] != nil {
+				if errs := addFn([]*types.Transaction{tx.Tx}); errs[0] != nil {
 					stats[i].Error = errs[0].Error()
 					continue
 				}

diff --git a/les/txrelay.go b/les/txrelay.go
@@ -114,8 +114,11 @@ func (ltrx *lesTxRelay) send(txs types.Transactions, count int) {
 	}
 
 	for p, list := range sendTo {
+		ll := make(types.NetworkTransactions, len(list))
+		for i := range list {
+			ll[i] = types.NewNetworkTransaction(list[i])
+		}
 		pp := p
-		ll := list
 		enc, _ := rlp.EncodeToBytes(ll)
 
 		reqID := rand.Uint64()