From cae6ae017ac8e8d1ef1fef8cad533e842bc86f42 Mon Sep 17 00:00:00 2001
From: "frankind.eth" <faguzzi3@gmail.com>
Date: Fri, 23 Feb 2024 05:56:21 -0300
Subject: [PATCH 1/4] feat: add propeller heads support

---
 .../src/ui/action/views/swap/index.vue        | 141 +++------
 packages/swap/.env.example                    |   1 +
 packages/swap/src/configs.ts                  |  19 +-
 packages/swap/src/index.ts                    |  21 +-
 .../src/providers/propeller-heads/index.ts    | 278 ++++++++++++++++++
 .../src/providers/propeller-heads/types.ts    |  34 +++
 packages/swap/src/types/index.ts              |   2 +
 packages/swap/tests/propeller-heads.test.ts   |  77 +++++
 packages/types/src/networks.ts                |   1 +
 9 files changed, 472 insertions(+), 102 deletions(-)
 create mode 100644 packages/swap/.env.example
 create mode 100644 packages/swap/src/providers/propeller-heads/index.ts
 create mode 100644 packages/swap/src/providers/propeller-heads/types.ts
 create mode 100644 packages/swap/tests/propeller-heads.test.ts

diff --git a/packages/extension/src/ui/action/views/swap/index.vue b/packages/extension/src/ui/action/views/swap/index.vue
index 8d92110f5..90fdf543f 100644
--- a/packages/extension/src/ui/action/views/swap/index.vue
+++ b/packages/extension/src/ui/action/views/swap/index.vue
@@ -10,112 +10,52 @@
         </div>
 
         <div class="swap__wrap">
-          <swap-token-amount-input
-            v-if="fromToken"
-            :value="fromAmount || ''"
-            :token="fromToken"
-            :autofocus="true"
-            :error-message="errors.inputAmount"
-            @update:input-max="setMax"
-            @toggle:select="toggleFromToken"
-            @update:value="inputAmountFrom"
-          />
+          <swap-token-amount-input v-if="fromToken" :value="fromAmount || ''" :token="fromToken" :autofocus="true"
+            :error-message="errors.inputAmount" @update:input-max="setMax" @toggle:select="toggleFromToken"
+            @update:value="inputAmountFrom" />
 
           <a class="swap__arrows"><swap-arrows /></a>
 
-          <swap-network-select
-            v-if="toNetwork"
-            :network="toNetwork"
-            @toggle:select="toggleToNetwork"
-          />
-
-          <swap-token-to-amount
-            :token="toToken"
-            :is-finding-rate="isFindingRate"
-            :fast-list="trendingToTokens"
-            :total-tokens="toTokens.length - trendingToTokens.length"
-            :amount="toAmount"
-            :no-providers="errors.noProviders"
-            @update:select-asset="selectTokenTo"
-            @toggle:select="toggleToToken"
-          />
-
-          <send-address-input
-            ref="addressInput"
-            :value="address"
-            :is-valid-address="addressIsValid"
-            :network-name="toAddressInputMeta.networkName"
-            :display-address="toAddressInputMeta.displayAddress"
-            :identicon="toAddressInputMeta.identicon"
-            @update:input-address="inputAddress"
-            @toggle:show-contacts="toggleSelectContact"
-          />
-
-          <send-contacts-list
-            :show-accounts="isOpenSelectContact"
-            :accounts="toAccounts"
-            :address="address"
-            :display-address="toAddressInputMeta.displayAddress"
-            :identicon="toAddressInputMeta.identicon"
-            @selected:account="selectAccount"
-            @update:paste-from-clipboard="addressInput.pasteFromClipboard()"
-            @close="toggleSelectContact"
-          />
+          <swap-network-select v-if="toNetwork" :network="toNetwork" @toggle:select="toggleToNetwork" />
+
+          <swap-token-to-amount :token="toToken" :is-finding-rate="isFindingRate" :fast-list="trendingToTokens"
+            :total-tokens="toTokens.length - trendingToTokens.length" :amount="toAmount"
+            :no-providers="errors.noProviders" @update:select-asset="selectTokenTo" @toggle:select="toggleToToken" />
+
+          <send-address-input ref="addressInput" :value="address" :is-valid-address="addressIsValid"
+            :network-name="toAddressInputMeta.networkName" :display-address="toAddressInputMeta.displayAddress"
+            :identicon="toAddressInputMeta.identicon" @update:input-address="inputAddress"
+            @toggle:show-contacts="toggleSelectContact" />
+
+          <send-contacts-list :show-accounts="isOpenSelectContact" :accounts="toAccounts" :address="address"
+            :display-address="toAddressInputMeta.displayAddress" :identicon="toAddressInputMeta.identicon"
+            @selected:account="selectAccount" @update:paste-from-clipboard="addressInput.pasteFromClipboard()"
+            @close="toggleSelectContact" />
         </div>
 
         <div class="swap__buttons">
           <div class="swap__buttons-cancel">
-            <base-button
-              title="Cancel"
-              :no-background="true"
-              @click="$router.go(-1)"
-            />
+            <base-button title="Cancel" :no-background="true" @click="$router.go(-1)" />
           </div>
           <div class="swap__buttons-send">
