Hotfix/release 3.7 patch

packages/e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "e2e",
-  "version": "3.9.0",
+  "version": "3.9.1-alpha.0",
   "private": true,
   "main": "index.js",
   "license": "MIT",
@@ -11,9 +11,9 @@
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
-    "@heliofi/common": "0.1.195",
-    "@heliofi/react": "^3.7.0",
-    "@heliofi/sdk": "^0.5.0",
+    "@heliofi/common": "0.1.248",
+    "@heliofi/react": "^3.7.1-alpha.0",
+    "@heliofi/sdk": "^0.5.1-alpha.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

packages/e2e/src/App.tsx

@@ -13,7 +13,7 @@ window.Buffer = window.Buffer || require('buffer').Buffer;
 
 const App = () => {
   const [paymentId, setPaymentId] = useState<string | null>(
-    '6438011a8fdd74a899bd0f51'
+    '6463450b60755941ed524a0e'
   );
 
   return (
@@ -25,8 +25,10 @@ const App = () => {
       />
       <HelioPay
         additionalJSON={{ key1: 'value1' }}
-        cluster="devnet"
-        customApiUrl="https://dev.api.hel.io/v1"
+        cluster="mainnet-beta"
+        // customApiUrl="https://dev.api.hel.io/v1"
+        // additionalJSON={{ key1: 'value1' }}
+        // customApiUrl="https://api.dev.hel.io/v1"
         paymentRequestId={paymentId}
         onSuccess={(event: SuccessPaymentEvent) => {
           console.log('onSuccess', event);
@@ -41,8 +43,10 @@ const App = () => {
           console.log('onStartPayment');
         }}
         supportedCurrencies={['USDC', 'SOL']}
-        // paymentType={PaymentRequestType.PAYSTREAM}
+        paymentType={'PAYLINK' as any}
         // totalAmount={0.01} // @TODO bug when also has normalizedPrice
+        totalAmount={0.0001}
+        // totalAmount={undefined}
       />
     </>
   );

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heliofi/react",
-  "version": "3.7.0",
+  "version": "3.7.1-alpha.0",
   "description": "React components for Helio",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,12 +14,12 @@
   },
   "dependencies": {
     "@aws-amplify/api-graphql": "^2.3.12",
+    "@coral-xyz/anchor": "^0.27.0",
     "@heliofi/common": "0.1.195",
     "@heliofi/helio-icons": "^1.0.5",
-    "@heliofi/sdk": "^0.5.0",
+    "@heliofi/sdk": "^0.5.1-alpha.0",
     "@heliofi/solana-adapter": "^3.3.10-alpha.0",
     "@popperjs/core": "^2.11.7",
-    "@project-serum/anchor": "^0.25.0",
     "@solana/spl-token": "^0.3.6",
     "@solana/wallet-adapter-base": "^0.9.5",
     "@solana/wallet-adapter-react": "^0.15.5",

packages/react/src/components/heliopay/index.tsx

@@ -54,7 +54,7 @@ export const HelioPay = ({
   const { HelioSDK } = useCompositionRoot();
 
   useMemo(() => {
-    HelioSDK.setCluster(cluster as Cluster);
+    HelioSDK.setCluster(cluster as any);
   }, [cluster]);
 
   useMemo(() => {

packages/react/src/providers/anchor/AnchorContext.tsx

@@ -1,4 +1,4 @@
-import { Program } from '@project-serum/anchor';
+import { Program } from '@coral-xyz/anchor';
 import { createContext, useContext } from 'react';
 import { HelioIdl } from '@heliofi/solana-adapter';
 

packages/react/src/providers/anchor/index.tsx

@@ -1,5 +1,5 @@
 import { IDL, PROGRAM_ID } from '@heliofi/solana-adapter';
-import { AnchorProvider as Provider, Program } from '@project-serum/anchor';
+import { AnchorProvider as Provider, Program } from '@coral-xyz/anchor';
 import { useAnchorWallet, useConnection } from '@solana/wallet-adapter-react';
 import { ConfirmOptions } from '@solana/web3.js';
 import React, { FC, ReactNode, useMemo } from 'react';

packages/react/src/providers/helio/HelioContext.tsx

@@ -157,7 +157,7 @@ export const useHelioProvider = () => {
       }
 
       if (bonkCurrency && mintAddress !== bonkCurrency.mintAddress) {
-        currencies.push(bonkCurrency);
+        currencies.unshift(bonkCurrency);
       }
 
       setTokenSwapCurrencies(currencies as unknown as Currency[]);

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heliofi/sdk",
-  "version": "0.5.0",
+  "version": "0.5.1-alpha.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@coral-xyz/anchor": "^0.27.0",
+    "@ethersproject/providers": "^5.7.0",
     "@heliofi/common": "0.1.195",
+    "@heliofi/evm-adapter": "0.0.30-beta",
     "@heliofi/solana-adapter": "^3.3.10-alpha.0",
     "@project-serum/anchor": "^0.25.0",
     "@solana/wallet-adapter-react": "^0.15.20",

packages/sdk/src/infrastructure/solana-utils/CreateTransaction.ts

@@ -1,9 +1,13 @@
-import { PrepareTransaction } from '@heliofi/common';
 import { Message, Transaction } from '@solana/web3.js';
 
 export function createTransaction(
-  prepareTransactionResponse: PrepareTransaction
+  prepareTransactionResponse: any
 ): Transaction {
+  if (prepareTransactionResponse.serializedTransaction != null) {
+    return Transaction.from(
+      JSON.parse(prepareTransactionResponse.serializedTransaction).data
+    );
+  }
   const message = Message.from(
     Buffer.from(JSON.parse(prepareTransactionResponse.transactionMessage).data)
   );

packages/sdk/src/infrastructure/solana-utils/payment/models/PaymentProps.ts

@@ -1,5 +1,5 @@
 import { HelioIdl } from '@heliofi/solana-adapter';
-import { Program } from '@project-serum/anchor';
+import { Program } from '@coral-xyz/anchor';
 import { AnchorWallet } from '@solana/wallet-adapter-react';
 import { Cluster, Connection } from '@solana/web3.js';
 import {

packages/sdk/src/infrastructure/solana-utils/payment/paylink/PaylinkSubmitService.ts

@@ -210,7 +210,7 @@ export class PaylinkSubmitService extends BasePaymentService<
   }> {
     const prepareSwapTransactionResponse =
       await this.apiService.getPreparedTransactionSwapMessage(
-        `${this.prepareEndpoint}/swap`,
+        `${this.prepareEndpoint}/swap${this.getQueryParams()}`,
         JSON.stringify({
           paymentRequestId,
           currency: symbol,
@@ -262,7 +262,7 @@ export class PaylinkSubmitService extends BasePaymentService<
   }: GetAndSignPayload): Promise<SignedTxAndToken> {
     const prepareTransactionResponse =
       await this.apiService.getPreparedTransactionMessage(
-        this.prepareEndpoint,
+        this.prepareEndpoint + this.getQueryParams(),
         JSON.stringify({
           paymentRequestId,
           currency: symbol,
@@ -280,4 +280,8 @@ export class PaylinkSubmitService extends BasePaymentService<
       token: prepareTransactionResponse.transactionToken,
     };
   }
+
+  private getQueryParams(): string {
+    return `?feePayer=HELIO`;
+  }
 }

yarn.lock

@@ -2941,6 +2941,20 @@
     class-validator "^0.14.0"
     moment "^2.29.4"
 
+"@heliofi/common@0.1.248":
+  version "0.1.248"
+  resolved "https://registry.yarnpkg.com/@heliofi/common/-/common-0.1.248.tgz#0b251b9b48b856d7877c256f851917f1d4bd0d76"
+  integrity sha512-dA/QA/PuLWuHDD6vCcMSkLtch+kVMCcbs8M29WUqcTnGbxR9CPouCqQfIHbH1Tj3lABkVTfYsY9T5XKp1j0aLA==
+  dependencies:
+    "@heliofi/evm-adapter" "^0.0.28-beta"
+    "@project-serum/anchor" "^0.25.0"
+    "@solana/web3.js" "^1.44.0"
+    bignumber.js "^9.1.1"
+    bs58 "^5.0.0"
+    class-transformer "^0.5.1"
+    class-validator "^0.14.0"
+    moment "^2.29.4"
+
 "@heliofi/eslint-config-helio@^0.0.4":
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/@heliofi/eslint-config-helio/-/eslint-config-helio-0.0.4.tgz#51eeddbf669f67866e1303201120a373ec0e8d22"
@@ -2951,6 +2965,13 @@
   resolved "https://registry.yarnpkg.com/@heliofi/eslint-config-helio/-/eslint-config-helio-0.1.1.tgz#2e35edc2e725b2536fcd79aa0b1141a8b0e95028"
   integrity sha512-23VJ5uixK2OO2uugcXKVzdPwW/BjJ1elfwMZnwMF+VYGTz6dv6HeA77vMjGJ2IkV6nnCwsYC7FeuBXOIKrzPxw==
 
+"@heliofi/evm-adapter@0.0.30-beta":
+  version "0.0.30-beta"
+  resolved "https://registry.yarnpkg.com/@heliofi/evm-adapter/-/evm-adapter-0.0.30-beta.tgz#ee82f2813b6f827a6b9cd274ef0ef962f430fcac"
+  integrity sha512-B0tAEUKU7+VqqL/5esaR45TPkqTkHX0/Xb6Y8fGGjdiHosMjnEB5+1KZ/Crth7F5gfzOD0yxTSZltA3i3ZHWOA==
+  dependencies:
+    ethers "^5.7.2"
+
 "@heliofi/evm-adapter@^0.0.28-beta":
   version "0.0.28-beta"
   resolved "https://registry.yarnpkg.com/@heliofi/evm-adapter/-/evm-adapter-0.0.28-beta.tgz#3e55af3e6a34cf2c956728610396833265587dbe"