Merge pull request #274 from breadwallet/bugfix/CORE-606

CORE-606: Address TSAN #3; Improve EWM locking
breadwallet · Oct 2, 2019 · 1370e70 · 1370e70
2 parents 2738125 + 6d8995d
commit 1370e70
Show file tree

Hide file tree

Showing 12 changed files with 202 additions and 564 deletions.
diff --git a/Swift/BRCore.xcodeproj/project.pbxproj b/Swift/BRCore.xcodeproj/project.pbxproj
@@ -1346,16 +1346,16 @@
 				3C97E24422416AB1003FD88F /* BRCryptoAmount.c */,
 				3C97E254224170B9003FD88F /* BRCryptoAccount.h */,
 				3C97E255224170B9003FD88F /* BRCryptoAccount.c */,
-				CE179CA6233A4FF400633B97 /* BRCryptoCipher.c */,
 				CE179CA5233A4FF400633B97 /* BRCryptoCipher.h */,
-				CE5E43C223390FBB001E9238 /* BRCryptoCoder.c */,
+				CE179CA6233A4FF400633B97 /* BRCryptoCipher.c */,
 				CE5E43C323390FBB001E9238 /* BRCryptoCoder.h */,
-				CE5E43BE233902A4001E9238 /* BRCryptoHasher.c */,
+				CE5E43C223390FBB001E9238 /* BRCryptoCoder.c */,
 				CE5E43BF233902A4001E9238 /* BRCryptoHasher.h */,
+				CE5E43BE233902A4001E9238 /* BRCryptoHasher.c */,
 				3C1D1F2322F0F1740028B20C /* BRCryptoKey.h */,
 				3C1D1F2422F0F1740028B20C /* BRCryptoKey.c */,
-				CE5E43C6233930F1001E9238 /* BRCryptoSigner.c */,
 				CE5E43C7233930F1001E9238 /* BRCryptoSigner.h */,
+				CE5E43C6233930F1001E9238 /* BRCryptoSigner.c */,
 				3C97E258224170EC003FD88F /* BRCryptoAddress.h */,
 				3C97E259224170EC003FD88F /* BRCryptoAddress.c */,
 				3CCC61E9228C7FB500C0A13E /* BRCryptoFeeBasis.h */,

diff --git a/crypto/BRCryptoFeeBasis.c b/crypto/BRCryptoFeeBasis.c
@@ -11,7 +11,7 @@
 #include <math.h>
 
 #include "BRCryptoFeeBasis.h"
-#include "ethereum/ewm/BREthereumBase.h"
+#include "ethereum/BREthereum.h"
 #include "generic/BRGeneric.h"
 #include "BRCryptoPrivate.h"
 

diff --git a/crypto/BRCryptoTransfer.c b/crypto/BRCryptoTransfer.c
@@ -17,9 +17,7 @@
 #include "support/BRAddress.h"
 #include "bitcoin/BRWallet.h"
 #include "bitcoin/BRTransaction.h"
-#include "ethereum/util/BRUtil.h"
 #include "ethereum/BREthereum.h"
