Merge pull request #131 from pipermerriam/piper/respect-defaultAccoun…

…t-config-within-contracts Respect the configuration within contract initiated transactions
ethereum · Dec 29, 2016 · d45b9b4 · d45b9b4
2 parents e0778d0 + 2b2273e
commit d45b9b4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/web3/contract.py b/web3/contract.py
@@ -306,7 +306,7 @@ def estimateGas(self, transaction=None):
 
         if self.address:
             estimate_transaction.setdefault('to', self.address)
-        estimate_transaction.setdefault('from', self.web3.eth.coinbase)
+        estimate_transaction.setdefault('from', self.web3.eth.defaultAccount)
 
         if 'to' not in estimate_transaction:
             if isinstance(self, type):
@@ -370,7 +370,7 @@ def call(self, transaction=None):
 
         if self.address:
             call_transaction.setdefault('to', self.address)
-        call_transaction.setdefault('from', self.web3.eth.coinbase)
+        call_transaction.setdefault('from', self.web3.eth.defaultAccount)
 
         if 'to' not in call_transaction:
             if isinstance(self, type):