@depay/widgets 6.13.1 → 6.14.0

package/README.md

@@ -194,6 +194,25 @@ DePayWidgets.Payment({
 });
 ```
 
+#### fromToken, fromAmount + toToken
+
+In case where you want to configure payments based on the source token + amount, rather than target token and amount, you can pass `fromToken`, `fromAmount` and `toToken` to `accept`.
+
+In those cases make sure to NOT configure `token` nor `amount`!
+
+```javascript
+DePayWidgets.Payment({
+  accept: [{
+    blockchain: 'bsc',
+    fromToken: '0xe9e7cea3dedca5984780bafc599bd69add087d56',
+    fromAmount: 0.1,
+    toToken: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
+    receiver: '0x08B277154218CCF3380CAE48d630DA13462E3950'
+  }]
+});
+
+// This will open a payment widget to send 0.1 BUSD to the receiver, converting it to BNB along the way.
+```
 
 #### track
 

package/dist/esm/index.bundle.js

@@ -61718,13 +61718,14 @@ let route$8 = ({
 var ChangableAmountProvider = (function (props) {
   var configurationsMissAmounts = function configurationsMissAmounts(configurations) {
     return !configurations.every(function (configuration) {
-      return typeof configuration.amount != 'undefined';
+      return typeof configuration.amount != 'undefined' || typeof configuration.fromAmount != 'undefined';
     });
   };
 
   var _useContext = react.useContext(ConfigurationContext),
-      amountConfiguration = _useContext.amount,
-      recover = _useContext.recover;
+      amountConfiguration = _useContext.amount;
+      _useContext.toAmount;
+      var recover = _useContext.recover;
 
   var _useState = react.useState(recover == undefined ? configurationsMissAmounts(props.accept) : false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -67681,14 +67682,16 @@ let transactionValue = ({ paymentRoute, exchangeRoute })=> {
 
 function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 class PaymentRoute {
-  constructor({ blockchain, fromToken, toToken, toDecimals, toAmount, fromAddress, toAddress, toContract }) {
+  constructor({ blockchain, fromAddress, fromToken, fromDecimals, fromAmount, toToken, toDecimals, toAmount, toAddress, toContract }) {
     this.blockchain = blockchain;
+    this.fromAddress = fromAddress;
     this.fromToken = fromToken;
+    this.fromAmount = _optionalChain([fromAmount, 'optionalAccess', _ => _.toString, 'call', _2 => _2()]);
+    this.fromDecimals = _optionalChain([fromDecimals, 'optionalAccess', _3 => _3.toString, 'call', _4 => _4()]);
     this.fromBalance = 0;
     this.toToken = toToken;
+    this.toAmount = _optionalChain([toAmount, 'optionalAccess', _5 => _5.toString, 'call', _6 => _6()]);
     this.toDecimals = toDecimals;
-    this.toAmount = _optionalChain([toAmount, 'optionalAccess', _ => _.toString, 'call', _2 => _2()]);
-    this.fromAddress = fromAddress;
     this.toAddress = toAddress;
     this.toContract = toContract;
     this.exchangeRoutes = [];
@@ -67748,22 +67751,43 @@ function convertToRoutes({ tokens, accept }) {
   return Promise.all(tokens.map(async (fromToken)=>{
     let relevantConfigurations = accept.filter((configuration)=>(configuration.blockchain == fromToken.blockchain));
     return Promise.all(relevantConfigurations.map(async (configuration)=>{
-      let blockchain = configuration.blockchain;
-      let toToken = new Token({ blockchain, address: configuration.token });
-      let toDecimals = await toToken.decimals();
-      let toAmount = (await toToken.BigNumber(configuration.amount)).toString();
-      return new PaymentRoute({
-        blockchain,
-        fromToken: fromToken,
-        toToken: toToken,
-        toAmount: toAmount,
-        toDecimals: toDecimals,
-        fromAddress: configuration.fromAddress,
-        toAddress: configuration.toAddress,
-        toContract: configuration.toContract
-      })
+      if(configuration.token && configuration.amount) {
+        let blockchain = configuration.blockchain;
+        let toToken = new Token({ blockchain, address: configuration.token });
+        let toDecimals = await toToken.decimals();
+        let toAmount = (await toToken.BigNumber(configuration.amount)).toString();
+
+        return new PaymentRoute({
+          blockchain,
+          fromToken,
+          toToken,
+          toAmount,
+          toDecimals,
+          fromAddress: configuration.fromAddress,
+          toAddress: configuration.toAddress,
+          toContract: configuration.toContract
+        })
+      } else if(configuration.fromToken && configuration.fromAmount && fromToken.address.toLowerCase() == configuration.fromToken.toLowerCase()) {
+        let blockchain = configuration.blockchain;
+        let fromAmount = (await fromToken.BigNumber(configuration.fromAmount)).toString();
+        let fromDecimals = await fromToken.decimals();
+        let toToken = new Token({ blockchain, address: configuration.toToken });
+        let toDecimals = await toToken.decimals();
+        
+        return new PaymentRoute({
+          blockchain,
+          fromToken,
+          fromAmount,
+          fromDecimals,
+          toToken,
+          toDecimals,
+          fromAddress: configuration.fromAddress,
+          toAddress: configuration.toAddress,
+          toContract: configuration.toContract
+        })
+      }
     }))
-  })).then((routes)=> routes.flat())
+  })).then((routes)=> routes.flat().filter(el => el))
 }
 
 async function route({ accept, whitelist, blacklist, apiKey, event, fee }) {
@@ -67819,14 +67843,25 @@ let addExchangeRoutes = async (routes) => {
   return await Promise.all(
     routes.map((route) => {
       if(route.directTransfer) { return [] }
-      return route$8({
-        blockchain: route.blockchain,
-        tokenIn: route.fromToken.address,
-        tokenOut: route.toToken.address,
-        amountOutMin: route.toAmount,
-        fromAddress: route.fromAddress,
-        toAddress: route.toAddress
-      })
+      if(route.toToken && route.toAmount) {
+        return route$8({
+          blockchain: route.blockchain,
+          tokenIn: route.fromToken.address,
+          tokenOut: route.toToken.address,
+          amountOutMin: route.toAmount,
+          fromAddress: route.fromAddress,
+          toAddress: route.toAddress
+        })
+      } else if(route.fromToken && route.fromAmount) {
+        return route$8({
+          blockchain: route.blockchain,
+          tokenIn: route.fromToken.address,
+          tokenOut: route.toToken.address,
+          amountIn: route.fromAmount,
+          fromAddress: route.fromAddress,
+          toAddress: route.toAddress
+        })
+      }
     }),
   ).then((exchangeRoutes) => {
     return routes.map((route, index) => {
@@ -67856,8 +67891,10 @@ let filterInsufficientBalance = async(routes) => {
   return routes.filter((route) => {
     if (route.fromToken.address.toLowerCase() == route.toToken.address.toLowerCase()) {
       return BigNumber.from(route.fromBalance).gte(BigNumber.from(route.toAmount))
-    } else {
+    } else if(route.fromAmount && route.toAmount) {
       return BigNumber.from(route.fromBalance).gte(BigNumber.from(route.exchangeRoutes[0].amountInMax))
+    } else if(route.exchangeRoutes[0] && route.exchangeRoutes[0].amountIn) {
+      return BigNumber.from(route.fromBalance).gte(BigNumber.from(route.exchangeRoutes[0].amountIn))
     }
   })
 };
@@ -71759,10 +71796,14 @@ var preflight$1 = /*#__PURE__*/function () {
                 throw 'You need to set a supported blockchain!';
               }
 
-              if (typeof configuration.token === 'undefined') {
+              if (typeof configuration.token === 'undefined' && typeof configuration.fromToken === 'undefined' && typeof configuration.fromAmount === 'undefined' && typeof configuration.toToken === 'undefined') {
                 throw 'You need to set the token you want to receive as payment!';
               }
 
+              if (typeof configuration.token === 'undefined' && typeof configuration.fromToken !== 'undefined' && typeof configuration.fromAmount === 'undefined' && typeof configuration.toToken === 'undefined') {
+                throw 'You need to set the fromToken, fromAmount and toToken!';
+              }
+
               if (typeof configuration.receiver === 'undefined') {
                 throw 'You need to set the receiver address that you want to receive the payment!';
               }

package/dist/esm/index.js

@@ -2021,13 +2021,14 @@ var WalletContext = /*#__PURE__*/React.createContext();
 var ChangableAmountProvider = (function (props) {
   var configurationsMissAmounts = function configurationsMissAmounts(configurations) {
     return !configurations.every(function (configuration) {
-      return typeof configuration.amount != 'undefined';
+      return typeof configuration.amount != 'undefined' || typeof configuration.fromAmount != 'undefined';
     });
   };
 
   var _useContext = useContext(ConfigurationContext),
-      amountConfiguration = _useContext.amount,
-      recover = _useContext.recover;
+      amountConfiguration = _useContext.amount;
+      _useContext.toAmount;
+      var recover = _useContext.recover;
 
   var _useState = useState(recover == undefined ? configurationsMissAmounts(props.accept) : false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -4633,10 +4634,14 @@ var preflight$1 = /*#__PURE__*/function () {
                 throw 'You need to set a supported blockchain!';
               }
 
-              if (typeof configuration.token === 'undefined') {
+              if (typeof configuration.token === 'undefined' && typeof configuration.fromToken === 'undefined' && typeof configuration.fromAmount === 'undefined' && typeof configuration.toToken === 'undefined') {
                 throw 'You need to set the token you want to receive as payment!';
               }
 
+              if (typeof configuration.token === 'undefined' && typeof configuration.fromToken !== 'undefined' && typeof configuration.fromAmount === 'undefined' && typeof configuration.toToken === 'undefined') {
+                throw 'You need to set the fromToken, fromAmount and toToken!';
+              }
+
               if (typeof configuration.receiver === 'undefined') {
                 throw 'You need to set the receiver address that you want to receive the payment!';
               }

package/dist/umd/index.bundle.js

@@ -61724,13 +61724,14 @@
   var ChangableAmountProvider = (function (props) {
     var configurationsMissAmounts = function configurationsMissAmounts(configurations) {
       return !configurations.every(function (configuration) {
-        return typeof configuration.amount != 'undefined';
+        return typeof configuration.amount != 'undefined' || typeof configuration.fromAmount != 'undefined';
       });
     };
 
     var _useContext = react.useContext(ConfigurationContext),
-        amountConfiguration = _useContext.amount,
-        recover = _useContext.recover;
+        amountConfiguration = _useContext.amount;
+        _useContext.toAmount;
+        var recover = _useContext.recover;
 
     var _useState = react.useState(recover == undefined ? configurationsMissAmounts(props.accept) : false),
         _useState2 = _slicedToArray(_useState, 2),
@@ -67687,14 +67688,16 @@
 
   function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
   class PaymentRoute {
-    constructor({ blockchain, fromToken, toToken, toDecimals, toAmount, fromAddress, toAddress, toContract }) {
+    constructor({ blockchain, fromAddress, fromToken, fromDecimals, fromAmount, toToken, toDecimals, toAmount, toAddress, toContract }) {
       this.blockchain = blockchain;
+      this.fromAddress = fromAddress;
       this.fromToken = fromToken;
+      this.fromAmount = _optionalChain([fromAmount, 'optionalAccess', _ => _.toString, 'call', _2 => _2()]);
+      this.fromDecimals = _optionalChain([fromDecimals, 'optionalAccess', _3 => _3.toString, 'call', _4 => _4()]);
       this.fromBalance = 0;
       this.toToken = toToken;
+      this.toAmount = _optionalChain([toAmount, 'optionalAccess', _5 => _5.toString, 'call', _6 => _6()]);
       this.toDecimals = toDecimals;
-      this.toAmount = _optionalChain([toAmount, 'optionalAccess', _ => _.toString, 'call', _2 => _2()]);
-      this.fromAddress = fromAddress;
       this.toAddress = toAddress;
       this.toContract = toContract;
       this.exchangeRoutes = [];
@@ -67754,22 +67757,43 @@
     return Promise.all(tokens.map(async (fromToken)=>{
       let relevantConfigurations = accept.filter((configuration)=>(configuration.blockchain == fromToken.blockchain));
       return Promise.all(relevantConfigurations.map(async (configuration)=>{
-        let blockchain = configuration.blockchain;
-        let toToken = new Token({ blockchain, address: configuration.token });
-        let toDecimals = await toToken.decimals();
-        let toAmount = (await toToken.BigNumber(configuration.amount)).toString();
-        return new PaymentRoute({
-          blockchain,
-          fromToken: fromToken,
-          toToken: toToken,
-          toAmount: toAmount,
-          toDecimals: toDecimals,
-          fromAddress: configuration.fromAddress,
-          toAddress: configuration.toAddress,
-          toContract: configuration.toContract
-        })
+        if(configuration.token && configuration.amount) {
+          let blockchain = configuration.blockchain;
+          let toToken = new Token({ blockchain, address: configuration.token });
+          let toDecimals = await toToken.decimals();
+          let toAmount = (await toToken.BigNumber(configuration.amount)).toString();
+
+          return new PaymentRoute({
+            blockchain,
+            fromToken,
+            toToken,
+            toAmount,
+            toDecimals,
+            fromAddress: configuration.fromAddress,
+            toAddress: configuration.toAddress,
+            toContract: configuration.toContract
+          })
+        } else if(configuration.fromToken && configuration.fromAmount && fromToken.address.toLowerCase() == configuration.fromToken.toLowerCase()) {
+          let blockchain = configuration.blockchain;
+          let fromAmount = (await fromToken.BigNumber(configuration.fromAmount)).toString();
+          let fromDecimals = await fromToken.decimals();
+          let toToken = new Token({ blockchain, address: configuration.toToken });
+          let toDecimals = await toToken.decimals();
+          
+          return new PaymentRoute({
+            blockchain,
+            fromToken,
+            fromAmount,
+            fromDecimals,
+            toToken,
+            toDecimals,
+            fromAddress: configuration.fromAddress,
+            toAddress: configuration.toAddress,
+            toContract: configuration.toContract
+          })
+        }
       }))
-    })).then((routes)=> routes.flat())
+    })).then((routes)=> routes.flat().filter(el => el))
   }
 
   async function route({ accept, whitelist, blacklist, apiKey, event, fee }) {
@@ -67825,14 +67849,25 @@
     return await Promise.all(
       routes.map((route) => {
         if(route.directTransfer) { return [] }
-        return route$8({
-          blockchain: route.blockchain,
-          tokenIn: route.fromToken.address,
-          tokenOut: route.toToken.address,
-          amountOutMin: route.toAmount,
-          fromAddress: route.fromAddress,
-          toAddress: route.toAddress
-        })
+        if(route.toToken && route.toAmount) {
+          return route$8({
+            blockchain: route.blockchain,
+            tokenIn: route.fromToken.address,
+            tokenOut: route.toToken.address,
+            amountOutMin: route.toAmount,
+            fromAddress: route.fromAddress,
+            toAddress: route.toAddress
+          })
+        } else if(route.fromToken && route.fromAmount) {
+          return route$8({
+            blockchain: route.blockchain,
+            tokenIn: route.fromToken.address,
+            tokenOut: route.toToken.address,
+            amountIn: route.fromAmount,
+            fromAddress: route.fromAddress,
+            toAddress: route.toAddress
+          })
+        }
       }),
     ).then((exchangeRoutes) => {
       return routes.map((route, index) => {
@@ -67862,8 +67897,10 @@
     return routes.filter((route) => {
       if (route.fromToken.address.toLowerCase() == route.toToken.address.toLowerCase()) {
         return BigNumber.from(route.fromBalance).gte(BigNumber.from(route.toAmount))
-      } else {
+      } else if(route.fromAmount && route.toAmount) {
         return BigNumber.from(route.fromBalance).gte(BigNumber.from(route.exchangeRoutes[0].amountInMax))
+      } else if(route.exchangeRoutes[0] && route.exchangeRoutes[0].amountIn) {
+        return BigNumber.from(route.fromBalance).gte(BigNumber.from(route.exchangeRoutes[0].amountIn))
       }
     })
   };
@@ -71765,10 +71802,14 @@
                   throw 'You need to set a supported blockchain!';
                 }
 
-                if (typeof configuration.token === 'undefined') {
+                if (typeof configuration.token === 'undefined' && typeof configuration.fromToken === 'undefined' && typeof configuration.fromAmount === 'undefined' && typeof configuration.toToken === 'undefined') {
                   throw 'You need to set the token you want to receive as payment!';
                 }
 
+                if (typeof configuration.token === 'undefined' && typeof configuration.fromToken !== 'undefined' && typeof configuration.fromAmount === 'undefined' && typeof configuration.toToken === 'undefined') {
+                  throw 'You need to set the fromToken, fromAmount and toToken!';
+                }
+
                 if (typeof configuration.receiver === 'undefined') {
                   throw 'You need to set the receiver address that you want to receive the payment!';
                 }

package/dist/umd/index.js

@@ -2016,13 +2016,14 @@
   var ChangableAmountProvider = (function (props) {
     var configurationsMissAmounts = function configurationsMissAmounts(configurations) {
       return !configurations.every(function (configuration) {
-        return typeof configuration.amount != 'undefined';
+        return typeof configuration.amount != 'undefined' || typeof configuration.fromAmount != 'undefined';
       });
     };
 
     var _useContext = React.useContext(ConfigurationContext),
-        amountConfiguration = _useContext.amount,
-        recover = _useContext.recover;
+        amountConfiguration = _useContext.amount;
+        _useContext.toAmount;
+        var recover = _useContext.recover;
 
     var _useState = React.useState(recover == undefined ? configurationsMissAmounts(props.accept) : false),
         _useState2 = _slicedToArray(_useState, 2),
@@ -4628,10 +4629,14 @@
                   throw 'You need to set a supported blockchain!';
                 }
 
-                if (typeof configuration.token === 'undefined') {
+                if (typeof configuration.token === 'undefined' && typeof configuration.fromToken === 'undefined' && typeof configuration.fromAmount === 'undefined' && typeof configuration.toToken === 'undefined') {
                   throw 'You need to set the token you want to receive as payment!';
                 }
 
+                if (typeof configuration.token === 'undefined' && typeof configuration.fromToken !== 'undefined' && typeof configuration.fromAmount === 'undefined' && typeof configuration.toToken === 'undefined') {
+                  throw 'You need to set the fromToken, fromAmount and toToken!';
+                }
+
                 if (typeof configuration.receiver === 'undefined') {
                   throw 'You need to set the receiver address that you want to receive the payment!';
                 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets",
   "moduleName": "DePayWidgets",
-  "version": "6.13.1",
+  "version": "6.14.0",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",
@@ -43,7 +43,7 @@
     "@depay/web3-client": "^8.0.0",
     "@depay/web3-constants": "^5.0.0",
     "@depay/web3-exchanges": "^8.1.0",
-    "@depay/web3-payments": "^9.2.0",
+    "@depay/web3-payments": "^9.3.0",
     "@depay/web3-tokens": "^8.0.0",
     "@depay/web3-wallets": "^9.0.0",
     "decimal.js": "^10.3.1",