fixup! Implement 0x gasless swap plugin without approve

src/index.ts

@@ -10,7 +10,7 @@ import { makeLetsExchangePlugin } from './swap/central/letsexchange'
 import { makeSideshiftPlugin } from './swap/central/sideshift'
 import { makeSwapuzPlugin } from './swap/central/swapuz'
 import { make0xPlugin } from './swap/defi/0x/0x'
-import { make0xGaslessSwap } from './swap/defi/0x/0xGaslessSwap'
+import { make0xGaslessPlugin } from './swap/defi/0x/0xGasless'
 import { makeCosmosIbcPlugin } from './swap/defi/cosmosIbc'
 import { makeLifiPlugin } from './swap/defi/lifi'
 import { makeThorchainPlugin } from './swap/defi/thorchain'
@@ -39,7 +39,7 @@ const plugins = {
   transfer: makeTransferPlugin,
   velodrome: makeVelodromePlugin,
   xrpdex,
-  zeroxgaslessswap: make0xGaslessSwap,
+  '0xgasless': make0xGaslessPlugin,
   '0x': make0xPlugin
 }
 

src/swap/defi/0x/0xGaslessSwap.ts → src/swap/defi/0x/0xGasless.ts

@@ -1,10 +1,8 @@
 import { add } from 'biggystring'
 import {
   EdgeCorePluginFactory,
-  EdgeNetworkFee,
   EdgeSwapApproveOptions,
   EdgeSwapInfo,
-  EdgeSwapPlugin,
   EdgeSwapQuote,
   EdgeSwapResult
 } from 'edge-core-js/types'
@@ -16,13 +14,11 @@ import { getCurrencyCode, getTokenAddress } from './util'
 
 const swapInfo: EdgeSwapInfo = {
   displayName: '0x Gasless Swap',
-  pluginId: 'zeroxgaslessswap',
+  pluginId: '0xgasless',
   supportEmail: '[email protected]'
 }
 
-export const make0xGaslessSwap: EdgeCorePluginFactory = (
-  opts
-): EdgeSwapPlugin => {
+export const make0xGaslessPlugin: EdgeCorePluginFactory = opts => {
   const { io } = opts
   const initOptions = asInitOptions(opts.initOptions)
 
@@ -44,10 +40,6 @@ export const make0xGaslessSwap: EdgeCorePluginFactory = (
         swapRequest.fromWallet,
         swapRequest.fromTokenId
       )
-      const fromCurrencyCode = getCurrencyCode(
-        swapRequest.fromWallet,
-        swapRequest.fromTokenId
-      )
       const toTokenAddress = getTokenAddress(
         swapRequest.toWallet,
         swapRequest.toTokenId
@@ -95,11 +87,6 @@ export const make0xGaslessSwap: EdgeCorePluginFactory = (
         )
       }
 
-      const networkFee: EdgeNetworkFee = {
-        currencyCode: fromCurrencyCode,
-        nativeAmount: add(gasFee.feeAmount, zeroExFee.feeAmount)
-      }
-
       return {
         approve: async (
           opts?: EdgeSwapApproveOptions
@@ -110,7 +97,13 @@ export const make0xGaslessSwap: EdgeCorePluginFactory = (
         expirationDate: new Date(Date.now() + EXPIRATION_MS),
         fromNativeAmount: apiSwapQuote.sellAmount,
         isEstimate: false,
-        networkFee,
+        networkFee: {
+          currencyCode: getCurrencyCode(
+            swapRequest.fromWallet,
+            swapRequest.fromTokenId
+          ),
+          nativeAmount: add(gasFee.feeAmount, zeroExFee.feeAmount)
+        },
         pluginId: swapInfo.pluginId,
         request: swapRequest,
         swapInfo: swapInfo,