-            <base-button
-              :title="sendButtonTitle"
-              :click="sendAction"
-              :disabled="isDisabled"
-            />
+            <base-button :title="sendButtonTitle" :click="sendAction" :disabled="isDisabled" />
           </div>
         </div>
       </div>
     </div>
 
-    <network-select-list
-      v-if="toNetworkOpen"
-      :assets="toNetworks"
-      @close="toggleToNetwork"
-      @update:select-asset="selectToNetwork"
-    />
-
-    <assets-select-list
-      v-if="fromSelectOpened"
-      :assets="fromTokens"
-      @close="toggleFromToken"
-      @update:select-asset="selectTokenFrom"
-    />
-
-    <assets-select-list
-      v-show="toSelectOpened"
-      :is-select-to-token="true"
-      :assets="toTokens"
-      :is-loading="fetchingTokens"
-      @close="toggleToToken"
-      @update:select-asset="selectTokenTo"
-    />
-
-    <swap-looking
-      v-show="isLooking"
-      :loading-type="LoadingType"
-      :close="toggleLooking"
-    />
-    <swap-error-popup
-      v-if="showSwapError"
-      :error="swapError"
-      :network-name="network.name_long"
-      :close="toggleSwapError"
-    />
+    <network-select-list v-if="toNetworkOpen" :assets="toNetworks" @close="toggleToNetwork"
+      @update:select-asset="selectToNetwork" />
+
+    <assets-select-list v-if="fromSelectOpened" :assets="fromTokens" @close="toggleFromToken"
+      @update:select-asset="selectTokenFrom" />
+
+    <assets-select-list v-show="toSelectOpened" :is-select-to-token="true" :assets="toTokens" :is-loading="fetchingTokens"
+      @close="toggleToToken" @update:select-asset="selectTokenTo" />
+
+    <swap-looking v-show="isLooking" :loading-type="LoadingType" :close="toggleLooking" />
+    <swap-error-popup v-if="showSwapError" :error="swapError" :network-name="network.name_long"
+      :close="toggleSwapError" />
   </div>
 </template>
 
