fix: wSOL contract deploy

neonlabsorg · Feb 17, 2025 · de8d3ab · de8d3ab
1 parent de58433
commit de8d3ab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/__tests__/e2e/transfer.spec.ts b/__tests__/e2e/transfer.spec.ts
@@ -236,21 +236,19 @@ describe("Tokens trasfer test", () => {
     if (wNEON && neonTransferContract) {
       await isWNeonTransferToSolana({ wNEON, NEON, neonWallet, solanaWallet, amount, provider, neonTransferContract, connection });
     } else {
-      throw new Error('ERC20 wrapper for wNEON or neonTransferContract wern\'t deployed');
+      throw new Error('ERC20 wrapper for wNEON or neonTransferContract wasn\'t deployed');
     }
   });
 
-  it.skip("Should wrap SOL -> wSOL and transfer 0.1 wSOL from Solana to Neon", async () => {
-    //Currently this test runs only with devnet setup, due to impossibility to deploy erc20 wrapper for wSOL
+  it("Should wrap SOL -> wSOL and transfer 0.1 wSOL from Solana to Neon", async () => {
     if(wSOL) {
       await isWSolToNeonTransfer({ connection, wSOL, neonWallet, solanaWallet, chainId, neonEvmProgram, solanaUrl: SOLANA_URL!, signer, amount, neonProxyRpcApi, provider, skipPreflight });
     } else {
-      throw new Error('ERC20 wrapper for WSOL wasn\'t deployed'); //Force test fail
+      throw new Error('ERC20 wrapper for WSOL wasn\'t deployed');
     }
   });
 
-  it.skip("Should transfer 0.1 wSOL from Neon to Solana and unwrap wSOL -> SOL", async () => {
-    //Currently this test runs only with devnet setup, due to impossibility to deploy erc20 wrapper for wSOL
+  it("Should transfer 0.1 wSOL from Neon to Solana and unwrap wSOL -> SOL", async () => {
     if(wSOL) {
       await isWSolToSolanaTransfer({ connection, wSOL, neonWallet, solanaWallet, solanaUrl: SOLANA_URL!, signer, amount, provider, skipPreflight });
     } else {

diff --git a/__tests__/tools/scripts/deployer.ts b/__tests__/tools/scripts/deployer.ts
@@ -7,7 +7,7 @@ import {
 import { NeonAddress, SPLToken } from '@neonevm/token-transfer-core';
 import { join } from 'path';
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
-import { fetchMetadata, findMetadataPda, Metadata } from "@metaplex-foundation/mpl-token-metadata";
+import { fetchMetadata, findMetadataPda } from "@metaplex-foundation/mpl-token-metadata";
 import { publicKey } from "@metaplex-foundation/umi";
 import { JsonRpcProvider, Wallet } from 'ethers';
 import { ethers } from "ethers";
@@ -151,7 +151,7 @@ export class Deployer {
 
 async function isSPLMetadata(solanaWallet: Keypair, tokenMint: string, connection: Connection): Promise<boolean> {
   const { umi } = setupUmiClient(connection.rpcEndpoint, solanaWallet);
-  console.log('Endpoint: ', connection.rpcEndpoint);
+
   try {
     const mintPublicKey = publicKey(tokenMint);
     const metadata = await fetchMetadata(umi, mintPublicKey);
@@ -228,10 +228,13 @@ export async function deployContracts(params: { provider: JsonRpcProvider, conne
   //Deploy contracts for erc20 wrappers and mint spl tokens
   if(factoryAddress) {
     fungibleSplToken = await deployer.deploySplToken(customSplToken, factoryAddress);
-    //TODO: add Metaplex Metadata account in genesis block
-    wSOL = await deployer.deployMintedToken(factoryAddress); //TODO: fix erc20 wrapper deploy for wSOL
+    /* To be able to deploy erc20 wrapper for wSOL token
+     * should be added Metaplex Metadata account
+     * 6dM4TqWyWJsbx7obrdLcviBkTafD5E8av61zfU6jq57X in genesis block
+     */
+    wSOL = await deployer.deployMintedToken(factoryAddress);
     console.log('Fungible SPL token', fungibleSplToken, wSOL);
   }
 
-  return { sender, factoryAddress, neonTransferContract: null, wNEON: null, fungibleSplToken, wSOL };
+  return { sender, factoryAddress, neonTransferContract, wNEON, fungibleSplToken, wSOL };
 }