-#include "ethereum/ewm/BREthereumTransfer.h"
 
 /**
  *
@@ -46,6 +44,7 @@ struct BRCryptoTransferRecord {
             uint64_t recv;
         } btc;
         struct {
+            BREthereumEWM ewm;
             BREthereumTransfer tid;
             BREthereumAddress accountAddress;
         } eth;
@@ -199,10 +198,11 @@ cryptoTransferCreateAsETH (BRCryptoUnit unit,
                            BREthereumTransfer tid,
                            BRCryptoFeeBasis feeBasisEstimated) {
     BRCryptoTransfer transfer = cryptoTransferCreateInternal (BLOCK_CHAIN_TYPE_ETH, unit, unitForFee);
+    transfer->u.eth.ewm = ewm;
     transfer->u.eth.tid = tid;
 
-    transfer->sourceAddress = cryptoAddressCreateAsETH (transferGetSourceAddress (tid));
-    transfer->targetAddress = cryptoAddressCreateAsETH (transferGetTargetAddress (tid));
+    transfer->sourceAddress = cryptoAddressCreateAsETH (ewmTransferGetSource (ewm, tid));
+    transfer->targetAddress = cryptoAddressCreateAsETH (ewmTransferGetTarget (ewm, tid));
 
     // cache the values that require the ewm
     BREthereumAccount account = ewmGetAccount (ewm);
@@ -234,7 +234,7 @@ cryptoTransferCreateAsETH (BRCryptoUnit unit,
     // Thus: if `feeBasisEstimated` is NULL, we'll take the ETH fee basis (as the best we have).
 
     // Get the ETH feeBasis, in the event that we need it.
-    BREthereumFeeBasis ethFeeBasis = transferGetFeeBasis(tid);
+    BREthereumFeeBasis ethFeeBasis = ewmTransferGetFeeBasis (ewm, tid);
 
     transfer->feeBasisEstimated = (NULL == feeBasisEstimated
                                    ? cryptoFeeBasisCreateAsETH (unitForFee,
@@ -328,7 +328,8 @@ cryptoTransferGetAmountAsSign (BRCryptoTransfer transfer, BRCryptoBoolean isNega
         }
 
         case BLOCK_CHAIN_TYPE_ETH: {
-            BREthereumAmount ethAmount = transferGetAmount(transfer->u.eth.tid);
+            BREthereumAmount ethAmount = ewmTransferGetAmount (transfer->u.eth.ewm,
+                                                               transfer->u.eth.tid);
             switch (amountGetType(ethAmount)) {
                 case AMOUNT_ETHER:
                     amount = cryptoAmountCreate (transfer->unit,
@@ -509,10 +510,11 @@ cryptoTransferGetDirection (BRCryptoTransfer transfer) {
             return CRYPTO_TRANSFER_RECEIVED;
         }
         case BLOCK_CHAIN_TYPE_ETH: {
-            BREthereumTransfer tid =transfer->u.eth.tid;
+            BREthereumEWM      ewm = transfer->u.eth.ewm;
+            BREthereumTransfer tid = transfer->u.eth.tid;
 
-            BREthereumAddress source = transferGetSourceAddress (tid);
-            BREthereumAddress target = transferGetTargetAddress (tid);
+            BREthereumAddress source = ewmTransferGetSource (ewm, tid);
+            BREthereumAddress target = ewmTransferGetTarget (ewm, tid);
 
             BREthereumBoolean accountIsSource = addressEqual (source, transfer->u.eth.accountAddress);
             BREthereumBoolean accountIsTarget = addressEqual (target, transfer->u.eth.accountAddress);
@@ -563,9 +565,10 @@ cryptoTransferGetHash (BRCryptoTransfer transfer) {
                     : cryptoHashCreateAsBTC (hash));
         }
         case BLOCK_CHAIN_TYPE_ETH: {
-            BREthereumTransfer tid =transfer->u.eth.tid;
+            BREthereumEWM      ewm = transfer->u.eth.ewm;
+            BREthereumTransfer tid = transfer->u.eth.tid;
 
-            BREthereumHash hash = transferGetOriginatingTransactionHash (tid);
+            BREthereumHash hash = ewmTransferGetOriginatingTransactionHash (ewm, tid);
             return (ETHEREUM_BOOLEAN_TRUE == hashEqual(hash, hashCreateEmpty())
                     ? NULL
                     : cryptoHashCreateAsETH (hash));

diff --git a/crypto/BRCryptoWallet.c b/crypto/BRCryptoWallet.c
@@ -15,12 +15,11 @@
 #include "BRCryptoBase.h"
 #include "BRCryptoPrivate.h"
 
-#include "generic/BRGeneric.h"
 
 #include "bitcoin/BRWallet.h"
 #include "bitcoin/BRWalletManager.h"
 #include "ethereum/BREthereum.h"
-#include "ethereum/ewm/BREthereumTransfer.h"
+#include "generic/BRGeneric.h"
 
 /**
  *

diff --git a/crypto/BRCryptoWalletManagerClient.c b/crypto/BRCryptoWalletManagerClient.c
@@ -20,7 +20,6 @@
 
 #include "bitcoin/BRWalletManager.h"
 #include "ethereum/BREthereum.h"
-#include "ethereum/ewm/BREthereumTransfer.h"
 #include "support/BRBase.h"
 #include "support/BRSyncMode.h"
 
@@ -1280,7 +1279,7 @@ cwmTransactionEventAsETH (BREthereumClientContext context,
 
                 BRCryptoTransferState oldState = cryptoTransferGetState (transfer);
 
-                BREthereumFeeBasis ethFeeBasis = transferGetFeeBasis (tid);
+                BREthereumFeeBasis ethFeeBasis = ewmTransferGetFeeBasis (ewm, tid);
 
                 BRCryptoUnit unit = cryptoTransferGetUnitForFee(transfer);
                 BRCryptoFeeBasis feeBasisConfirmed = cryptoFeeBasisCreateAsETH (unit,

diff --git a/ethereum/base/BREthereumFeeBasis.c b/ethereum/base/BREthereumFeeBasis.c
@@ -19,6 +19,16 @@ feeBasisCreate (BREthereumGas limit,
     };
 }
 
+extern BREthereumGas
+feeBasisGetGasLimit (BREthereumFeeBasis basis) {
+    return (FEE_BASIS_GAS == basis.type ? basis.u.gas.limit : gasCreate(0));
+}
+
+extern BREthereumGasPrice
+feeBasisGetGasPrice (BREthereumFeeBasis basis) {
+    return (FEE_BASIS_GAS == basis.type ? basis.u.gas.price : gasPriceCreate(etherCreateZero()));
+}
+
 extern BREthereumEther
 feeBasisGetFee (BREthereumFeeBasis feeBasis, int *overflow) {  // BREthereumBoolean
     *overflow = 0;

diff --git a/ethereum/base/BREthereumFeeBasis.h b/ethereum/base/BREthereumFeeBasis.h
@@ -32,6 +32,12 @@ extern BREthereumFeeBasis
 feeBasisCreate (BREthereumGas limit,
                 BREthereumGasPrice price);
 
+extern BREthereumGas
+feeBasisGetGasLimit (BREthereumFeeBasis basis);
+
+extern BREthereumGasPrice
+feeBasisGetGasPrice (BREthereumFeeBasis basis);
+
 extern BREthereumEther
 feeBasisGetFee (BREthereumFeeBasis feeBasis, int *overflow);