fix

Ethernal-Tech · Feb 29, 2024 · b021bef · b021bef
1 parent da60882
commit b021bef
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/loadtest/helpers/init.js b/loadtest/helpers/init.js
@@ -9,7 +9,7 @@ export function fundTestAccounts(client, root_address) {
 
     // fund the VUs accounts
     for (let i = 0; i < exec.instance.vusInitialized; i++) {
-        var tacc = wallet.generateKey();        
+        var tacc = wallet.generateKey();
         accounts[i] = {
             private_key: tacc.private_key,
             address: tacc.address,

diff --git a/loadtest/scenarios/multiple_EOA.js b/loadtest/scenarios/multiple_EOA.js
@@ -83,7 +83,7 @@ export default function (data) {
   const tx = {
     to: "0xDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF",
     value: Number(0.00000001 * 1e18),
-    gas_price: client.gasPrice(),
+    gas_price: client.gasPrice()*1.5,
     nonce: userData.nonce,
   };
 

diff --git a/loadtest/scenarios/multiple_ERC20.js b/loadtest/scenarios/multiple_ERC20.js
@@ -91,8 +91,8 @@ export default function (data) {
 
     console.log(acc.address);
     const con = client.newContract(data.contract_address, JSON.stringify(ZexCoin.abi));
-    const res = con.txn("transfer", { gas_limit: 100000, nonce: acc.nonce }, acc.address, 1);
-    console.log(`txn hash => ${res}`);
+    const res = con.txn("transfer", { gas_limit: 100000, nonce: acc.nonce, gas_price: client.gasPrice()*1.8 }, acc.address, 1);
+    console.log("sender => " + acc.address + " tx hash => " + res + " nonce => " + acc.nonce);
 
     acc.nonce++;
     // console.log(JSON.stringify(con.call("balanceOf", acc.address)));

diff --git a/txpool/txpool.go b/txpool/txpool.go
@@ -925,12 +925,7 @@ func (p *TxPool) handlePromoteRequest(req promoteRequest) {
 // addGossipTx handles receiving transactions
 // gossiped by the network.
 func (p *TxPool) addGossipTx(obj interface{}, peerID peer.ID) {
-	if !p.sealing.Load() {
-		return
-	}
-
-	// ignore txs gossiped by the node itself
-	if p.localPeerID == peerID {
+	if !p.sealing.Load() || p.localPeerID == peerID {
 		return
 	}