@@ -301,10 +241,10 @@ onMounted(async () => {
         if (props.network.name === net) {
           thisNetwork =
             swapToTokens.all[net as unknown as SupportedNetworkName].length ===
-            1
+              1
               ? getNetworkInfoByName(
-                  NetworkNames.Ethereum as unknown as SupportedNetworkName
-                )
+                NetworkNames.Ethereum as unknown as SupportedNetworkName
+              )
               : netInfo;
         }
         toNetworks.value.push(netInfo);
@@ -626,13 +566,13 @@ const sendAction = async () => {
   const marketData = new MarketData();
   const fromPrice = fromToken.value!.cgId
     ? await marketData
-        .getMarketData([fromToken.value!.cgId])
-        .then((res) => res[0]!.current_price)
+      .getMarketData([fromToken.value!.cgId])
+      .then((res) => res[0]!.current_price)
     : 0;
   const toPrice = toToken.value!.cgId
     ? await marketData
-        .getMarketData([toToken.value!.cgId])
-        .then((res) => res[0]!.current_price)
+      .getMarketData([toToken.value!.cgId])
+      .then((res) => res[0]!.current_price)
     : 0;
   const localFromToken = { ...fromToken.value! };
   const localToToken = { ...toToken.value! };
@@ -710,6 +650,7 @@ const sendAction = async () => {
 
 <style lang="less" scoped>
 @import "~@action/styles/theme.less";
+
 .container {
   width: 100%;
   height: 600px;
@@ -719,6 +660,7 @@ const sendAction = async () => {
   box-sizing: border-box;
   position: relative;
 }
+
 .swap {
   width: 100%;
   height: 100%;
@@ -813,6 +755,7 @@ const sendAction = async () => {
     max-height: 114px;
     padding: 8px;
     box-sizing: border-box;
+
     h3 {
       display: none;
     }
diff --git a/packages/swap/.env.example b/packages/swap/.env.example
new file mode 100644
index 000000000..71af26f54
--- /dev/null
+++ b/packages/swap/.env.example
@@ -0,0 +1 @@
+PROPELLER_HEADS_API_KEY=
diff --git a/packages/swap/src/configs.ts b/packages/swap/src/configs.ts
index 90405a66b..481a53313 100644
--- a/packages/swap/src/configs.ts
+++ b/packages/swap/src/configs.ts
@@ -2,7 +2,14 @@ import { NetworkNames } from "@enkryptcom/types";
 import { numberToHex } from "web3-utils";
 import { ProviderName, SupportedNetworkName, WalletIdentifier } from "./types";
 
-const FEE_CONFIGS = {
+type ProviderFeeConfig = Record<
+  WalletIdentifier,
+  { referrer: string; fee: number }
+>;
+
+type ProvidersFeeConfigs = Partial<Record<ProviderName, ProviderFeeConfig>>;
+
+const FEE_CONFIGS: ProvidersFeeConfigs = {
   [ProviderName.oneInch]: {
     [WalletIdentifier.enkrypt]: {
       referrer: "0x551d9d8eb02e1c713009da8f7c194870d651054a",
@@ -43,6 +50,16 @@ const FEE_CONFIGS = {
       fee: 0.025,
     },
   },
+  [ProviderName.propellerHeads]: {
+    [WalletIdentifier.enkrypt]: {
+      referrer: "0xabe295bac4b5bce0edcf42d180a3a952ef718b9e",
+      fee: 0.00875,
+    },
+    [WalletIdentifier.mew]: {
+      referrer: "0x48ae878bf9f752ee65679c017e32e4cafac51696",
+      fee: 0.025,
+    },
+  },
 };
 
 const TOKEN_LISTS: {
diff --git a/packages/swap/src/index.ts b/packages/swap/src/index.ts
index d1eb64284..73072c56c 100644
--- a/packages/swap/src/index.ts
+++ b/packages/swap/src/index.ts
@@ -7,6 +7,7 @@ import Paraswap from "./providers/paraswap";
 import Changelly from "./providers/changelly";
 import ZeroX from "./providers/zerox";
 import Rango from "./providers/rango";
+import PropellerHeads from "./providers/propeller-heads";
 import NetworkDetails, {
   isSupportedNetwork,
   getSupportedNetworks,
@@ -57,9 +58,18 @@ class Swap extends EventEmitter {
     | typeof Paraswap
     | typeof ZeroX
     | typeof Rango
+    | typeof Rango
+    | typeof PropellerHeads
   )[];
 
-  private providers: (OneInch | Changelly | Paraswap | ZeroX | Rango)[];
+  private providers: (
+    | OneInch
+    | Changelly
+    | Paraswap
+    | ZeroX
+    | Rango
+    | PropellerHeads
+  )[];
 
   private tokenList: FromTokenType;
 
@@ -81,7 +91,14 @@ class Swap extends EventEmitter {
         };
     this.api = options.api;
     this.walletId = options.walletIdentifier;
-    this.providerClasses = [OneInch, Paraswap, Changelly, ZeroX, Rango];
+    this.providerClasses = [
+      OneInch,
+      Paraswap,
+      Changelly,
+      ZeroX,
+      Rango,
+      PropellerHeads,
+    ];
     this.topTokenInfo = {
       contractsToId: {},
       topTokens: {},
diff --git a/packages/swap/src/providers/propeller-heads/index.ts b/packages/swap/src/providers/propeller-heads/index.ts
new file mode 100644
index 000000000..7408c9f9c
--- /dev/null
+++ b/packages/swap/src/providers/propeller-heads/index.ts
@@ -0,0 +1,278 @@
+import dotenv from "dotenv";
+import Web3Eth from "web3-eth";
+import { numberToHex, stringToHex, toBN } from "web3-utils";
+import {
+  EVMTransaction,
+  getQuoteOptions,
+  MinMaxResponse,
+  ProviderClass,
+  ProviderFromTokenResponse,
+  ProviderName,
+  ProviderQuoteResponse,
+  ProviderSwapResponse,
+  ProviderToTokenResponse,
+  QuoteMetaOptions,
+  StatusOptions,
+  StatusOptionsResponse,
+  SupportedNetworkName,
+  SwapQuote,
+  TokenType,
+  TransactionStatus,
+  TransactionType,
+} from "../../types";
+import {
+  DEFAULT_SLIPPAGE,
+  FEE_CONFIGS,
+  GAS_LIMITS,
+  NATIVE_TOKEN_ADDRESS,
+} from "../../configs";
+import {
+  PropellerHeadsResponseType,
+  PropellerHeadsSwapResponse,
+} from "./types";
+import {
+  getAllowanceTransactions,
+  TOKEN_AMOUNT_INFINITY_AND_BEYOND,
+} from "../../utils/approvals";
+import { isEVMAddress } from "../../utils/common";
+
+dotenv.config();
+
+const { PROPELLER_HEADS_API_KEY } = process.env;
+
+if (!PROPELLER_HEADS_API_KEY) {
+  throw new Error("PROPELLER_HEADS_API_KEY is not set");
+}
+
+const supportedNetworks: {
+  [key in SupportedNetworkName]?: { approvalAddress: string; chainId: string };
+} = {
+  [SupportedNetworkName.Ethereum]: {
+    approvalAddress: "0x14f2b6ca0324cd2B013aD02a7D85541d215e2906",
+    chainId: "1",
+  },
+  [SupportedNetworkName.Zksync]: {
+    approvalAddress: "0xe832e655E4C3c36b2be5256915ECF8536a642f59",
+    chainId: "324",
+  },
+  // [SupportedNetworkName.Starknet]: {
+  //   approvalAddress: "0x060b1a6a696cbd77df0b6be6a2a951cf0fc7b951304a9371eac2f5d05a77357f",
+  //   chainId: "137",
+  // },
+};
+
+const NetworkNamesToSupportedProppellerHeadsBlockchains: Partial<
+  Record<SupportedNetworkName, string>
+> = {
+  [SupportedNetworkName.Ethereum]: "ethereum",
+};
+
+const BASE_URL = "https://api.propellerheads.xyz/partner/v2";
+
+class PropellerHeads extends ProviderClass {
+  tokenList: TokenType[];
+
+  network: SupportedNetworkName;
+
+  web3eth: Web3Eth;
+
+  name: ProviderName;
+
+  fromTokens: ProviderFromTokenResponse;
+
+  toTokens: ProviderToTokenResponse;
+
+  constructor(web3eth: Web3Eth, network: SupportedNetworkName) {
+    super(web3eth, network);
+    this.name = ProviderName.propellerHeads;
+    this.network = network;
+    this.web3eth = web3eth;
+    this.tokenList = [];
+    this.fromTokens = {};
+    this.toTokens = {};
+  }
+
+  init(tokenList: TokenType[]): Promise<void> {
+    if (!PropellerHeads.isSupported(this.network)) return;
+    tokenList.forEach((t) => {
+      this.fromTokens[t.address] = t;
+      if (!this.toTokens[this.network]) this.toTokens[this.network] = {};
+      this.toTokens[this.network][t.address] = {
+        ...t,
+        networkInfo: {
+          name: this.network,
+          isAddress: (address: string) =>
+            Promise.resolve(isEVMAddress(address)),
+        },
+      };
+    });
+  }
+
+  static isSupported(network: SupportedNetworkName) {
+    return Object.keys(supportedNetworks).includes(
+      network as unknown as string
+    );
+  }
+
+  getFromTokens() {
+    return this.fromTokens;
+  }
+
+  getToTokens() {
+    return this.toTokens;
+  }
+
+  getMinMaxAmount(): Promise<MinMaxResponse> {
+    return Promise.resolve({
+      minimumFrom: toBN("1"),
+      maximumFrom: toBN(TOKEN_AMOUNT_INFINITY_AND_BEYOND),
+      minimumTo: toBN("1"),
+      maximumTo: toBN(TOKEN_AMOUNT_INFINITY_AND_BEYOND),
+    });
+  }
+
+  private getPropellerHeadsSwap(
+    options: getQuoteOptions,
+    meta: QuoteMetaOptions
+  ): Promise<PropellerHeadsSwapResponse | null> {
+    if (
+      !PropellerHeads.isSupported(
+        options.toToken.networkInfo.name as SupportedNetworkName
+      ) ||
+      this.network !== options.toToken.networkInfo.name
+    )
+      return Promise.resolve(null);
+
+    if (options.fromAddress.toLowerCase() !== options.toAddress.toLowerCase())
+      return Promise.resolve(null);
+
+    const body = {
+      orders: [
+        {
+          sell_token: options.fromToken.address,
+          buy_token: options.toToken.address,
+          sell_amount: options.amount.toString(),
+          origin_address: options.fromAddress,
+        },
+      ],
+    };
+
+    const params = new URLSearchParams({
+      blockchain:
+        NetworkNamesToSupportedProppellerHeadsBlockchains[this.network],
+    });
+
+    return fetch(`${BASE_URL}/solver/quote?${params.toString()}`, {
+      method: "POST",
+      body: JSON.stringify(body),
+      headers: {
+        "x-api-key": PROPELLER_HEADS_API_KEY,
+        accept: "application/json",
+        "Content-Type": "application/json",
+      },
+    })
+      .then((res) => res.json())
+      .then(async (response: PropellerHeadsResponseType) => {
+        const transactions: EVMTransaction[] = [];
+
+        if (options.fromToken.address !== NATIVE_TOKEN_ADDRESS) {
+          const approvalTxs = await getAllowanceTransactions({
+            infinityApproval: meta.infiniteApproval,
+            spender: supportedNetworks[this.network].approvalAddress,
+            web3eth: this.web3eth,
+            amount: options.amount,
+            fromAddress: options.fromAddress,
+            fromToken: options.fromToken,
+          });
+          transactions.push(...approvalTxs);
+        }
+        transactions.push({
+          from: options.fromAddress,
+          gasLimit: GAS_LIMITS.swap,
+          to: options.fromAddress,
+          value: numberToHex(options.amount),
+          data: stringToHex(JSON.stringify(response)),
+          type: TransactionType.evm,
+        });
+
+        return {
+          transactions,
+          toTokenAmount: toBN(response.quotes[0].buy_amount),
+          fromTokenAmount: toBN(response.quotes[0].sell_amount),
+        };
+      })
+      .catch((e) => {
+        console.error(e);
+        return null;
+      });
+  }
+
+  getQuote(
+    options: getQuoteOptions,
+    meta: QuoteMetaOptions
+  ): Promise<ProviderQuoteResponse | null> {
+    return this.getPropellerHeadsSwap(options, meta).then(async (res) => {
+      if (!res) return null;
+      const response: ProviderQuoteResponse = {
+        fromTokenAmount: res.fromTokenAmount,
+        additionalNativeFees: toBN(0),
+        toTokenAmount: res.toTokenAmount,
+        provider: this.name,
+        quote: {
+          meta,
+          options,
+          provider: this.name,
+        },
+        totalGaslimit: res.transactions.reduce(
+          (total: number, curVal: EVMTransaction) =>
+            total + toBN(curVal.gasLimit).toNumber(),
+          0
+        ),
+        minMax: await this.getMinMaxAmount(),
+      };
+      return response;
+    });
+  }
+
+  getSwap(quote: SwapQuote): Promise<ProviderSwapResponse | null> {
+    return this.getPropellerHeadsSwap(quote.options, quote.meta).then((res) => {
+      if (!res) return null;
+      const feeConfig =
+        FEE_CONFIGS[this.name][quote.meta.walletIdentifier].fee || 0;
+      const response: ProviderSwapResponse = {
+        fromTokenAmount: res.fromTokenAmount,
+        additionalNativeFees: toBN(0),
+        provider: this.name,
+        toTokenAmount: res.toTokenAmount,
+        transactions: res.transactions,
+        slippage: quote.meta.slippage || DEFAULT_SLIPPAGE,
+        fee: feeConfig * 100,
+        getStatusObject: async (
+          options: StatusOptions
+        ): Promise<StatusOptionsResponse> => ({
+          options,
+          provider: this.name,
+        }),
+      };
+      return response;
+    });
+  }
+
+  getStatus(options: StatusOptions): Promise<TransactionStatus> {
+    const promises = options.transactionHashes.map((hash) =>
+      this.web3eth.getTransactionReceipt(hash)
+    );
+    return Promise.all(promises).then((receipts) => {
+      // eslint-disable-next-line no-restricted-syntax
+      for (const receipt of receipts) {
+        if (!receipt || (receipt && !receipt.blockNumber)) {
+          return TransactionStatus.pending;
+        }
+        if (receipt && !receipt.status) return TransactionStatus.failed;
+      }
+      return TransactionStatus.success;
+    });
+  }
+}
+
+export default PropellerHeads;
diff --git a/packages/swap/src/providers/propeller-heads/types.ts b/packages/swap/src/providers/propeller-heads/types.ts
new file mode 100644
index 000000000..509fa731c
--- /dev/null
+++ b/packages/swap/src/providers/propeller-heads/types.ts
@@ -0,0 +1,34 @@
+import { BN, EVMTransaction } from "../../types";
+
+export interface PropellerHeadsResponseType {
+  request_id: string;
+  quotes: [
+    {
+      sell_token: string;
+      buy_token: string;
+      sell_amount: string;
+      buy_amount: string;
+      external_id: string;
+    }
+  ];
+  gas: number;
+  buy_tokens: [
+    {
+      symbol: string;
+      decimals: string;
+      address: string;
+    }
+  ];
+  sell_tokens: [
+    {
+      symbol: string;
+      decimals: string;
+      address: string;
+    }
+  ];
+}
+export interface PropellerHeadsSwapResponse {
+  transactions: EVMTransaction[];
+  toTokenAmount: BN;
+  fromTokenAmount: BN;
+}
diff --git a/packages/swap/src/types/index.ts b/packages/swap/src/types/index.ts
index ac1e38b84..c98fbb9eb 100644
--- a/packages/swap/src/types/index.ts
+++ b/packages/swap/src/types/index.ts
@@ -27,6 +27,7 @@ export enum SupportedNetworkName {
   Klaytn = NetworkNames.Klaytn,
   Aurora = NetworkNames.Aurora,
   Zksync = NetworkNames.ZkSync,
+  Starknet = NetworkNames.Starknet,
 }
 
 // eslint-disable-next-line no-shadow
@@ -118,6 +119,7 @@ export enum ProviderName {
   zerox = "zerox",
   changelly = "changelly",
   rango = "rango",
+  propellerHeads = "propellerHeads",
 }
 
 // eslint-disable-next-line no-shadow
diff --git a/packages/swap/tests/propeller-heads.test.ts b/packages/swap/tests/propeller-heads.test.ts
new file mode 100644
index 000000000..6b70e055d
--- /dev/null
+++ b/packages/swap/tests/propeller-heads.test.ts
@@ -0,0 +1,77 @@
+import { expect } from "chai";
+import { toBN } from "web3-utils";
+import Web3Eth from "web3-eth";
+import PropellerHeads from "../src/providers/propeller-heads";
+import {
+  ProviderName,
+  SupportedNetworkName,
+  WalletIdentifier,
+} from "../src/types";
+import { fromTokenWBTC, toToken, nodeURL } from "./fixtures/mainnet/configs";
+
+describe("Propeller Heads Provider", () => {
+  const web3eth = new Web3Eth(nodeURL);
+  const localAmount = toBN("100000000");
+
+  it("should return a quote with infinite approval", async () => {
+    const propellerHeads = new PropellerHeads(
+      web3eth,
+      SupportedNetworkName.Ethereum
+    );
+
+    const quote = await propellerHeads.getQuote(
+      {
+        amount: localAmount,
+        fromAddress: "0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656", // aave
+        fromToken: fromTokenWBTC,
+        toToken,
+        toAddress: "0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656", // aave
+      },
+      { infiniteApproval: true, walletIdentifier: WalletIdentifier.enkrypt }
+    );
+
+    expect(quote?.provider).to.be.eq(ProviderName.propellerHeads);
+    expect(quote?.quote.meta.infiniteApproval).to.be.eq(true);
+    expect(quote?.quote.meta.walletIdentifier).to.be.eq(
+      WalletIdentifier.enkrypt
+    );
+    expect(typeof quote?.fromTokenAmount).to.be.eq(typeof localAmount);
+    expect(quote?.toTokenAmount.gtn(0)).to.be.eq(true);
+
+    const swap = await propellerHeads.getSwap(quote!.quote);
+
+    expect(swap?.transactions.length).to.be.eq(2);
+    expect(swap?.transactions[0].to).to.be.eq(fromTokenWBTC.address);
+  }).timeout(25000);
+
+  it("should return a quote with non-infinite approval", async () => {
+    const propellerHeads = new PropellerHeads(
+      web3eth,
+      SupportedNetworkName.Ethereum
+    );
+
+    const quote = await propellerHeads.getQuote(
+      {
+        amount: localAmount,
+        fromAddress: "0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656", // aave
+        fromToken: fromTokenWBTC,
+        toToken,
+        toAddress: "0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656", // aave
+      },
+      { infiniteApproval: false, walletIdentifier: WalletIdentifier.enkrypt }
+    );
+
+    expect(quote?.provider).to.be.eq(ProviderName.propellerHeads);
+    expect(quote?.quote.meta.infiniteApproval).to.be.eq(false);
+    expect(quote?.quote.meta.walletIdentifier).to.be.eq(
+      WalletIdentifier.enkrypt
+    );
+    expect(typeof quote?.fromTokenAmount).to.be.eq(typeof localAmount);
+    expect(quote?.toTokenAmount.gtn(0)).to.be.eq(true);
+
+    const swap = await propellerHeads.getSwap(quote!.quote);
+
+    expect(swap?.transactions.length).to.be.eq(2);
+    expect(swap?.transactions[0].to).to.be.eq(fromTokenWBTC.address);
+  }).timeout(25000);
+});
diff --git a/packages/types/src/networks.ts b/packages/types/src/networks.ts
index b46dccf54..835a55d93 100644
--- a/packages/types/src/networks.ts
+++ b/packages/types/src/networks.ts
@@ -62,6 +62,7 @@ export enum NetworkNames {
   Dogecoin = "DOGE",
   ArtheraTest = "AATest",
   Arthera = "AA",
+  Starknet = "Starknet",
 }
 
 export enum CoingeckoPlatform {

From 6bbbecc6ce39dbfba35913367f55f024632d173e Mon Sep 17 00:00:00 2001
From: "frankind.eth" <faguzzi3@gmail.com>
Date: Fri, 23 Feb 2024 06:29:06 -0300
Subject: [PATCH 2/4] feat: update propeller heads supportedNetworks

---
 packages/swap/src/configs.ts                         |  1 +
 packages/swap/src/providers/propeller-heads/index.ts | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/swap/src/configs.ts b/packages/swap/src/configs.ts
index 481a53313..f665bb65c 100644
--- a/packages/swap/src/configs.ts
+++ b/packages/swap/src/configs.ts
@@ -50,6 +50,7 @@ const FEE_CONFIGS: ProvidersFeeConfigs = {
       fee: 0.025,
     },
   },
+  // TODO: update referrer addresses
   [ProviderName.propellerHeads]: {
     [WalletIdentifier.enkrypt]: {
       referrer: "0xabe295bac4b5bce0edcf42d180a3a952ef718b9e",
diff --git a/packages/swap/src/providers/propeller-heads/index.ts b/packages/swap/src/providers/propeller-heads/index.ts
index 7408c9f9c..6f6ea76e5 100644
--- a/packages/swap/src/providers/propeller-heads/index.ts
+++ b/packages/swap/src/providers/propeller-heads/index.ts
@@ -55,16 +55,20 @@ const supportedNetworks: {
     approvalAddress: "0xe832e655E4C3c36b2be5256915ECF8536a642f59",
     chainId: "324",
   },
-  // [SupportedNetworkName.Starknet]: {
-  //   approvalAddress: "0x060b1a6a696cbd77df0b6be6a2a951cf0fc7b951304a9371eac2f5d05a77357f",
-  //   chainId: "137",
-  // },
+  [SupportedNetworkName.Starknet]: {
+    approvalAddress:
+      "0x060b1a6a696cbd77df0b6be6a2a951cf0fc7b951304a9371eac2f5d05a77357f",
+    // TODO: Update chain id
+    chainId: "137",
+  },
 };
 
 const NetworkNamesToSupportedProppellerHeadsBlockchains: Partial<
   Record<SupportedNetworkName, string>
 > = {
   [SupportedNetworkName.Ethereum]: "ethereum",
+  [SupportedNetworkName.Zksync]: "zksync",
+  [SupportedNetworkName.Starknet]: "starknet",
 };
 
 const BASE_URL = "https://api.propellerheads.xyz/partner/v2";

From 9e76432fe63c8989e22f967b793c03a68d9ef127 Mon Sep 17 00:00:00 2001
From: "frankind.eth" <faguzzi3@gmail.com>
Date: Tue, 5 Mar 2024 15:57:12 -0300
Subject: [PATCH 3/4] feat: Updated transaction type for Starknet support

---
 packages/swap/src/providers/propeller-heads/index.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/swap/src/providers/propeller-heads/index.ts b/packages/swap/src/providers/propeller-heads/index.ts
index 6f6ea76e5..706e37edf 100644
--- a/packages/swap/src/providers/propeller-heads/index.ts
+++ b/packages/swap/src/providers/propeller-heads/index.ts
@@ -16,6 +16,7 @@ import {
   StatusOptionsResponse,
   SupportedNetworkName,
   SwapQuote,
+  SwapTransaction,
   TokenType,
   TransactionStatus,
   TransactionType,
@@ -58,8 +59,7 @@ const supportedNetworks: {
   [SupportedNetworkName.Starknet]: {
     approvalAddress:
       "0x060b1a6a696cbd77df0b6be6a2a951cf0fc7b951304a9371eac2f5d05a77357f",
-    // TODO: Update chain id
-    chainId: "137",
+    chainId: "0x534e5f4d41494e",
   },
 };
 
@@ -177,7 +177,11 @@ class PropellerHeads extends ProviderClass {
     })
       .then((res) => res.json())
       .then(async (response: PropellerHeadsResponseType) => {
-        const transactions: EVMTransaction[] = [];
+        const transactions: SwapTransaction[] = [];
+        const transactionType: TransactionType =
+          this.network === SupportedNetworkName.Starknet
+            ? TransactionType.generic
+            : TransactionType.evm;
 
         if (options.fromToken.address !== NATIVE_TOKEN_ADDRESS) {
           const approvalTxs = await getAllowanceTransactions({
@@ -196,7 +200,7 @@ class PropellerHeads extends ProviderClass {
           to: options.fromAddress,
           value: numberToHex(options.amount),
           data: stringToHex(JSON.stringify(response)),
-          type: TransactionType.evm,
+          type: transactionType,
         });
 
         return {

From 87c8766f5071f114497da56608b165350c8f6d59 Mon Sep 17 00:00:00 2001
From: "frankind.eth" <faguzzi3@gmail.com>
Date: Wed, 6 Mar 2024 05:02:02 -0300
Subject: [PATCH 4/4] feat: Revert changes to Extension Swap view

---
 .../src/ui/action/views/swap/index.vue        | 141 ++++++++++++------
 1 file changed, 99 insertions(+), 42 deletions(-)

diff --git a/packages/extension/src/ui/action/views/swap/index.vue b/packages/extension/src/ui/action/views/swap/index.vue
index 90fdf543f..8d92110f5 100644
--- a/packages/extension/src/ui/action/views/swap/index.vue
+++ b/packages/extension/src/ui/action/views/swap/index.vue
@@ -10,52 +10,112 @@
         </div>
 
         <div class="swap__wrap">
-          <swap-token-amount-input v-if="fromToken" :value="fromAmount || ''" :token="fromToken" :autofocus="true"
-            :error-message="errors.inputAmount" @update:input-max="setMax" @toggle:select="toggleFromToken"
-            @update:value="inputAmountFrom" />
+          <swap-token-amount-input
+            v-if="fromToken"
+            :value="fromAmount || ''"
+            :token="fromToken"
+            :autofocus="true"
+            :error-message="errors.inputAmount"
+            @update:input-max="setMax"
+            @toggle:select="toggleFromToken"
+            @update:value="inputAmountFrom"
+          />
 
           <a class="swap__arrows"><swap-arrows /></a>
 
-          <swap-network-select v-if="toNetwork" :network="toNetwork" @toggle:select="toggleToNetwork" />
-
-          <swap-token-to-amount :token="toToken" :is-finding-rate="isFindingRate" :fast-list="trendingToTokens"
-            :total-tokens="toTokens.length - trendingToTokens.length" :amount="toAmount"
-            :no-providers="errors.noProviders" @update:select-asset="selectTokenTo" @toggle:select="toggleToToken" />
-
-          <send-address-input ref="addressInput" :value="address" :is-valid-address="addressIsValid"
-            :network-name="toAddressInputMeta.networkName" :display-address="toAddressInputMeta.displayAddress"
-            :identicon="toAddressInputMeta.identicon" @update:input-address="inputAddress"
-            @toggle:show-contacts="toggleSelectContact" />
-
-          <send-contacts-list :show-accounts="isOpenSelectContact" :accounts="toAccounts" :address="address"
-            :display-address="toAddressInputMeta.displayAddress" :identicon="toAddressInputMeta.identicon"
-            @selected:account="selectAccount" @update:paste-from-clipboard="addressInput.pasteFromClipboard()"
-            @close="toggleSelectContact" />
+          <swap-network-select
+            v-if="toNetwork"
+            :network="toNetwork"
+            @toggle:select="toggleToNetwork"
+          />
+
+          <swap-token-to-amount
+            :token="toToken"
+            :is-finding-rate="isFindingRate"
+            :fast-list="trendingToTokens"
+            :total-tokens="toTokens.length - trendingToTokens.length"
+            :amount="toAmount"
+            :no-providers="errors.noProviders"
+            @update:select-asset="selectTokenTo"
+            @toggle:select="toggleToToken"
+          />
+
+          <send-address-input
+            ref="addressInput"
+            :value="address"
+            :is-valid-address="addressIsValid"
+            :network-name="toAddressInputMeta.networkName"
+            :display-address="toAddressInputMeta.displayAddress"
+            :identicon="toAddressInputMeta.identicon"
+            @update:input-address="inputAddress"
+            @toggle:show-contacts="toggleSelectContact"
+          />
+
+          <send-contacts-list
+            :show-accounts="isOpenSelectContact"
+            :accounts="toAccounts"
+            :address="address"
+            :display-address="toAddressInputMeta.displayAddress"
+            :identicon="toAddressInputMeta.identicon"
+            @selected:account="selectAccount"
+            @update:paste-from-clipboard="addressInput.pasteFromClipboard()"
+            @close="toggleSelectContact"
+          />
         </div>
 
         <div class="swap__buttons">
           <div class="swap__buttons-cancel">
-            <base-button title="Cancel" :no-background="true" @click="$router.go(-1)" />
+            <base-button
+              title="Cancel"
+              :no-background="true"
+              @click="$router.go(-1)"
+            />
           </div>
           <div class="swap__buttons-send">
-            <base-button :title="sendButtonTitle" :click="sendAction" :disabled="isDisabled" />
+            <base-button
+              :title="sendButtonTitle"
+              :click="sendAction"
+              :disabled="isDisabled"
+            />
           </div>
         </div>
       </div>
     </div>
 
-    <network-select-list v-if="toNetworkOpen" :assets="toNetworks" @close="toggleToNetwork"
-      @update:select-asset="selectToNetwork" />
-
-    <assets-select-list v-if="fromSelectOpened" :assets="fromTokens" @close="toggleFromToken"
-      @update:select-asset="selectTokenFrom" />
-
-    <assets-select-list v-show="toSelectOpened" :is-select-to-token="true" :assets="toTokens" :is-loading="fetchingTokens"
-      @close="toggleToToken" @update:select-asset="selectTokenTo" />
-
-    <swap-looking v-show="isLooking" :loading-type="LoadingType" :close="toggleLooking" />
-    <swap-error-popup v-if="showSwapError" :error="swapError" :network-name="network.name_long"
-      :close="toggleSwapError" />
+    <network-select-list
+      v-if="toNetworkOpen"
+      :assets="toNetworks"
+      @close="toggleToNetwork"
+      @update:select-asset="selectToNetwork"
+    />
+
+    <assets-select-list
+      v-if="fromSelectOpened"
+      :assets="fromTokens"
+      @close="toggleFromToken"
+      @update:select-asset="selectTokenFrom"
+    />
+
+    <assets-select-list
+      v-show="toSelectOpened"
+      :is-select-to-token="true"
+      :assets="toTokens"
+      :is-loading="fetchingTokens"
+      @close="toggleToToken"
+      @update:select-asset="selectTokenTo"
+    />
+
+    <swap-looking
+      v-show="isLooking"
+      :loading-type="LoadingType"
+      :close="toggleLooking"
+    />
+    <swap-error-popup
+      v-if="showSwapError"
+      :error="swapError"
+      :network-name="network.name_long"
+      :close="toggleSwapError"
+    />
   </div>
 </template>
 
@@ -241,10 +301,10 @@ onMounted(async () => {
         if (props.network.name === net) {
           thisNetwork =
             swapToTokens.all[net as unknown as SupportedNetworkName].length ===
-              1
+            1
               ? getNetworkInfoByName(
-                NetworkNames.Ethereum as unknown as SupportedNetworkName
-              )
+                  NetworkNames.Ethereum as unknown as SupportedNetworkName
+                )
               : netInfo;
         }
         toNetworks.value.push(netInfo);
@@ -566,13 +626,13 @@ const sendAction = async () => {
   const marketData = new MarketData();
   const fromPrice = fromToken.value!.cgId
     ? await marketData
-      .getMarketData([fromToken.value!.cgId])
-      .then((res) => res[0]!.current_price)
+        .getMarketData([fromToken.value!.cgId])
+        .then((res) => res[0]!.current_price)
     : 0;
   const toPrice = toToken.value!.cgId
     ? await marketData
-      .getMarketData([toToken.value!.cgId])
-      .then((res) => res[0]!.current_price)
+        .getMarketData([toToken.value!.cgId])
+        .then((res) => res[0]!.current_price)
     : 0;
   const localFromToken = { ...fromToken.value! };
   const localToToken = { ...toToken.value! };
@@ -650,7 +710,6 @@ const sendAction = async () => {
 
 <style lang="less" scoped>
 @import "~@action/styles/theme.less";
-
 .container {
   width: 100%;
   height: 600px;
@@ -660,7 +719,6 @@ const sendAction = async () => {
   box-sizing: border-box;
   position: relative;
 }
-
 .swap {
   width: 100%;
   height: 100%;
@@ -755,7 +813,6 @@ const sendAction = async () => {
     max-height: 114px;
     padding: 8px;
     box-sizing: border-box;
-
     h3 {
       display: none;
     }