feat(payments): require eth payment amount be string

blockchain · Mar 7, 2020 · f829b98 · f829b98
1 parent 3eb88a8
commit f829b98
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 5 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/borrow/sagas.utils.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/borrow/sagas.utils.ts
@@ -27,9 +27,18 @@ export default ({
   ): Generator<PaymentType | CallEffect, boolean, any> {
     let paymentError
     try {
-      payment = yield payment.amount(
-        parseInt(convertStandardToBase(coin, amount))
-      )
+      switch (payment.coin) {
+        case 'PAX':
+        case 'ETH':
+          payment = yield payment.amount(
+            parseInt(convertStandardToBase(coin, amount)).toString()
+          )
+          break
+        default:
+          payment = yield payment.amount(
+            parseInt(convertStandardToBase(coin, amount))
+          )
+      }
       payment = yield payment.to(destination, ADDRESS_TYPES.ADDRESS)
       payment = yield payment.build()
       // ask for second password

diff --git a/packages/blockchain-wallet-v4/src/redux/payment/bch/sagas.js b/packages/blockchain-wallet-v4/src/redux/payment/bch/sagas.js
@@ -285,6 +285,8 @@ export default ({ api }) => {
   // ///////////////////////////////////////////////////////////////////////////
   function create ({ network, payment } = { network: undefined, payment: {} }) {
     const makePayment = p => ({
+      coin: 'BCH',
+
       value () {
         return p
       },

diff --git a/packages/blockchain-wallet-v4/src/redux/payment/btc/sagas.js b/packages/blockchain-wallet-v4/src/redux/payment/btc/sagas.js
@@ -265,6 +265,8 @@ export default ({ api }) => {
 
   function create ({ network, payment } = { network: undefined, payment: {} }) {
     const makePayment = p => ({
+      coin: 'BTC',
+
       value () {
         return p
       },

diff --git a/packages/blockchain-wallet-v4/src/redux/payment/eth/sagas.js b/packages/blockchain-wallet-v4/src/redux/payment/eth/sagas.js
@@ -134,6 +134,8 @@ export default ({ api }) => {
 
   function create ({ network, payment } = { network: undefined, payment: {} }) {
     const makePayment = p => ({
+      coin: 'ETH',
+
       value () {
         return p
       },

diff --git a/packages/blockchain-wallet-v4/src/redux/payment/types.ts b/packages/blockchain-wallet-v4/src/redux/payment/types.ts
@@ -1,3 +1,5 @@
+import { CoinType } from 'core/types'
+
 export type UTXOType = {
   address: string
   change: boolean
@@ -45,11 +47,36 @@ export type PaymentValue = {
   to?: Array<any>
 }
 
-export type PaymentType = {
-  amount: (n: number | string) => PaymentType
+type IPaymentType = {
   build: () => PaymentType
   publish: () => PaymentType
   sign: (pw: string) => PaymentType
   to: (address: string, addressType?: FromType) => PaymentType
   value: () => PaymentValue
 }
+
+type BchPaymentType = IPaymentType & {
+  amount: (n: number) => BchPaymentType
+  coin: 'BCH'
+}
+
+type BtcPaymentType = IPaymentType & {
+  amount: (n: number) => BtcPaymentType
+  coin: 'BTC'
+}
+
+type EthPaymentType = IPaymentType & {
+  amount: (n: string) => EthPaymentType
+  coin: 'ETH' | 'PAX'
+}
+
+type XlmPaymentType = IPaymentType & {
+  amount: (n: number) => XlmPaymentType
+  coin: 'XLM'
+}
+
+export type PaymentType =
+  | BchPaymentType
+  | BtcPaymentType
+  | EthPaymentType
+  | XlmPaymentType
diff --git a/packages/blockchain-wallet-v4/src/redux/payment/xlm/sagas.js b/packages/blockchain-wallet-v4/src/redux/payment/xlm/sagas.js
@@ -152,6 +152,8 @@ export default ({ api }) => {
 
   function create ({ payment } = { payment: {} }) {
     const makePayment = p => ({
+      coin: 'XLM',
+
       value () {
         return p
       },