gas price fix

Author: Bojan131

dkg/providers/blockchain/async_blockchain.py

@@ -182,22 +182,38 @@ async def fetch_gas_price(oracle_url: str) -> Wei | None:
                     async with session.get(oracle_url) as response:
                         response.raise_for_status()
                         data: dict = await response.json()
+                        
+                        print(f"🔍 Gas price oracle response: {data}")
 
                         if "result" in data:
                             gas_price = int(data["result"], 16)
                         elif "fast" in data:
                             gas_price = self.w3.to_wei(data["fast"], "gwei")
+                        elif "result" in data and "SafeGasPrice" in data["result"]:
+                            # Handle Basescan format
+                            gas_price = self.w3.to_wei(data["result"]["SafeGasPrice"], "gwei")
+                        elif "result" in data and "FastGasPrice" in data["result"]:
+                            # Handle Basescan format with FastGasPrice
+                            gas_price = self.w3.to_wei(data["result"]["FastGasPrice"], "gwei")
                         else:
+                            print(f"⚠️ Unknown gas price oracle format: {data}")
                             return None
 
-                        # Ensure minimum gas price (1 gwei = 1,000,000,000 wei)
-                        min_gas_price = self.w3.to_wei(1, "gwei")  # 1 gwei minimum
+                        print(f"💰 Parsed gas price: {gas_price} wei")
+                        
+                        # Ensure minimum gas price (2 gwei = 2,000,000,000 wei)
+                        min_gas_price = self.w3.to_wei(2, "gwei")  # 2 gwei minimum
                         if gas_price < min_gas_price:
                             print(f"⚠️ Gas price from oracle too low ({gas_price} wei), using minimum ({min_gas_price} wei)")
-                            return min_gas_price
+                            gas_price = min_gas_price
+                        
+                        # Apply multiplier to ensure transaction goes through (1.5x)
+                        gas_price = int(gas_price * 1.5)
+                        print(f"🚀 Final gas price with multiplier: {gas_price} wei")
 
                         return gas_price
-            except Exception:
+            except Exception as e:
+                print(f"❌ Error fetching gas price from {oracle_url}: {e}")
                 return None
 
         oracles = self.gas_price_oracle
@@ -213,14 +229,14 @@ async def fetch_gas_price(oracle_url: str) -> Wei | None:
         # Fallback: use network gas price with minimum
         try:
             network_gas_price = await self.w3.eth.gas_price
-            min_gas_price = self.w3.to_wei(1, "gwei")  # 1 gwei minimum
+            min_gas_price = self.w3.to_wei(2, "gwei")  # 2 gwei minimum
             if network_gas_price < min_gas_price:
                 print(f"⚠️ Network gas price too low ({network_gas_price} wei), using minimum ({min_gas_price} wei)")
                 return min_gas_price
             return network_gas_price
         except Exception:
             # Final fallback: return minimum gas price
-            return self.w3.to_wei(1, "gwei")
+            return self.w3.to_wei(2, "gwei")
 
     async def _init_contracts(self):
         init_tasks = []

dkg/providers/blockchain/blockchain.py

@@ -167,22 +167,38 @@ def fetch_gas_price(oracle_url: str) -> Wei | None:
                 response = requests.get(oracle_url)
                 response.raise_for_status()
                 data: dict = response.json()
+                
+                print(f"🔍 Gas price oracle response: {data}")
 
                 if "result" in data:
                     gas_price = int(data["result"], 16)
                 elif "fast" in data:
                     gas_price = self.w3.to_wei(data["fast"], "gwei")
+                elif "result" in data and "SafeGasPrice" in data["result"]:
+                    # Handle Basescan format
+                    gas_price = self.w3.to_wei(data["result"]["SafeGasPrice"], "gwei")
+                elif "result" in data and "FastGasPrice" in data["result"]:
+                    # Handle Basescan format with FastGasPrice
+                    gas_price = self.w3.to_wei(data["result"]["FastGasPrice"], "gwei")
                 else:
+                    print(f"⚠️ Unknown gas price oracle format: {data}")
                     return None
 
-                # Ensure minimum gas price (1 gwei = 1,000,000,000 wei)
-                min_gas_price = self.w3.to_wei(1, "gwei")  # 1 gwei minimum
+                print(f"💰 Parsed gas price: {gas_price} wei")
+                
+                # Ensure minimum gas price (2 gwei = 2,000,000,000 wei)
+                min_gas_price = self.w3.to_wei(2, "gwei")  # 2 gwei minimum
                 if gas_price < min_gas_price:
                     print(f"⚠️ Gas price from oracle too low ({gas_price} wei), using minimum ({min_gas_price} wei)")
-                    return min_gas_price
+                    gas_price = min_gas_price
+                
+                # Apply multiplier to ensure transaction goes through (1.5x)
+                gas_price = int(gas_price * 1.5)
+                print(f"🚀 Final gas price with multiplier: {gas_price} wei")
 
                 return gas_price
-            except Exception:
+            except Exception as e:
+                print(f"❌ Error fetching gas price from {oracle_url}: {e}")
                 return None
 
         oracles = self.gas_price_oracle
@@ -198,14 +214,14 @@ def fetch_gas_price(oracle_url: str) -> Wei | None:
         # Fallback: use network gas price with minimum
         try:
             network_gas_price = self.w3.eth.gas_price
-            min_gas_price = self.w3.to_wei(1, "gwei")  # 1 gwei minimum
+            min_gas_price = self.w3.to_wei(2, "gwei")  # 2 gwei minimum
             if network_gas_price < min_gas_price:
                 print(f"⚠️ Network gas price too low ({network_gas_price} wei), using minimum ({min_gas_price} wei)")
                 return min_gas_price
             return network_gas_price
         except Exception:
             # Final fallback: return minimum gas price
-            return self.w3.to_wei(1, "gwei")
+            return self.w3.to_wei(2, "gwei")
 
     def _init_contracts(self):
         for contract in self.abi.keys():