@exodus/ethereum-lib 2.22.2 → 2.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.22.2",
+  "version": "2.24.0",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "files": [
@@ -21,11 +21,11 @@
     "@exodus/ethereumjs-tx": "^3.3.0-exodus.6",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/models": "^8.10.4",
-    "@exodus/solidity-contract": "^0.1.3",
+    "@exodus/solidity-contract": "^1.1.3",
     "base-x": "^3.0.2",
     "lodash": "^4.17.15",
     "ms": "^2.1.1",
     "reselect": "~3.0.1"
   },
-  "gitHead": "0fefa0bb464c8abb4cc510090fb7b8a5a4c68dfd"
+  "gitHead": "835e8e4b0197268cf458c971c38920de96e3b9f2"
 }

package/src/constants.js

@@ -28,7 +28,7 @@ const CHAIN_DATA = {
   matic: {
     chainId: 137,
     serverUrl: 'https://polygon.a.exodus.io/wallet/v1/',
-    confirmationsNumber: 355,
+    confirmationsNumber: 50,
     tokenType: 'MATIC_ERC20',
   },
   avalanchec: {

package/src/create-contract/index.js

@@ -9,27 +9,27 @@ export default function createContract(address, contractName) {
     // case 'cdai':
     //   return new SolidityContract(ABI.cdai, address)
     case 'augurv2':
-      return new SolidityContract(ABI.repv2, address)
+      return new SolidityContract(ABI.repv2, address, true)
     case 'aragon':
-      return new SolidityContract(ABI.ant, address)
+      return new SolidityContract(ABI.ant, address, true)
     case 'golem':
-      return new SolidityContract(ABI.gnt, address)
+      return new SolidityContract(ABI.gnt, address, true)
     case 'loomv2Swap':
-      return new SolidityContract(ABI.loomv2Swap, address)
+      return new SolidityContract(ABI.loomv2Swap, address, true)
     case 'kyberv2':
-      return new SolidityContract(ABI.kyberv2, address)
+      return new SolidityContract(ABI.kyberv2, address, true)
     case 'maticValidatorShare':
-      return new SolidityContract(ABI.maticValidatorShare, address)
+      return new SolidityContract(ABI.maticValidatorShare, address, true)
     case 'maticStakingManager':
-      return new SolidityContract(ABI.maticStakingManager, address)
+      return new SolidityContract(ABI.maticStakingManager, address, true)
     case 'fantomSfc':
-      return new SolidityContract(ABI.fantomSfc, address)
+      return new SolidityContract(ABI.fantomSfc, address, true)
     case 'ensResolver':
-      return new SolidityContract(ABI.ensResolver, address)
+      return new SolidityContract(ABI.ensResolver, address, true)
     case 'ensRegistry':
-      return new SolidityContract(ABI.ensRegistry, address)
+      return new SolidityContract(ABI.ensRegistry, address, true)
     case 'erc721':
-      return new SolidityContract(ABI.erc721, address)
+      return new SolidityContract(ABI.erc721, address, true)
     default:
       return SolidityContract.erc20(address)
   }

package/src/selectors/get-can-accelerate-tx-factory.js

@@ -160,7 +160,7 @@ export default (
   getIsEnoughBalanceToAccelerateSelector,
   getTxLogSelector,
   getIsExchangeTxSelector,
-  assets
+  assetsSelector
 ) =>
   createSelector(
     getFeeDataSelector,
@@ -171,6 +171,7 @@ export default (
     getIsEnoughBalanceToAccelerateSelector,
     getTxLogSelector,
     getIsExchangeTxSelector,
+    assetsSelector,
     (
       getFeeData,
       getFee,
@@ -179,7 +180,8 @@ export default (
       getIsRbfEnabled,
       getIsEnoughBalanceToAccelerate,
       getTxLog,
-      getIsExchangeTx
+      getIsExchangeTx,
+      assets
     ) => (tx) =>
       canAccelerateTx({
         tx,

package/src/unsigned-tx/create-unsigned-tx.js

@@ -44,8 +44,8 @@ export default function createUnsignedTx({
 
   const txData = {
     nonce: nonce === 0 ? Buffer.alloc(0) : intToBuffer(nonce),
-    gasPrice: currency2buffer(gasPrice.toBase()),
-    tipGasPrice: tipGasPrice ? currency2buffer(tipGasPrice.toBase()) : undefined,
+    gasPrice: currency2buffer(gasPrice),
+    tipGasPrice: tipGasPrice ? currency2buffer(tipGasPrice) : undefined,
     gasLimit: intToBuffer(gasLimit),
     to,
     value,
@@ -57,7 +57,7 @@ export default function createUnsignedTx({
     assetName: asset.name,
     // TODO: We should move away from putting the PK into txMeta, it is a bad practice. It is a potential PK exposure risk if the wrong PK gets included here.
     privateKey, // Used for importing private key
-    fee: baseAsset.currency.baseUnit(gasPrice.toBase().toNumber() * gasLimit),
+    fee: baseAsset.currency.baseUnit(gasPrice.toBaseNumber() * gasLimit),
     eip1559Enabled: !!eip1559Enabled,
   }
 

package/src/utils/index.js

@@ -35,17 +35,14 @@ export function buffer2currency({ asset, value }) {
 }
 
 export function currency2buffer(value) {
-  const b10Value = value
-    .toBase()
-    .floor() // probably not necessary, but to be safe
-    .toString({ unit: false })
+  const b10Value = value.toBaseString()
 
   // Desktop: const hexValue = value.toBase()._number.toString(16)
   const hexValue = base16.encode(base10.decode(b10Value))
 
   if (hexValue.includes('.')) {
     // <-- probably not necessary anymore
-    throw new RangeError(`${value.toBase().toString()} can not be converted to Buffer`)
+    throw new RangeError(`${value.toBaseString()} can not be converted to Buffer`)
   }
 
   return Buffer.from(ethUtil.padToEven(hexValue), 'hex')